Blame SOURCES/0286-Revert-sc-lok-Cache-viewdata-zoom-and-reuse-for-curs.patch

135360
From cc6294f25ba79ab1ad55f5cae600666eb8700d7b Mon Sep 17 00:00:00 2001
135360
From: Andrzej Hunt <andrzej@ahunt.org>
135360
Date: Fri, 6 Nov 2015 17:36:18 +0100
135360
Subject: [PATCH 286/398] Revert "sc lok: Cache viewdata zoom and reuse for
135360
 cursor callback"
135360
135360
This reverts fab3c48a0cd5a0517025993502a04358308fe5ef for now.
135360
The correct solution is to have the client "hint" at the current
135360
resolution, which is still being developed
135360
(gerrit-id: I34b5afcdcc06a671a8ac92c03e87404e42adf4cd).
135360
For now the cursor will be wrongly positioned when moved as the result
135360
of a mouse click.
135360
135360
Reviewed-on: https://gerrit.libreoffice.org/19827
135360
Tested-by: Andrzej Hunt <andrzej@ahunt.org>
135360
Reviewed-by: Andrzej Hunt <andrzej@ahunt.org>
135360
(cherry picked from commit 064fb1f73abbc103226a8fce8a46b7e8b8347dac)
135360
135360
Change-Id: I68d56eac958e607e8e2e3ad16aff4e1a7dd0b6dd
135360
---
135360
 sc/source/ui/inc/gridwin.hxx   | 9 ---------
135360
 sc/source/ui/view/gridwin.cxx  | 4 +++-
135360
 sc/source/ui/view/gridwin4.cxx | 6 +++---
135360
 3 files changed, 6 insertions(+), 13 deletions(-)
135360
135360
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
135360
index 8081f107409c..dc1cec7fd8c7 100644
135360
--- a/sc/source/ui/inc/gridwin.hxx
135360
+++ b/sc/source/ui/inc/gridwin.hxx
135360
@@ -200,15 +200,6 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou
135360
     bool                    bAutoMarkVisible:1;
135360
     bool                    bListValButton:1;
135360
 
135360
-    // We cache the tiled rendering zoom level in order to be able to
135360
-    // calculate the correct cell cursor position (which is dependent
135360
-    // on the zoom level). The caching is necessary since
135360
-    // ScModelObj::postMouseEvent resets the zoom level to the default,
135360
-    // which means we have the default zoom level set during the
135360
-    // cell cursor position calculations in updateLibreOfficeKitCellCursor().
135360
-    Fraction                mTiledZoomX;
135360
-    Fraction                mTiledZoomY;
135360
-
135360
     DECL_LINK( PopupModeEndHdl, void* );
135360
     DECL_LINK( PopupSpellingHdl, SpellCallbackInfo* );
135360
 
135360
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
135360
index efa8d332ad2a..d6887b6f4e07 100644
135360
--- a/sc/source/ui/view/gridwin.cxx
135360
+++ b/sc/source/ui/view/gridwin.cxx
135360
@@ -5834,7 +5834,9 @@ void ScGridWindow::updateLibreOfficeKitCellCursor()
135360
 {
135360
     ScDocument* pDoc = pViewData->GetDocument();
135360
     ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
135360
-    OString aCursor = getCellCursor(mTiledZoomX, mTiledZoomY);
135360
+    // TODO: the zoom levels here should be replaced by the setClientZoom values
135360
+    // in a patch currently in gerrit (https://gerrit.libreoffice.org/#/c/19822/)
135360
+    OString aCursor = getCellCursor(pViewData->GetZoomX(), pViewData->GetZoomY());
135360
     pDrawLayer->libreOfficeKitCallback(LOK_CALLBACK_CELL_CURSOR, aCursor.getStr());
135360
 }
135360
 
135360
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
135360
index cfdde43e1a04..ceaf3d8d7c3a 100644
135360
--- a/sc/source/ui/view/gridwin4.cxx
135360
+++ b/sc/source/ui/view/gridwin4.cxx
135360
@@ -955,11 +955,11 @@ void ScGridWindow::PaintTile( VirtualDevice& rDevice,
135360
     // Similarly to Writer, we should set the mapmode once on the rDevice, and
135360
     // not care about any zoom settings.
135360
 
135360
-    mTiledZoomX = Fraction(long(nOutputWidth * TWIPS_PER_PIXEL), nTileWidth);
135360
-    mTiledZoomY = Fraction(long(nOutputHeight * TWIPS_PER_PIXEL), nTileHeight);
135360
+    Fraction aFracX(long(nOutputWidth * TWIPS_PER_PIXEL), nTileWidth);
135360
+    Fraction aFracY(long(nOutputHeight * TWIPS_PER_PIXEL), nTileHeight);
135360
 
135360
     // page break zoom, and aLogicMode in ScViewData
135360
-    pViewData->SetZoom(mTiledZoomX, mTiledZoomY, true);
135360
+    pViewData->SetZoom(aFracX, aFracY, true);
135360
 
135360
     double fTilePosXPixel = static_cast<double>(nTilePosX) * nOutputWidth / nTileWidth;
135360
     double fTilePosYPixel = static_cast<double>(nTilePosY) * nOutputHeight / nTileHeight;
135360
-- 
135360
2.12.0
135360