[Libreoffice-commits] core.git: Branch 'private/kohei/calc-shared-string' - sc/source

[Kohei Yoshida]

 sc/source/ui/inc/gridwin.hxx  |    2 --
 sc/source/ui/view/gridwin.cxx |    8 +-------
 2 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 769d45e47c6b1d7eab3887395f260e7faa4d3ddf
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Wed Oct 9 19:06:08 2013 -0400

    GetEditUrlOrError() is no more. Just use GetEditUrl().
    
    Since it no longer checks for cells with misspelled words....
    
    Change-Id: I372c283e0567c2e0e40d26eeb19dcf6e5d3f9e0f

diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 4cc2242..b25f849 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -274,8 +274,6 @@ class ScGridWindow : public Window, public DropTargetHelper, public DragSourceHe
 
     bool            GetEditUrl( const Point& rPos,
                                 OUString* pName=0, OUString* pUrl=0, OUString* pTarget=0 );
-    bool GetEditUrlOrError(
-        const Point& rPos, OUString* pName = NULL, OUString* pUrl = NULL, OUString* pTarget = NULL );
 
     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 7a6a753..9ef4359 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2984,7 +2984,7 @@ void ScGridWindow::Command( const CommandEvent& rCEvt )
         if ( !bEdit )
         {
                 // Edit-Zelle mit Spelling-Errors ?
-            if (bMouse && (GetEditUrlOrError(aPosPixel) || bSpellError))
+            if (bMouse && (GetEditUrl(aPosPixel) || bSpellError))
             {
                 //  GetEditUrlOrError hat den Cursor schon bewegt
 
@@ -5115,12 +5115,6 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, sal_Bool bUp )
 bool ScGridWindow::GetEditUrl( const Point& rPos,
                                OUString* pName, OUString* pUrl, OUString* pTarget )
 {
-    return GetEditUrlOrError(rPos, pName, pUrl, pTarget);
-}
-
-bool ScGridWindow::GetEditUrlOrError(
-    const Point& rPos, OUString* pName, OUString* pUrl, OUString* pTarget )
-{
     //! nPosX/Y mit uebergeben?
     SCsCOL nPosX;
     SCsROW nPosY;