Kaydet (Commit) ea95d600 authored tarafından Caolán McNamara's avatar Caolán McNamara

check for invalidated item with IsInvalidItem

üst d0fb0305
...@@ -536,6 +536,8 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet, ...@@ -536,6 +536,8 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet,
{ {
SfxItemIter aIter( rChgSet ); SfxItemIter aIter( rChgSet );
const SfxPoolItem* pItem = aIter.FirstItem(); const SfxPoolItem* pItem = aIter.FirstItem();
if (!IsInvalidItem(pItem))
{
const sal_uInt16 nWhich = pItem->Which(); const sal_uInt16 nWhich = pItem->Which();
if ( isCHRATR(nWhich) || if ( isCHRATR(nWhich) ||
...@@ -558,6 +560,7 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet, ...@@ -558,6 +560,7 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet,
bOtherAttr = true; bOtherAttr = true;
} }
} }
}
// Build new itemset if either // Build new itemset if either
// - rChgSet.Count() > 1 or // - rChgSet.Count() > 1 or
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment