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

[Libreoffice Gerrit user]

 sc/source/filter/xml/xmlstyli.cxx |   11 +++++------
 sc/source/filter/xml/xmlstyli.hxx |    1 +
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 2ec30db5f8a9b629b3a099ed8e4d3598567feceb
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Sep 28 20:14:17 2012 +0200

    fetime of mpCondFormat is more complex, fdo#55379
    
    Change-Id: I2b34f9fefdfdfa245ab73f8691090cbde8bcd34e
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 7388d86..167755f 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -392,12 +392,15 @@ XMLTableStyleContext::XMLTableStyleContext( ScXMLImport& rImport,
     nNumberFormat(-1),
     nLastSheet(-1),
     bParentSet(false),
-    mpCondFormat(NULL)
+    mpCondFormat(NULL),
+    mbDeleteCondFormat(true)
 {
 }
 
 XMLTableStyleContext::~XMLTableStyleContext()
 {
+    if(mbDeleteCondFormat)
+        delete mpCondFormat;
 }
 
 SvXMLImportContext *XMLTableStyleContext::CreateChildContext(
@@ -444,11 +447,6 @@ void XMLTableStyleContext::ApplyCondFormat( uno::Sequence<table::CellRangeAddres
     {
         if(itr->EqualEntries(*mpCondFormat))
         {
-            // we don't need the new cond format entry now
-            // the found one is the same and we just need to add the range to it
-            delete mpCondFormat;
-            mpCondFormat = NULL;
-
             ScRangeList& rRangeList = itr->GetRangeList();
             sal_uInt32 nCondId = itr->GetKey();
             size_t n = rRange.size();
@@ -470,6 +468,7 @@ void XMLTableStyleContext::ApplyCondFormat( uno::Sequence<table::CellRangeAddres
 
     if(mpCondFormat)
     {
+        mbDeleteCondFormat = false;
         sal_uLong nIndex = pDoc->AddCondFormat(mpCondFormat, nTab );
         mpCondFormat->SetKey(nIndex);
         mpCondFormat->AddRange(rRange);
diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx
index d674fe3..2498b3c 100644
--- a/sc/source/filter/xml/xmlstyli.hxx
+++ b/sc/source/filter/xml/xmlstyli.hxx
@@ -101,6 +101,7 @@ class XMLTableStyleContext : public XMLPropStyleContext
     SCTAB                       nLastSheet;
     bool                        bParentSet;
     ScConditionalFormat*        mpCondFormat;
+    bool                        mbDeleteCondFormat;
 
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }