[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source

[Markus Mohrhard]

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

New commits:
commit a7eb431731761e72a343c29276cfbbea0e6f01ec
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Feb 19 20:11:28 2013 +0100

    respect nDelFlags, fdo#57661
    
    Change-Id: I77d3e1f537b59504125d66f66f691d01f8f23894
    (cherry picked from commit 41095e934bcd83e08a472c8fb53743cd3f8e926c)
    Reviewed-on: https://gerrit.libreoffice.org/2616
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 936e597..47cd340 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -567,7 +567,7 @@ void ScTable::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark )
         if (nDelFlag & IDF_NOTE && pRange)
             maNotes.erase(pRange->aStart.Col(), pRange->aStart.Row(), pRange->aEnd.Col(), pRange->aEnd.Row(), true);
 
-        if(pRange && pRange->aStart.Tab() == nTab)
+        if((nDelFlag & IDF_ATTRIB) && pRange && pRange->aStart.Tab() == nTab)
             mpCondFormatList->DeleteArea( pRange->aStart.Col(), pRange->aStart.Row(), pRange->aEnd.Col(), pRange->aEnd.Row() );
     }