CWS-TOOLING: integrate CWS unoawt

4 files changed, 15 insertions, 15 deletions

diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx
index 11cc61ed84ff..53ec488c2082 100644
--- a/desktop/source/migration/pages.cxx
+++ b/desktop/source/migration/pages.cxx
@@ -357,9 +357,9 @@ MigrationPage::MigrationPage(
     m_ftBody.SetText( aText );
 }
 
-sal_Bool MigrationPage::commitPage( CommitPageReason _eReason )
+sal_Bool MigrationPage::commitPage( svt::WizardTypes::CommitPageReason _eReason )
 {
-    if (_eReason == eTravelForward && m_cbMigration.IsChecked() && !m_bMigrationDone)
+    if (_eReason == svt::WizardTypes::eTravelForward && m_cbMigration.IsChecked() && !m_bMigrationDone)
     {
         GetParent()->EnterWait();
         FirstStartWizard* pWizard = dynamic_cast< FirstStartWizard* >( GetParent() );
@@ -433,7 +433,7 @@ UserPage::UserPage( svt::OWizardMachine* parent, const ResId& resid)
     }
 }
 
-sal_Bool UserPage::commitPage( CommitPageReason )
+sal_Bool UserPage::commitPage( svt::WizardTypes::CommitPageReason )
 {
     SvtUserOptions aUserOpt;
     aUserOpt.SetFirstName(m_edFirst.GetText());
@@ -463,9 +463,9 @@ UpdateCheckPage::UpdateCheckPage( svt::OWizardMachine* parent, const ResId& resi
     _setBold(m_ftHead);
 }
 
-sal_Bool UpdateCheckPage::commitPage( CommitPageReason _eReason )
+sal_Bool UpdateCheckPage::commitPage( svt::WizardTypes::CommitPageReason _eReason )
 {
-    if ( _eReason == eTravelForward )
+    if ( _eReason == svt::WizardTypes::eTravelForward )
     {
         try {
             Reference < XNameReplace > xUpdateAccess;
@@ -589,9 +589,9 @@ void RegistrationPage::updateButtonStates()
     m_rbNever.Show( m_bNeverVisible );
 }
 
-sal_Bool RegistrationPage::commitPage( CommitPageReason _eReason )
+sal_Bool RegistrationPage::commitPage( svt::WizardTypes::CommitPageReason _eReason )
 {
-    if ( _eReason == eFinish )
+    if ( _eReason == svt::WizardTypes::eFinish )
     {
         ::utl::RegOptions aOptions;
         rtl::OUString aEvent;
@@ -665,7 +665,7 @@ void RegistrationPage::executeSingleMode()
     // the registration modes "Now" and "Later" are handled by the page
     RegistrationPage::RegistrationMode eMode = pPage->getRegistrationMode();
     if ( eMode == RegistrationPage::rmNow || eMode == RegistrationPage::rmLater )
-        pPage->commitPage( IWizardPage::eFinish );
+        pPage->commitPage( WizardTypes::eFinish );
     if ( eMode != RegistrationPage::rmLater )
         ::utl::RegOptions().removeReminder();
 }
diff --git a/desktop/source/migration/pages.hxx b/desktop/source/migration/pages.hxx
index 9740773fe602..776268eb475c 100644
--- a/desktop/source/migration/pages.hxx
+++ b/desktop/source/migration/pages.hxx
@@ -125,7 +125,7 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XThrobber > m_xThrobber;
 public:
     MigrationPage( svt::OWizardMachine* parent, const ResId& resid, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XThrobber > xThrobber );
-    virtual sal_Bool commitPage( CommitPageReason _eReason );
+    virtual sal_Bool commitPage( svt::WizardTypes::CommitPageReason _eReason );
 
 protected:
     virtual void ActivatePage();
@@ -148,7 +148,7 @@ private:
 
 public:
     UserPage( svt::OWizardMachine* parent, const ResId& resid);
-    virtual sal_Bool commitPage( CommitPageReason _eReason );
+    virtual sal_Bool commitPage( svt::WizardTypes::CommitPageReason _eReason );
 protected:
     virtual void ActivatePage();
 };
@@ -161,7 +161,7 @@ private:
     CheckBox m_cbUpdateCheck;
 public:
     UpdateCheckPage( svt::OWizardMachine* parent, const ResId& resid);
-    virtual sal_Bool commitPage( CommitPageReason _eReason );
+    virtual sal_Bool commitPage( svt::WizardTypes::CommitPageReason _eReason );
 
 protected:
     virtual void ActivatePage();
@@ -188,7 +188,7 @@ protected:
     virtual bool canAdvance() const;
     virtual void ActivatePage();
 
-    virtual sal_Bool commitPage( CommitPageReason _eReason );
+    virtual sal_Bool commitPage( svt::WizardTypes::CommitPageReason _eReason );
 
 public:
     RegistrationPage( Window* parent, const ResId& resid);
diff --git a/desktop/source/migration/wizard.cxx b/desktop/source/migration/wizard.cxx
index d3f5b0a9d66f..81a789a613b9 100644
--- a/desktop/source/migration/wizard.cxx
+++ b/desktop/source/migration/wizard.cxx
@@ -434,10 +434,10 @@ sal_Bool FirstStartWizard::leaveState(WizardState)
     return sal_True;
 }
 
-sal_Bool FirstStartWizard::onFinish(sal_Int32 _nResult)
+sal_Bool FirstStartWizard::onFinish()
 {
     // return sal_True;
-    if (svt::RoadmapWizard::onFinish(_nResult))
+    if ( svt::RoadmapWizard::onFinish() )
     {
 #ifndef OS2 // cannot enable quickstart on first startup, see shutdownicon.cxx comments.
         enableQuickstart();
diff --git a/desktop/source/migration/wizard.hxx b/desktop/source/migration/wizard.hxx
index 018b68dead1c..3317880f8bd6 100644
--- a/desktop/source/migration/wizard.hxx
+++ b/desktop/source/migration/wizard.hxx
@@ -96,7 +96,7 @@ protected:
     virtual TabPage* createPage(WizardState _nState);
     virtual sal_Bool prepareLeaveCurrentState( CommitPageReason _eReason );
     virtual sal_Bool leaveState(WizardState _nState );
-    virtual sal_Bool onFinish(sal_Int32 _nResult);
+    virtual sal_Bool onFinish();
     virtual void     enterState(WizardState _nState);
 
     // from svt::RoadmapWizard