Attachment 62831 Details for Bug 48256 – Proposed patch Part 2

[patch] Proposed patch Part 2

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

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Arnhold

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

Size: 1.81 KB

patch

obsolete

>From a4445323887cfb123e5b2c9721749bb259d57eac Mon Sep 17 00:00:00 2001
>From: Thomas Arnhold <thomas@arnhold.org>
>Date: Sat, 9 Jun 2012 05:41:08 +0200
>Subject: [PATCH 2/2] fdo#48256 clean out Hide/Show Cursor
>
>Remove CursorSwitcher as it does the same as
>HideCursor() and ShowCursor().
>
>Change-Id: I1ea5d125a338829b1d797a7d9ce5dafbda712290
>---
> sc/source/ui/view/viewfun3.cxx |   20 --------------------
> 1 file changed, 20 deletions(-)
>
>diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
>index 589e816..eff0a1b 100644
>--- a/sc/source/ui/view/viewfun3.cxx
>+++ b/sc/source/ui/view/viewfun3.cxx
>@@ -865,23 +865,6 @@ sal_Bool lcl_SelHasAttrib( ScDocument* pDoc, SCCOL nCol1, SCROW nRow1, SCCOL nCo
> 
> namespace {
> 
>-class CursorSwitcher
>-{
>-public:
>-    CursorSwitcher(ScViewFunc* pViewFunc) :
>-        mpViewFunc(pViewFunc)
>-    {
>-        mpViewFunc->HideCursor();
>-    }
>-
>-    ~CursorSwitcher()
>-    {
>-        mpViewFunc->ShowCursor();
>-    }
>-private:
>-    ScViewFunc* mpViewFunc;
>-};
>-
> bool checkDestRangeForOverwrite(const ScRangeList& rDestRanges, const ScDocument* pDoc, const ScMarkData& rMark, Window* pParentWnd)
> {
>     bool bIsEmpty = true;
>@@ -1618,7 +1601,6 @@ bool ScViewFunc::PasteMultiRangesFromClip(
>     if (pDoc->IsUndoEnabled())
>         pDoc->BeginDrawUndo();
> 
>-    CursorSwitcher aCursorSwitch(this);
>     sal_uInt16 nNoObjFlags = nFlags & ~IDF_OBJECTS;
>     pDoc->CopyMultiRangeFromClip(rCurPos, aMark, nNoObjFlags, pClipDoc,
>                                  true, bAsLink, false, bSkipEmpty);
>@@ -1771,8 +1753,6 @@ bool ScViewFunc::PasteFromClipToMultiRanges(
>     if (pDoc->IsUndoEnabled())
>         pDoc->BeginDrawUndo();
> 
>-    CursorSwitcher aCursorSwitch(this);
>-
>     // First, paste everything but the drawing objects.
>     for (size_t i = 0, n = aRanges.size(); i < n; ++i)
>     {
>-- 
>1.7.10.4
>

Actions: View

Attachments on bug 48256: 62830 | 62831 | 62832