convert RID_NAVIGATOR floatingwindow to .ui

Change-Id: I40dbe9d315889a7c0033e940499b52aa4c137690

4 files changed, 16 insertions, 66 deletions

diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index f89a4459e92d..9b8864f79fc7 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -128,6 +128,7 @@ class NavigatorTree :   public ::cppu::BaseMutex
 
         inline uno::Reference< uno::XInterface > getContent() const { return m_xContent; }
         inline void setContent(const uno::Reference< uno::XInterface >& _xContent) { m_xContent = _xContent; }
+
     protected:
         // OPropertyChangeListener
         virtual void _propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException) SAL_OVERRIDE;
@@ -205,6 +206,8 @@ public:
 
     SvTreeListEntry* find(const uno::Reference< uno::XInterface >& _xContent);
     void removeEntry(SvTreeListEntry* _pEntry,bool _bRemove = true);
+
+    virtual Size GetOptimalSize() const SAL_OVERRIDE;
 private:
     using SvTreeListBox::ExecuteDrop;
 };
@@ -220,6 +223,9 @@ NavigatorTree::NavigatorTree( Window* pParent,OReportController& _rController )
         ,m_pDragedEntry(NULL)
         ,m_nTimerCounter( DROP_ACTION_TIMER_INITIAL_TICKS )
 {
+    set_hexpand(true);
+    set_vexpand(true);
+
     m_pReportListener = new OPropertyChangeMultiplexer(this,m_rController.getReportDefinition().get());
     m_pReportListener->addProperty(PROPERTY_PAGEHEADERON);
     m_pReportListener->addProperty(PROPERTY_PAGEFOOTERON);
@@ -861,13 +867,16 @@ void NavigatorTree::UserData::_disposing(const lang::EventObject& _rSource)
     m_pTree->_disposing( _rSource );
 }
 
-// class ONavigatorImpl
+Size NavigatorTree::GetOptimalSize() const
+{
+    return LogicToPixel(Size(100, 70), MAP_APPFONT);
+}
 
