sc/source/filter/xml/xmlstyli.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 34638df69902a2251e8c23833b62c005a754fd5d
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Tue Oct 9 07:04:58 2012 +0200
don't insert the same data twice into boost::ptr_set, fdo#55710
Change-Id: Ifcd421cab6e675482d11aa5d2f92e11569077173
diff --git a/sc/source/filter/xml/xmlstyli.cxx
b/sc/source/filter/xml/xmlstyli.cxx
index fe0f265..bb05437 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;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
