[Libreoffice-commits] core.git: sfx2/source
Pranav Kant
pranavk at collabora.co.uk
Tue Feb 21 06:19:24 UTC 2017
sfx2/source/control/dispatch.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit e4a0b50943921dcf6a914983cb693f9f6d20e145
Author: Pranav Kant <pranavk at collabora.co.uk>
Date: Tue Feb 21 11:45:57 2017 +0530
sfx2: fix incorrect debug output
Fallback from 9351353b63886f494782f28f5400f5d71d22bcbd
While at it, add one more such statement in Execute_
Change-Id: Ibebc6f007542751718b53ed978ee52c300d14439
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 75918ef..b8b25ed 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -902,6 +902,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" );
@@ -1731,7 +1732,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) )
@@ -1865,7 +1866,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() ) )
More information about the Libreoffice-commits
mailing list