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 /svx | |
parent | 46a985feca255abbebf826be6103ee8cc7f2cde1 (diff) |
convert GETFOCUS constants to scoped enum
Change-Id: I7c324bb6358be28c119592850eb7607479279f09
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/accessibility/AccessibleFrameSelector.cxx | 16 | ||||
-rw-r--r-- | svx/source/fmcomp/gridcell.cxx | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 40c175fb3976..2227951f752c 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -465,20 +465,20 @@ void AccFrameSelector::NotifyFocusListeners(bool bGetFocus) aEvent.FocusFlags = 0; if(bGetFocus) { - sal_uInt16 nFocusFlags = mpFrameSel->GetGetFocusFlags(); - if(nFocusFlags&GETFOCUS_TAB) + GetFocusFlags nFocusFlags = mpFrameSel->GetGetFocusFlags(); + if(nFocusFlags & GetFocusFlags::Tab) aEvent.FocusFlags |= AwtFocusChangeReason::TAB; - if(nFocusFlags&GETFOCUS_CURSOR) + if(nFocusFlags & GetFocusFlags::Cursor) aEvent.FocusFlags |= AwtFocusChangeReason::CURSOR; - if(nFocusFlags&GETFOCUS_MNEMONIC) + if(nFocusFlags & GetFocusFlags::Mnemonic) aEvent.FocusFlags |= AwtFocusChangeReason::MNEMONIC; - if(nFocusFlags&GETFOCUS_FORWARD) + if(nFocusFlags & GetFocusFlags::Forward) aEvent.FocusFlags |= AwtFocusChangeReason::FORWARD; - if(nFocusFlags&GETFOCUS_BACKWARD) + if(nFocusFlags & GetFocusFlags::Backward) aEvent.FocusFlags |= AwtFocusChangeReason::BACKWARD; - if(nFocusFlags&GETFOCUS_AROUND) + if(nFocusFlags & GetFocusFlags::Around) aEvent.FocusFlags |= AwtFocusChangeReason::AROUND; - if(nFocusFlags&GETFOCUS_UNIQUEMNEMONIC) + if(nFocusFlags & GetFocusFlags::UniqueMnemonic) aEvent.FocusFlags |= AwtFocusChangeReason::UNIQUEMNEMONIC; } aEvent.Temporary = sal_False; diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 27763ce1a67f..3ea3c5479efd 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -3441,7 +3441,7 @@ void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& awt::FocusEvent aEvent; aEvent.Source = *this; - aEvent.FocusFlags = _rWindow.GetGetFocusFlags(); + aEvent.FocusFlags = static_cast<sal_Int16>(_rWindow.GetGetFocusFlags()); aEvent.Temporary = sal_False; if ( bFocusGained ) |