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

Markus Mohrhard markus.mohrhard at googlemail.com
Fri Oct 4 06:14:10 PDT 2013


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

New commits:
commit 268cb4cff758b556085d7df532e7f8fbce0efd60
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Sep 25 17:47:13 2013 +0200

    compare against IDF_HARDATTR, fdo#69720
    
    regression from e851ea0ed30e9bb95c273a29aeab7f48f606145f
    
    Change-Id: I07819f90efe87fe9d82515d637960fe48ca40c80
    (cherry picked from commit 6f2957969bd72308ddf79cb2befa2373f2dc1dbe)
    Reviewed-on: https://gerrit.libreoffice.org/6034
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index c5e629a..c19662e 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -522,7 +522,7 @@ void ScColumn::DeleteArea(SCROW nStartRow, SCROW nEndRow, sal_uInt16 nDelFlag)
     // Delete attributes just now
     if ((nDelFlag & IDF_ATTRIB) == IDF_ATTRIB)
         pAttrArray->DeleteArea( nStartRow, nEndRow );
-    else if ((nDelFlag & IDF_ATTRIB) != 0)
+    else if ((nDelFlag & IDF_HARDATTR) == IDF_HARDATTR)
         pAttrArray->DeleteHardAttr( nStartRow, nEndRow );
 
     // Broadcast on only cells that were deleted; no point broadcasting on


More information about the Libreoffice-commits mailing list