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

[Michael Meeks (via logerrit)]

 sc/source/ui/inc/viewdata.hxx  |    6 ------
 sc/source/ui/view/gridwin.cxx  |    7 -------
 sc/source/ui/view/viewdata.cxx |    2 --
 3 files changed, 15 deletions(-)

New commits:
commit bf5425a4fecf611043729e041f9cb390d1896cca
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Tue Dec 3 11:18:33 2019 +0000
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon May 18 00:00:50 2020 +0200

    revert optimization - 31b7dc19c32f42197c481cb7d2f44c600b755e2b
    
    Doing faster lookups across the calc data structrures is far more
    effective than complex caching of this kind.
    
    Change-Id: I43d3ee948ae817ec1d196acc6e5603e6acf1970c
    Reviewed-on: https://gerrit.libreoffice.org/84371
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94391
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 1edfdeebd222..a01720498893 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -234,8 +234,6 @@ private:
     SCROW           nCurY;
     SCCOL           nOldCurX;
     SCROW           nOldCurY;
-    SCCOL           nLOKOldCurX;
-    SCROW           nLOKOldCurY;
 
     ScPositionHelper aWidthHelper;
     ScPositionHelper aHeightHelper;
@@ -405,8 +403,6 @@ public:
     SCROW           GetCurYForTab( SCTAB nTabIndex ) const;
     SCCOL           GetOldCurX() const;
     SCROW           GetOldCurY() const;
-    SCCOL           GetLOKOldCurX() const                   { return pThisTab->nLOKOldCurX; }
-    SCROW           GetLOKOldCurY() const                   { return pThisTab->nLOKOldCurY; }
     long            GetLOKDocWidthPixel() const             { return pThisTab->aWidthHelper.getPosition(pThisTab->nMaxTiledCol); }
     long            GetLOKDocHeightPixel() const            { return pThisTab->aHeightHelper.getPosition(pThisTab->nMaxTiledRow); }
 
@@ -437,8 +433,6 @@ public:
     void            SetCurYForTab( SCCOL nNewCurY, SCTAB nTabIndex );
     void            SetOldCursor( SCCOL nNewX, SCROW nNewY );
     void            ResetOldCursor();
-    void            SetLOKOldCurX( SCCOL nCurX )                    { pThisTab->nLOKOldCurX = nCurX; }
-    void            SetLOKOldCurY( SCROW nCurY )                    { pThisTab->nLOKOldCurY = nCurY; }
 
     void            SetHSplitMode( ScSplitMode eMode )              { pThisTab->eHSplitMode = eMode; }
     void            SetVSplitMode( ScSplitMode eMode )              { pThisTab->eVSplitMode = eMode; }
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 37ea3a3d295c..9219bc896e1a 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5753,13 +5753,6 @@ OString ScGridWindow::getCellCursor(const Fraction& rZoomX, const Fraction& rZoo
 
     pViewData->SetZoom(defaultZoomX, defaultZoomY, true);
 
-    pViewData->GetLOKWidthHelper().removeByIndex(pViewData->GetLOKOldCurX() - 1);
-    pViewData->GetLOKWidthHelper().insert(nX - 1, aScrPos.getX());
-    pViewData->SetLOKOldCurX(nX);
-    pViewData->GetLOKHeightHelper().removeByIndex(pViewData->GetLOKOldCurY() - 1);
-    pViewData->GetLOKHeightHelper().insert(nY - 1, aScrPos.getY());
-    pViewData->SetLOKOldCurY(nY);
-
     return ss.str().c_str();
 }
 
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 7c4b719f2e33..c740e7465769 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -497,8 +497,6 @@ ScViewDataTable::ScViewDataTable(ScDocument *pDoc) :
                 nCurY( 0 ),
                 nOldCurX( 0 ),
                 nOldCurY( 0 ),
-                nLOKOldCurX( 0 ),
-                nLOKOldCurY( 0 ),
                 aWidthHelper(pDoc, true),
                 aHeightHelper(pDoc, false),
                 nMaxTiledCol( 20 ),