diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-04-22 14:17:10 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-04-23 09:48:31 +0200 |
| commit | fe7fd5bdd2ae8b0829dd5947a7acd0b75970a51c (patch) | |
| tree | 5b160a57510bb737d95ddfdf2508b12c99ba115d /sd | |
| parent | 700fe95fac2e2f592159f189ed3ac9e633bf749d (diff) | |
tdf#141824 init navigator to possibly floating in base ctor
so its in the expected state when the child contents are created
Change-Id: Id5baaca8479334c8fa2ec60ce8b598b7a61a3d7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114481
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/dlg/NavigatorChildWindow.cxx | 11 | ||||
| -rw-r--r-- | sd/source/ui/inc/navigatr.hxx | 3 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx b/sd/source/ui/dlg/NavigatorChildWindow.cxx index a6eee97e6620..6055c238a3c9 100644 --- a/sd/source/ui/dlg/NavigatorChildWindow.cxx +++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx @@ -40,8 +40,9 @@ static void RequestNavigatorUpdate (SfxBindings const * pBindings) } } -SdNavigatorFloat::SdNavigatorFloat(SfxBindings* _pBindings, SfxChildWindow* _pMgr, vcl::Window* _pParent) - : SfxNavigator(_pBindings, _pMgr, _pParent) +SdNavigatorFloat::SdNavigatorFloat(SfxBindings* _pBindings, SfxChildWindow* _pMgr, + vcl::Window* _pParent, SfxChildWinInfo* pInfo) + : SfxNavigator(_pBindings, _pMgr, _pParent, pInfo) , m_xNavWin(std::make_unique<SdNavigatorWin>(m_xContainer.get(), _pBindings, this)) , m_bSetInitialFocusOnActivate(true) { @@ -88,10 +89,10 @@ SFX_IMPL_DOCKINGWINDOW(SdNavigatorWrapper, SID_NAVIGATOR); SdNavigatorWrapper::SdNavigatorWrapper(vcl::Window *_pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) - : SfxNavigatorWrapper(_pParent, nId, pBindings, pInfo) + : SfxNavigatorWrapper(_pParent, nId) { - SetWindow(VclPtr<SdNavigatorFloat>::Create(pBindings, this, _pParent)); - Initialize(pInfo); + SetWindow(VclPtr<SdNavigatorFloat>::Create(pBindings, this, _pParent, pInfo)); + Initialize(); } } // end of namespace sd diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index 218b594acbcb..b19748c8cbf7 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -86,7 +86,8 @@ private: bool m_bSetInitialFocusOnActivate; public: - SdNavigatorFloat(SfxBindings* _pBindings, SfxChildWindow* pMgr, vcl::Window* pParent); + SdNavigatorFloat(SfxBindings* _pBindings, SfxChildWindow* pMgr, + vcl::Window* pParent, SfxChildWinInfo* pInfo); void InitTreeLB(const SdDrawDocument* pDoc); void FreshTree(const SdDrawDocument* pDoc); virtual void Activate() override; |