coverity#1190356 Dereference null return value

Change-Id: I9a857423cd190b2da9f535e8897a9c9baba40b73

coverity#1190356 Dereference null return value
Change-Id: I9a857423cd190b2da9f535e8897a9c9baba40b73
ca789f8e · Caolán McNamara · cfb2d0fe · ca789f8e
Kaydet (Commit) ca789f8e authored Mar 06, 2014 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 4 deletions

numitem.cxx editeng/source/items/numitem.cxx +14 -4

No files found.
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -814,11 +814,21 @@ void SvxNumRule::SetLevel( sal_uInt16 i, const SvxNumberFormat& rNumFmt, bool bI
 {
    DBG_ASSERT(i < SVX_MAX_NUM, "Wrong Level" );
-    if( (i < SVX_MAX_NUM) && (!aFmtsSet[i] || !(rNumFmt == *Get( i ))) )
+    if( (i < SVX_MAX_NUM) )
    {
-        delete aFmts[ i ];
+        bool bReplace = !aFmtsSet[i];
-        aFmts[ i ] = new SvxNumberFormat( rNumFmt );
+        if (!bReplace)
-        aFmtsSet[i] = bIsValid;
+        {
+            const SvxNumberFormat *pFmt = Get(i);
+            bReplace = pFmt ? rNumFmt != *pFmt : true;
+        }
+        if (bReplace)
+        {
+            delete aFmts[i];
+            aFmts[i] = new SvxNumberFormat(rNumFmt);
+            aFmtsSet[i] = bIsValid;
+        }
    }
 }