commit f089de7dc5c367a3123129b08a9050b3bacc4eba
author Eike Rathke <erack@redhat.com> Sat Aug 15 00:47:03 2015 +0200
committer Eike Rathke <erack@redhat.com> Sat Aug 15 01:35:15 2015 +0200
tree 7b75f03f0e3234fc75d329d708fd2083c407f46f
parent 4466a7949af63621a2b180715de2ae3675343715

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

Change-Id: If3ce8feec940c7212fe467f39db868630522b17e

sc/source/core/data/column2.cxx

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index f995ada..967c35e 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -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);