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 /sfx2/source/dialog/mgetempl.cxx | |
| 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 'sfx2/source/dialog/mgetempl.cxx')
| -rw-r--r-- | sfx2/source/dialog/mgetempl.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 3290ae18bddf..fb99cd388d5e 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -589,7 +589,7 @@ void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet) } -SfxTabPage::sfxpg SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) +DeactivateRC SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) /* [Description] @@ -606,7 +606,7 @@ SfxTabPage::sfxpg SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet */ { - sfxpg nRet = SfxTabPage::LEAVE_PAGE; + DeactivateRC nRet = DeactivateRC::LeavePage; if ( m_pNameRw->IsModified() ) { @@ -620,7 +620,7 @@ SfxTabPage::sfxpg SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet aBox->Execute(); m_pNameRw->GrabFocus(); m_pNameRw->SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) ); - return SfxTabPage::KEEP_PAGE; + return DeactivateRC::KeepPage; } bModified = true; } @@ -636,7 +636,7 @@ SfxTabPage::sfxpg SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ScopedVclPtrInstance< MessageDialog > aBox(this, SfxResId( STR_TABPAGE_INVALIDSTYLE ), VclMessageType::Info); aBox->Execute(); m_pFollowLb->GrabFocus(); - return SfxTabPage::KEEP_PAGE; + return DeactivateRC::KeepPage; } bModified = true; } @@ -656,10 +656,10 @@ SfxTabPage::sfxpg SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ScopedVclPtrInstance< MessageDialog > aBox(this, SfxResId( STR_TABPAGE_INVALIDPARENT ), VclMessageType::Info); aBox->Execute(); m_pBaseLb->GrabFocus(); - return SfxTabPage::KEEP_PAGE; + return DeactivateRC::KeepPage; } bModified = true; - nRet = sfxpg(nRet | SfxTabPage::REFRESH_SET); + nRet = nRet | DeactivateRC::RefreshSet; } } |