[Libreoffice-commits] core.git: Branch 'feature/cib_contract138c' - 2 commits - configure.ac sc/source

[Thorsten Behrens (via logerrit)]

 configure.ac                      |    2 +-
 sc/source/filter/xml/xmlimprt.cxx |   19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

New commits:
commit e27f7c3b74bbb11c9b188659821308b0072a24ef
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Wed Jan 15 00:23:18 2020 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Jan 15 00:25:31 2020 +0100

    Release 6.2.9.1
    
    Change-Id: I317a54be07a33fb66ce6236528ae7e8db43974ca

diff --git a/configure.ac b/configure.ac
index 7231d74cbdaf..a6c7f84e13e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([LibreOffice],[6.2.9.0],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.2.9.1],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
commit 7fd4bd293ff9c9271a67bee99cf1aebbe49c81bc
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Wed Jan 15 00:24:35 2020 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Jan 15 00:25:31 2020 +0100

    Revert tdf#62268: allow row height recalculation on document load
    
    This reverts part of commit 1e55a47e89a9d9d6cf9cb3993484022aaf2c097b
    
    During document load rows with style:use-optimal-row-height="true"
    should recalculate it's height.
    
    Change-Id: I091069839555f899644b355cc3a9f031e304dc83

diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 6179192b1641..15cf8ad670cf 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1795,25 +1795,6 @@ void SAL_CALL ScXMLImport::endDocument()
             }
         }
 
-        // There are rows with optimal height which need to be updated
-        if (pDoc && !maRecalcRowRanges.empty())
-        {
-            bool bLockHeight = pDoc->IsAdjustHeightLocked();
-            if (bLockHeight)
-            {
-                pDoc->UnlockAdjustHeight();
-            }
-
-            ScSizeDeviceProvider aProv(static_cast<ScDocShell*>(pDoc->GetDocumentShell()));
-            ScDocRowHeightUpdater aUpdater(*pDoc, aProv.GetDevice(), aProv.GetPPTX(), aProv.GetPPTY(), &maRecalcRowRanges);
-            aUpdater.update();
-
-            if (bLockHeight)
-            {
-                pDoc->LockAdjustHeight();
-            }
-        }
-
         aTables.FixupOLEs();
     }
     if (GetModel().is())