core.git: vcl/inc vcl/source

[Michael Weghorn (via logerrit)]

 vcl/inc/wizdlg.hxx                   |    2 --
 vcl/source/control/roadmapwizard.cxx |   11 +++--------
 2 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 3d473098d3c8ba3eb4730bbc07a04fa66b4a0fb8
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon May 19 09:54:06 2025 +0200
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Mon May 19 23:30:00 2025 +0200

    vcl: Merge RoadmapWizard::{Activate,Show}Page
    
    Change-Id: I2f3a92ae95abb89dcf31c37b28d73fc9fa87f73e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185510
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx
index 5c9d0c09def3..442d75ed01f0 100644
--- a/vcl/inc/wizdlg.hxx
+++ b/vcl/inc/wizdlg.hxx
@@ -167,8 +167,6 @@ namespace vcl
         virtual void        StateChanged( StateChangedType nStateChange ) 
override;
         virtual bool        EventNotify( NotifyEvent& rNEvt ) override;
 
-        void                ActivatePage();
-
         virtual void        queue_resize(StateChangedType eReason = 
StateChangedType::Layout) override;
 
         bool                ShowPage( sal_uInt16 nLevel );
diff --git a/vcl/source/control/roadmapwizard.cxx 
b/vcl/source/control/roadmapwizard.cxx
index 7a62969f88f5..3bcc0765afa9 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -582,20 +582,15 @@ namespace vcl
             SetPage( i_nState, pNewPage );
     }
 
-    void RoadmapWizard::ActivatePage()
+    bool RoadmapWizard::ShowPage( sal_uInt16 nLevel )
     {
-        WizardTypes::WizardState nCurrentLevel = GetCurLevel();
-        GetOrCreatePage( nCurrentLevel );
+        mnCurLevel = nLevel;
+        GetOrCreatePage(mnCurLevel);
 
         // synchronize the roadmap
         implUpdateRoadmap();
         m_xRoadmapImpl->pRoadmap->SelectRoadmapItemByID(getCurrentState());
-    }
 
-    bool RoadmapWizard::ShowPage( sal_uInt16 nLevel )
-    {
-        mnCurLevel = nLevel;
-        ActivatePage();
         ImplShowTabPage( ImplGetPage( mnCurLevel ) );
         return true;
     }