[Libreoffice-commits] core.git: svtools/source

Mike Kaganski mike.kaganski at collabora.com
Mon Nov 28 14:36:18 UTC 2016


 svtools/source/control/ruler.cxx |    9 ---------
 1 file changed, 9 deletions(-)

New commits:
commit 764358a43b83cdae9269af47070e3cb4739c96c0
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Thu Nov 24 18:14:31 2016 +0300

    tdf#104215: Remove the out-of-borders ruler check
    
    It is not called for out-of-borders points anyway, unless
    there is a table border on page border, in which case the cursor
    shows that dragging should be possible.
    
    Change-Id: If5cecbcd0799c74012c525588c0d2fce5d79ffd6
    Reviewed-on: https://gerrit.libreoffice.org/31309
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 22b752d..25fa30a 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -1515,7 +1515,6 @@ bool Ruler::ImplHitTest( const Point& rPos, RulerSelection* pHitTest,
 
     // test if outside
     nX -= mnVirOff;
-    long nXTemp = nX;
     if ( (nX < mpData->nRulVirOff - nXExtraOff) ||
          (nX > mpData->nRulVirOff + mpData->nRulWidth + nXExtraOff) ||
          (nY < 0) ||
@@ -1615,14 +1614,6 @@ bool Ruler::ImplHitTest( const Point& rPos, RulerSelection* pHitTest,
         }
     }
 
-    // everything left and right is outside and don't take this into account
-    if ( (nXTemp < mpData->nRulVirOff) || (nXTemp > mpData->nRulVirOff+mpData->nRulWidth) )
-    {
-        pHitTest->nPos = 0;
-        pHitTest->eType = RulerType::Outside;
-        return false;
-    }
-
     // test the borders
     int nBorderTolerance = 1;
     if(pHitTest->bExpandTest)


More information about the Libreoffice-commits mailing list