summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-10-09 08:46:31 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2012-10-09 09:24:10 +0200
commitd126dcfe359782a6229156f7cbdb20e642b63a5e (patch)
tree185681b1a111451afa128ee68d9cc58750544d43
parenta00d5c5321959c316f6103e18dddef1ad5f02376 (diff)
don't insert the same pointer twice into a ptr_set, fdo#55710
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
-rw-r--r--sc/source/filter/xml/xmlstyli.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 167755f9b56e..59d1fe43749e 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 );