diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-09 08:40:43 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-09 08:41:12 +0200 |
commit | cfab2fd725276e99fb6fa8b619ca5b2ac3bd025a (patch) | |
tree | 5a4734260635c750c32b788f1fa74117224b7348 /sfx2/source/control | |
parent | 502a7662555bfa66ab6be84b7d2d11b049ed7a4e (diff) |
convert SFX_SHELL constants to scoped enum
Change-Id: If1649e8f3b9d200b0b176bef7deea41445bd3f2f
Diffstat (limited to 'sfx2/source/control')
-rw-r--r-- | sfx2/source/control/dispatch.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 081d1a635383..987ef969b0ef 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -169,7 +169,7 @@ void SfxDispatcher::Flush() void SfxDispatcher::Push(SfxShell& rShell) { - Pop( rShell, SFX_SHELL_PUSH ); + Pop( rShell, SfxDispatcherPopFlags::PUSH ); } /** This method checks whether a particular <SfxShell> instance is @@ -411,25 +411,25 @@ SfxDispatcher::~SfxDispatcher() SfxShell cancel each other out. @param rShell the stack to take the SfxShell instance. - @param nMode SFX_SHELL_POP_UNTIL + @param nMode SfxDispatcherPopFlags::POP_UNTIL Also all 'rShell' of SfxShells are taken from the stack. - SFX_SHELL_POP_DELETE + SfxDispatcherPopFlags::POP_DELETE All SfxShells actually taken from the stack will be deleted. - SFX_SHELL_PUSH (InPlace use only) + SfxDispatcherPopFlags::PUSH (InPlace use only) The Shell is pushed. */ -void SfxDispatcher::Pop(SfxShell& rShell, sal_uInt16 nMode) +void SfxDispatcher::Pop(SfxShell& rShell, SfxDispatcherPopFlags nMode) { DBG_ASSERT( rShell.GetInterface(), "pushing SfxShell without previous RegisterInterface()" ); - bool bDelete = (nMode & SFX_SHELL_POP_DELETE) == SFX_SHELL_POP_DELETE; - bool bUntil = (nMode & SFX_SHELL_POP_UNTIL) == SFX_SHELL_POP_UNTIL; - bool bPush = (nMode & SFX_SHELL_PUSH) == SFX_SHELL_PUSH; + bool bDelete = bool(nMode & SfxDispatcherPopFlags::POP_DELETE); + bool bUntil = bool(nMode & SfxDispatcherPopFlags::POP_UNTIL); + bool bPush = bool(nMode & SfxDispatcherPopFlags::PUSH); SfxApplication *pSfxApp = SfxGetpApp(); |