[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sc/source

[Vasily Melenchuk]

 sc/source/core/data/dociter.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a60bb6a9c5ac2e06782b31db3904093fa33234eb
Author: Vasily Melenchuk <Vasily.Melenchuk at cib.de>
Date:   Thu Jun 28 17:44:39 2018 +0300

    tdf#118086: calc: invalid row autoheight fixed
    
    RowHeightContext should be initialized for each tab separately.
    Reusage of same data was causing invalid heights for next pages.
    
    Change-Id: Ib10518a8eef416e2197d0f6232fc981ce748882b
    Reviewed-on: https://gerrit.libreoffice.org/56603
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit e2fce4f05084061efb64e53444ab5d2d0d05b612)
    Reviewed-on: https://gerrit.libreoffice.org/56669
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index db673758410e..c8dee787ef91 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -2610,13 +2610,13 @@ void ScDocRowHeightUpdater::update()
     Fraction aZoom(1, 1);
     itr = mpTabRangesArray->begin();
     sal_uInt32 nProgressStart = 0;
-    sc::RowHeightContext aCxt(mfPPTX, mfPPTY, aZoom, aZoom, mpOutDev);
     for (; itr != itrEnd; ++itr)
     {
         SCTAB nTab = itr->mnTab;
         if (!ValidTab(nTab) || nTab >= mrDoc.GetTableCount() || !mrDoc.maTabs[nTab])
             continue;
 
+        sc::RowHeightContext aCxt(mfPPTX, mfPPTY, aZoom, aZoom, mpOutDev);
         ScFlatBoolRowSegments::RangeData aData;
         ScFlatBoolRowSegments::RangeIterator aRangeItr(*itr->mpRanges);
         for (bool bFound = aRangeItr.getFirst(aData); bFound; bFound = aRangeItr.getNext(aData))