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>

17 files changed, 43 insertions, 48 deletions

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();