diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-27 13:47:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-28 12:47:05 +0200 |
| commit | 4c93c30c79ae885d488a8a04d383fe5308a1d520 (patch) | |
| tree | c0309401c718c0459dd1a0035bcbddd113d655b8 /svtools | |
| parent | 46a985feca255abbebf826be6103ee8cc7f2cde1 (diff) | |
convert GETFOCUS constants to scoped enum
Change-Id: I7c324bb6358be28c119592850eb7607479279f09
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/brwbox/editbrowsebox.cxx | 10 | ||||
| -rw-r--r-- | svtools/source/brwbox/editbrowsebox2.cxx | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index 56155ddce018..3764de7a0ad2 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -47,10 +47,10 @@ namespace svt namespace { - sal_uInt16 getRealGetFocusFlags( vcl::Window* _pWindow ) + GetFocusFlags getRealGetFocusFlags( vcl::Window* _pWindow ) { - sal_uInt16 nFlags = 0; - while ( _pWindow && !nFlags ) + GetFocusFlags nFlags = GetFocusFlags::NONE; + while ( _pWindow && nFlags == GetFocusFlags::NONE ) { nFlags = _pWindow->GetGetFocusFlags( ); _pWindow = _pWindow->GetParent(); @@ -228,7 +228,7 @@ namespace svt void EditBrowseBox::LoseFocus() { BrowseBox::LoseFocus(); - DetermineFocus( 0 ); + DetermineFocus( GetFocusFlags::NONE ); } @@ -747,7 +747,7 @@ namespace svt break; case MouseNotifyEvent::LOSEFOCUS: - DetermineFocus( 0 ); + DetermineFocus( GetFocusFlags::NONE ); break; default: diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx index e3c6d3444a49..8a659ee6d06f 100644 --- a/svtools/source/brwbox/editbrowsebox2.cxx +++ b/svtools/source/brwbox/editbrowsebox2.cxx @@ -133,7 +133,7 @@ void EditBrowseBox::GrabTableFocus() aController->GetWindow().GrabFocus(); } -void EditBrowseBox::DetermineFocus( const sal_uInt16 _nGetFocusFlags ) +void EditBrowseBox::DetermineFocus( const GetFocusFlags _nGetFocusFlags ) { bool bFocus = false; for (vcl::Window* pWindow = Application::GetFocusWindow(); @@ -148,7 +148,7 @@ void EditBrowseBox::DetermineFocus( const sal_uInt16 _nGetFocusFlags ) if ( GetBrowserFlags( ) & EditBrowseBoxFlags::SMART_TAB_TRAVEL ) { if ( bHasFocus // we got the focus - && ( _nGetFocusFlags & GETFOCUS_TAB ) // using the TAB key + && ( _nGetFocusFlags & GetFocusFlags::Tab ) // using the TAB key ) { long nRows = GetRowCount(); @@ -156,7 +156,7 @@ void EditBrowseBox::DetermineFocus( const sal_uInt16 _nGetFocusFlags ) if ( ( nRows > 0 ) && ( nCols > 0 ) ) { - if ( _nGetFocusFlags & GETFOCUS_FORWARD ) + if ( _nGetFocusFlags & GetFocusFlags::Forward ) { if ( GetColumnId( 0 ) != HandleColumnId ) { @@ -168,7 +168,7 @@ void EditBrowseBox::DetermineFocus( const sal_uInt16 _nGetFocusFlags ) GoToRowColumnId( 0, GetColumnId( 1 ) ); } } - else if ( _nGetFocusFlags & GETFOCUS_BACKWARD ) + else if ( _nGetFocusFlags & GetFocusFlags::Backward ) { GoToRowColumnId( nRows - 1, GetColumnId( nCols -1 ) ); } |