diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-09-12 16:17:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-09-14 06:51:30 +0200 |
| commit | df809481d4fcee0ac51cf056161ee4953ade44bd (patch) | |
| tree | d4f948b1a675338598dd11dea2b498c470bc806a /svtools | |
| parent | 6df7568e46b7f307ad6ae94730809fe63a6981a6 (diff) | |
inherit from one class
Change-Id: Ia3cb14429a42e445c14cecc20728d59d985f4b5d
Reviewed-on: https://gerrit.libreoffice.org/78837
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/uno/wizard/wizardshell.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/uno/wizard/wizardshell.hxx | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx index 539dd7cea2d5..4b8b6e9052a9 100644 --- a/svtools/source/uno/wizard/wizardshell.cxx +++ b/svtools/source/uno/wizard/wizardshell.cxx @@ -25,6 +25,8 @@ #include <com/sun/star/ui/dialogs/WizardTravelType.hpp> +using vcl::RoadmapWizardTypes::WizardPath; + namespace svt { namespace uno { diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx index 320d31e6330a..6217f5822770 100644 --- a/svtools/source/uno/wizard/wizardshell.hxx +++ b/svtools/source/uno/wizard/wizardshell.hxx @@ -26,6 +26,8 @@ #include <map> #include <memory> +using vcl::WizardTypes::WizardState; +using vcl::WizardTypes::CommitPageReason; namespace svt { namespace uno { @@ -76,7 +78,7 @@ namespace svt { namespace uno void activatePath( const sal_Int16 i_nPathID, const bool i_bFinal ) { - WizardShell_Base::activatePath( PathId( i_nPathID ), i_bFinal ); + WizardShell_Base::activatePath( vcl::RoadmapWizardTypes::PathId( i_nPathID ), i_bFinal ); } css::uno::Reference< css::ui::dialogs::XWizardPage > @@ -95,14 +97,14 @@ namespace svt { namespace uno } private: - sal_Int16 impl_stateToPageId( const WizardTypes::WizardState i_nState ) const + sal_Int16 impl_stateToPageId( const WizardState i_nState ) const { return static_cast< sal_Int16 >( i_nState + m_nFirstPageID ); } WizardState impl_pageIdToState( const sal_Int16 i_nPageId ) const { - return static_cast< WizardState >( i_nPageId - m_nFirstPageID ); + return static_cast<WizardState>(i_nPageId - m_nFirstPageID); } PWizardPageController impl_getController( TabPage* i_pPage ) const; |