[Libreoffice-commits] .: sc/source

[Libreoffice Gerrit user]

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

New commits:
commit 78e35a68b23830debc574431c18f1b7637a513c8
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Sep 16 04:06:37 2012 +0200

    only delete cond formats when attributes are deleted, fdo#54748
    
    Change-Id: I41829e8464fb2fb5e7bbc435f9aa5ed72e7d5cbc

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 48cff65..eb22ac6 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -534,7 +534,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)