desktop/qa/desktop_lib/test_desktop_lib.cxx | 2 +-
sc/source/ui/view/gridwin.cxx | 7 ++-----
2 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 227dac69d08222d2ec1b7971795afbb8296b105f
Author: Michael Meeks <michael.me...@collabora.com>
AuthorDate: Mon Oct 28 21:39:14 2019 +0000
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Wed Nov 6 14:27:43 2019 +0100
Revert "lok: sc: make hi-dpi/zoom compatible with retrieving cell cursor"
This reverts commit e3ff84aed5be8e0d2780d80b178fa8fc0e388859.
Change-Id: I174dd54cf7b44f12c90c61882814b6dee9be9b7c
Reviewed-on: https://gerrit.libreoffice.org/82096
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index f36f03c33814..dc390e72c825 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -816,7 +816,7 @@ void DesktopLOKTest::testCellCursor()
OString aRectangle(aTree.get<std::string>("commandValues").c_str());
// cell cursor geometry + col + row
- CPPUNIT_ASSERT_EQUAL(OString("0, 0, 1274, 254, 0, 0"), aRectangle);
+ CPPUNIT_ASSERT_EQUAL(OString("0, 0, 1279, 255, 0, 0"), aRectangle);
}
void DesktopLOKTest::testCommandResult()
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 6977de2cc9cc..4719c08cc235 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5664,7 +5664,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
@@ -5680,10 +5680,7 @@ OString ScGridWindow::getCellCursor(const Fraction&
/*rZoomX*/, const Fraction&
Fraction defaultZoomX = pViewData->GetZoomX();
Fraction defaultZoomY = pViewData->GetZoomY();
- // 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);
+ pViewData->SetZoom(rZoomX, rZoomY, true);
Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, true );
long nSizeXPix;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
