diff --git a/include/sfx2/navigat.hxx b/include/sfx2/navigat.hxx index febdefa81745..a6823be6d8f6 100644 --- a/include/sfx2/navigat.hxx +++ b/include/sfx2/navigat.hxx @@ -34,8 +34,8 @@ public: class SFX2_DLLPUBLIC SfxNavigator : public SfxDockingWindow { public: - SfxNavigator(SfxBindings* pBindings, SfxChildWindow* pChildWin, - vcl::Window* pParent, SfxChildWinInfo* pInfo); + SfxNavigator(SfxBindings& rBindings, SfxChildWindow* pChildWin, vcl::Window* pParent, + SfxChildWinInfo& rInfo); }; #endif diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index f88fef759097..9a5480406f17 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -288,7 +288,7 @@ ScNavigatorSettings::ScNavigatorSettings() ScNavigatorWin::ScNavigatorWin(SfxBindings& rBindings, SfxChildWindow* _pMgr, vcl::Window* _pParent, SfxChildWinInfo& rInfo) - : SfxNavigator(&rBindings, _pMgr, _pParent, &rInfo) + : SfxNavigator(rBindings, _pMgr, _pParent, rInfo) { m_xNavigator = std::make_unique(rBindings, m_xContainer.get(), this); SetMinOutputSizePixel(GetOptimalSize()); diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx b/sd/source/ui/dlg/NavigatorChildWindow.cxx index e4da41d59d1c..ea298d83a71e 100644 --- a/sd/source/ui/dlg/NavigatorChildWindow.cxx +++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx @@ -46,7 +46,7 @@ static void RequestNavigatorUpdate (SfxBindings const * pBindings) SdNavigatorFloat::SdNavigatorFloat(SfxBindings& rBindings, SfxChildWindow* _pMgr, vcl::Window* _pParent, SfxChildWinInfo& rInfo) - : SfxNavigator(&rBindings, _pMgr, _pParent, &rInfo) + : SfxNavigator(rBindings, _pMgr, _pParent, rInfo) , m_xNavWin(std::make_unique(m_xContainer.get(), &rBindings, this)) , m_bSetInitialFocusOnActivate(true) { diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index 6c82ea21a522..9b197dd14868 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -35,19 +35,15 @@ void SfxNavigatorWrapper::Initialize() SetHideNotDelete(true); } -SfxNavigator::SfxNavigator(SfxBindings* pBind , - SfxChildWindow* pChildWin , - vcl::Window* pParent, - SfxChildWinInfo* pInfo) - : SfxDockingWindow(pBind , - pChildWin , - pParent , - u"Navigator"_ustr, u"sfx/ui/navigator.ui"_ustr) +SfxNavigator::SfxNavigator(SfxBindings& rBindings, SfxChildWindow* pChildWin, vcl::Window* pParent, + SfxChildWinInfo& rInfo) + : SfxDockingWindow(&rBindings, pChildWin, pParent, u"Navigator"_ustr, + u"sfx/ui/navigator.ui"_ustr) { SetText(SfxResId(STR_SID_NAVIGATOR)); SetHelpId(HID_NAVIGATOR_WINDOW); SetOutputSizePixel(Size(270, 240)); - Initialize(pInfo); + Initialize(&rInfo); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 9fdcaae7f0c3..06776fbdee46 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -1304,7 +1304,7 @@ SwView* SwNavigationPI::GetCreateView() const SwNavigatorWin::SwNavigatorWin(SfxBindings& rBindings, SfxChildWindow* _pMgr, vcl::Window* pParent, SfxChildWinInfo& rInfo) - : SfxNavigator(&rBindings, _pMgr, pParent, &rInfo) + : SfxNavigator(rBindings, _pMgr, pParent, rInfo) , m_xNavi(std::make_unique(m_xContainer.get(), rBindings.GetActiveFrame(), &rBindings, this)) {