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>

63 files changed, 173 insertions, 177 deletions

diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index c9da0b2227e7..a0a352f0d6bd 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -90,7 +90,7 @@ CreationWizard::~CreationWizard() = default;
 
 VclPtr<TabPage> CreationWizard::createPage(WizardState nState)
 {
-    VclPtr<svt::OWizardPage> pRet;
+    VclPtr<vcl::OWizardPage> pRet;
     switch( nState )
     {
     case STATE_CHARTTYPE:
@@ -136,13 +136,13 @@ bool CreationWizard::leaveState( WizardState /*_nState*/ )
     return m_bCanTravel;
 }
 
-svt::WizardTypes::WizardState CreationWizard::determineNextState( WizardState nCurrentState ) const
+vcl::WizardTypes::WizardState CreationWizard::determineNextState( WizardState nCurrentState ) const
 {
     if( !m_bCanTravel )
         return WZS_INVALID_STATE;
     if( nCurrentState == STATE_LAST )
         return WZS_INVALID_STATE;
-    svt::WizardTypes::WizardState nNextState = nCurrentState + 1;
+    vcl::WizardTypes::WizardState nNextState = nCurrentState + 1;
     while( !isStateEnabled( nNextState ) && nNextState <= STATE_LAST )
         ++nNextState;
     return (nNextState==STATE_LAST+1) ? WZS_INVALID_STATE : nNextState;
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index fd4710151511..0d2e833c7cc9 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -707,7 +707,7 @@ void ChartTypeTabPage::dispose()
     m_pSortByXValuesResourceGroup.reset();
     m_xSubTypeListWin.reset();
     m_xSubTypeList.reset();
-    svt::OWizardPage::dispose();
+    vcl::OWizardPage::dispose();
 }
 
 ChartTypeParameter ChartTypeTabPage::getCurrentParamter() const
@@ -921,7 +921,7 @@ void ChartTypeTabPage::initializePage()
     }
 }
 
-bool ChartTypeTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
+bool ChartTypeTabPage::commitPage( ::vcl::WizardTypes::CommitPageReason /*eReason*/ )
 {
     return true; // return false if this page should not be left
 }
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx
index 4470ed60443d..9d299fd009ab 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -26,7 +26,7 @@
 #include "ChartTypeTemplateProvider.hxx"
 #include <TimerTriggeredControllerLock.hxx>
 
-#include <svtools/wizardmachine.hxx>
+#include <vcl/wizardmachine.hxx>
 
 namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
 namespace weld { class CustomWeld; }
@@ -42,7 +42,7 @@ class SplineResourceGroup;
 class GeometryResourceGroup;
 class SortByXValuesResourceGroup;
 
