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.mohrh...@googlemail.com>
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
