loplugin:unnecessaryvirtual

Change-Id: I866d7bd03a41260a9b4f4be87a7a02d3ceecc1c7
Reviewed-on: https://gerrit.libreoffice.org/79534
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 12 insertions, 37 deletions

diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx
index 91daa8ddfb19..fc394da25c77 100644
--- a/vcl/source/control/wizardmachine.cxx
+++ b/vcl/source/control/wizardmachine.cxx
@@ -588,12 +588,6 @@ namespace vcl
         enterState( nCurrentLevel );
     }
 
-    bool RoadmapWizard::DeactivatePage()
-    {
-        WizardTypes::WizardState nCurrentState = getCurrentState();
-        return leaveState(nCurrentState);
-    }
-
     void RoadmapWizard::defaultButton(WizardButtonFlags _nWizardButtonFlags)
     {
         // the new default button
@@ -629,32 +623,22 @@ namespace vcl
 
     bool RoadmapWizard::ShowPage( sal_uInt16 nLevel )
     {
-        if ( DeactivatePage() )
-        {
-            mnCurLevel = nLevel;
-            ActivatePage();
-            ImplShowTabPage( ImplGetPage( mnCurLevel ) );
-            return true;
-        }
-        else
-            return false;
+        mnCurLevel = nLevel;
+        ActivatePage();
+        ImplShowTabPage( ImplGetPage( mnCurLevel ) );
+        return true;
     }
 
     bool RoadmapWizard::Finish( long nResult )
     {
-        if ( DeactivatePage() )
-        {
-            if ( mpCurTabPage )
-                mpCurTabPage->DeactivatePage();
+        if ( mpCurTabPage )
+            mpCurTabPage->DeactivatePage();
 
-            if ( IsInExecute() )
-                EndDialog( nResult );
-            else if ( GetStyle() & WB_CLOSEABLE )
-                Close();
-            return true;
-        }
-        else
-            return false;
+        if ( IsInExecute() )
+            EndDialog( nResult );
+        else if ( GetStyle() & WB_CLOSEABLE )
+            Close();
+        return true;
     }
 
     void RoadmapWizard::AddPage( TabPage* pPage )
@@ -829,15 +813,6 @@ namespace vcl
             m_pCancel->Enable(_bEnable);
     }
 
-    bool RoadmapWizard::leaveState(WizardTypes::WizardState)
-    {
-        // no need to ask the page here.
-        // If we reach this point, we already gave the current page the chance to commit it's data,
-        // and it was allowed to commit it's data
-
-        return true;
-    }
-
     bool RoadmapWizard::onFinish()
     {
         return Finish( RET_OK );
@@ -1054,7 +1029,7 @@ namespace vcl
         travelNext();
     }
 
-    IWizardPageController* RoadmapWizard::getPageController( TabPage* _pCurrentPage ) const
+    IWizardPageController* RoadmapWizard::getPageController( TabPage* _pCurrentPage )
     {
         IWizardPageController* pController = dynamic_cast< IWizardPageController* >( _pCurrentPage );
         return pController;