mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BrowseBox::bHideCursor misuses sal_Bool for TriState

Browse Source 
(TRISTATE_INDET == "smart" is probably obvious enough to not warrant an extra
enum.)

Change-Id: I5fde5294c83c9f805d9df645089665b9dbcfec96
This commit is contained in:
Stephan Bergmann
2014-02-25 12:44:37 +01:00
parent d618ea6b86
commit ee120240f7
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/svtools/brwbox.hxx
View File

@@ -210,10 +210,6 @@ class SVT_DLLPUBLIC BrowseBox
,public DropTargetHelper ,public DropTargetHelper
,public svt::IAccessibleTableProvider ,public svt::IAccessibleTableProvider
{ {
#define NO_CURSOR_HIDE 0
#define HARD_CURSOR_HIDE 1
#define SMART_CURSOR_HIDE 2
friend class BrowserDataWin; friend class BrowserDataWin;
friend class ::svt::BrowseBoxImpl; friend class ::svt::BrowseBoxImpl;
@@ -268,7 +264,7 @@ private:
sal_Bool bNotToggleSel; // set while in ToggleSelection() etc. sal_Bool bNotToggleSel; // set while in ToggleSelection() etc.
sal_Bool bHasFocus; // set/unset in Get/LoseFocus sal_Bool bHasFocus; // set/unset in Get/LoseFocus
sal_Bool bHideSelect; // hide selection (highlight) sal_Bool bHideSelect; // hide selection (highlight)
sal_Bool bHideCursor; // hide cursor (frame) TriState bHideCursor; // hide cursor (frame)
Range aSelRange; // for selection expansion Range aSelRange; // for selection expansion
BrowserColumns* pCols; // array of column-descriptions BrowserColumns* pCols; // array of column-descriptions

8
svtools/source/brwbox/brwbox1.cxx
View File

@@ -96,7 +96,7 @@ void BrowseBox::ConstructImpl( BrowserMode nMode )
bHit = sal_False; bHit = sal_False;
mbInteractiveRowHeight = sal_False; mbInteractiveRowHeight = sal_False;
bHideSelect = sal_False; bHideSelect = sal_False;
bHideCursor = NO_CURSOR_HIDE; bHideCursor = TRISTATE_FALSE;
nRowCount = 0; nRowCount = 0;
m_bFocusOnlyCursor = sal_True; m_bFocusOnlyCursor = sal_True;
m_aCursorColor = COL_TRANSPARENT; m_aCursorColor = COL_TRANSPARENT;
@@ -2291,15 +2291,15 @@ void BrowseBox::SetMode( BrowserMode nMode )
bHideSelect = ((nMode & BROWSER_HIDESELECT) == BROWSER_HIDESELECT); bHideSelect = ((nMode & BROWSER_HIDESELECT) == BROWSER_HIDESELECT);
// default: do not hide the cursor at all (untaken scrolling and such) // default: do not hide the cursor at all (untaken scrolling and such)
bHideCursor = NO_CURSOR_HIDE; bHideCursor = TRISTATE_FALSE;
if ( BROWSER_SMART_HIDECURSOR == ( nMode & BROWSER_SMART_HIDECURSOR ) ) if ( BROWSER_SMART_HIDECURSOR == ( nMode & BROWSER_SMART_HIDECURSOR ) )
{ // smart cursor hide overrules hard cursor hide { // smart cursor hide overrules hard cursor hide
bHideCursor = SMART_CURSOR_HIDE; bHideCursor = TRISTATE_INDET;
} }
else if ( BROWSER_HIDECURSOR == ( nMode & BROWSER_HIDECURSOR ) ) else if ( BROWSER_HIDECURSOR == ( nMode & BROWSER_HIDECURSOR ) )
{ {
bHideCursor = HARD_CURSOR_HIDE; bHideCursor = TRISTATE_TRUE;
} }
m_bFocusOnlyCursor = ((nMode & BROWSER_CURSOR_WO_FOCUS) == 0); m_bFocusOnlyCursor = ((nMode & BROWSER_CURSOR_WO_FOCUS) == 0);

4
svtools/source/brwbox/brwbox2.cxx
View File

@@ -383,12 +383,12 @@ void BrowseBox::ToggleSelection( sal_Bool bForce )
void BrowseBox::DrawCursor() void BrowseBox::DrawCursor()
{ {
bool bReallyHide = false; bool bReallyHide = false;
if ( SMART_CURSOR_HIDE == bHideCursor ) if ( bHideCursor == TRISTATE_INDET )
{ {
if ( !GetSelectRowCount() && !GetSelectColumnCount() ) if ( !GetSelectRowCount() && !GetSelectColumnCount() )
bReallyHide = true; bReallyHide = true;
} }
else if ( HARD_CURSOR_HIDE == bHideCursor ) else if ( bHideCursor == TRISTATE_TRUE )
{ {
bReallyHide = true; bReallyHide = true;
} }