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

[Dennis Francis (via logerrit)]

 sc/source/ui/view/output.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 3f62c10548466119ec6b1a662ab339e5dbe0b05f
Author:     Dennis Francis <dennis.francis at collabora.com>
AuthorDate: Tue Jan 21 22:11:19 2020 +0530
Commit:     Dennis Francis <dennis.francis at collabora.com>
CommitDate: Wed Jan 22 06:43:10 2020 +0100

    tdf#130112 lok: Do not apply zoom-factor twice...
    
    ... in ScOutputData::FillReferenceMarks().
    mnPPT[XY] already has the factor aZoom[XY] in it. Refer
    ScViewData::CalcPPT() to see how PPT[XY] are derived.
    
    Change-Id: I3f9b5c01cb53514450fad5f7b2b6861b112effdb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87158
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 54e2dfa7613c..803817e25a39 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -1931,10 +1931,11 @@ ReferenceMark ScOutputData::FillReferenceMark( SCCOL nRefStartX, SCROW nRefStart
 
         if (bTop && bBottom && bLeft && bRight)
         {
-            aResult = ReferenceMark( nMinX / mnPPTX * double( aZoomX ),
-                                     nMinY / mnPPTY * double( aZoomY ),
-                                     ( nMaxX - nMinX ) / mnPPTX * double( aZoomX ),
-                                     ( nMaxY - nMinY ) / mnPPTY * double( aZoomY ),
+            // mnPPT[XY] already has the factor aZoom[XY] in it.
+            aResult = ReferenceMark( nMinX / mnPPTX,
+                                     nMinY / mnPPTY,
+                                     ( nMaxX - nMinX ) / mnPPTX,
+                                     ( nMaxY - nMinY ) / mnPPTY,
                                      nTab,
                                      rColor );
         }