Skip to content

C
core
Kaydet (Commit) 5e29af06 authored tarafından Markus Mohrhard's avatar Markus Mohrhard
Dosyalara gözat
Seçenekler

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

Change-Id: Ib52a546a98f681b918de5e3bd285c36407fa8254
üst fa7b61a0
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
sc/source/core/data/attarray.cxx
Dosyayı görüntüle @ 5e29af06
...@@ -1278,6 +1278,8 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const ...@@ -1278,6 +1278,8 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const
const ScProtectionAttr* pCondProtect = static_cast<const ScProtectionAttr*>(pItem); const ScProtectionAttr* pCondProtect = static_cast<const ScProtectionAttr*>(pItem);
if( pCondProtect->GetProtection() || pProtect->GetHideCell() ) if( pCondProtect->GetProtection() || pProtect->GetHideCell() )
bFoundCond = true; bFoundCond = true;
else
break;
} }
else else
{ {
...@@ -1285,7 +1287,7 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const ...@@ -1285,7 +1287,7 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const
// but existing one + cell where conditional // but existing one + cell where conditional
// formatting does not remove it // formatting does not remove it
// => we have a protected cell // => we have a protected cell
bFoundCond = true; bFoundCond = bFoundTemp;
} }
} }
bFoundTemp = bFoundCond; 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