[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0-29' - 2 commits - instsetoo_native/util sc/source

[Andras Timar (via logerrit)]

 instsetoo_native/util/openoffice.lst.in |    2 +-
 sc/source/ui/unoobj/docuno.cxx          |   10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit ff48096467a4b802e7d1a0055dc35a490715401e
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Aug 21 10:09:30 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Aug 21 10:09:30 2019 +0200

    Change PACKAGEREVISION to 295
    
    Change-Id: I4c8dda8b39f2d08d9dbd4203582a8ad558db710c

diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 69b880205f8c..f469cdadbf7b 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -61,7 +61,7 @@ CollaboraOffice
             ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt
             ADDSYSTEMINTEGRATION 1
             PACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@
-            PACKAGEREVISION 294
+            PACKAGEREVISION 295
             LICENSENAME LGPL
             ROOTMODULEGID gid_Module_Root
             GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
commit 9be29941ec4519edeb3318f2325ea75ba52f3857
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Sat Jul 27 21:33:05 2019 -0400
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Aug 21 10:08:44 2019 +0200

    calc: simplify getDocumentSize calculation.
    
    Change-Id: Iee2ebf2c6ed74651556647264f519caa9c59dad7
    Reviewed-on: https://gerrit.libreoffice.org/76558
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 3a651dd9b6c0..b5a828f943e8 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -607,15 +607,7 @@ Size ScModelObj::getDocumentSize()
     };
 
     long nDocWidthPixel = pViewData->GetLOKWidthHelper().computePosition(nEndCol, GetColWidthPx);
-
-
-    auto GetRowHeightPx = [pThisDoc, nTab](SCROW nRow) {
-        const sal_uInt16 nSize = pThisDoc->GetRowHeight(nRow, nTab);
-        return ScViewData::ToPixel(nSize, 1.0 / TWIPS_PER_PIXEL);
-    };
-
-    long nDocHeightPixel = pViewData->GetLOKHeightHelper().computePosition(nEndRow, GetRowHeightPx);
-
+    long nDocHeightPixel = pThisDoc->GetScaledRowHeight( 0, nEndRow, nTab, 1.0 / TWIPS_PER_PIXEL );
 
     if (nDocWidthPixel > 0 && nDocHeightPixel > 0)
     {