From df809481d4fcee0ac51cf056161ee4953ade44bd Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 12 Sep 2019 16:17:30 +0100 Subject: inherit from one class MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia3cb14429a42e445c14cecc20728d59d985f4b5d Reviewed-on: https://gerrit.libreoffice.org/78837 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- extensions/source/abpilot/abspilot.cxx | 3 ++- extensions/source/abpilot/abspilot.hxx | 3 +++ extensions/source/dbpilots/gridwizard.hxx | 2 ++ extensions/source/dbpilots/groupboxwiz.hxx | 2 ++ extensions/source/dbpilots/listcombowizard.hxx | 3 ++- 5 files changed, 11 insertions(+), 2 deletions(-) (limited to 'extensions') diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index 865252a38fc3..02eca7b3e28e 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -33,6 +33,7 @@ #include "fieldmappingpage.hxx" #include "fieldmappingimpl.hxx" +using vcl::RoadmapWizardTypes::PathId; namespace abp { @@ -215,7 +216,7 @@ namespace abp if ( !OAddressBookSourcePilot_Base::prepareLeaveCurrentState( _eReason ) ) return false; - if ( _eReason == eTravelBackward ) + if ( _eReason == vcl::WizardTypes::eTravelBackward ) return true; bool bAllow = true; diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx index 2ff045940b06..2a3ed894389e 100644 --- a/extensions/source/abpilot/abspilot.hxx +++ b/extensions/source/abpilot/abspilot.hxx @@ -24,6 +24,9 @@ #include "addresssettings.hxx" #include "datasourcehandling.hxx" +using vcl::WizardTypes::WizardState; +using vcl::WizardTypes::CommitPageReason; + namespace abp { typedef ::vcl::RoadmapWizardMachine OAddressBookSourcePilot_Base; diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx index b38d58f9192e..a0756f6295f5 100644 --- a/extensions/source/dbpilots/gridwizard.hxx +++ b/extensions/source/dbpilots/gridwizard.hxx @@ -23,6 +23,8 @@ #include "controlwizard.hxx" #include "commonpagesdbp.hxx" +using vcl::WizardTypes::WizardState; +using vcl::WizardTypes::CommitPageReason; namespace dbp { diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx index 01db8750545f..903ac01d93cd 100644 --- a/extensions/source/dbpilots/groupboxwiz.hxx +++ b/extensions/source/dbpilots/groupboxwiz.hxx @@ -23,6 +23,8 @@ #include "controlwizard.hxx" #include "commonpagesdbp.hxx" +using vcl::WizardTypes::WizardState; +using vcl::WizardTypes::CommitPageReason; namespace dbp { diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx index 400063243255..1ecafaf5cf87 100644 --- a/extensions/source/dbpilots/listcombowizard.hxx +++ b/extensions/source/dbpilots/listcombowizard.hxx @@ -23,11 +23,12 @@ #include "controlwizard.hxx" #include "commonpagesdbp.hxx" +using vcl::WizardTypes::WizardState; +using vcl::WizardTypes::CommitPageReason; namespace dbp { - #define LCW_STATE_DATASOURCE_SELECTION 0 #define LCW_STATE_TABLESELECTION 1 #define LCW_STATE_FIELDSELECTION 2 -- cgit v1.2.3