Kaydet (Commit) 91502a72 authored tarafından Laurent Godard's avatar Laurent Godard Kaydeden (comit) Caolán McNamara

fdo#83141: also optimize ScTable::HasAttribSelection

applying same strategy than 1e721077

Change-Id: I8c226d5d66ba8371ea1baec73e72b3e50886bb4f
Reviewed-on: https://gerrit.libreoffice.org/11877Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 16505967
......@@ -1849,10 +1849,17 @@ bool ScTable::HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal
bool ScTable::HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) const
{
bool bFound = false;
for (SCCOL i=0; i<=MAXCOL && !bFound; i++)
bFound |= aCol[i].HasAttribSelection( rMark, nMask );
return bFound;
std::vector<sc::ColRowSpan> aSpans = rMark.GetMarkedColSpans();
for (size_t i = 0; i < aSpans.size(); ++i)
{
for (SCCOLROW j = aSpans[i].mnStart; j < aSpans[i].mnEnd; ++j)
{
if (aCol[j].HasAttribSelection(rMark, nMask))
return true;
}
}
return false;
}
bool ScTable::ExtendMerge( SCCOL nStartCol, SCROW nStartRow,
......
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