Kaydet (Commit) 9c2099cf authored tarafından Eike Rathke's avatar Eike Rathke Kaydeden (comit) Andras Timar

Resolves: tdf#93358 resync attribute pattern that may have changed

Change-Id: If3ce8feec940c7212fe467f39db868630522b17e
(cherry picked from commit f089de7d)
Reviewed-on: https://gerrit.libreoffice.org/17765Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMarkus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: 's avatarMarkus Mohrhard <markus.mohrhard@googlemail.com>
üst 83b00768
......@@ -824,7 +824,18 @@ void ScColumn::GetOptimalHeight(
}
if (bStdOnly)
if (HasEditCells(nStart,nEnd,nEditPos)) // includes mixed script types
{
bool bHasEditCells = HasEditCells(nStart,nEnd,nEditPos);
// Call to HasEditCells() may change pattern due to
// calculation, => sync always.
// We don't know which row changed first, but as pPattern
// covered nStart to nEnd we can pick nStart. Worst case we
// have to repeat that for every row in range if every row
// changed.
pPattern = aIter.Resync( nStart, nStart, nEnd);
if (bHasEditCells && nEnd < nEditPos)
bHasEditCells = false; // run into that again
if (bHasEditCells) // includes mixed script types
{
if (nEditPos == nStart)
{
......@@ -840,6 +851,7 @@ void ScColumn::GetOptimalHeight(
nEnd = nEditPos - 1; // standard - part
}
}
}
sc::SingleColumnSpanSet aSpanSet;
aSpanSet.scan(*this, nStart, nEnd);
......
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