check for invalidated item with IsInvalidItem

ea95d600 · Caolán McNamara · d0fb0305 · ea95d600
Kaydet (Commit) ea95d600 authored Eki 28, 2011 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 18 deletions

docfmt.cxx sw/source/core/doc/docfmt.cxx +21 -18

No files found.
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -536,26 +536,29 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet,
    {
        SfxItemIter aIter( rChgSet );
        const SfxPoolItem* pItem = aIter.FirstItem();
-        const sal_uInt16 nWhich = pItem->Which();
+        if (!IsInvalidItem(pItem))
-        if ( isCHRATR(nWhich) ||
-             (RES_TXTATR_CHARFMT == nWhich) ||
-             (RES_TXTATR_INETFMT == nWhich) ||
-             (RES_TXTATR_AUTOFMT == nWhich) ||
-             (RES_TXTATR_UNKNOWN_CONTAINER == nWhich) )
        {
-            pCharSet  = &rChgSet;
+            const sal_uInt16 nWhich = pItem->Which();
-            bCharAttr = true;
-        }
-        if (    isPARATR(nWhich)
+            if ( isCHRATR(nWhich) ||
-             || isPARATR_LIST(nWhich)
+                 (RES_TXTATR_CHARFMT == nWhich) ||
-             || isFRMATR(nWhich)
+                 (RES_TXTATR_INETFMT == nWhich) ||
-             || isGRFATR(nWhich)
+                 (RES_TXTATR_AUTOFMT == nWhich) ||
-             || isUNKNOWNATR(nWhich) )
+                 (RES_TXTATR_UNKNOWN_CONTAINER == nWhich) )
-        {
+            {
-            pOtherSet = &rChgSet;
+                pCharSet  = &rChgSet;
-            bOtherAttr = true;
+                bCharAttr = true;
+            }
+            if (    isPARATR(nWhich)
+                 || isPARATR_LIST(nWhich)
+                 || isFRMATR(nWhich)
+                 || isGRFATR(nWhich)
+                 || isUNKNOWNATR(nWhich) )
+            {
+                pOtherSet = &rChgSet;
+                bOtherAttr = true;
+            }
        }
    }