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

[Libreoffice Gerrit user]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |    2 +-
 sc/source/ui/view/gridwin.cxx               |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit e3ff84aed5be8e0d2780d80b178fa8fc0e388859
Author:     Marco Cecchetti <marco.cecchetti at collabora.com>
AuthorDate: Sat Oct 27 17:25:06 2018 +0000
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Nov 9 07:01:41 2018 +0100

    lok: sc: make hi-dpi/zoom compatible with retrieving cell cursor
    
    A bit different approach than trying to handle different zoom levels
    at the samet time: instead, always handle the spreadsheet at 100%, but
    use cairo to scale to the actual zoom level.
    
    Change-Id: I318aec8fa4baaab2ee1f271223b2e10e26d41fcf
    Reviewed-on: https://gerrit.libreoffice.org/63040
    Tested-by: Jenkins
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 728af9163222..855bb398a570 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -784,7 +784,7 @@ void DesktopLOKTest::testCellCursor()
 
     OString aRectangle(aTree.get<std::string>("commandValues").c_str());
     // cell cursor geometry + col + row
-    CPPUNIT_ASSERT_EQUAL(OString("0, 0, 1279, 255, 0, 0"), aRectangle);
+    CPPUNIT_ASSERT_EQUAL(OString("0, 0, 1274, 254, 0, 0"), aRectangle);
 
     comphelper::LibreOfficeKit::setActive(false);
 }
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index ba4d08dc874a..914640ce392e 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5658,7 +5658,7 @@ OString ScGridWindow::getCellCursor( int nOutputWidth, int nOutputHeight,
     return getCellCursor(zoomX, zoomY);
 }
 
-OString ScGridWindow::getCellCursor(const Fraction& rZoomX, const Fraction& rZoomY) const
+OString ScGridWindow::getCellCursor(const Fraction& /*rZoomX*/, const Fraction& /*rZoomY*/) const
 {
     // GridWindow stores a shown cell cursor in mpOOCursors, hence
     // we can use that to determine whether we would want to be showing
@@ -5674,7 +5674,10 @@ OString ScGridWindow::getCellCursor(const Fraction& rZoomX, const Fraction& rZoo
     Fraction defaultZoomX = pViewData->GetZoomX();
     Fraction defaultZoomY = pViewData->GetZoomY();
 
-    pViewData->SetZoom(rZoomX, rZoomY, true);
+    // hardcode to what we mean as 100% (256px tiles meaning 3840 twips)
+    Fraction aFracX(long(256 * TWIPS_PER_PIXEL), 3840);
+    Fraction aFracY(long(256 * TWIPS_PER_PIXEL), 3840);
+    pViewData->SetZoom(aFracX, aFracY, true);
 
     Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, true );
     long nSizeXPix;