move WizardMachine to vcl

Change-Id: I55cc4a6c1ad111a22a43fd66a3cd01b5b02fb7cb
Reviewed-on: https://gerrit.libreoffice.org/76902
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

10 files changed, 20 insertions, 19 deletions

diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index d2b19ed7608f..7c17ac5f19f8 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -147,12 +147,12 @@ namespace dbmm
         return !m_pSaveAsLocation->GetText().isEmpty();
     }
 
-    bool SaveDBDocPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+    bool SaveDBDocPage::commitPage( ::vcl::WizardTypes::CommitPageReason _eReason )
     {
         if ( !MacroMigrationPage::commitPage( _eReason ) )
             return false;
 
-        if ( ::svt::WizardTypes::eTravelBackward == _eReason )
+        if ( ::vcl::WizardTypes::eTravelBackward == _eReason )
             return true;
 
         if ( !m_pLocationController->prepareCommit() )
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
index 3d42bb4e8062..d2f30f44b688 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
@@ -24,7 +24,7 @@
 #include "rangeprogressbar.hxx"
 
 #include <svtools/urlcontrol.hxx>
-#include <svtools/wizardmachine.hxx>
+#include <vcl/wizardmachine.hxx>
 #include <svx/databaselocationinput.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/edit.hxx>
@@ -41,7 +41,7 @@ namespace dbmm
     class MacroMigrationDialog;
 
     // MacroMigrationPage
-    typedef ::svt::OWizardPage  MacroMigrationPage_Base;
+    typedef ::vcl::OWizardPage  MacroMigrationPage_Base;
     class MacroMigrationPage : public MacroMigrationPage_Base
     {
     public:
@@ -87,7 +87,7 @@ namespace dbmm
 
         // IWizardPageController overridables
         virtual void        initializePage() override;
-        virtual bool        commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
+        virtual bool        commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override;
         virtual bool        canAdvance() const override;
 
         DECL_LINK( OnLocationModified, Edit&, void );
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 2b20943c745c..5052ed5f59cd 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -149,7 +149,7 @@ namespace dbaui
         callModifiedHdl();
     }
 
-    bool OConnectionTabPageSetup::commitPage( ::svt::WizardTypes::CommitPageReason /*_eReason*/ )
+    bool OConnectionTabPageSetup::commitPage( ::vcl::WizardTypes::CommitPageReason /*_eReason*/ )
     {
         return commitURL();
     }
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index a21364cc45a6..5ab2d4776ff6 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -55,7 +55,7 @@ namespace dbaui
         virtual bool        FillItemSet (SfxItemSet* _rCoreAttrs) override;
 
         virtual void        implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
-        virtual bool        commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
+        virtual bool        commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override;
 
     protected:
         OConnectionTabPageSetup(TabPageParent pParent, const OUString& _rUIXMLDescription, const OString& _rId, const SfxItemSet& _rCoreAttrs, const char* pHelpTextResId, const char* pHeaderResId, const char* pUrlResId);
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index f85635e8cbbb..e0599f5f1517 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -185,7 +185,7 @@ namespace dbaui
         if ( m_pItemSetHelper )
             Reset(m_pItemSetHelper->getOutputSet());
     }
-    bool OGenericAdministrationPage::commitPage( ::svt::WizardTypes::CommitPageReason )
+    bool OGenericAdministrationPage::commitPage( ::vcl::WizardTypes::CommitPageReason )
     {
         return true;
     }
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index 63641145cbdf..4a4db351e0bd 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -23,7 +23,7 @@
 #include <sfx2/tabdlg.hxx>
 #include <dsntypes.hxx>
 #include <commontypes.hxx>
-#include <svtools/wizardmachine.hxx>
+#include <vcl/wizardmachine.hxx>
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
 #include <curledit.hxx>
@@ -111,7 +111,7 @@ namespace dbaui
     class IDatabaseSettingsDialog;
     class IItemSetHelper;
     class OGenericAdministrationPage    :public SfxTabPage
