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

6 files changed, 11 insertions, 11 deletions

diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index ecdce4bab..ec1b5c2f1 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -314,9 +314,9 @@ namespace dbmm
     }
 
     //--------------------------------------------------------------------
-    sal_Bool MacroMigrationDialog::onFinish( sal_Int32 _nResult )
+    sal_Bool MacroMigrationDialog::onFinish()
     {
-        return MacroMigrationDialog_Base::onFinish( _nResult );
+        return MacroMigrationDialog_Base::onFinish();
     }
 
     //--------------------------------------------------------------------
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
index 5e042a3f5..947f9d1ae 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
@@ -68,7 +68,7 @@ namespace dbmm
         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();
 
         // Dialog overridables
         virtual BOOL    Close();
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index cc07cfd9f..53e3f928d 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -411,10 +411,10 @@ IWizardPageController* ODbTypeWizDialog::getPageController( TabPage* _pCurrentPa
     return pPage;
 }
 // -----------------------------------------------------------------------------
-sal_Bool ODbTypeWizDialog::onFinish(sal_Int32 _nResult)
+sal_Bool ODbTypeWizDialog::onFinish()
 {
     saveDatasource();
-    return m_pImpl->saveChanges(*m_pOutSet) ? OWizardMachine::onFinish(_nResult) : sal_False;
+    return m_pImpl->saveChanges(*m_pOutSet) ? OWizardMachine::onFinish() : sal_False;
 }
 //.........................................................................
 }	// namespace dbaui
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 3338e9406..b43f6b7ab 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -789,7 +789,7 @@ IMPL_LINK(ODbTypeWizDialogSetup, OnRecentDocumentSelected, OGeneralPage*, /*_pGe
 IMPL_LINK(ODbTypeWizDialogSetup, OnSingleDocumentChosen, OGeneralPage*, /*_pGeneralPage*/)
 {
     if ( prepareLeaveCurrentState( eFinish ) )
-        onFinish( RET_OK );
+        onFinish();
     return 0L;
 }
 
@@ -1206,7 +1206,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
     }
 
     // -----------------------------------------------------------------------------
-    sal_Bool ODbTypeWizDialogSetup::onFinish(sal_Int32 _nResult)
+    sal_Bool ODbTypeWizDialogSetup::onFinish()
     {
         if ( m_pGeneralPage->GetDatabaseCreationMode() == OGeneralPage::eOpenExisting )
         {
@@ -1214,7 +1214,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
             // wants us to load could be a non-database document. Instead, we asynchronously
             // open the selected document. Thus, the wizard's return value is RET_CANCEL,
             // which means to not continue loading the database document
-            if ( !OWizardMachine::onFinish( RET_CANCEL ) )
+            if ( !OWizardMachine::Finnish( RET_CANCEL ) )
                 return sal_False;
 
             Reference< XComponentLoader > xFrameLoader;
@@ -1237,7 +1237,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
             skipUntil(PAGE_DBSETUPWIZARD_FINAL);
         }
         if (getCurrentState() == PAGE_DBSETUPWIZARD_FINAL)
-            return SaveDatabaseDocument() ? OWizardMachine::onFinish( _nResult ) : sal_False;
+            return SaveDatabaseDocument() ? OWizardMachine::onFinish() : sal_False;
         else
         {
                enableButtons( WZB_FINISH, sal_False );
diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx
index 8c1839e28..3bd8fc666 100644
--- a/dbaccess/source/ui/inc/dbwiz.hxx
+++ b/dbaccess/source/ui/inc/dbwiz.hxx
@@ -113,7 +113,7 @@ protected:
     virtual	sal_Bool	leaveState(WizardState _nState);
     virtual ::svt::IWizardPageController*
                         getPageController( TabPage* _pCurrentPage ) const;
-    virtual sal_Bool    onFinish(sal_Int32 _nResult);
+    virtual sal_Bool    onFinish();
 
 protected:
     inline sal_Bool	isUIEnabled() const { return m_bUIEnabled; }
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index 45b38e952..25899e158 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -150,7 +150,7 @@ protected:
     virtual	sal_Bool	leaveState(WizardState _nState);
     virtual void enterState(WizardState _nState);
     virtual ::svt::IWizardPageController* getPageController( TabPage* _pCurrentPage ) const;
-    virtual sal_Bool onFinish(sal_Int32 _nResult);
+    virtual sal_Bool onFinish();
 
 protected:
     inline sal_Bool	isUIEnabled() const { return m_bUIEnabled; }