Kaydet (Commit) 7c6b21c3 authored tarafından Markus Mohrhard's avatar Markus Mohrhard Kaydeden (comit) Kohei Yoshida

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

Change-Id: Ib52a546a98f681b918de5e3bd285c36407fa8254
Reviewed-on: https://gerrit.libreoffice.org/1942Reviewed-by: 's avatarKohei Yoshida <kohei.yoshida@gmail.com>
Tested-by: 's avatarKohei Yoshida <kohei.yoshida@gmail.com>
üst 3305827a
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment