sfx2: Switch 2 SfxNavigator ctor params to ref
Change-Id: I11324ba8191f3c07396e99238cc98b0199cc434a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208369 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Jenkins
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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<ScNavigatorDlg>(rBindings, m_xContainer.get(), this);
|
||||
SetMinOutputSizePixel(GetOptimalSize());
|
||||
|
||||
@@ -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<SdNavigatorWin>(m_xContainer.get(), &rBindings, this))
|
||||
, m_bSetInitialFocusOnActivate(true)
|
||||
{
|
||||
|
||||
@@ -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: */
|
||||
|
||||
@@ -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<SwNavigationPI>(m_xContainer.get(), rBindings.GetActiveFrame(),
|
||||
&rBindings, this))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user