diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-12-03 12:34:37 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-12-04 09:54:36 +0100 |
| commit | 754afe85b2ddec45987f3060066f55dda05cdb67 (patch) | |
| tree | 832d6e7c507dd7e94ccd425093e5cf78ba736de2 /reportdesign/source/ui/inc | |
| parent | 2701708942061e05f5516f940f626e1a5a257226 (diff) | |
weld ONavigator
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>
Diffstat (limited to 'reportdesign/source/ui/inc')
| -rw-r--r-- | reportdesign/source/ui/inc/DesignView.hxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/inc/Navigator.hxx | 15 |
2 files changed, 8 insertions, 9 deletions
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 |