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

[Markus Mohrhard]

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

New commits:
commit 7c6b21c31904b2ed007f961e4bf094af1a1981c7
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Jan 30 01:34:24 2013 +0100

    if no cond format is valid use the existing protection, fdo#58826
    
    Change-Id: Ib52a546a98f681b918de5e3bd285c36407fa8254
    Reviewed-on: https://gerrit.libreoffice.org/1942
    Reviewed-by: Kohei Yoshida <kohei.yoshida at gmail.com>
    Tested-by: Kohei Yoshida <kohei.yoshida at gmail.com>

diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 201538d..8059b17 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1278,6 +1278,8 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const
                         const ScProtectionAttr* pCondProtect = static_cast<const ScProtectionAttr*>(pItem);
                         if( pCondProtect->GetProtection() || pProtect->GetHideCell() )
                             bFoundCond = true;
+                        else
+                            break;
                     }
                     else
                     {
@@ -1285,7 +1287,7 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const
                         // but existing one + cell where conditional
                         // formatting does not remove it
                         // => we have a protected cell
-                        bFoundCond = true;
+                        bFoundCond = bFoundTemp;
                     }
                 }
                 bFoundTemp = bFoundCond;