summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-25 09:59:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-25 10:00:10 +0100
commit93d7c753051664bc3f03d41fe634c1d996a07a80 (patch)
treeab6864718f337a67306ce9fac57b7399c4e8e0cb /sfx2
parentf5ae42f9344a523e586fdcca4f0e670ee2a4d821 (diff)
Adapt to sal/log.hxx
Change-Id: I96786bcab1205d212926af6c7c6afbf88bfe1453
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/control/dispatch.cxx16
1 files changed, 6 insertions, 10 deletions
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index d74bd22c4c9c..1f8da2e8e8a0 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -2099,7 +2099,7 @@ bool SfxDispatcher::_FillState
pSh->CallState( pFunc, rState );
#ifdef DBG_UTIL
// To examine the conformity of IDL (SlotMap) and current Items
- if ( DbgIsAssertWarning() && rState.Count() )
+ if ( rState.Count() )
{
SfxInterface *pIF = pSh->GetInterface();
SfxItemIter aIter( rState );
@@ -2110,15 +2110,11 @@ bool SfxDispatcher::_FillState
if ( !IsInvalidItem(pItem) && !pItem->ISA(SfxVoidItem) )
{
sal_uInt16 nSlotId = rState.GetPool()->GetSlotId(pItem->Which());
- if ( !pItem->IsA(pIF->GetSlot(nSlotId)->GetType()->Type()) )
- {
- OStringBuffer aMsg("item-type unequal to IDL (=> no BASIC)");
- aMsg.append("\nwith SID: ");
- aMsg.append(static_cast<sal_Int32>(nSlotId));
- aMsg.append("\nin ");
- aMsg.append(pIF->GetClassName());
- DbgOut(aMsg.getStr(), DBG_OUT_ERROR, __FILE__, __LINE__);
- }
+ SAL_WARN_IF(
+ !pItem->IsA(pIF->GetSlot(nSlotId)->GetType()->Type()),
+ "sfx.control",
+ "item-type unequal to IDL (=> no BASIC) with SID: "
+ << nSlotId << " in " << pIF->GetClassName());
}
}
}