[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/table2.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0e8e9408fad0d56212c71acaba7f6c1816d0ee54
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Nov 4 19:04:13 2012 +0100

    only delete cond formats if the correct attributes are passed, fdo#56316
    
    Change-Id: If9859b5021c532daacccfaf386e0489c134e4afb
    
    Signed-off-by: Kohei Yoshida <kohei.yoshida at gmail.com>

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index e8df882..bc97e9c 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -561,7 +561,8 @@ void ScTable::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal
             ApplyPatternArea( nCol1, nRow1, nCol2, nRow2, aPattern );
         }
 
-        mpCondFormatList->DeleteArea( nCol1, nRow1, nCol2, nRow2 );
+        if( nDelFlag & IDF_ATTRIB )
+            mpCondFormatList->DeleteArea( nCol1, nRow1, nCol2, nRow2 );
     }
 
     if (nDelFlag & IDF_NOTE)