-class ChartTypeTabPage final : public ResourceChangeListener, public svt::OWizardPage, public ChartTypeTemplateProvider
+class ChartTypeTabPage final : public ResourceChangeListener, public vcl::OWizardPage, public ChartTypeTemplateProvider
 {
 public:
     ChartTypeTabPage( TabPageParent pParent
@@ -52,7 +52,7 @@ public:
     virtual void        dispose() override;
 
     virtual void        initializePage() override;
-    virtual bool        commitPage( ::svt::WizardTypes::CommitPageReason eReason ) override;
+    virtual bool        commitPage( ::vcl::WizardTypes::CommitPageReason eReason ) override;
 
     virtual css::uno::Reference< css::chart2::XChartTypeTemplate > getCurrentTemplate() const override;
 
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 48acb07074b9..452b4f0b3603 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -171,7 +171,7 @@ DataSourceTabPage::DataSourceTabPage(TabPageParent pParent, DialogModel & rDialo
                                      ChartTypeTemplateProvider* pTemplateProvider,
                                      Dialog * pParentDialog,
                                      bool bHideDescription /* = false */)
-    : ::svt::OWizardPage(pParent, "modules/schart/ui/tp_DataSource.ui", "tp_DataSource")
+    : ::vcl::OWizardPage(pParent, "modules/schart/ui/tp_DataSource.ui", "tp_DataSource")
     , m_pTemplateProvider(pTemplateProvider)
     , m_rDialogModel(rDialogModel)
     , m_pCurrentRangeChoosingField( nullptr )
@@ -253,7 +253,7 @@ DataSourceTabPage::~DataSourceTabPage()
 void DataSourceTabPage::dispose()
 {
     m_pParentDialog.clear();
-    ::svt::OWizardPage::dispose();
+    ::vcl::OWizardPage::dispose();
 }
 
 void DataSourceTabPage::ActivatePage()
@@ -270,15 +270,15 @@ void DataSourceTabPage::initializePage()
 void DataSourceTabPage::DeactivatePage()
 {
     commitPage();
-    svt::OWizardPage::DeactivatePage();
+    vcl::OWizardPage::DeactivatePage();
 }
 
 void DataSourceTabPage::commitPage()
 {
-    commitPage(::svt::WizardTypes::eFinish);
+    commitPage(::vcl::WizardTypes::eFinish);
 }
 
-bool DataSourceTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
+bool DataSourceTabPage::commitPage( ::vcl::WizardTypes::CommitPageReason /*eReason*/ )
 {
     //ranges may have been edited in the meanwhile (dirty is true in that case here)
     if( isValid() )
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index fbf14dfe2a8f..26698ce91821 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_DATASOURCE_HXX
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_DATASOURCE_HXX
 
-#include <svtools/wizardmachine.hxx>
+#include <vcl/wizardmachine.hxx>
 
 #include <RangeSelectionListener.hxx>
 
@@ -47,7 +47,7 @@ public:
 };
 
 class DataSourceTabPage final :
-        public ::svt::OWizardPage,
+        public ::vcl::OWizardPage,
         public RangeSelectionListenerParent
 {
 public:
@@ -65,7 +65,7 @@ public:
 private:
     // OWizardPage
     virtual void dispose() override;
-    virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ) override;
+    virtual bool commitPage( ::vcl::WizardTypes::CommitPageReason eReason ) override;
 
     //TabPage
     virtual void DeactivatePage() override;
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index a20a12f0ab4a..39bc4ebe4f78 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -184,15 +184,15 @@ void RangeChooserTabPage::initControlsFromModel()
 void RangeChooserTabPage::DeactivatePage()
 {
     commitPage();
-    svt::OWizardPage::DeactivatePage();
+    vcl::OWizardPage::DeactivatePage();
 }
 
 void RangeChooserTabPage::commitPage()
 {
-    commitPage(::svt::WizardTypes::eFinish);
+    commitPage(::vcl::WizardTypes::eFinish);
 }
 
-bool RangeChooserTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
+bool RangeChooserTabPage::commitPage( ::vcl::WizardTypes::CommitPageReason /*eReason*/ )
 {
     //ranges may have been edited in the meanwhile (dirty is true in that case here)
     if( isValid() )
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index c020ccceb1ea..6bf8f28156e8 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -22,7 +22,7 @@
 
 #include <RangeSelectionListener.hxx>
 
-#include <svtools/wizardmachine.hxx>
+#include <vcl/wizardmachine.hxx>
 
 namespace chart { class TabPageNotifiable; }
 namespace com { namespace sun { namespace star { namespace chart2 { class XChartTypeTemplate; } } } }
@@ -33,7 +33,7 @@ namespace chart
 class ChartTypeTemplateProvider;
 class DialogModel;
 
-class RangeChooserTabPage final : public svt::OWizardPage, public RangeSelectionListenerParent
+class RangeChooserTabPage final : public vcl::OWizardPage, public RangeSelectionListenerParent
 {
 public:
 
@@ -54,7 +54,7 @@ public:
 private:
 
     //OWizardPage
-    virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ) override;
+    virtual bool commitPage( ::vcl::WizardTypes::CommitPageReason eReason ) override;
 
     //TabPage
     virtual void DeactivatePage() override;
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index 628b77fc13f9..24b6d50026fb 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -91,7 +91,7 @@ void TitlesAndObjectsTabPage::initializePage()
     m_bCommitToModel = true;
 }
 
-bool TitlesAndObjectsTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
+bool TitlesAndObjectsTabPage::commitPage( ::vcl::WizardTypes::CommitPageReason /*eReason*/ )
 {
     if( m_xTitleResources->get_value_changed_from_saved() ) //titles may have changed in the meanwhile
         commitToModel();
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
index 332d56376973..7b82898d60f5 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
@@ -22,7 +22,7 @@
 
 #include <TimerTriggeredControllerLock.hxx>
 
-#include <svtools/wizardmachine.hxx>
+#include <vcl/wizardmachine.hxx>
 
 #include <memory>
 
@@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star { namespace uno { class XComponen
 namespace chart
 {
 
-class TitlesAndObjectsTabPage final : public svt::OWizardPage
+class TitlesAndObjectsTabPage final : public vcl::OWizardPage
 {
 public:
     TitlesAndObjectsTabPage(TabPageParent pParent,
@@ -43,7 +43,7 @@ public:
     virtual ~TitlesAndObjectsTabPage() override;
 
     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;
 
 private:
diff --git a/compilerplugins/clang/constantparam.numbers.results b/compilerplugins/clang/constantparam.numbers.results
index c080ebde2779..71bb7f333186 100644
--- a/compilerplugins/clang/constantparam.numbers.results
+++ b/compilerplugins/clang/constantparam.numbers.results
@@ -986,10 +986,6 @@ include/svtools/unitconv.hxx:45
     long ControlToItem(long,enum FieldUnit,enum MapUnit)
     enum FieldUnit eCtrl
     5
-include/svtools/wizdlg.hxx:198
-    long WizardDialog::LogicalCoordinateToPixel(int)
-    int iCoordinate
-    6
 include/svx/AccessibleShape.hxx:207
     _Bool accessibility::AccessibleShape::GetState(short)
     short aState
@@ -1614,6 +1610,10 @@ include/vcl/window.hxx:1572
     void vcl::Window::SimulateKeyPress(unsigned short) const
     unsigned short nKeyCode
     1312
+include/vcl/wizdlg.hxx:198
+    long WizardDialog::LogicalCoordinateToPixel(int)
+    int iCoordinate
+    6
 include/vcl/wrkwin.hxx:61
     void WorkWindow::WorkWindow(enum WindowType)
     enum WindowType nType
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);
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index cf2598ef042b..e32374b7ed43 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -143,12 +143,12 @@ namespace abp
     }
 
 
-    bool FinalPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+    bool FinalPage::commitPage( ::vcl::WizardTypes::CommitPageReason _eReason )
     {
         if (!AddressBookSourcePage::commitPage(_eReason))
             return false;
 
-        if  (   ( ::svt::WizardTypes::eTravelBackward != _eReason )
+        if  (   ( ::vcl::WizardTypes::eTravelBackward != _eReason )
             &&  ( !m_pLocationController->prepareCommit() )
             )
             return false;
diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx
index 595806a77570..719d894be872 100644
--- a/extensions/source/abpilot/abpfinalpage.hxx
+++ b/extensions/source/abpilot/abpfinalpage.hxx
@@ -56,7 +56,7 @@ namespace abp
     private:
         // OWizardPage overridables
         virtual void        initializePage() override;
-        virtual bool        commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
+        virtual bool        commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override;
 
         // TabDialog overridables
         virtual void        ActivatePage() override;
diff --git a/extensions/source/abpilot/abspage.hxx b/extensions/source/abpilot/abspage.hxx
index 4a0a8d782463..257e9735b858 100644
--- a/extensions/source/abpilot/abspage.hxx
+++ b/extensions/source/abpilot/abspage.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ABSPAGE_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ABSPAGE_HXX
 
-#include <svtools/wizardmachine.hxx>
+#include <vcl/wizardmachine.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <strings.hrc>
 #include <componentmodule.hxx>
@@ -34,7 +34,7 @@ namespace abp
     class OAddressBookSourcePilot;
     struct AddressSettings;
 
-    typedef ::svt::OWizardPage AddressBookSourcePage_Base;
+    typedef ::vcl::OWizardPage AddressBookSourcePage_Base;
     /// the base class for all tab pages in the address book source wizard
     class AddressBookSourcePage : public AddressBookSourcePage_Base
     {
diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx
index da4c5b3ee058..7e68a65e88e9 100644
--- a/extensions/source/abpilot/tableselectionpage.cxx
+++ b/extensions/source/abpilot/tableselectionpage.cxx
@@ -90,7 +90,7 @@ namespace abp
     }
 
 
-    bool TableSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+    bool TableSelectionPage::commitPage( ::vcl::WizardTypes::CommitPageReason _eReason )
     {
         if (!AddressBookSourcePage::commitPage(_eReason))
             return false;
diff --git a/extensions/source/abpilot/tableselectionpage.hxx b/extensions/source/abpilot/tableselectionpage.hxx
index 31ffa8a4e08d..9f58ea945976 100644
--- a/extensions/source/abpilot/tableselectionpage.hxx
+++ b/extensions/source/abpilot/tableselectionpage.hxx
@@ -39,7 +39,7 @@ namespace abp
     private:
         // OWizardPage overridables
         virtual void        initializePage() override;
-        virtual bool        commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
+        virtual bool        commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override;
 
         // TabDialog overridables
         virtual void        ActivatePage() override;
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index 5e3d49e1cb1d..ae72d77a3ce1 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -212,7 +212,7 @@ namespace abp
     }
 
 
-    bool TypeSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+    bool TypeSelectionPage::commitPage( ::vcl::WizardTypes::CommitPageReason _eReason )
     {
         if (!AddressBookSourcePage::commitPage(_eReason))
             return false;
diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx
index 0146e7c85ec5..219afd059bf2 100644
--- a/extensions/source/abpilot/typeselectionpage.hxx
+++ b/extensions/source/abpilot/typeselectionpage.hxx
@@ -67,7 +67,7 @@ namespace abp
     private:
         // OWizardPage overridables
         virtual void        initializePage() override;
-        virtual bool        commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
+        virtual bool        commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override;
 
         // TabDialog overridables
         virtual void        ActivatePage() override;
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 92d441902de8..4b94cfff0256 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -166,7 +166,7 @@ namespace dbp
     }
 
 
-    bool OTableSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+    bool OTableSelectionPage::commitPage( ::vcl::WizardTypes::CommitPageReason _eReason )
     {
         if (!OControlWizardPage::commitPage(_eReason))
             return false;
@@ -481,7 +481,7 @@ namespace dbp
     }
 
 
-    bool ODBFieldPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+    bool ODBFieldPage::commitPage( ::vcl::WizardTypes::CommitPageReason _eReason )
     {
         if (!OMaybeListSelectionPage::commitPage(_eReason))
             return false;
diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx
index fa0b7619cb11..23a36aad9774 100644
--- a/extensions/source/dbpilots/commonpagesdbp.hxx
+++ b/extensions/source/dbpilots/commonpagesdbp.hxx
@@ -50,7 +50,7 @@ namespace dbp
 
         // OWizardPage overridables
         virtual void        initializePage() override;
-        virtual bool        commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
+        virtual bool        commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override;
 
         DECL_LINK( OnListboxSelection, ListBox&, void );
         DECL_LINK( OnListboxDoubleClicked, ListBox&, void );
@@ -127,7 +127,7 @@ namespace dbp
 
         // OWizardPage overridables
         virtual void initializePage() override;
-        virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
+        virtual bool commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override;
 
         // own overridables
         virtual OUString& getDBFieldSetting() = 0;
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 9852fe1d9bc2..61a6735ed386 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -141,7 +141,7 @@ namespace dbp
         _rList.Clear();
         const OUString* pItems = _rItems.getConstArray();
         const OUString* pEnd = pItems + _rItems.getLength();
-        ::svt::WizardTypes::WizardState nPos;
+        ::vcl::WizardTypes::WizardState nPos;
         sal_Int32 nIndex = 0;
         for (;pItems < pEnd; ++pItems, ++nIndex)
         {
@@ -156,7 +156,7 @@ namespace dbp
         _rList.Clear();
         const OUString* pItems = _rItems.getConstArray();
         const OUString* pEnd = pItems + _rItems.getLength();
-        ::svt::WizardTypes::WizardState nPos;
+        ::vcl::WizardTypes::WizardState nPos;
         for (;pItems < pEnd; ++pItems)
         {
             nPos = _rList.InsertEntry(*pItems);
diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx
index ed1729bf07cb..d84babbfc250 100644
--- a/extensions/source/dbpilots/controlwizard.hxx
+++ b/extensions/source/dbpilots/controlwizard.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_CONTROLWIZARD_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_CONTROLWIZARD_HXX
 
-#include <svtools/wizardmachine.hxx>
+#include <vcl/wizardmachine.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
@@ -46,7 +46,7 @@ namespace dbp
     };
 
     class OControlWizard;
-    typedef ::svt::OWizardPage OControlWizardPage_Base;
+    typedef ::vcl::OWizardPage OControlWizardPage_Base;
     class OControlWizardPage : public OControlWizardPage_Base
     {
         VclPtr<FixedText>      m_pFormDatasourceLabel;
@@ -87,7 +87,7 @@ namespace dbp
 
     struct OAccessRegulator;
 
-    typedef ::svt::OWizardMachine OControlWizard_Base;
+    typedef ::vcl::OWizardMachine OControlWizard_Base;
     class OControlWizard : public OControlWizard_Base
     {
     private:
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 7a3ab8374979..cdacbd4d644e 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -218,7 +218,6 @@ namespace dbp
         }
     }
 
-
     VclPtr<TabPage> OGridWizard::createPage(WizardState _nState)
     {
         switch (_nState)
@@ -231,8 +230,7 @@ namespace dbp
         return VclPtr<TabPage>();
     }
 
-
-    WizardTypes::WizardState OGridWizard::determineNextState( WizardState _nCurrentState ) const
+    vcl::WizardTypes::WizardState OGridWizard::determineNextState( WizardState _nCurrentState ) const
     {
         switch (_nCurrentState)
         {
@@ -245,7 +243,6 @@ namespace dbp
         return WZS_INVALID_STATE;
     }
 
-
     void OGridWizard::enterState(WizardState _nState)
     {
         OControlWizard::enterState(_nState);
@@ -356,7 +353,7 @@ namespace dbp
     }
 
 
-    bool OGridFieldsSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+    bool OGridFieldsSelection::commitPage( ::vcl::WizardTypes::CommitPageReason _eReason )
     {
         if (!OGridPage::commitPage(_eReason))
             return false;
diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx
index 4943946182b3..496c77467ce7 100644
--- a/extensions/source/dbpilots/gridwizard.hxx
+++ b/extensions/source/dbpilots/gridwizard.hxx
@@ -87,7 +87,7 @@ namespace dbp
 
         // OWizardPage 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(OnMoveOneEntry, Button*, void);
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index f8ee3b2129b5..73aea6009cfc 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -65,7 +65,7 @@ namespace dbp
     }
 
 
-    VclPtr<TabPage> OGroupBoxWizard::createPage(::svt::WizardTypes::WizardState _nState)
+    VclPtr<TabPage> OGroupBoxWizard::createPage(::vcl::WizardTypes::WizardState _nState)
     {
         switch (_nState)
         {
@@ -89,7 +89,7 @@ namespace dbp
     }
 
 
-    WizardTypes::WizardState OGroupBoxWizard::determineNextState( ::svt::WizardTypes::WizardState _nCurrentState ) const
+    vcl::WizardTypes::WizardState OGroupBoxWizard::determineNextState( ::vcl::WizardTypes::WizardState _nCurrentState ) const
     {
         switch (_nCurrentState)
         {
@@ -113,7 +113,7 @@ namespace dbp
     }
 
 
-    void OGroupBoxWizard::enterState(::svt::WizardTypes::WizardState _nState)
+    void OGroupBoxWizard::enterState(::vcl::WizardTypes::WizardState _nState)
     {
         // some stuff to do before calling the base class (modifying our settings)
         switch (_nState)
@@ -231,7 +231,7 @@ namespace dbp
     }
 
 
-    bool ORadioSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+    bool ORadioSelectionPage::commitPage( ::vcl::WizardTypes::CommitPageReason _eReason )
     {
         if (!OGBWPage::commitPage(_eReason))
             return false;
@@ -359,7 +359,7 @@ namespace dbp
     }
 
 
-    bool ODefaultFieldSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+    bool ODefaultFieldSelectionPage::commitPage( ::vcl::WizardTypes::CommitPageReason _eReason )
     {
         if (!OMaybeListSelectionPage::commitPage(_eReason))
             return false;
@@ -372,7 +372,7 @@ namespace dbp
 
     OOptionValuesPage::OOptionValuesPage( OControlWizard* _pParent )
         :OGBWPage(_pParent, "OptionValuesPage", "modules/sabpilot/ui/optionvaluespage.ui")
-        ,m_nLastSelection(::svt::WizardTypes::WizardState(-1))
+        ,m_nLastSelection(::vcl::WizardTypes::WizardState(-1))
     {
         get(m_pValue, "optionvalue");
         get(m_pOptions, "radiobuttons");
@@ -407,7 +407,7 @@ namespace dbp
 
     void OOptionValuesPage::implTraveledOptions()
     {
-        if (::svt::WizardTypes::WizardState(-1) != m_nLastSelection)
+        if (::vcl::WizardTypes::WizardState(-1) != m_nLastSelection)
         {
             // save the value for the last option
             DBG_ASSERT(static_cast<size_t>(m_nLastSelection) < m_aUncommittedValues.size(), "OOptionValuesPage::implTraveledOptions: invalid previous selection index!");
@@ -444,7 +444,7 @@ namespace dbp
     }
 
 
-    bool OOptionValuesPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+    bool OOptionValuesPage::commitPage( ::vcl::WizardTypes::CommitPageReason _eReason )
     {
         if (!OGBWPage::commitPage(_eReason))
             return false;
@@ -510,7 +510,7 @@ namespace dbp
     }
 
 
-    bool OFinalizeGBWPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+    bool OFinalizeGBWPage::commitPage( ::vcl::WizardTypes::CommitPageReason _eReason )
     {
         if (!OGBWPage::commitPage(_eReason))
             return false;
diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx
index f00320e21c68..5325c0e28529 100644
--- a/extensions/source/dbpilots/groupboxwiz.hxx
+++ b/extensions/source/dbpilots/groupboxwiz.hxx
@@ -91,7 +91,7 @@ namespace dbp
 
         // OWizardPage 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( OnMoveEntry, Button*, void );
@@ -115,7 +115,7 @@ namespace dbp
     private:
         // OWizardPage overridables
         virtual void        initializePage() override;
-        virtual bool        commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
+        virtual bool        commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override;
 
         OOptionGroupSettings& getSettings() { return static_cast<OGroupBoxWizard*>(getDialog())->getSettings(); }
     };
@@ -126,7 +126,7 @@ namespace dbp
         VclPtr<ListBox>         m_pOptions;
 
         std::vector<OUString>   m_aUncommittedValues;
-        ::svt::WizardTypes::WizardState
+        ::vcl::WizardTypes::WizardState
                         m_nLastSelection;
 
     public:
@@ -140,7 +140,7 @@ namespace dbp
 
         // OWizardPage overridables
         virtual void        initializePage() override;
-        virtual bool        commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
+        virtual bool        commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override;
 
         void implTraveledOptions();
 
@@ -172,7 +172,7 @@ namespace dbp
 
         // OWizardPage 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;
     };
 
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index 77fee4c8396e..e8e902b419fd 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -104,8 +104,7 @@ namespace dbp
         return VclPtr<TabPage>();
     }
 
-
-    WizardTypes::WizardState OListComboWizard::determineNextState( WizardState _nCurrentState ) const
+    vcl::WizardTypes::WizardState OListComboWizard::determineNextState( WizardState _nCurrentState ) const
     {
         switch (_nCurrentState)
         {
@@ -120,7 +119,6 @@ namespace dbp
         return WZS_INVALID_STATE;
     }
 
-
     void OListComboWizard::enterState(WizardState _nState)
     {
         OControlWizard::enterState(_nState);
@@ -335,14 +333,14 @@ namespace dbp
     }
 
 
-    bool OContentTableSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+    bool OContentTableSelection::commitPage( ::vcl::WizardTypes::CommitPageReason _eReason )
     {
         if (!OLCPage::commitPage(_eReason))
             return false;
 
         OListComboSettings& rSettings = getSettings();
         rSettings.sListContentTable = m_pSelectTable->GetSelectedEntry();
-        if (rSettings.sListContentTable.isEmpty() && (::svt::WizardTypes::eTravelBackward != _eReason))
+        if (rSettings.sListContentTable.isEmpty() && (::vcl::WizardTypes::eTravelBackward != _eReason))
             // need to select a table
             return false;
 
@@ -409,7 +407,7 @@ namespace dbp
     }
 
 
-    bool OContentFieldSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+    bool OContentFieldSelection::commitPage( ::vcl::WizardTypes::CommitPageReason _eReason )
     {
         if (!OLCPage::commitPage(_eReason))
             return false;
@@ -492,7 +490,7 @@ namespace dbp
         implCheckFinish();
     }
 
-    bool OLinkFieldsPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+    bool OLinkFieldsPage::commitPage( ::vcl::WizardTypes::CommitPageReason _eReason )
     {
         if (!OLCPage::commitPage(_eReason))
             return false;
diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx
index af77d557baed..2640c0119fde 100644
--- a/extensions/source/dbpilots/listcombowizard.hxx
+++ b/extensions/source/dbpilots/listcombowizard.hxx
@@ -106,7 +106,7 @@ namespace dbp
 
         // OWizardPage 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( OnTableDoubleClicked, ListBox&, void );
@@ -131,7 +131,7 @@ namespace dbp
 
         // OWizardPage 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;
     };
 
@@ -152,7 +152,7 @@ namespace dbp
 
         // OWizardPage 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;
 
         void implCheckFinish();
diff --git a/include/svtools/roadmapwizard.hxx b/include/svtools/roadmapwizard.hxx
index 30f58d6f13d3..2ff7c6146273 100644
--- a/include/svtools/roadmapwizard.hxx
+++ b/include/svtools/roadmapwizard.hxx
@@ -22,7 +22,7 @@
 
 #include <memory>
 #include <svtools/svtdllapi.h>
-#include <svtools/wizardmachine.hxx>
+#include <vcl/wizardmachine.hxx>
 
 
 namespace svt
@@ -34,7 +34,7 @@ namespace svt
     {
     public:
         typedef sal_Int16                                   PathId;
-        typedef ::std::vector< WizardTypes::WizardState >   WizardPath;
+        typedef ::std::vector< vcl::WizardTypes::WizardState >   WizardPath;
         typedef VclPtr<TabPage> (* RoadmapPageFactory)( RoadmapWizard& );
     };
 
@@ -60,7 +60,7 @@ namespace svt
         <code>n2</code>, which share at least the first <code>k</code> states (where <code>k</code>
         is at least 1), and an arbitrary number of other states.
     */
-    class SVT_DLLPUBLIC RoadmapWizard : public OWizardMachine, public RoadmapWizardTypes
+    class SVT_DLLPUBLIC RoadmapWizard : public vcl::OWizardMachine, public RoadmapWizardTypes
     {
     private:
         std::unique_ptr<RoadmapWizardImpl>  m_pImpl;
diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index 398129a1d77f..f0491fe20866 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -241,9 +241,6 @@
 #define STR_SVT_PRNDLG_DEFPRINTER               NC_("STR_SVT_PRNDLG_DEFPRINTER", "Default printer")
 #define STR_SVT_PRNDLG_JOBCOUNT                 NC_("STR_SVT_PRNDLG_JOBCOUNT", "%d documents")
 
-#define STR_WIZDLG_FINISH                       NC_("STR_WIZDLG_FINISH", "~Finish")
-#define STR_WIZDLG_NEXT                         NC_("STR_WIZDLG_NEXT", "~Next >")
-#define STR_WIZDLG_PREVIOUS                     NC_("STR_WIZDLG_PREVIOUS", "< Bac~k")
 #define STR_WIZDLG_ROADMAP_TITLE                NC_("STR_WIZDLG_ROADMAP_TITLE", "Steps")
 
 #define STR_NO_FIELD_SELECTION                  NC_("STR_NO_FIELD_SELECTION", "<none>")
diff --git a/include/svtools/wizardmachine.hxx b/include/vcl/wizardmachine.hxx
index 83c6f2fa92ec..0b0afbce1576 100644
--- a/include/svtools/wizardmachine.hxx
+++ b/include/vcl/wizardmachine.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SVTOOLS_WIZARDMACHINE_HXX
 
 #include <memory>
-#include <svtools/svtdllapi.h>
+#include <vcl/dllapi.h>
 #include <vcl/wizdlg.hxx>
 #include <vcl/button.hxx>
 #include <vcl/tabpage.hxx>
@@ -45,7 +45,7 @@ namespace o3tl
     template<> struct typed_flags<WizardButtonFlags> : is_typed_flags<WizardButtonFlags, 0x001f> {};
 }
 
-namespace svt
+namespace vcl
 {
 
 
@@ -96,7 +96,7 @@ namespace svt
 
     //= OWizardPage
 
-    class SVT_DLLPUBLIC OWizardPage : public TabPage, public IWizardPageController
+    class VCL_DLLPUBLIC OWizardPage : public TabPage, public IWizardPageController
     {
 
     public:
@@ -149,7 +149,7 @@ namespace svt
         they can implement non-linear traveling this way.
     */
 
-    class SVT_DLLPUBLIC OWizardMachine : public WizardDialog, public WizardTypes
+    class VCL_DLLPUBLIC OWizardMachine : public WizardDialog, public WizardTypes
     {
     private:
         // restrict access to some aspects of our base class
@@ -353,9 +353,9 @@ namespace svt
         DECL_DLLPRIVATE_LINK(OnPrevPage, Button*, void);
         DECL_DLLPRIVATE_LINK(OnFinish, Button*, void);
 
-        SVT_DLLPRIVATE void     implResetDefault(vcl::Window const * _pWindow);
-        SVT_DLLPRIVATE void     implUpdateTitle();
-        SVT_DLLPRIVATE void     implConstruct( const WizardButtonFlags _nButtonFlags );
+        VCL_DLLPRIVATE void     implResetDefault(vcl::Window const * _pWindow);
+        VCL_DLLPRIVATE void     implUpdateTitle();
+        VCL_DLLPRIVATE void     implConstruct( const WizardButtonFlags _nButtonFlags );
     };
 
     /// helper class to temporarily suspend any traveling in the wizard
@@ -378,7 +378,7 @@ namespace svt
     };
 
 
-}   // namespace svt
+}   // namespace vcl
 
 
 #endif // INCLUDED_SVTOOLS_WIZARDMACHINE_HXX
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 810cb3c121dc..290747d196e5 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7020,7 +7020,6 @@ include/svtools/unoevent.hxx
 include/svtools/unoimap.hxx
 include/svtools/urlcontrol.hxx
 include/svtools/valueset.hxx
-include/svtools/wizardmachine.hxx
 include/svx/AccessibleControlShape.hxx
 include/svx/AccessibleGraphicShape.hxx
 include/svx/AccessibleOLEShape.hxx
@@ -7972,6 +7971,7 @@ include/vcl/virdev.hxx
 include/vcl/waitobj.hxx
 include/vcl/wall.hxx
 include/vcl/window.hxx
+include/vcl/wizardmachine.hxx
 include/vcl/wizdlg.hxx
 include/vcl/wmf.hxx
 include/vcl/wmfexternal.hxx
@@ -13754,7 +13754,6 @@ svtools/source/dialogs/insdlg.cxx
 svtools/source/dialogs/prnsetup.cxx
 svtools/source/dialogs/restartdialog.cxx
 svtools/source/dialogs/roadmapwizard.cxx
-svtools/source/dialogs/wizardmachine.cxx
 svtools/source/edit/editsyntaxhighlighter.cxx
 svtools/source/edit/svmedit.cxx
 svtools/source/edit/svmedit2.cxx
@@ -17798,6 +17797,7 @@ vcl/source/control/spinfld.cxx
 vcl/source/control/tabctrl.cxx
 vcl/source/control/throbber.cxx
 vcl/source/control/thumbpos.hxx
+vcl/source/control/wizardmachine.cxx
 vcl/source/control/wizdlg.cxx
 vcl/source/edit/textdat2.hxx
 vcl/source/edit/textdata.cxx
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 5ebfeb980dd1..62981eea217d 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -125,7 +125,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/dialogs/restartdialog \
     svtools/source/dialogs/roadmapwizard \
     svtools/source/dialogs/ServerDetailsControls \
-    svtools/source/dialogs/wizardmachine \
     svtools/source/edit/editsyntaxhighlighter \
     svtools/source/edit/svmedit \
     svtools/source/edit/svmedit2 \
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index 6139634edfe1..8e9b4e38a260 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -34,7 +34,7 @@ namespace svt
 {
     namespace
     {
-        typedef ::std::set< WizardTypes::WizardState > StateSet;
+        typedef ::std::set< vcl::WizardTypes::WizardState > StateSet;
 
         typedef ::std::map<
                     RoadmapWizardTypes::PathId,
@@ -42,7 +42,7 @@ namespace svt
                 > Paths;
 
         typedef ::std::map<
-                    WizardTypes::WizardState,
+                    vcl::WizardTypes::WizardState,
                     ::std::pair<
                         OUString,
                         RoadmapWizardTypes::RoadmapPageFactory
@@ -67,15 +67,15 @@ namespace svt
         }
 
         /// returns the index of the current state in given path, or -1
-        static sal_Int32 getStateIndexInPath( WizardTypes::WizardState _nState, const WizardPath& _rPath );
+        static sal_Int32 getStateIndexInPath( vcl::WizardTypes::WizardState _nState, const WizardPath& _rPath );
         /// returns the index of the current state in the path with the given id, or -1
-        sal_Int32 getStateIndexInPath( WizardTypes::WizardState _nState, PathId _nPathId );
+        sal_Int32 getStateIndexInPath( vcl::WizardTypes::WizardState _nState, PathId _nPathId );
         /// returns the index of the first state in which the two given paths differ
         static sal_Int32 getFirstDifferentIndex( const WizardPath& _rLHS, const WizardPath& _rRHS );
     };
 
 
-    sal_Int32 RoadmapWizardImpl::getStateIndexInPath( WizardTypes::WizardState _nState, const WizardPath& _rPath )
+    sal_Int32 RoadmapWizardImpl::getStateIndexInPath( vcl::WizardTypes::WizardState _nState, const WizardPath& _rPath )
     {
         sal_Int32 nStateIndexInPath = 0;
         bool bFound = false;
@@ -94,7 +94,7 @@ namespace svt
     }
 
 
-    sal_Int32 RoadmapWizardImpl::getStateIndexInPath( WizardTypes::WizardState _nState, PathId _nPathId )
+    sal_Int32 RoadmapWizardImpl::getStateIndexInPath( vcl::WizardTypes::WizardState _nState, PathId _nPathId )
     {
         sal_Int32 nStateIndexInPath = -1;
         Paths::const_iterator aPathPos = aPaths.find( _nPathId );
@@ -271,7 +271,7 @@ namespace svt
         TabPage* pCurrentPage = GetPage( getCurrentState() );
         if ( pCurrentPage )
         {
-            const IWizardPageController* pController = getPageController( GetPage( getCurrentState() ) );
+            const vcl::IWizardPageController* pController = getPageController( GetPage( getCurrentState() ) );
             OSL_ENSURE( pController != nullptr, "RoadmapWizard::implUpdateRoadmap: no controller for the current page!" );
             bCurrentPageCanAdvance = !pController || pController->canAdvance();
         }
@@ -337,7 +337,7 @@ namespace svt
     }
 
 
-    WizardTypes::WizardState RoadmapWizard::determineNextState( WizardState _nCurrentState ) const
+    vcl::WizardTypes::WizardState RoadmapWizard::determineNextState( WizardState _nCurrentState ) const
     {
 
         sal_Int32 nCurrentStatePathIndex = -1;
@@ -432,7 +432,7 @@ namespace svt
         if ( isTravelingSuspended() )
             return;
 
-        WizardTravelSuspension aTravelGuard( *this );
+        vcl::WizardTravelSuspension aTravelGuard( *this );
 
         sal_Int32 nCurrentIndex = m_pImpl->getStateIndexInPath( getCurrentState(), m_pImpl->nActivePath );
         sal_Int32 nNewIndex     = m_pImpl->getStateIndexInPath( nCurItemId, m_pImpl->nActivePath );
diff --git a/svtools/source/uno/wizard/wizardpagecontroller.cxx b/svtools/source/uno/wizard/wizardpagecontroller.cxx
index 70364d67034e..5c5a4a725b6a 100644
--- a/svtools/source/uno/wizard/wizardpagecontroller.cxx
+++ b/svtools/source/uno/wizard/wizardpagecontroller.cxx
@@ -128,8 +128,7 @@ namespace svt { namespace uno
         }
     }
 
-
-    bool WizardPageController::commitPage( WizardTypes::CommitPageReason i_eReason )
+    bool WizardPageController::commitPage( vcl::WizardTypes::CommitPageReason i_eReason )
     {
         if ( !m_xWizardPage.is() )
             return true;
@@ -146,7 +145,6 @@ namespace svt { namespace uno
         return true;
     }
 
-
     bool WizardPageController::canAdvance() const
     {
         if ( !m_xWizardPage.is() )
diff --git a/svtools/source/uno/wizard/wizardpagecontroller.hxx b/svtools/source/uno/wizard/wizardpagecontroller.hxx
index 7d11c292cf8a..b81421372e82 100644
--- a/svtools/source/uno/wizard/wizardpagecontroller.hxx
+++ b/svtools/source/uno/wizard/wizardpagecontroller.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVTOOLS_SOURCE_UNO_WIZARD_WIZARDPAGECONTROLLER_HXX
 #define INCLUDED_SVTOOLS_SOURCE_UNO_WIZARD_WIZARDPAGECONTROLLER_HXX
 
-#include <svtools/wizardmachine.hxx>
+#include <vcl/wizardmachine.hxx>
 
 #include <com/sun/star/ui/dialogs/XWizardController.hpp>
 
@@ -34,7 +34,7 @@ namespace svt { namespace uno
 
     //= WizardPageController
 
-    class WizardPageController : public IWizardPageController
+    class WizardPageController : public vcl::IWizardPageController
     {
     public:
         WizardPageController(
@@ -46,7 +46,7 @@ namespace svt { namespace uno
 
         // IWizardPageController overridables
         virtual void        initializePage() override;
-        virtual bool        commitPage( WizardTypes::CommitPageReason _eReason ) override;
+        virtual bool        commitPage( vcl::WizardTypes::CommitPageReason _eReason ) override;
         virtual bool        canAdvance() const override;
 
         const css::uno::Reference< css::ui::dialogs::XWizardPage >&
diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx
index 81843f74befa..539dd7cea2d5 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -89,13 +89,13 @@ namespace svt { namespace uno
     {
         switch ( i_eReason )
         {
-        case WizardTypes::eTravelForward:
+        case vcl::WizardTypes::eTravelForward:
             return WizardTravelType::FORWARD;
 
-        case WizardTypes::eTravelBackward:
+        case vcl::WizardTypes::eTravelBackward:
             return WizardTravelType::BACKWARD;
 
-        case WizardTypes::eFinish:
+        case vcl::WizardTypes::eFinish:
             return WizardTravelType::FINISH;
 
         default:
@@ -188,7 +188,7 @@ namespace svt { namespace uno
         return pPage;
     }
 
-    IWizardPageController* WizardShell::getPageController( TabPage* i_pCurrentPage ) const
+    vcl::IWizardPageController* WizardShell::getPageController( TabPage* i_pCurrentPage ) const
     {
         return impl_getController( i_pCurrentPage ).get();
     }
diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx
index 34016a16f259..2b17fcff5167 100644
--- a/svtools/source/uno/wizard/wizardshell.hxx
+++ b/svtools/source/uno/wizard/wizardshell.hxx
@@ -57,7 +57,7 @@ namespace svt { namespace uno
         virtual OUString    getStateDisplayName( WizardState i_nState ) const override;
         virtual bool        canAdvance() const override;
         virtual bool        onFinish() override;
-        virtual IWizardPageController*
+        virtual vcl::IWizardPageController*
                             getPageController( TabPage* _pCurrentPage ) const override;
 
         static sal_Int16 convertCommitReasonToTravelType( const CommitPageReason i_eReason );
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index 9e5b9ad2fc06..dcbcffa2c31e 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -89,7 +89,7 @@ SwMailMergeWizard::~SwMailMergeWizard()
 
 VclPtr<TabPage> SwMailMergeWizard::createPage(WizardState _nState)
 {
-    VclPtr<OWizardPage> pRet;
+    VclPtr<vcl::OWizardPage> pRet;
     switch(_nState)
     {
         case MM_DOCUMENTSELECTPAGE :
@@ -202,7 +202,7 @@ void SwMailMergeWizard::UpdateRoadmap()
     //#i97436# if a document has to be loaded then enable output type page only
     m_bDocumentLoad = false;
     bool bEnableOutputTypePage = (nCurPage != MM_DOCUMENTSELECTPAGE) ||
-        static_cast<svt::OWizardPage*>(pCurPage)->commitPage( ::svt::WizardTypes::eValidate );
+        static_cast<vcl::OWizardPage*>(pCurPage)->commitPage( ::vcl::WizardTypes::eValidate );
 
     // handle the Finish button
     bool bCanFinish = !m_bDocumentLoad && bEnableOutputTypePage &&
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index ade32dbc2b9e..dd12860e54ca 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -58,7 +58,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdbcx;
 
 SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage( SwMailMergeWizard* _pParent) :
-    svt::OWizardPage(_pParent, "MMAddressBlockPage",
+    vcl::OWizardPage(_pParent, "MMAddressBlockPage",
         "modules/swriter/ui/mmaddressblockpage.ui")
     , m_pWizard(_pParent)
 {
@@ -122,7 +122,7 @@ void SwMailMergeAddressBlockPage::dispose()
     m_pPrevSetIB.clear();
     m_pNextSetIB.clear();
     m_pWizard.clear();
-    svt::OWizardPage::dispose();
+    vcl::OWizardPage::dispose();
 }
 
 bool SwMailMergeAddressBlockPage::canAdvance() const
@@ -158,9 +158,9 @@ void SwMailMergeAddressBlockPage::ActivatePage()
     }
 }
 
-bool SwMailMergeAddressBlockPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+bool SwMailMergeAddressBlockPage::commitPage( ::vcl::WizardTypes::CommitPageReason _eReason )
 {
-    return ::svt::WizardTypes::eTravelForward != _eReason || m_pWizard->GetConfigItem().GetResultSet().is();
+    return ::vcl::WizardTypes::eTravelForward != _eReason || m_pWizard->GetConfigItem().GetResultSet().is();
 }
 
 IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressListHdl_Impl, Button*, void)
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 5cdd6c1ad900..1bf08e55c2df 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SW_SOURCE_UI_DBUI_MMADDRESSBLOCKPAGE_HXX
 
 #include <editeng/weldeditview.hxx>
-#include <svtools/wizardmachine.hxx>
+#include <vcl/wizardmachine.hxx>
 #include <vcl/button.hxx>
 #include <mailmergehelper.hxx>
 #include <sfx2/basedlgs.hxx>
@@ -32,7 +32,7 @@
 class SwMailMergeWizard;
 class SwMailMergeConfigItem;
 
-class SwMailMergeAddressBlockPage : public svt::OWizardPage
+class SwMailMergeAddressBlockPage : public vcl::OWizardPage
 {
     VclPtr<PushButton>         m_pAddressListPB;
     VclPtr<FixedText>          m_pCurrentAddressFI;
@@ -71,7 +71,7 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage
     void                EnableAddressBlock(bool bAll, bool bSelective);
 
     virtual void        ActivatePage() override;
-    virtual bool        commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
+    virtual bool        commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override;
     virtual bool        canAdvance() const override;
 
 public:
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index fb3e05110330..ee22935376e3 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star::uno;
 using namespace svt;
 
 SwMailMergeDocSelectPage::SwMailMergeDocSelectPage(SwMailMergeWizard* pWizard, TabPageParent pParent)
-    : svt::OWizardPage(pParent, "modules/swriter/ui/mmselectpage.ui", "MMSelectPage")
+    : vcl::OWizardPage(pParent, "modules/swriter/ui/mmselectpage.ui", "MMSelectPage")
     , m_pWizard(pWizard)
     , m_xCurrentDocRB(m_xBuilder->weld_radio_button("currentdoc"))
     , m_xNewDocRB(m_xBuilder->weld_radio_button("newdoc"))
@@ -94,7 +94,7 @@ SwMailMergeDocSelectPage::~SwMailMergeDocSelectPage()
 void SwMailMergeDocSelectPage::dispose()
 {
     m_pWizard.clear();
-    svt::OWizardPage::dispose();
+    vcl::OWizardPage::dispose();
 }
 
 IMPL_LINK_NOARG(SwMailMergeDocSelectPage, DocSelectHdl, weld::ToggleButton&, void)
@@ -158,11 +158,11 @@ IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, weld::Button&, rButton, void)
     m_pWizard->enableButtons(WizardButtonFlags::NEXT, m_pWizard->isStateEnabled(MM_OUTPUTTYPETPAGE));
 }
 
-bool SwMailMergeDocSelectPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+bool SwMailMergeDocSelectPage::commitPage( ::vcl::WizardTypes::CommitPageReason _eReason )
 {
     bool bReturn = false;
-    bool bNext = _eReason == ::svt::WizardTypes::eTravelForward;
-    if(bNext || _eReason == ::svt::WizardTypes::eValidate )
+    bool bNext = _eReason == ::vcl::WizardTypes::eTravelForward;
+    if(bNext || _eReason == ::vcl::WizardTypes::eValidate )
     {
         OUString sReloadDocument;
         bReturn = m_xCurrentDocRB->get_active() ||
@@ -186,7 +186,7 @@ bool SwMailMergeDocSelectPage::commitPage( ::svt::WizardTypes::CommitPageReason
                 bReturn = !sReloadDocument.isEmpty();
             }
         }
-        if( _eReason == ::svt::WizardTypes::eValidate )
+        if( _eReason == ::vcl::WizardTypes::eValidate )
             m_pWizard->SetDocumentLoad(!m_xCurrentDocRB->get_active());
 
         if(bNext && !m_xCurrentDocRB->get_active())
diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx
index ae1a6e23588f..0a7afb45f240 100644
--- a/sw/source/ui/dbui/mmdocselectpage.hxx
+++ b/sw/source/ui/dbui/mmdocselectpage.hxx
@@ -19,12 +19,12 @@
 #ifndef INCLUDED_SW_SOURCE_UI_DBUI_MMDOCSELECTPAGE_HXX
 #define INCLUDED_SW_SOURCE_UI_DBUI_MMDOCSELECTPAGE_HXX
 
-#include <svtools/wizardmachine.hxx>
+#include <vcl/wizardmachine.hxx>
 #include <vcl/weld.hxx>
 
 class SwMailMergeWizard;
 
-class SwMailMergeDocSelectPage : public svt::OWizardPage
+class SwMailMergeDocSelectPage : public vcl::OWizardPage
 {
     OUString            m_sLoadFileName;
     OUString            m_sLoadTemplateName;
@@ -43,7 +43,7 @@ class SwMailMergeDocSelectPage : public svt::OWizardPage
     DECL_LINK(DocSelectHdl, weld::ToggleButton&, void);
     DECL_LINK(FileSelectHdl, weld::Button&, void);
 
-    virtual bool    commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
+    virtual bool    commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override;
 
 public:
     SwMailMergeDocSelectPage(SwMailMergeWizard* pWizard, TabPageParent pParent);
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index 17748adec77c..b80cc86480d7 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -197,7 +197,7 @@ void SwGreetingsHandler::Contains(bool bContainsGreeting)
 }
 
 SwMailMergeGreetingsPage::SwMailMergeGreetingsPage(SwMailMergeWizard* pWizard, TabPageParent pParent)
-    : svt::OWizardPage(pParent, "modules/swriter/ui/mmsalutationpage.ui", "MMSalutationPage")
+    : vcl::OWizardPage(pParent, "modules/swriter/ui/mmsalutationpage.ui", "MMSalutationPage")
     , SwGreetingsHandler(pWizard->GetConfigItem(), *m_xBuilder)
     , m_xPreview(new AddressPreview(m_xBuilder->weld_scrolled_window("previewwin")))
     , m_xPreviewFI(m_xBuilder->weld_label("previewft"))
@@ -254,7 +254,7 @@ void SwMailMergeGreetingsPage::dispose()
 {
     m_xPreviewWIN.reset();
     m_xPreview.reset();
-    svt::OWizardPage::dispose();
+    vcl::OWizardPage::dispose();
 }
 
 void SwMailMergeGreetingsPage::ActivatePage()
@@ -280,7 +280,7 @@ void SwMailMergeGreetingsPage::ActivatePage()
     m_pWizard->enableButtons(WizardButtonFlags::NEXT, m_pWizard->isStateEnabled(MM_LAYOUTPAGE));
 }
 
-bool SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPageReason )
+bool SwMailMergeGreetingsPage::commitPage( ::vcl::WizardTypes::CommitPageReason )
 {
     if (m_xFemaleColumnLB->get_value_changed_from_saved())
     {
diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx
index 68ef6d9927cd..b836d931d14e 100644
--- a/sw/source/ui/dbui/mmgreetingspage.hxx
+++ b/sw/source/ui/dbui/mmgreetingspage.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UI_DBUI_MMGREETINGSPAGE_HXX
 #define INCLUDED_SW_SOURCE_UI_DBUI_MMGREETINGSPAGE_HXX
 
-#include <svtools/wizardmachine.hxx>
+#include <vcl/wizardmachine.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <mailmergehelper.hxx>
 #include <vcl/weld.hxx>
@@ -82,7 +82,7 @@ protected:
     virtual void    UpdatePreview();
 };
 
-class SwMailMergeGreetingsPage : public svt::OWizardPage
+class SwMailMergeGreetingsPage : public vcl::OWizardPage
                                , public SwGreetingsHandler
 {
     std::unique_ptr<AddressPreview> m_xPreview;
@@ -103,7 +103,7 @@ class SwMailMergeGreetingsPage : public svt::OWizardPage
 
     virtual void        UpdatePreview() override;
     virtual void        ActivatePage() override;
-    virtual bool        commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
+    virtual bool        commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override;
 public:
     SwMailMergeGreetingsPage(SwMailMergeWizard* pWizard, TabPageParent pParent);
     virtual ~SwMailMergeGreetingsPage() override;
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index e2738aaf413a..ef464a8a6648 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -76,7 +76,7 @@ using namespace ::com::sun::star::view;
 #define DEFAULT_ADDRESS_HEIGHT (MM50*7) // 3,5cm
 
 SwMailMergeLayoutPage::SwMailMergeLayoutPage(SwMailMergeWizard* pWizard, TabPageParent pParent)
-    : svt::OWizardPage(pParent, "modules/swriter/ui/mmlayoutpage.ui", "MMLayoutPage")
+    : vcl::OWizardPage(pParent, "modules/swriter/ui/mmlayoutpage.ui", "MMLayoutPage")
     , m_pExampleWrtShell(nullptr)
     , m_pAddressBlockFormat(nullptr)
     , m_bIsGreetingInserted(false)
@@ -160,7 +160,7 @@ void SwMailMergeLayoutPage::dispose()
 {
     File::remove( m_sExampleURL );
     m_pWizard.clear();
-    svt::OWizardPage::dispose();
+    vcl::OWizardPage::dispose();
 }
 
 void SwMailMergeLayoutPage::ActivatePage()
@@ -216,11 +216,11 @@ void SwMailMergeLayoutPage::ActivatePage()
     }
 }
 
-bool SwMailMergeLayoutPage::commitPage(::svt::WizardTypes::CommitPageReason eReason)
+bool SwMailMergeLayoutPage::commitPage(::vcl::WizardTypes::CommitPageReason eReason)
 {
     //now insert the frame and the greeting
     SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
-    if (eReason == ::svt::WizardTypes::eTravelForward || eReason == ::svt::WizardTypes::eFinish)
+    if (eReason == ::vcl::WizardTypes::eTravelForward || eReason == ::vcl::WizardTypes::eFinish)
     {
         long nLeft = static_cast< long >(m_xLeftMF->denormalize(m_xLeftMF->get_value(FieldUnit::TWIP)));
         long nTop  = static_cast< long >(m_xTopMF->denormalize(m_xTopMF->get_value(FieldUnit::TWIP)));
diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx
index 0cc58b285407..6ce46554b993 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UI_DBUI_MMLAYOUTPAGE_HXX
 #define INCLUDED_SW_SOURCE_UI_DBUI_MMLAYOUTPAGE_HXX
 
-#include <svtools/wizardmachine.hxx>
+#include <vcl/wizardmachine.hxx>
 #include <mailmergehelper.hxx>
 #include <com/sun/star/uno/Reference.h>
 
@@ -31,7 +31,7 @@ class SwView;
 
 namespace com{ namespace sun{ namespace star{ namespace beans{ class XPropertySet;}}}}
 
-class SwMailMergeLayoutPage : public svt::OWizardPage
+class SwMailMergeLayoutPage : public vcl::OWizardPage
 {
     SwWrtShell*         m_pExampleWrtShell;
 
@@ -71,7 +71,7 @@ class SwMailMergeLayoutPage : public svt::OWizardPage
     static void             InsertGreeting(SwWrtShell& rShell, SwMailMergeConfigItem const & rConfigItem, bool bExample);
 
     virtual void        ActivatePage() override;
-    virtual bool        commitPage(::svt::WizardTypes::CommitPageReason _eReason) override;
+    virtual bool        commitPage(::vcl::WizardTypes::CommitPageReason _eReason) override;
 public:
     SwMailMergeLayoutPage(SwMailMergeWizard* pWizard, TabPageParent pParent);
     virtual ~SwMailMergeLayoutPage() override;
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 1ec126e0323c..c470a9f1a9e0 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -41,7 +41,7 @@
 using namespace ::com::sun::star;
 
 SwMailMergeOutputTypePage::SwMailMergeOutputTypePage(SwMailMergeWizard* pWizard, TabPageParent pParent)
-    : svt::OWizardPage(pParent, "modules/swriter/ui/mmoutputtypepage.ui", "MMOutputTypePage")
+    : vcl::OWizardPage(pParent, "modules/swriter/ui/mmoutputtypepage.ui", "MMOutputTypePage")
     , m_pWizard(pWizard)
     , m_xLetterRB(m_xBuilder->weld_radio_button("letter"))
     , m_xMailRB(m_xBuilder->weld_radio_button("email"))
@@ -68,7 +68,7 @@ SwMailMergeOutputTypePage::~SwMailMergeOutputTypePage()
 void SwMailMergeOutputTypePage::dispose()
 {
     m_pWizard.clear();
-    svt::OWizardPage::dispose();
+    vcl::OWizardPage::dispose();
 }
 
 IMPL_LINK_NOARG(SwMailMergeOutputTypePage, TypeHdl_Impl, weld::ToggleButton&, void)
diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx
index 20e43ab69060..5b2f2ab1c17c 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.hxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.hxx
@@ -19,11 +19,11 @@
 #ifndef INCLUDED_SW_SOURCE_UI_DBUI_MMOUTPUTTYPEPAGE_HXX
 #define INCLUDED_SW_SOURCE_UI_DBUI_MMOUTPUTTYPEPAGE_HXX
 
-#include <svtools/wizardmachine.hxx>
+#include <vcl/wizardmachine.hxx>
 #include <vcl/weld.hxx>
 class SwMailMergeWizard;
 
-class SwMailMergeOutputTypePage : public svt::OWizardPage
+class SwMailMergeOutputTypePage : public vcl::OWizardPage
 {
     VclPtr<SwMailMergeWizard>  m_pWizard;
 
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx
index d6ef4477ffe5..12233b9eb9d1 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UI_DBUI_MMOUTPUTPAGE_HXX
 #define INCLUDED_SW_SOURCE_UI_DBUI_MMOUTPUTPAGE_HXX
 
+#include <vcl/wizardmachine.hxx>
 #include <vcl/button.hxx>
 #include <vcl/prgsbar.hxx>
 #include <vcl/weld.hxx>
diff --git a/sw/source/uibase/inc/mailmergewizard.hxx b/sw/source/uibase/inc/mailmergewizard.hxx
index 4867a5e15668..adc8cf460ed9 100644
--- a/sw/source/uibase/inc/mailmergewizard.hxx
+++ b/sw/source/uibase/inc/mailmergewizard.hxx
@@ -48,7 +48,7 @@ class SwMailMergeWizard : public ::svt::RoadmapWizard
 
     sal_uInt16              m_nRestartPage;
 
-    using svt::OWizardMachine::skipUntil;
+    using vcl::OWizardMachine::skipUntil;
 
 protected:
     virtual VclPtr<TabPage>         createPage( WizardState _nState ) override;
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 6b1cb84287fd..4f6e483fe685 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -210,6 +210,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/control/spinfld \
     vcl/source/control/tabctrl \
     vcl/source/control/throbber \
+    vcl/source/control/wizardmachine \
     vcl/source/control/wizdlg \
     vcl/source/edit/vclmedit \
     vcl/source/edit/textdata \
diff --git a/vcl/inc/strings.hrc b/vcl/inc/strings.hrc
index b321927fb127..0991ff0182a4 100644
--- a/vcl/inc/strings.hrc
+++ b/vcl/inc/strings.hrc
@@ -148,6 +148,10 @@
 #define STR_SVT_CALENDAR_WEEK                        NC_("STR_SVT_CALENDAR_WEEK", "Week")
 #define STR_SVT_CALENDAR_TODAY                       NC_("STR_SVT_CALENDAR_TODAY", "Today")
 
+#define STR_WIZDLG_FINISH                            NC_("STR_WIZDLG_FINISH", "~Finish")
+#define STR_WIZDLG_NEXT                              NC_("STR_WIZDLG_NEXT", "~Next >")
+#define STR_WIZDLG_PREVIOUS                          NC_("STR_WIZDLG_PREVIOUS", "< Bac~k")
+
 #endif // INCLUDED_VCL_INC_STRINGS_HRC
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx
index 54c830c42507..f42c509bff37 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/vcl/source/control/wizardmachine.cxx
@@ -17,16 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtools/wizardmachine.hxx>
+#include <vcl/wizardmachine.hxx>
 #include <svtools/helpids.h>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <svtools/svtresid.hxx>
-#include <svtools/strings.hrc>
 #include <vcl/svapp.hxx>
+#include <strings.hrc>
+#include <svdata.hxx>
 #include <stack>
 
-namespace svt
+namespace vcl
 {
     //= WizardPageImplData
     OWizardPage::OWizardPage(vcl::Window *pParent, const OString& rID,
@@ -135,7 +135,7 @@ namespace svt
             m_pPrevPage = VclPtr<PushButton>::Create(this, WB_TABSTOP);
             m_pPrevPage->SetHelpId( HID_WIZARD_PREVIOUS );
             m_pPrevPage->SetSizePixel(LogicToPixel(Size(50, 14), MapMode(MapUnit::MapAppFont)));
-            m_pPrevPage->SetText(SvtResId(STR_WIZDLG_PREVIOUS));
+            m_pPrevPage->SetText(VclResId(STR_WIZDLG_PREVIOUS));
             m_pPrevPage->Show();
             m_pPrevPage->set_id("previous");
 
@@ -153,7 +153,7 @@ namespace svt
             m_pNextPage = VclPtr<PushButton>::Create(this, WB_TABSTOP);
             m_pNextPage->SetHelpId( HID_WIZARD_NEXT );
             m_pNextPage->SetSizePixel(LogicToPixel(Size(50, 14), MapMode(MapUnit::MapAppFont)));
-            m_pNextPage->SetText(SvtResId(STR_WIZDLG_NEXT));
+            m_pNextPage->SetText(VclResId(STR_WIZDLG_NEXT));
             m_pNextPage->Show();
             m_pNextPage->set_id("next");
 
@@ -167,7 +167,7 @@ namespace svt
         {
             m_pFinish = VclPtr<OKButton>::Create(this, WB_TABSTOP);
             m_pFinish->SetSizePixel(LogicToPixel(Size(50, 14), MapMode(MapUnit::MapAppFont)));
-            m_pFinish->SetText(SvtResId(STR_WIZDLG_FINISH));
+            m_pFinish->SetText(VclResId(STR_WIZDLG_FINISH));
             m_pFinish->Show();
             m_pFinish->set_id("finish");