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

[Libreoffice Gerrit user]

 sc/source/filter/xml/xmlstyli.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9b4d2473a11db4d1dee0fa445346907d7e942801
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Sep 14 18:51:53 2012 +0200

    don't add old cond formats if new ones are already loaded, fdo#54749
    
    Change-Id: Ib0cbe1a3347e7231e7908b9bd8135e984e6ef644
    Signed-off-by: Kohei Yoshida <kohei.yoshida at gmail.com>

diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 93e95fe..7388d86 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -424,7 +424,7 @@ SvXMLImportContext *XMLTableStyleContext::CreateChildContext(
 
 void XMLTableStyleContext::ApplyCondFormat( uno::Sequence<table::CellRangeAddress> xCellRanges )
 {
-    if(!mpCondFormat)
+    if(!mpCondFormat || GetScImport().HasNewCondFormatData())
         return;
 
     ScRangeList rRange;