[Libreoffice-commits] core.git: sc/source

Michael Meeks (via logerrit) logerrit at kemper.freedesktop.org
Fri Aug 2 20:37:57 UTC 2019


 sc/source/ui/unoobj/docuno.cxx |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 5a9bdcbb0dfd6f149d243cd69e158aa3ad70dd91
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Sat Jul 27 21:33:05 2019 -0400
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Aug 2 22:36:32 2019 +0200

    calc: simplify getDocumentSize calculation.
    
    Change-Id: Iee2ebf2c6ed74651556647264f519caa9c59dad7
    Reviewed-on: https://gerrit.libreoffice.org/76492
    Tested-by: Jenkins
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 9c7f24611cf5..640e35ec4c89 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -617,15 +617,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)
     {


More information about the Libreoffice-commits mailing list