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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/source/ui/dlg/tpaction.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/dlg/tpoption.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/inc/tpaction.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/inc/tpoption.hxx | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 49393bd441d5..f78f184638e6 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -369,12 +369,12 @@ void SdTPAction::ActivatePage( const SfxItemSet& ) { } -SfxTabPage::sfxpg SdTPAction::DeactivatePage( SfxItemSet* pPageSet ) +DeactivateRC SdTPAction::DeactivatePage( SfxItemSet* pPageSet ) { if( pPageSet ) FillItemSet( pPageSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } VclPtr<SfxTabPage> SdTPAction::Create( vcl::Window* pWindow, diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index df67367bcfdd..df55b9652ae7 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -363,7 +363,7 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet ) } } -SfxTabPage::sfxpg SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) +DeactivateRC SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) { // check parser sal_Int32 nX, nY; @@ -371,17 +371,17 @@ SfxTabPage::sfxpg SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) { if( pActiveSet ) FillItemSet( pActiveSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } ScopedVclPtrInstance< WarningBox > aWarnBox( GetParent(), WB_YES_NO, SD_RESSTR( STR_WARN_SCALE_FAIL ) ); if( aWarnBox->Execute() == RET_YES ) - return KEEP_PAGE; + return DeactivateRC::KeepPage; if( pActiveSet ) FillItemSet( pActiveSet ); - return LEAVE_PAGE; + return DeactivateRC::LeavePage; } bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs ) diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index ecc407fdf5fe..13e59a142a10 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -102,7 +102,7 @@ public: virtual void Reset( const SfxItemSet * ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; void Construct(); diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index d0b765c48494..e4edb5ef9f32 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -127,7 +127,7 @@ private: protected: virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet ) override; + virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; public: SdTpOptionsMisc( vcl::Window* pParent, const SfxItemSet& rInAttrs ); |