unoawt: onFinish does not need this parameter, it's always called with RET_OK

6 files changed, 11 insertions, 12 deletions

diff --git a/svtools/inc/svtools/wizardmachine.hxx b/svtools/inc/svtools/wizardmachine.hxx
index 9c1b8e2a6867..05e796646253 100644
--- a/svtools/inc/svtools/wizardmachine.hxx
+++ b/svtools/inc/svtools/wizardmachine.hxx
@@ -259,7 +259,7 @@ namespace svt
         /** called when the finish button is pressed
             <p>By default, only the base class' Finnish method (which is not virtual) is called</p>
         */
-        virtual sal_Bool    onFinish(sal_Int32 _nResult);
+        virtual sal_Bool    onFinish();
 
         /// travel to the next state
         sal_Bool            travelNext();
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index bc19a588a204..5a5c094c1572 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -445,9 +445,9 @@ namespace svt
     }
 
     //---------------------------------------------------------------------
-    sal_Bool OWizardMachine::onFinish(sal_Int32 _nResult)
+    sal_Bool OWizardMachine::onFinish()
     {
-        return Finnish(_nResult);
+        return Finnish( RET_OK );
     }
 
     //---------------------------------------------------------------------
@@ -460,8 +460,7 @@ namespace svt
         {
             return 0L;
         }
-        long nRet = onFinish( RET_OK );
-        return nRet;
+        return onFinish() ? 1L : 0L;
     }
 
     //---------------------------------------------------------------------
diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx
index 51dbbe3f2013..fb78e4a7bd11 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -276,11 +276,11 @@ namespace svt { namespace uno
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    sal_Bool WizardShell::onFinish( sal_Int32 i_nResult )
+    sal_Bool WizardShell::onFinish()
     {
         try
         {
-            if ( ( i_nResult == RET_OK ) && m_xController.is() && !m_xController->confirmFinish() )
+            if ( m_xController.is() && !m_xController->confirmFinish() )
                 return sal_False;
         }
         catch( const Exception& )
@@ -288,7 +288,7 @@ namespace svt { namespace uno
             DBG_UNHANDLED_EXCEPTION();
         }
 
-        return WizardShell_Base::onFinish( i_nResult );
+        return WizardShell_Base::onFinish();
     }
 
 //......................................................................................................................
diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx
index b21e1c4756e5..ffe4c1fc37f8 100644
--- a/svtools/source/uno/wizard/wizardshell.hxx
+++ b/svtools/source/uno/wizard/wizardshell.hxx
@@ -70,7 +70,7 @@ namespace svt { namespace uno
         virtual sal_Bool    leaveState( WizardState i_nState );
         virtual String      getStateDisplayName( WizardState i_nState ) const;
         virtual bool        canAdvance() const;
-        virtual sal_Bool    onFinish( sal_Int32 _nResult );
+        virtual sal_Bool    onFinish();
         virtual IWizardPageController*
                             getPageController( TabPage* _pCurrentPage ) const;
 
diff --git a/svtools/workben/unodialog/roadmapskeleton.cxx b/svtools/workben/unodialog/roadmapskeleton.cxx
index f261f219c3fd..e3ed06707f14 100644
--- a/svtools/workben/unodialog/roadmapskeleton.cxx
+++ b/svtools/workben/unodialog/roadmapskeleton.cxx
@@ -103,9 +103,9 @@ namespace udlg
     }
 
     //--------------------------------------------------------------------
-    sal_Bool RoadmapSkeletonDialog::onFinish( sal_Int32 _nResult )
+    sal_Bool RoadmapSkeletonDialog::onFinish()
     {
-        return RoadmapSkeletonDialog_Base::onFinish( _nResult );
+        return RoadmapSkeletonDialog_Base::onFinish();
     }
 
 //........................................................................
diff --git a/svtools/workben/unodialog/roadmapskeleton.hxx b/svtools/workben/unodialog/roadmapskeleton.hxx
index 216c940b842a..8859390c4b58 100644
--- a/svtools/workben/unodialog/roadmapskeleton.hxx
+++ b/svtools/workben/unodialog/roadmapskeleton.hxx
@@ -52,7 +52,7 @@ namespace udlg
         virtual sal_Bool        prepareLeaveCurrentState( CommitPageReason _eReason );
         virtual sal_Bool        leaveState( WizardState _nState );
         virtual WizardState     determineNextState( WizardState _nCurrentState ) const;
-        virtual sal_Bool        onFinish( sal_Int32 _nResult );
+        virtual sal_Bool        onFinish();
 
     private:
         ::comphelper::ComponentContext  m_aContext;