[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/xml/xmlstyli.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d126dcfe359782a6229156f7cbdb20e642b63a5e
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Oct 9 08:46:31 2012 +0200

    don't insert the same pointer twice into a ptr_set, fdo#55710
    
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 167755f..59d1fe4 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -462,11 +462,11 @@ void XMLTableStyleContext::ApplyCondFormat( uno::Sequence<table::CellRangeAddres
             aMarkData.MarkFromRangeList(rRange, true);
             pDoc->ApplySelectionPattern( aPattern , aMarkData);
 
-            break;
+            return;
         }
     }
 
-    if(mpCondFormat)
+    if(mpCondFormat && mbDeleteCondFormat)
     {
         mbDeleteCondFormat = false;
         sal_uLong nIndex = pDoc->AddCondFormat(mpCondFormat, nTab );