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 /sw/source/uibase | |
| 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 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/utlui/navipi.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 47593d643c42..05bbbe6a9e5b 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -1093,7 +1093,8 @@ class SwNavigatorWin : public SfxNavigator private: std::unique_ptr<SwNavigationPI> m_xNavi; public: - SwNavigatorWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, vcl::Window* pParent); + SwNavigatorWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, + vcl::Window* pParent, SfxChildWinInfo* pInfo); virtual void StateChanged(StateChangedType nStateChange) override; virtual void dispose() override { @@ -1106,8 +1107,9 @@ public: } }; -SwNavigatorWin::SwNavigatorWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, vcl::Window* pParent) - : SfxNavigator(_pBindings, _pMgr, pParent) +SwNavigatorWin::SwNavigatorWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, + vcl::Window* pParent, SfxChildWinInfo* pInfo) + : SfxNavigator(_pBindings, _pMgr, pParent, pInfo) , m_xNavi(std::make_unique<SwNavigationPI>(m_xContainer.get(), _pBindings->GetActiveFrame(), _pBindings, this)) { _pBindings->Invalidate(SID_NAVIGATOR); @@ -1143,10 +1145,10 @@ SFX_IMPL_DOCKINGWINDOW(SwNavigatorWrapper, SID_NAVIGATOR); SwNavigatorWrapper::SwNavigatorWrapper(vcl::Window *_pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) - : SfxNavigatorWrapper(_pParent, nId, pBindings, pInfo) + : SfxNavigatorWrapper(_pParent, nId) { - SetWindow(VclPtr<SwNavigatorWin>::Create(pBindings, this, _pParent)); - Initialize(pInfo); + SetWindow(VclPtr<SwNavigatorWin>::Create(pBindings, this, _pParent, pInfo)); + Initialize(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |