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

[Kohei Yoshida]

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

New commits:
commit 190a4ee599a463415faa7d9bcb81b6a157a4971e
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Tue Jul 29 13:44:38 2014 -0400

    Revert "it makes no sense to use the second column as well, fdo#81499"
    
    This reverts commit 14277af57b397b03b753a61c22cc5211e43a5f82.
    
    There is a reason why we do this, to allow misspelled word outside the
    cell area to be right-clickable.

diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index ed066b2..17b02f8 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, SCROW nRow );
+    bool IsSpellErrorAtPos( const Point& rPos, SCCOL nCol1, SCCOL nCol2, 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 bd2bb44..5b7528c 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, nCellY);
+                    bSpellError = IsSpellErrorAtPos(aPosPixel, nColSpellError, nCellX, nCellY);
                 }
             }
 
@@ -5334,7 +5334,7 @@ bool ScGridWindow::GetEditUrl( const Point& rPos,
     return false;
 }
 
-bool ScGridWindow::IsSpellErrorAtPos( const Point& rPos, SCCOL nCol1, SCROW nRow )
+bool ScGridWindow::IsSpellErrorAtPos( const Point& rPos, SCCOL nCol1, SCCOL nCol2, SCROW nRow )
 {
     if (!mpSpellCheckCxt)
         return false;
@@ -5359,6 +5359,10 @@ bool ScGridWindow::IsSpellErrorAtPos( const Point& rPos, SCCOL nCol1, SCROW nRow
     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);