Bugzilla – Attachment 62830 Details for
Bug 48256
clean out Hide/Show Cursor ...
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed patch
0001-fdo-48256-clean-out-Hide-Show-Cursor.patch (text/plain), 7.49 KB, created by
Thomas Arnhold
on 2012-06-08 21:01:25 UTC
(
hide
)
Description:
Proposed patch
Filename:
MIME Type:
Creator:
Thomas Arnhold
Created:
2012-06-08 21:01:25 UTC
Size:
7.49 KB
patch
obsolete
>From eb7ec3b05a6e27f19a38255b258d93606498a81e Mon Sep 17 00:00:00 2001 >From: Thomas Arnhold <thomas@arnhold.org> >Date: Sat, 9 Jun 2012 05:38:46 +0200 >Subject: [PATCH 1/2] fdo#48256 clean out Hide/Show Cursor > >Change-Id: I1e0694f0402bc2eb71e6c86d57be73874f4ffb6d >--- > sc/source/ui/view/dbfunc3.cxx | 12 ------------ > sc/source/ui/view/gridwin.cxx | 4 ---- > sc/source/ui/view/gridwin2.cxx | 2 -- > sc/source/ui/view/viewfun2.cxx | 4 ---- > sc/source/ui/view/viewfun3.cxx | 7 ------- > sc/source/ui/view/viewfunc.cxx | 4 ---- > 6 files changed, 33 deletions(-) > >diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx >index 26c00cc..cf7d96a 100644 >--- a/sc/source/ui/view/dbfunc3.cxx >+++ b/sc/source/ui/view/dbfunc3.cxx >@@ -202,9 +202,7 @@ void ScDBFunc::RemoveAllOutlines( sal_Bool bRecord ) > ScDocShell* pDocSh = GetViewData()->GetDocShell(); > ScOutlineDocFunc aFunc(*pDocSh); > >- HideCursor(); > sal_Bool bOk = aFunc.RemoveAllOutlines( nTab, bRecord, false ); >- ShowCursor(); > > if (bOk) > UpdateScrollBars(); >@@ -236,9 +234,7 @@ void ScDBFunc::SelectLevel( sal_Bool bColumns, sal_uInt16 nLevel, sal_Bool bReco > ScDocShell* pDocSh = GetViewData()->GetDocShell(); > ScOutlineDocFunc aFunc(*pDocSh); > >- HideCursor(); > sal_Bool bOk = aFunc.SelectLevel( nTab, bColumns, nLevel, bRecord, bPaint, false ); >- ShowCursor(); > > if (bOk) > UpdateScrollBars(); >@@ -252,9 +248,7 @@ void ScDBFunc::ShowOutline( sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEn > ScDocShell* pDocSh = GetViewData()->GetDocShell(); > ScOutlineDocFunc aFunc(*pDocSh); > >- HideCursor(); > sal_Bool bOk = aFunc.ShowOutline( nTab, bColumns, nLevel, nEntry, bRecord, bPaint, false ); >- ShowCursor(); > > if ( bOk && bPaint ) > UpdateScrollBars(); >@@ -268,9 +262,7 @@ void ScDBFunc::HideOutline( sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEn > ScDocShell* pDocSh = GetViewData()->GetDocShell(); > ScOutlineDocFunc aFunc(*pDocSh); > >- HideCursor(); > sal_Bool bOk = aFunc.HideOutline( nTab, bColumns, nLevel, nEntry, bRecord, bPaint, false ); >- ShowCursor(); > > if ( bOk && bPaint ) > UpdateScrollBars(); >@@ -359,9 +351,7 @@ void ScDBFunc::ShowMarkedOutlines( sal_Bool bRecord ) > { > ScDocShell* pDocSh = GetViewData()->GetDocShell(); > ScOutlineDocFunc aFunc(*pDocSh); >- HideCursor(); > sal_Bool bDone = aFunc.ShowMarkedOutlines( aRange, bRecord, false ); >- ShowCursor(); > if (bDone) > UpdateScrollBars(); > } >@@ -378,9 +368,7 @@ void ScDBFunc::HideMarkedOutlines( sal_Bool bRecord ) > { > ScDocShell* pDocSh = GetViewData()->GetDocShell(); > ScOutlineDocFunc aFunc(*pDocSh); >- HideCursor(); > sal_Bool bDone = aFunc.HideMarkedOutlines( aRange, bRecord, false ); >- ShowCursor(); > if (bDone) > UpdateScrollBars(); > } >diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx >index 40e8f38..0485843 100644 >--- a/sc/source/ui/view/gridwin.cxx >+++ b/sc/source/ui/view/gridwin.cxx >@@ -736,9 +736,7 @@ void ScGridWindow::RefreshAutoFilterButton(const ScAddress& rPos) > bool bFilterActive = IsAutoFilterActive(rPos.Col(), rPos.Row(), rPos.Tab()); > mpFilterButton->setHasHiddenMember(bFilterActive); > mpFilterButton->setPopupPressed(false); >- HideCursor(); > mpFilterButton->draw(); >- ShowCursor(); > } > } > >@@ -4678,11 +4676,9 @@ void ScGridWindow::UpdateAutoFillMark(bool bMarked, const ScRange& rMarkRange) > { > if ( bMarked != bAutoMarkVisible || ( bMarked && rMarkRange.aEnd != aAutoMarkPos ) ) > { >- HideCursor(); > bAutoMarkVisible = bMarked; > if ( bMarked ) > aAutoMarkPos = rMarkRange.aEnd; >- ShowCursor(); > > UpdateAutoFillOverlay(); > } >diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx >index 7d3fa0a..0c7fb54 100644 >--- a/sc/source/ui/view/gridwin2.cxx >+++ b/sc/source/ui/view/gridwin2.cxx >@@ -155,9 +155,7 @@ bool ScGridWindow::DoAutoFilterButton( SCCOL nCol, SCROW nRow, const MouseEvent& > mpFilterButton->setDrawBaseButton(false); > mpFilterButton->setDrawPopupButton(true); > mpFilterButton->setPopupPressed(true); >- HideCursor(); > mpFilterButton->draw(); >- ShowCursor(); > LaunchAutoFilterMenu(nCol, nRow); > return true; > } >diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx >index 8b7358c..c54fb1e 100644 >--- a/sc/source/ui/view/viewfun2.cxx >+++ b/sc/source/ui/view/viewfun2.cxx >@@ -1142,9 +1142,7 @@ sal_Bool ScViewFunc::MergeCells( sal_Bool bApi, sal_Bool& rDoContents, sal_Bool > > if (bOk) > { >- HideCursor(); > bOk = pDocSh->GetDocFunc().MergeCells( aMergeOption, rDoContents, bRecord, bApi ); >- ShowCursor(); > > if (bOk) > { >@@ -1243,11 +1241,9 @@ sal_Bool ScViewFunc::RemoveMerge( sal_Bool bRecord ) > } > while (bExtended); > >- HideCursor(); > sal_Bool bOk = pDocSh->GetDocFunc().UnmergeCells(aOption, bRecord, false ); > aExtended = aOption.getFirstSingleRange(); > MarkRange( aExtended ); >- ShowCursor(); > > if (bOk) > pDocSh->UpdateOle(GetViewData()); >diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx >index c69aaae..589e816 100644 >--- a/sc/source/ui/view/viewfun3.cxx >+++ b/sc/source/ui/view/viewfun3.cxx >@@ -240,8 +240,6 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, sal_Bool bIncludeObjects ) > sal_uInt16 nExtFlags = 0; > pDocSh->UpdatePaintExt( nExtFlags, aRange ); > >- HideCursor(); // Cursor aendert sich ! >- > rMark.MarkToMulti(); > pDoc->DeleteSelection( IDF_ALL, rMark ); > if ( bIncludeObjects ) >@@ -256,7 +254,6 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, sal_Bool bIncludeObjects ) > new ScUndoCut( pDocSh, aRange, aOldEnd, rMark, pUndoDoc ) ); > > aModificator.SetDocumentModified(); >- ShowCursor(); // Cursor aendert sich ! > pDocSh->UpdateOle(GetViewData()); > > CellContentChanged(); >@@ -1321,8 +1318,6 @@ bool ScViewFunc::PasteFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc, > rMark.SetMarkArea( aUserRange ); > MarkDataChanged(); > >- HideCursor(); // Cursor aendert sich ! >- > // > // Aus Clipboard kopieren, > // wenn gerechnet werden soll, Originaldaten merken >@@ -1422,8 +1417,6 @@ bool ScViewFunc::PasteFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc, > PAINT_GRID ); > } > >- ShowCursor(); // Cursor aendert sich ! >- > //! Block-Bereich bei RefUndoDoc weglassen !!! > > if ( bRecord ) >diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx >index 0335455..f338d7b 100644 >--- a/sc/source/ui/view/viewfunc.cxx >+++ b/sc/source/ui/view/viewfunc.cxx >@@ -2313,8 +2313,6 @@ void ScViewFunc::SetWidthOrHeight( sal_Bool bWidth, SCCOLROW nRangeCnt, SCCOLROW > > if (bPaint) > { >- HideCursor(); >- > itr = pMarkData->begin(); > for (; itr != itrEnd; ++itr) > { >@@ -2343,8 +2341,6 @@ void ScViewFunc::SetWidthOrHeight( sal_Bool bWidth, SCCOLROW nRangeCnt, SCCOLROW > pDocSh->UpdateOle(GetViewData()); > if( !pDocSh->IsReadOnly() ) > aModificator.SetDocumentModified(); >- >- ShowCursor(); > } > > // #i97876# Spreadsheet data changes are not notified >-- >1.7.10.4 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 48256
: 62830 |
62831
|
62832