diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-06-05 15:15:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-06 07:02:20 +0000 |
| commit | 11b4a6ddce31f173f10b703eb63fde2c88c0bc70 (patch) | |
| tree | 5f635db51172fd421dffbcadfa021530634567cd /chart2 | |
| parent | 7d1b01070c330d45212cd69ea692b2263c23c2a6 (diff) | |
Convert DeactivePage return code to scoped enum
Change-Id: Idd5372ad20fc6676864b31b3796f8b9bc0ad73dd
Reviewed-on: https://gerrit.libreoffice.org/25918
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'chart2')
4 files changed, 8 insertions, 8 deletions
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index b8de8916b537..908fd49b9d27 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -276,12 +276,12 @@ void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs) } } -SfxTabPage::sfxpg AxisPositionsTabPage::DeactivatePage(SfxItemSet* pItemSet) +DeactivateRC AxisPositionsTabPage::DeactivatePage(SfxItemSet* pItemSet) { if( pItemSet ) FillItemSet( pItemSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void AxisPositionsTabPage::SetNumFormatter( SvNumberFormatter* pFormatter ) diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index dae55be9b20d..cfd4435bb933 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -40,7 +40,7 @@ public: virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override; virtual void Reset( const SfxItemSet* rInAttrs ) override; using TabPage::DeactivatePage; - virtual sfxpg DeactivatePage( SfxItemSet* pItemSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pItemSet = nullptr ) override; void SetNumFormatter( SvNumberFormatter* pFormatter ); diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index 1160f34b8e79..d53ba44dc376 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -416,12 +416,12 @@ void ScaleTabPage::Reset(const SfxItemSet* rInAttrs) SetNumFormat(); } -SfxTabPage::sfxpg ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) +DeactivateRC ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) { if( !pNumFormatter ) { OSL_FAIL( "No NumberFormatter available" ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } bool bDateAxis = chart2::AxisType::DATE == m_nAxisType; @@ -527,12 +527,12 @@ SfxTabPage::sfxpg ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) } if( ShowWarning( nErrStrId, pControl ) ) - return KEEP_PAGE; + return DeactivateRC::KeepPage; if( pItemSet ) FillItemSet( pItemSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } void ScaleTabPage::SetNumFormatter( SvNumberFormatter* pFormatter ) diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index 0798240f1b0b..0224bf4c9003 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -40,7 +40,7 @@ public: virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override; virtual void Reset( const SfxItemSet* rInAttrs ) override; using TabPage::DeactivatePage; - virtual sfxpg DeactivatePage( SfxItemSet* pItemSet = nullptr ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pItemSet = nullptr ) override; void SetNumFormatter( SvNumberFormatter* pFormatter ); void SetNumFormat(); |