+// class ONavigatorImpl
 class ONavigatorImpl: private boost::noncopyable
 {
 public:
     ONavigatorImpl(OReportController& _rController,ONavigator* _pParent);
-    virtual ~ONavigatorImpl();
 
     uno::Reference< report::XReportDefinition>  m_xReport;
     ::rptui::OReportController&                 m_rController;
@@ -877,7 +886,7 @@ public:
 ONavigatorImpl::ONavigatorImpl(OReportController& _rController,ONavigator* _pParent)
     :m_xReport(_rController.getReportDefinition())
     ,m_rController(_rController)
-    ,m_pNavigatorTree(new NavigatorTree(_pParent,_rController))
+    ,m_pNavigatorTree(new NavigatorTree(_pParent->get<Window>("box"),_rController))
 {
     reportdesign::OReportVisitor aVisitor(m_pNavigatorTree.get());
     aVisitor.start(m_xReport);
@@ -886,55 +895,17 @@ ONavigatorImpl::ONavigatorImpl(OReportController& _rController,ONavigator* _pPar
     m_pNavigatorTree->_selectionChanged(aEvent);
 }
 
-ONavigatorImpl::~ONavigatorImpl()
-{
-}
-
-const long STD_WIN_SIZE_X = 210;
-const long STD_WIN_SIZE_Y = 280;
-const long LISTBOX_BORDER = 2;
-
 // class ONavigator
-
-ONavigator::ONavigator( Window* _pParent
-                        ,OReportController& _rController)
-    : FloatingWindow( _pParent, ModuleRes(RID_NAVIGATOR) )
+ONavigator::ONavigator(Window* _pParent ,OReportController& _rController)
+    : FloatingWindow( _pParent, "FloatingNavigator", "modules/dbreport/ui/floatingnavigator.ui")
 {
-
     m_pImpl.reset(new ONavigatorImpl(_rController,this));
 
-    FreeResource();
     m_pImpl->m_pNavigatorTree->Show();
     m_pImpl->m_pNavigatorTree->GrabFocus();
-    SetSizePixel(Size(STD_WIN_SIZE_X,STD_WIN_SIZE_Y));
     Show();
-
 }
 
-
-
-ONavigator::~ONavigator()
-{
-}
-
-void ONavigator::Resize()
-{
-    FloatingWindow::Resize();
-
-    Size aSize( GetOutputSizePixel() );
-
-
-
-    // Groesse der form::ListBox anpassen
-    Point aLBPos( LISTBOX_BORDER, LISTBOX_BORDER );
-    Size aLBSize( aSize );
-    aLBSize.Width() -= (2*LISTBOX_BORDER);
-    aLBSize.Height() -= (2*LISTBOX_BORDER);
-
-    m_pImpl->m_pNavigatorTree->SetPosSizePixel( aLBPos, aLBSize );
-}
-
-
 void ONavigator::GetFocus()
 {
     Window::GetFocus();
diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src
index 242ee1a70984..c6471f67efd6 100644
--- a/reportdesign/source/ui/dlg/Navigator.src
+++ b/reportdesign/source/ui/dlg/Navigator.src
@@ -27,25 +27,6 @@
 #define RID_SVXIMG_EXPANDEDNODE                     (RID_FORMS_START + 3)
 #define RID_SVXIMG_FORMS                            (RID_FORMS_START +13)
 
-FloatingWindow RID_NAVIGATOR
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 200 , 250 ) ;
-    Text [ en-US ] = "Report navigator" ;
-    HelpId = HID_RPT_NAVIGATOR_DLG;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Sizeable = TRUE;
-
-    Control 1
-    {
-        Pos = MAP_APPFONT( 0, 0 );
-        Size = MAP_APPFONT( 200, 250 );
-        Border = TRUE;
-        TabStop = TRUE;
-    };
-};
 #define NAVIGATOR_IMAGEIDS \
     IdList = \
     { \
diff --git a/reportdesign/source/ui/inc/Navigator.hxx b/reportdesign/source/ui/inc/Navigator.hxx
index 42b5fa016cb5..9f7942aa3bad 100644
--- a/reportdesign/source/ui/inc/Navigator.hxx
+++ b/reportdesign/source/ui/inc/Navigator.hxx
@@ -35,10 +35,8 @@ namespace rptui
     public:
            ONavigator( Window* pParent
                     ,OReportController& _rController);
-        virtual ~ONavigator();
 
         // window
-        virtual void    Resize() SAL_OVERRIDE;
         virtual void GetFocus() SAL_OVERRIDE;
     };
 
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index b4e9de932b96..2558c8cc0c99 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -149,7 +149,7 @@ ODesignView::~ODesignView()
     }
     if ( m_pReportExplorer )
     {
-        SvtViewOptions aDlgOpt( E_WINDOW, OUString::number( RID_NAVIGATOR) );
+        SvtViewOptions aDlgOpt(E_WINDOW, OStringToOUString(m_pReportExplorer->GetHelpId(), RTL_TEXTENCODING_UTF8));
         aDlgOpt.SetWindowState(OStringToOUString(m_pReportExplorer->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US));
         notifySystemWindow(this,m_pReportExplorer,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
         SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -496,7 +496,7 @@ void ODesignView::toggleReportExplorer()
     {
         OReportController& rReportController = getController();
         m_pReportExplorer = new ONavigator(this,rReportController);
-        SvtViewOptions aDlgOpt( E_WINDOW, OUString::number( RID_NAVIGATOR) );
+        SvtViewOptions aDlgOpt(E_WINDOW, OStringToOUString(m_pReportExplorer->GetHelpId(), RTL_TEXTENCODING_UTF8));
         if ( aDlgOpt.Exists() )
             m_pReportExplorer->SetWindowState(OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US));
         m_pReportExplorer->AddEventListener(LINK(&rReportController,OReportController,EventLstHdl));