From 754afe85b2ddec45987f3060066f55dda05cdb67 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 3 Dec 2019 12:34:37 +0000
Subject: weld ONavigator
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I0b1ae0d50fa8b4c01c36ece0fdd1c2b316ccd27b
Reviewed-on: https://gerrit.libreoffice.org/84357
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 reportdesign/source/ui/inc/DesignView.hxx |  2 +-
 reportdesign/source/ui/inc/Navigator.hxx  | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'reportdesign/source/ui/inc')

diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 05136a7544c3..7b78d7327cf4 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -65,7 +65,7 @@ namespace rptui
         VclPtr<PropBrw>                     m_pPropWin;
         std::shared_ptr<OAddFieldWindow>    m_xAddField;
         OSectionView*                       m_pCurrentView;
-        VclPtr<ONavigator>                  m_pReportExplorer;
+        std::shared_ptr<ONavigator>         m_xReportExplorer;
         Idle                                m_aMarkIdle;
         DlgEdMode                           m_eMode;
         sal_uInt16                          m_eActObj;
diff --git a/reportdesign/source/ui/inc/Navigator.hxx b/reportdesign/source/ui/inc/Navigator.hxx
index 43550c9f3929..5c28d240138c 100644
--- a/reportdesign/source/ui/inc/Navigator.hxx
+++ b/reportdesign/source/ui/inc/Navigator.hxx
@@ -19,24 +19,23 @@
 #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_NAVIGATOR_HXX
 #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_NAVIGATOR_HXX
 
-#include <vcl/floatwin.hxx>
+#include <vcl/weld.hxx>
 #include <memory>
 namespace rptui
 {
     class OReportController;
     class ONavigatorImpl;
-    class ONavigator :  public FloatingWindow
+    class ONavigator : public weld::GenericDialogController
     {
         ::std::unique_ptr<ONavigatorImpl> m_pImpl;
         ONavigator(const ONavigator&) = delete;
         void operator =(const ONavigator&) = delete;
-    public:
-           ONavigator( vcl::Window* pParent
-                    ,OReportController& _rController);
 
-        // window
-        virtual void GetFocus() override;
-        virtual void dispose() override;
+        DECL_LINK(FocusChangeHdl, weld::Widget&, void);
+
+    public:
+        ONavigator(weld::Window* pParent, OReportController& rController);
+        ~ONavigator();
     };
 
 } // namespace rptui
-- 
cgit