diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-06 13:26:09 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-07 07:10:39 +0000 |
commit | 2d48f5fc0a4f7b5b8c9d3a4f4cc85d5f3a7e5053 (patch) | |
tree | c2e18df7dd44255e98c91f242194fd9bb66f3f3e /dbaccess | |
parent | Convert region to use std::unique_ptr (diff) | |
download | core-2d48f5fc0a4f7b5b8c9d3a4f4cc85d5f3a7e5053.tar.gz core-2d48f5fc0a4f7b5b8c9d3a4f4cc85d5f3a7e5053.zip |
convert VCLEVENT constants to scoped enum
Change-Id: Ic8ccb0a9715ec05182dacddab2c015b0de6a0fba
Reviewed-on: https://gerrit.libreoffice.org/31675
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/ui/app/AppDetailView.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/control/dbtreelistbox.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/admincontrols.cxx | 14 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/ToolBoxHelper.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/TableWindowAccess.cxx | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 4118915e16a4..d9f8a0b3fe62 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -286,7 +286,7 @@ bool OCreationList::setCurrentEntryInvalidate( SvTreeListEntry* _pEntry ) if ( GetCurEntry() ) { InvalidateEntry( GetCurEntry() ); - CallEventListeners( VCLEVENT_LISTBOX_TREESELECT, GetCurEntry() ); + CallEventListeners( VclEventId::ListboxTreeSelect, GetCurEntry() ); } updateHelpText(); return true; @@ -334,7 +334,7 @@ void OCreationList::KeyInput( const KeyEvent& rKEvt ) if ( pNewCurrent ) { InvalidateEntry( pNewCurrent ); - CallEventListeners( VCLEVENT_LISTBOX_SELECT, pNewCurrent ); + CallEventListeners( VclEventId::ListboxSelect, pNewCurrent ); } updateHelpText(); } diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 2fbf134df3e9..ccfca86880a6 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -672,7 +672,7 @@ void DBTreeListBox::ExecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry ) IMPL_LINK( DBTreeListBox, MenuEventListener, VclMenuEvent&, rMenuEvent, void ) { - if ( rMenuEvent.GetId() == VCLEVENT_OBJECT_DYING ) + if ( rMenuEvent.GetId() == VclEventId::ObjectDying ) { css::uno::Reference< css::lang::XComponent > xComponent( m_xMenuController, css::uno::UNO_QUERY ); if ( xComponent.is() ) diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 8b493c9cd0fa..46e6e45136b0 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -40,9 +40,9 @@ namespace dbaui // IWindowEventFilter virtual bool payAttentionTo( const VclWindowEvent& _rEvent ) const override { - return ( _rEvent.GetId() == VCLEVENT_WINDOW_ENABLED ) - || ( _rEvent.GetId() == VCLEVENT_WINDOW_DISABLED ) - || ( _rEvent.GetId() == VCLEVENT_EDIT_MODIFY ); + return ( _rEvent.GetId() == VclEventId::WindowEnabled ) + || ( _rEvent.GetId() == VclEventId::WindowDisabled ) + || ( _rEvent.GetId() == VclEventId::EditModify ); } }; @@ -69,21 +69,21 @@ namespace dbaui switch ( _rTrigger.GetId() ) { - case 0: + case VclEventId::NONE: // initial call const_cast< TextResetOperator* >( this )->m_sUserText = _rTrigger.GetWindow()->GetText(); break; - case VCLEVENT_EDIT_MODIFY: + case VclEventId::EditModify: if ( _rTrigger.GetWindow()->IsEnabled() ) const_cast< TextResetOperator* >( this )->m_sUserText = _rTrigger.GetWindow()->GetText(); break; - case VCLEVENT_WINDOW_ENABLED: + case VclEventId::WindowEnabled: _rOperateOn.SetText( m_sUserText ); break; - case VCLEVENT_WINDOW_DISABLED: + case VclEventId::WindowDisabled: _rOperateOn.SetText( m_sDisabledText ); break; diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx index 20d60659e778..e49e1be8c989 100644 --- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx +++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx @@ -76,7 +76,7 @@ namespace dbaui } IMPL_LINK(OToolBoxHelper, SettingsChanged, VclSimpleEvent&, _rEvt, void) { - if ( m_pToolBox && _rEvt.GetId() == VCLEVENT_APPLICATION_DATACHANGED ) + if ( m_pToolBox && _rEvt.GetId() == VclEventId::ApplicationDataChanged ) { DataChangedEvent* pData = static_cast<DataChangedEvent*>(static_cast<VclWindowEvent&>(_rEvt).GetData()); if ( pData && ((( pData->GetType() == DataChangedEventType::SETTINGS ) || diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index 6a2a609701dc..5616112c10c0 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -51,7 +51,7 @@ namespace dbaui } void OTableWindowAccess::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { - if ( rVclWindowEvent.GetId() == VCLEVENT_OBJECT_DYING ) + if ( rVclWindowEvent.GetId() == VclEventId::ObjectDying ) { ::osl::MutexGuard aGuard( m_aMutex ); m_pTable = nullptr; |