vcl/inc/wizdlg.hxx | 3 ---
vcl/source/control/roadmapwizard.cxx | 11 +++--------
2 files changed, 3 insertions(+), 11 deletions(-)
New commits:
commit b583b8b413f57250fed6e1d95303b2c46d7d8e28
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon May 19 09:47:36 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Mon May 19 23:29:05 2025 +0200
vcl: Merge RoadmapWizard::enterState into caller
The state param was ignored anyway.
Change-Id: I4022c4aebf76bac679192f2e67218b96d662c5fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185509
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx
index 93817246330a..5c9d0c09def3 100644
--- a/vcl/inc/wizdlg.hxx
+++ b/vcl/inc/wizdlg.hxx
@@ -204,9 +204,6 @@ namespace vcl
/// to override to create new pages
VclPtr<TabPage> createPage(WizardTypes::WizardState nState);
- /// will be called when a new page is about to be displayed
- void enterState(WizardTypes::WizardState _nState);
-
/** determine the next state to travel from the given one
This method ensures that traveling happens along the active path.
diff --git a/vcl/source/control/roadmapwizard.cxx
b/vcl/source/control/roadmapwizard.cxx
index 89b6b408575f..7a62969f88f5 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -587,7 +587,9 @@ namespace vcl
WizardTypes::WizardState nCurrentLevel = GetCurLevel();
GetOrCreatePage( nCurrentLevel );
- enterState( nCurrentLevel );
+ // synchronize the roadmap
+ implUpdateRoadmap();
+ m_xRoadmapImpl->pRoadmap->SelectRoadmapItemByID(getCurrentState());
}
bool RoadmapWizard::ShowPage( sal_uInt16 nLevel )
@@ -1038,13 +1040,6 @@ namespace vcl
m_xRoadmapImpl->pRoadmap->SelectRoadmapItemByID( getCurrentState()
);
}
- void RoadmapWizard::enterState(WizardTypes::WizardState /*nState*/)
- {
- // synchronize the roadmap
- implUpdateRoadmap( );
- m_xRoadmapImpl->pRoadmap->SelectRoadmapItemByID( getCurrentState() );
- }
-
OUString RoadmapWizard::getStateDisplayName( WizardTypes::WizardState
_nState ) const
{
OUString sDisplayName;
