diff options
author | Tobias Madl <tobias.madl.dev@gmail.com> | 2014-11-26 14:53:25 +0000 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2014-12-01 07:43:31 +0000 |
commit | 14596452e781f6a66bcc63b0c447c852df1f2896 (patch) | |
tree | c225569f229679084b081021c8c51cfdaf12eb21 /cui | |
parent | 96ec51292301a105effacfcceec44f696ee6e0f0 (diff) |
fdo#84938: replace EVENT_ constants with enum
Change-Id: I8275832d8dae43b374bddd48520d11592e9a6a1f
Reviewed-on: https://gerrit.libreoffice.org/13134
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/customize/macropg.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/SpellDialog.cxx | 6 | ||||
-rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/hangulhanjadlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/connpooloptions.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optcolor.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optpath.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/treeopt.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/numfmt.cxx | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index c2d44516ca7b..ca978e590b1c 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -120,7 +120,7 @@ bool MacroEventListBox::Notify( NotifyEvent& rNEvt ) { bool nRet = Control::Notify( rNEvt ); - if( rNEvt.GetType() == EVENT_GETFOCUS ) + if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS ) { if ( rNEvt.GetWindow() != &maListBox ) maListBox.GrabFocus(); diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 96b59dc53fc2..5bbf6ddce72a 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -988,12 +988,12 @@ bool SpellDialog::Notify( NotifyEvent& rNEvt ) */ if( IsVisible() && !bFocusLocked ) { - if( rNEvt.GetType() == EVENT_GETFOCUS ) + if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS ) { //notify the child window of the focus change rParent.GetFocus(); } - else if( rNEvt.GetType() == EVENT_LOSEFOCUS ) + else if( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS ) { //notify the child window of the focus change rParent.LoseFocus(); @@ -1274,7 +1274,7 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) { bool bChange = false; const TextCharAttrib* pErrorAttrib = 0; - if(rNEvt.GetType() == EVENT_KEYINPUT) + if(rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) { const KeyEvent& rKeyEvt = *rNEvt.GetKeyEvent(); bChange = TextEngine::DoesKeyChangeText( rKeyEvt ); diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 15601c9bee55..540c7bed398a 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -188,7 +188,7 @@ sal_Int32 HexColorControl::GetColor() bool HexColorControl::PreNotify( NotifyEvent& rNEvt ) { - if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) + if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { if ( ImplProcessKeyInput( *rNEvt.GetKeyEvent() ) ) return true; diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 1391bd57c205..7e02beed6bee 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -1365,7 +1365,7 @@ namespace svx bool SuggestionEdit::PreNotify( NotifyEvent& rNEvt ) { bool nHandled = false; - if( rNEvt.GetType() == EVENT_KEYINPUT ) + if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); const vcl::KeyCode& rKeyCode = pKEvt->GetKeyCode(); diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 7743d8207874..3d432698e0fc 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -359,7 +359,7 @@ namespace offapp bool ConnectionPoolOptionsPage::Notify( NotifyEvent& _rNEvt ) { - if (EVENT_LOSEFOCUS == _rNEvt.GetType()) + if (MouseNotifyEvent::LOSEFOCUS == _rNEvt.GetType()) if (m_pTimeout->IsWindowOrChild(_rNEvt.GetWindow())) commitTimeoutField(); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 67d0890aafce..778b42962821 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -935,7 +935,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ScrollHdl, ScrollBar*, pScrollBar) bool ColorConfigCtrl_Impl::PreNotify( NotifyEvent& rNEvt ) { - if(rNEvt.GetType() == EVENT_COMMAND) + if(rNEvt.GetType() == MouseNotifyEvent::COMMAND) { const CommandEvent* pCEvt = rNEvt.GetCommandEvent(); sal_uInt16 nCmd = pCEvt->GetCommand(); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index d231aa10542b..c16535acd725 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -167,7 +167,7 @@ bool SvxControlFocusHelper::Notify( NotifyEvent& rNEvt ) { bool nRet = Control::Notify( rNEvt ); - if ( m_pFocusCtrl && rNEvt.GetWindow() != m_pFocusCtrl && rNEvt.GetType() == EVENT_GETFOCUS ) + if ( m_pFocusCtrl && rNEvt.GetWindow() != m_pFocusCtrl && rNEvt.GetType() == MouseNotifyEvent::GETFOCUS ) m_pFocusCtrl->GrabFocus(); return nRet; } diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 46673d20e1b7..92ed59b1d052 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -891,7 +891,7 @@ void OfaTreeOptionsDialog::ActivateLastSelection() bool OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt ) { - if ( rNEvt.GetType() == EVENT_KEYINPUT ) + if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); const vcl::KeyCode aKeyCode = pKEvt->GetKeyCode(); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 5cd2da24da9b..8ad859529f54 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -2323,7 +2323,7 @@ bool OfaAutoCompleteTabPage::AutoCompleteMultiListBox::PreNotify( { bool nHandled = MultiListBox::PreNotify( rNEvt ); - if( !nHandled && EVENT_KEYUP == rNEvt.GetType() ) + if( !nHandled && MouseNotifyEvent::KEYUP == rNEvt.GetType() ) { const vcl::KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode(); switch( rKeyCode.GetModifier() | rKeyCode.GetCode() ) diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 9d8682253d7f..ce26ca8fc310 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -1660,7 +1660,7 @@ void SvxNumberFormatTabPage::ChangePreviewText( sal_uInt16 nPos ) bool SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt ) { - if(rNEvt.GetType()==EVENT_LOSEFOCUS) + if(rNEvt.GetType()==MouseNotifyEvent::LOSEFOCUS) { if ( rNEvt.GetWindow() == dynamic_cast< vcl::Window* >( m_pEdComment ) && !m_pEdComment->IsVisible() ) { |