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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/navigat.cxx | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index 90116d8a2064..aac78f33bc13 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -28,32 +28,29 @@ #include <helpids.h> #include <tools/debug.hxx> -SfxNavigatorWrapper::SfxNavigatorWrapper( vcl::Window* pParentWnd , - sal_uInt16 nId , - SfxBindings* /*pBindings*/ , - SfxChildWinInfo* /*pInfo*/ ) - : SfxChildWindow( pParentWnd , nId ) +SfxNavigatorWrapper::SfxNavigatorWrapper(vcl::Window* pParentWnd, sal_uInt16 nId) + : SfxChildWindow(pParentWnd , nId) { } -void SfxNavigatorWrapper::Initialize(SfxChildWinInfo* pInfo) +void SfxNavigatorWrapper::Initialize() { - GetWindow()->SetHelpId ( HID_NAVIGATOR_WINDOW ); - GetWindow()->SetOutputSizePixel( Size( 270, 240 ) ); - - static_cast<SfxDockingWindow*>( GetWindow() )->Initialize( pInfo ); - SetHideNotDelete( true ); + SetHideNotDelete(true); } -SfxNavigator::SfxNavigator( SfxBindings* pBind , - SfxChildWindow* pChildWin , - vcl::Window* pParent ) +SfxNavigator::SfxNavigator(SfxBindings* pBind , + SfxChildWindow* pChildWin , + vcl::Window* pParent, + SfxChildWinInfo* pInfo) : SfxDockingWindow(pBind , pChildWin , pParent , "Navigator", "sfx/ui/navigator.ui") { SetText(SfxResId(STR_SID_NAVIGATOR)); + SetHelpId(HID_NAVIGATOR_WINDOW); + SetOutputSizePixel(Size(270, 240)); + Initialize(pInfo); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |