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

8 files changed, 12 insertions, 24 deletions

diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 105ab39655f0..d8007873a2c4 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -213,14 +213,11 @@ namespace abp
     }
 
     //---------------------------------------------------------------------
-    sal_Bool OAddessBookSourcePilot::onFinish(sal_Int32 _nResult)
+    sal_Bool OAddessBookSourcePilot::onFinish()
     {
-        if (!OAddessBookSourcePilot_Base::onFinish(_nResult))
+        if ( !OAddessBookSourcePilot_Base::onFinish() )
             return sal_False;
 
-        if (RET_OK != _nResult)
-            return sal_True;
-
         implCommitAll();
 
         addressconfig::markPilotSuccess( getORB() );
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index b0f3b900871b..0abdacd0281d 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -79,7 +79,7 @@ namespace abp
         virtual ::svt::OWizardPage* createPage( WizardState _nState );
         virtual void                enterState( WizardState _nState );
         virtual sal_Bool            prepareLeaveCurrentState( CommitPageReason _eReason );
-        virtual sal_Bool            onFinish( sal_Int32 _nResult );
+        virtual sal_Bool            onFinish();
 
         // RoadmapWizard
         virtual String              getStateDisplayName( WizardState _nState ) const;
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index ec42cf346450..a54ed2f4b879 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -285,9 +285,9 @@ namespace dbp
     }
 
     //---------------------------------------------------------------------
-    sal_Bool OGridWizard::onFinish(sal_Int32 _nResult)
+    sal_Bool OGridWizard::onFinish()
     {
-        if (!OControlWizard::onFinish(_nResult))
+        if ( !OControlWizard::onFinish() )
             return sal_False;
 
         implApplySettings();
diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx
index 1ab0d3186440..85b91d274345 100644
--- a/extensions/source/dbpilots/gridwizard.hxx
+++ b/extensions/source/dbpilots/gridwizard.hxx
@@ -68,8 +68,7 @@ namespace dbp
         virtual WizardState         determineNextState( WizardState _nCurrentState ) const;
         virtual void                enterState( WizardState _nState );
         virtual sal_Bool            leaveState( WizardState _nState );
-
-        virtual sal_Bool onFinish(sal_Int32 _nResult);
+        virtual sal_Bool            onFinish();
 
         virtual sal_Bool approveControl(sal_Int16 _nClassId);
 
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index f35ed890fde5..9956cfe86428 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -187,18 +187,15 @@ namespace dbp
     }
 
     //---------------------------------------------------------------------
-    sal_Bool OGroupBoxWizard::onFinish(sal_Int32 _nResult)
+    sal_Bool OGroupBoxWizard::onFinish()
     {
-        if (RET_OK != _nResult)
-            return OControlWizard::onFinish(_nResult);
-
         // commit the basic control setttings
         commitControlSettings(&m_aSettings);
 
         // create the radio buttons
         createRadios();
 
-        return OControlWizard::onFinish(_nResult);
+        return OControlWizard::onFinish();
     }
 
     //=====================================================================
diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx
index cba4895e8664..de0f9767f3a4 100644
--- a/extensions/source/dbpilots/groupboxwiz.hxx
+++ b/extensions/source/dbpilots/groupboxwiz.hxx
@@ -73,8 +73,7 @@ namespace dbp
         virtual ::svt::OWizardPage* createPage( WizardState _nState );
         virtual WizardState         determineNextState( WizardState _nCurrentState ) const;
         virtual void                enterState( WizardState _nState );
-
-        virtual sal_Bool onFinish(sal_Int32 _nResult);
+        virtual sal_Bool            onFinish();
 
         virtual sal_Bool approveControl(sal_Int16 _nClassId);
 
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index 63659f613460..bf3f56781d63 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -226,14 +226,11 @@ namespace dbp
     }
 
     //---------------------------------------------------------------------
-    sal_Bool OListComboWizard::onFinish(sal_Int32 _nResult)
+    sal_Bool OListComboWizard::onFinish()
     {
-        if (!OControlWizard::onFinish(_nResult))
+        if ( !OControlWizard::onFinish() )
             return sal_False;
 
-        if (RET_OK != _nResult)
-            return sal_True;
-
         implApplySettings();
         return sal_True;
     }
diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx
index c30a19a77a00..05f7f70ea65d 100644
--- a/extensions/source/dbpilots/listcombowizard.hxx
+++ b/extensions/source/dbpilots/listcombowizard.hxx
@@ -80,8 +80,7 @@ namespace dbp
         virtual WizardState         determineNextState( WizardState _nCurrentState ) const;
         virtual void                enterState( WizardState _nState );
         virtual sal_Bool            leaveState( WizardState _nState );
-
-        virtual sal_Bool onFinish(sal_Int32 _nResult);
+        virtual sal_Bool            onFinish();
 
         virtual sal_Bool approveControl(sal_Int16 _nClassId);