Attachment 62832 Details for Bug 48256 – Proposed patch Part 3

[patch] Proposed patch Part 3

0003-fdo-48256-clean-out-Hide-Show-Cursor.patch (text/plain), 3.58 KB, created by Thomas Arnhold on 2012-06-08 21:13:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Arnhold

Created: 2012-06-08 21:13:03 UTC

Size: 3.58 KB

patch

obsolete

>From 6779f23b872557ab06711e401221c6ce0f933bc2 Mon Sep 17 00:00:00 2001
>From: Thomas Arnhold <thomas@arnhold.org>
>Date: Sat, 9 Jun 2012 06:11:13 +0200
>Subject: [PATCH] fdo#48256 clean out Hide/Show Cursor
>
>Change-Id: I8a849087adcd9b3ffce1a5d6c7a9d6bce602624d
>---
> sc/source/ui/inc/gridwin.hxx   |   11 -----------
> sc/source/ui/view/gridwin.cxx  |    4 ----
> sc/source/ui/view/gridwin5.cxx |   28 ----------------------------
> 3 files changed, 43 deletions(-)
>
>diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
>index 8a64de9..a560436 100644
>--- a/sc/source/ui/inc/gridwin.hxx
>+++ b/sc/source/ui/inc/gridwin.hxx
>@@ -83,17 +83,6 @@ struct SpellCallbackInfo;
> #define SC_PD_BREAK_V       32
> 
> 
>-class ScHideTextCursor
>-{
>-private:
>-    ScViewData* pViewData;
>-    ScSplitPos  eWhich;
>-
>-public:
>-            ScHideTextCursor( ScViewData* pData, ScSplitPos eW );
>-            ~ScHideTextCursor();
>-};
>-
> // ---------------------------------------------------------------------------
> // predefines
> namespace sdr { namespace overlay { class OverlayObjectList; }}
>diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
>index 0485843..64db55b 100644
>--- a/sc/source/ui/view/gridwin.cxx
>+++ b/sc/source/ui/view/gridwin.cxx
>@@ -5107,8 +5107,6 @@ bool ScGridWindow::GetEditUrlOrError( bool bSpellErr, const Point& rPos,
>     if( !bFound )
>         return false;
> 
>-    ScHideTextCursor aHideCursor( pViewData, eWhich );  // before GetEditArea (MapMode is changed)
>-
>     const ScPatternAttr* pPattern = pDoc->GetPattern( nPosX, nPosY, nTab );
>     // bForceToTop = sal_False, use the cell's real position
>     Rectangle aEditRect = pViewData->GetEditArea( eWhich, nPosX, nPosY, this, pPattern, false );
>@@ -5260,8 +5258,6 @@ bool ScGridWindow::GetEditUrlOrError( bool bSpellErr, const Point& rPos,
> 
>         SetMapMode(aOld);
> 
>-        //  text cursor is restored in ScHideTextCursor dtor
>-
>         return bRet;
>     }
>     return false;
>diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
>index 4293910..1ff8895 100644
>--- a/sc/source/ui/view/gridwin5.cxx
>+++ b/sc/source/ui/view/gridwin5.cxx
>@@ -61,32 +61,6 @@
> 
> // -----------------------------------------------------------------------
> 
>-ScHideTextCursor::ScHideTextCursor( ScViewData* pData, ScSplitPos eW ) :
>-    pViewData(pData),
>-    eWhich(eW)
>-{
>-    Window* pWin = pViewData->GetView()->GetWindowByPos( eWhich );
>-    if (pWin)
>-    {
>-        Cursor* pCur = pWin->GetCursor();
>-        if ( pCur && pCur->IsVisible() )
>-            pCur->Hide();
>-    }
>-}
>-
>-ScHideTextCursor::~ScHideTextCursor()
>-{
>-    Window* pWin = pViewData->GetView()->GetWindowByPos( eWhich );
>-    if (pWin)
>-    {
>-        //  restore text cursor
>-        if ( pViewData->HasEditView(eWhich) && pWin->HasFocus() )
>-            pViewData->GetEditView(eWhich)->ShowCursor( false, sal_True );
>-    }
>-}
>-
>-// -----------------------------------------------------------------------
>-
> bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, bool bKeyboard )
> {
>     bool bDone = false;
>@@ -368,8 +342,6 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
>                 pViewData->GetPosFromPixel( aPosPixel.X(), aPosPixel.Y(), eWhich, nPosX, nPosY );
>                 const ScPatternAttr* pPattern = pDoc->GetPattern( nPosX, nPosY, nTab );
> 
>-                ScHideTextCursor aHideCursor( pViewData, eWhich );      // MapMode is changed in GetEditArea
>-
>                 // bForceToTop = sal_False, use the cell's real position
>                 aPixRect = pViewData->GetEditArea( eWhich, nPosX, nPosY, this, pPattern, false );
>             }
>-- 
>1.7.10.4
>

Actions: View

Attachments on bug 48256: 62830 | 62831 | 62832