diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-08-03 20:17:38 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-08-16 22:32:42 +0200 |
commit | 4d450704d672dddf2c555fda5ff3140d8c537d02 (patch) | |
tree | a7e13e2b579792695ebc900740b9c0ce466634bd /extensions/source/abpilot | |
parent | f52d015b04779b8aaa3e353cbd9d0d5da3e73a16 (diff) |
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>
Diffstat (limited to 'extensions/source/abpilot')
-rw-r--r-- | extensions/source/abpilot/abpfinalpage.cxx | 4 | ||||
-rw-r--r-- | extensions/source/abpilot/abpfinalpage.hxx | 2 | ||||
-rw-r--r-- | extensions/source/abpilot/abspage.hxx | 4 | ||||
-rw-r--r-- | extensions/source/abpilot/tableselectionpage.cxx | 2 | ||||
-rw-r--r-- | extensions/source/abpilot/tableselectionpage.hxx | 2 | ||||
-rw-r--r-- | extensions/source/abpilot/typeselectionpage.cxx | 2 | ||||
-rw-r--r-- | extensions/source/abpilot/typeselectionpage.hxx | 2 |
7 files changed, 9 insertions, 9 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; |