diff options
author | Pranav Kant <pranavk@collabora.co.uk> | 2017-02-21 11:45:57 +0530 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2017-02-28 11:17:26 +0100 |
commit | 1ad56de1728c5180be97789532edaa2a12ff8dee (patch) | |
tree | 19d3b55e4d2ccfb912db089e2061825f77ea58df /sfx2 | |
parent | 8388724fbc5ff2cc29ad62b5ad5a57016aaafed3 (diff) |
sfx2: fix incorrect debug output
Fallback from 9351353b63886f494782f28f5400f5d71d22bcbd
While at it, add one more such statement in Execute_
Change-Id: Ibebc6f007542751718b53ed978ee52c300d14439
(cherry picked from commit e4a0b50943921dcf6a914983cb693f9f6d20e145)
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/control/dispatch.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 71cd48bd5466..c22fe4329481 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -911,6 +911,7 @@ bool SfxDispatcher::GetShellAndSlot_Impl(sal_uInt16 nSlot, SfxShell** ppShell, void SfxDispatcher::Execute_(SfxShell& rShell, const SfxSlot& rSlot, SfxRequest& rReq, SfxCallMode eCallMode) { + SFX_STACK(SfxDispatcher::Execute_); DBG_ASSERT( !xImp->bFlushing, "recursive call to dispatcher" ); DBG_ASSERT( xImp->aToDoStack.empty(), "unprepared InPlace _Execute" ); @@ -1738,7 +1739,7 @@ SfxSlotFilterState SfxDispatcher::IsSlotEnabledByFilter_Impl( sal_uInt16 nSID ) */ bool SfxDispatcher::FindServer_(sal_uInt16 nSlot, SfxSlotServer& rServer, bool bModal) { - SFX_STACK(SfxDispatcher::_FindServer); + SFX_STACK(SfxDispatcher::FindServer_); // Dispatcher locked? (nevertheless let SID_HELP_PI through) if ( IsLocked(nSlot) ) @@ -1872,7 +1873,7 @@ bool SfxDispatcher::FindServer_(sal_uInt16 nSlot, SfxSlotServer& rServer, bool b bool SfxDispatcher::FillState_(const SfxSlotServer& rSvr, SfxItemSet& rState, const SfxSlot* pRealSlot) { - SFX_STACK(SfxDispatcher::_FillState); + SFX_STACK(SfxDispatcher::FillState_); const SfxSlot *pSlot = rSvr.GetSlot(); if ( pSlot && IsLocked( pSlot->GetSlotId() ) ) |