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

[Michael Meeks (via logerrit)]

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

New commits:
commit e8d908a1c892147b72c687cfecaadf60a93c71a8
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Sat Jul 27 21:33:05 2019 -0400
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Jul 30 08:57:49 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 58c58b904aea..faba8a57b39e 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)
     {