-                                        ,public ::svt::IWizardPageController
+                                        ,public ::vcl::IWizardPageController
     {
     private:
         Link<OGenericAdministrationPage const *, void> m_aModifiedHandler; /// to be called if something on the page has been modified
@@ -162,7 +162,7 @@ namespace dbaui
 
         // svt::IWizardPageController
         virtual void initializePage() override;
-        virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
+        virtual bool commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override;
         virtual bool canAdvance() const override;
 
         void                SetRoadmapStateValue( bool _bDoEnable ) { m_abEnableRoadmap = _bDoEnable; }
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 2eb084e4dddc..d36da8d5c0e0 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -103,7 +103,7 @@ ODbTypeWizDialog::~ODbTypeWizDialog()
 void ODbTypeWizDialog::dispose()
 {
     m_pOutSet.reset();
-    svt::OWizardMachine::dispose();
+    vcl::OWizardMachine::dispose();
 }
 
 IMPL_LINK(ODbTypeWizDialog, OnTypeSelected, OGeneralPage&, _rTabPage, void)
@@ -114,7 +114,7 @@ IMPL_LINK(ODbTypeWizDialog, OnTypeSelected, OGeneralPage&, _rTabPage, void)
     enableButtons(WizardButtonFlags::FINISH,!bURLRequired);
 }
 
-WizardTypes::WizardState ODbTypeWizDialog::determineNextState( WizardState _nCurrentState ) const
+vcl::WizardTypes::WizardState ODbTypeWizDialog::determineNextState( WizardState _nCurrentState ) const
 {
     WizardTypes::WizardState nNextState = WZS_INVALID_STATE;
     switch(_nCurrentState)
@@ -331,7 +331,7 @@ void ODbTypeWizDialog::saveDatasource()
     DataSourceInfoConverter::convert( getORB(), m_pCollection,sOldURL,m_eType,m_pImpl->getCurrentDataSource());
 }
 
-IWizardPageController* ODbTypeWizDialog::getPageController( TabPage* _pCurrentPage ) const
+vcl::IWizardPageController* ODbTypeWizDialog::getPageController( TabPage* _pCurrentPage ) const
 {
     OGenericAdministrationPage* pPage = static_cast<OGenericAdministrationPage*>(_pCurrentPage);
     return pPage;
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 76405e537cfe..4fc9ec6aaeea 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -848,7 +848,8 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
         }
         return aExistenceCheck.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset );
     }
-    IWizardPageController* ODbTypeWizDialogSetup::getPageController( TabPage* _pCurrentPage ) const
+
+    vcl::IWizardPageController* ODbTypeWizDialogSetup::getPageController( TabPage* _pCurrentPage ) const
     {
         OGenericAdministrationPage* pPage = static_cast<OGenericAdministrationPage*>(_pCurrentPage);
         return pPage;
diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx
index 3a02170da565..5887004e2567 100644
--- a/dbaccess/source/ui/inc/dbwiz.hxx
+++ b/dbaccess/source/ui/inc/dbwiz.hxx
@@ -23,7 +23,7 @@
 #include <sfx2/tabdlg.hxx>
 #include <dsntypes.hxx>
 #include "IItemSetHelper.hxx"
-#include <svtools/wizardmachine.hxx>
+#include <vcl/wizardmachine.hxx>
 #include <memory>
 
 namespace com { namespace sun { namespace star {
@@ -50,7 +50,7 @@ class OGeneralPage;
 class ODbDataSourceAdministrationHelper;
 /** tab dialog for administrating the office wide registered data sources
 */
-class ODbTypeWizDialog : public svt::OWizardMachine , public IItemSetHelper, public IDatabaseSettingsDialog
+class ODbTypeWizDialog : public vcl::OWizardMachine , public IItemSetHelper, public IDatabaseSettingsDialog
 {
 private:
     std::unique_ptr<ODbDataSourceAdministrationHelper>  m_pImpl;
@@ -89,7 +89,7 @@ protected:
     virtual VclPtr<TabPage> createPage(WizardState _nState) override;
     virtual WizardState determineNextState(WizardState _nCurrentState) const override;
     virtual bool        leaveState(WizardState _nState) override;
-    virtual ::svt::IWizardPageController*
+    virtual ::vcl::IWizardPageController*
                         getPageController( TabPage* _pCurrentPage ) const override;
     virtual bool        onFinish() override;
 
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index c84b730fab94..4e56f5551bee 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -124,7 +124,7 @@ private:
     virtual VclPtr<TabPage> createPage(WizardState _nState) override;
     virtual bool        leaveState(WizardState _nState) override;
     virtual void        enterState(WizardState _nState) override;
-    virtual ::svt::IWizardPageController* getPageController( TabPage* _pCurrentPage ) const override;
+    virtual ::vcl::IWizardPageController* getPageController( TabPage* _pCurrentPage ) const override;
     virtual bool        onFinish() override;
 
     void resetPages(const css::uno::Reference< css::beans::XPropertySet >& _rxDatasource);