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>

9 files changed, 26 insertions, 26 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: