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

[Stephan Bergmann]

 sc/source/core/data/global.cxx |    6 +++---
 sc/source/ui/view/gridwin.cxx  |    5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 8c8d7ef3d8e7fbeee459089374b76248119d17b3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Feb 3 17:05:48 2017 +0100

    Revert "sc tiled rendering: We keep increasing the precision here..."
    
    This reverts commit 27ca6387b7188d1805dda8906d809025a2d3fb95, at least together
    with f7962f59ea0b2a8f7c2d6c015e1c02855e1008fe "sc rowlimit: Make the cursor
    better fit the rendering" it makes CppunitTest_desktop_lib fail.

diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 0e175d1..3b5e848 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -519,9 +519,9 @@ void ScGlobal::Init()
 void ScGlobal::InitPPT()
 {
     OutputDevice* pDev = Application::GetDefaultDevice();
-
-    nScreenPPTX = double(pDev->GetDPIX()) / double(TWIPS_PER_INCH);
-    nScreenPPTY = double(pDev->GetDPIY()) / double(TWIPS_PER_INCH);
+    Point aPix1000 = pDev->LogicToPixel( Point(100000,100000), MapUnit::MapTwip );
+    nScreenPPTX = aPix1000.X() / 100000.0;
+    nScreenPPTY = aPix1000.Y() / 100000.0;
 }
 
 const OUString& ScGlobal::GetClipDocName()
commit 42bffebf0bdacf30095349c06adbf186542917d5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Feb 3 17:04:57 2017 +0100

    Revert "sc rowlimit: Make the cursor better fit the rendering."
    
    This reverts commit f7962f59ea0b2a8f7c2d6c015e1c02855e1008fe; at least together
    with 27ca6387b7188d1805dda8906d809025a2d3fb95 "sc tiled rendering: We keep
    increasing the precision here..." it makes CppunitTest_desktop_lib fail.

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 278aa5d..3ac3af0 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5721,9 +5721,8 @@ OString ScGridWindow::getCellCursor(const Fraction& rZoomX, const Fraction& rZoo
 
     double fPPTX = pViewData->GetPPTX();
     double fPPTY = pViewData->GetPPTY();
-
-    Rectangle aRect(Point(rtl::math::round(aScrPos.getX() / fPPTX), rtl::math::round(aScrPos.getY() / fPPTY)),
-                    Size(rtl::math::round(nSizeXPix / fPPTX), rtl::math::round(nSizeYPix / fPPTY)));
+    Rectangle aRect(Point(aScrPos.getX() / fPPTX, aScrPos.getY() / fPPTY),
+                    Size(nSizeXPix / fPPTX, nSizeYPix / fPPTY));
 
     pViewData->SetZoom(defaultZoomX, defaultZoomY, true);