Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1942

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/1942/1

if no cond format is valid use the existing protection, fdo#58826

Change-Id: Ib52a546a98f681b918de5e3bd285c36407fa8254
---
M sc/source/core/data/attarray.cxx
1 file changed, 3 insertions(+), 1 deletion(-)



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 @@
                         const ScProtectionAttr* pCondProtect = static_cast<const 
ScProtectionAttr*>(pItem);
                         if( pCondProtect->GetProtection() || pProtect->GetHideCell() )
                             bFoundCond = true;
+                        else
+                            break;
                     }
                     else
                     {
@@ -1285,7 +1287,7 @@
                         // but existing one + cell where conditional
                         // formatting does not remove it
                         // => we have a protected cell
-                        bFoundCond = true;
+                        bFoundCond = bFoundTemp;
                     }
                 }
                 bFoundTemp = bFoundCond;

-- 
To view, visit https://gerrit.libreoffice.org/1942
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib52a546a98f681b918de5e3bd285c36407fa8254
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard <markus.mohrhard@googlemail.com>

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.