summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-10-09 07:04:58 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-10-09 07:07:24 +0200
commit34638df69902a2251e8c23833b62c005a754fd5d (patch)
treec3d62d3b029ed6b4b546cc646ff2080db28824fd
parent1ae1bca7e6108081b16c9bedd1078e6c8ba34bf6 (diff)
don't insert the same data twice into boost::ptr_set, fdo#55710
Change-Id: Ifcd421cab6e675482d11aa5d2f92e11569077173
-rw-r--r--sc/source/filter/xml/xmlstyli.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index fe0f2650c87b..bb054377c104 100644
--- 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;
}