diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-22 14:36:56 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-22 14:18:25 +0100 |
commit | cbadc090a273a1d07d7b917fe0317d5450067662 (patch) | |
tree | 52fbd1212960af3c12d825f8b4cdf0f9877c79a0 /vcl | |
parent | 0970b8b652835001076d14138a54b4add1b93a93 (diff) |
inline some construction methods
only called from one constructor
Change-Id: I082cf3b459c936b79a6df695fffac5e3cf43705b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87186
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/wizdlg.hxx | 3 | ||||
-rw-r--r-- | vcl/source/control/roadmapwizard.cxx | 33 | ||||
-rw-r--r-- | vcl/source/control/wizardmachine.cxx | 17 |
3 files changed, 20 insertions, 33 deletions
diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx index eeb17934d617..9bb9f77abb38 100644 --- a/vcl/inc/wizdlg.hxx +++ b/vcl/inc/wizdlg.hxx @@ -256,8 +256,6 @@ namespace vcl */ void implUpdateRoadmap( ); - void impl_construct(); - public: class AccessGuard { @@ -274,7 +272,6 @@ namespace vcl TabPage* GetOrCreatePage(const WizardTypes::WizardState i_nState); private: - void ImplInitData(); void ImplCalcSize( Size& rSize ); void ImplPosCtrls(); void ImplPosTabPage(); diff --git a/vcl/source/control/roadmapwizard.cxx b/vcl/source/control/roadmapwizard.cxx index a6c718039b22..f4a35bb7861a 100644 --- a/vcl/source/control/roadmapwizard.cxx +++ b/vcl/source/control/roadmapwizard.cxx @@ -130,22 +130,22 @@ namespace vcl , m_xWizardImpl(new WizardMachineImplData) , m_xRoadmapImpl(new RoadmapWizardImpl) { - ImplInitData(); + mpFirstPage = nullptr; + mpFirstBtn = nullptr; + mpCurTabPage = nullptr; + mpPrevBtn = nullptr; + mpNextBtn = nullptr; + mpViewWindow = nullptr; + mnCurLevel = 0; + meViewAlign = WindowAlign::Left; + mbEmptyViewMargin = false; + mnLeftAlignCount = 0; + + maWizardLayoutIdle.SetPriority(TaskPriority::RESIZE); + maWizardLayoutIdle.SetInvokeHandler( LINK( this, RoadmapWizard, ImplHandleWizardLayoutTimerHdl ) ); implConstruct(WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP); - impl_construct(); - } - - RoadmapWizardMachine::RoadmapWizardMachine(weld::Window* pParent) - : WizardMachine(pParent, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP) - , m_pImpl( new RoadmapWizardImpl ) - { - m_xAssistant->connect_jump_page(LINK(this, RoadmapWizardMachine, OnRoadmapItemSelected)); - } - - void RoadmapWizard::impl_construct() - { SetLeftAlignedButtonCount( 1 ); mbEmptyViewMargin = true; @@ -163,6 +163,13 @@ namespace vcl m_xRoadmapImpl->pRoadmap->Show(); } + RoadmapWizardMachine::RoadmapWizardMachine(weld::Window* pParent) + : WizardMachine(pParent, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP) + , m_pImpl( new RoadmapWizardImpl ) + { + m_xAssistant->connect_jump_page(LINK(this, RoadmapWizardMachine, OnRoadmapItemSelected)); + } + void RoadmapWizard::ShowRoadmap(bool bShow) { m_xRoadmapImpl->pRoadmap->Show(bShow); diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx index a92c4c4b68cb..4971a5c53bb7 100644 --- a/vcl/source/control/wizardmachine.cxx +++ b/vcl/source/control/wizardmachine.cxx @@ -75,23 +75,6 @@ namespace vcl return true; } - void RoadmapWizard::ImplInitData() - { - mpFirstPage = nullptr; - mpFirstBtn = nullptr; - mpCurTabPage = nullptr; - mpPrevBtn = nullptr; - mpNextBtn = nullptr; - mpViewWindow = nullptr; - mnCurLevel = 0; - meViewAlign = WindowAlign::Left; - mbEmptyViewMargin = false; - mnLeftAlignCount = 0; - - maWizardLayoutIdle.SetPriority(TaskPriority::RESIZE); - maWizardLayoutIdle.SetInvokeHandler( LINK( this, RoadmapWizard, ImplHandleWizardLayoutTimerHdl ) ); - } - void RoadmapWizard::SetLeftAlignedButtonCount( sal_Int16 _nCount ) { mnLeftAlignCount = _nCount; |