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

[Markus Mohrhard]

 sc/source/ui/inc/gridwin.hxx  |    2 +-
 sc/source/ui/view/gridwin.cxx |    8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 14277af57b397b03b753a61c22cc5211e43a5f82
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sat Jul 19 22:20:33 2014 +0200

    it makes no sense to use the second column as well, fdo#81499
    
    Change-Id: If5990d41f444a2d051c9b9029d61ffd8b8cf377e

diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 17b02f8..ed066b2 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -273,7 +273,7 @@ class ScGridWindow : public Window, public DropTargetHelper, public DragSourceHe
     bool            GetEditUrl( const Point& rPos,
                                 OUString* pName=0, OUString* pUrl=0, OUString* pTarget=0 );
 
-    bool IsSpellErrorAtPos( const Point& rPos, SCCOL nCol1, SCCOL nCol2, SCROW nRow );
+    bool IsSpellErrorAtPos( const Point& rPos, SCCOL nCol1, SCROW nRow );
 
     bool            HitRangeFinder( const Point& rMouse, RfCorner& rCorner, sal_uInt16* pIndex = NULL,
                                     SCsCOL* pAddX = NULL, SCsROW* pAddY = NULL );
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 5b7528c..bd2bb44 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3010,7 +3010,7 @@ void ScGridWindow::Command( const CommandEvent& rCEvt )
                 if (bSpellError)
                 {
                     // Check and see if a misspelled word is under the mouse pointer.
-                    bSpellError = IsSpellErrorAtPos(aPosPixel, nColSpellError, nCellX, nCellY);
+                    bSpellError = IsSpellErrorAtPos(aPosPixel, nColSpellError, nCellY);
                 }
             }
 
@@ -5334,7 +5334,7 @@ bool ScGridWindow::GetEditUrl( const Point& rPos,
     return false;
 }
 
-bool ScGridWindow::IsSpellErrorAtPos( const Point& rPos, SCCOL nCol1, SCCOL nCol2, SCROW nRow )
+bool ScGridWindow::IsSpellErrorAtPos( const Point& rPos, SCCOL nCol1, SCROW nRow )
 {
     if (!mpSpellCheckCxt)
         return false;
@@ -5359,10 +5359,6 @@ bool ScGridWindow::IsSpellErrorAtPos( const Point& rPos, SCCOL nCol1, SCCOL nCol
     if (rPos.Y() < aEditRect.Top())
         return false;
 
-    Rectangle aEditRect2 = pViewData->GetEditArea(eWhich, nCol2, nRow, this, pPattern, false);
-    long nWidth = aEditRect2.Right() - aEditRect.Left();
-    aEditRect.setWidth(nWidth);
-
     MapMode aEditMode = pViewData->GetLogicMode(eWhich);
     Rectangle aLogicEdit = PixelToLogic(aEditRect, aEditMode);
     Point aLogicClick = PixelToLogic(rPos, aEditMode);
commit 46698bfa032690b3c14035db4903e9d6be6550e1
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sat Jul 19 16:59:24 2014 +0200

    that was just a complex way to describe that the whole range is in it
    
    Change-Id: Ib204b6ab39872280c8889615170735ed8c1fc811

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index f5615b5..5b7528c 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5360,8 +5360,8 @@ bool ScGridWindow::IsSpellErrorAtPos( const Point& rPos, SCCOL nCol1, SCCOL nCol
         return false;
 
     Rectangle aEditRect2 = pViewData->GetEditArea(eWhich, nCol2, nRow, this, pPattern, false);
-    long nExt = aEditRect2.Left() - aEditRect.Right() + aEditRect2.GetWidth();
-    aEditRect.setWidth(aEditRect.getWidth() + nExt);
+    long nWidth = aEditRect2.Right() - aEditRect.Left();
+    aEditRect.setWidth(nWidth);
 
     MapMode aEditMode = pViewData->GetLogicMode(eWhich);
     Rectangle aLogicEdit = PixelToLogic(aEditRect, aEditMode);