don't insert the same data twice into boost::ptr_set, fdo#55710

Change-Id: Ifcd421cab6e675482d11aa5d2f92e11569077173
2012-10-09 07:04:58 +02:00
parent 1ae1bca7e6
commit 34638df699
1 changed files with 3 additions and 3 deletions
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -455,18 +455,18 @@ void XMLTableStyleContext::ApplyCondFormat( uno::Sequence<table::CellRangeAddres
            }

            pDoc->AddCondFormatData( aRangeList, nTab, nCondId );
-            break;
+            return;
        }
    }

-    if(mpCondFormat)
+    if(mpCondFormat && mbDeleteCondFormat)
    {
-        mbDeleteCondFormat = false;
        sal_uLong nIndex = pDoc->AddCondFormat(mpCondFormat, nTab );
        mpCondFormat->SetKey(nIndex);
        mpCondFormat->AddRange(aRangeList);

        pDoc->AddCondFormatData( aRangeList, nTab, nIndex );
+        mbDeleteCondFormat = false;
    }