diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-16 16:27:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-17 07:57:52 +0200 |
| commit | 3ed6cb574888c82e250774ddf48d8a371483e890 (patch) | |
| tree | 6cc062a502a6efde7ce16e38c0d484ca4b1f7dbb /chart2 | |
| parent | 802a76d4a972db180a21efb9cb6e05220b724c22 (diff) | |
convert AccessibleBase::EventType to scoped enum
and drop unused enumerators
Change-Id: I1ce08b16d587edcaee214b40798fe53fa3fc7923
Diffstat (limited to 'chart2')
3 files changed, 6 insertions, 21 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index d887fa67b734..3a283d2e48bf 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -122,14 +122,7 @@ bool AccessibleBase::NotifyEvent( EventType eEventType, const AccessibleUniqueId aSelected <<= AccessibleStateType::SELECTED; switch( eEventType ) { - case OBJECT_CHANGE: - { - BroadcastAccEvent( AccessibleEventId::VISIBLE_DATA_CHANGED, aEmpty, aEmpty ); - SAL_INFO("chart2.accessibility", "Visible data event sent by: " << getAccessibleName()); - } - break; - - case GOT_SELECTION: + case EventType::GOT_SELECTION: { AddState( AccessibleStateType::SELECTED ); BroadcastAccEvent( AccessibleEventId::STATE_CHANGED, aSelected, aEmpty ); @@ -142,7 +135,7 @@ bool AccessibleBase::NotifyEvent( EventType eEventType, const AccessibleUniqueId } break; - case LOST_SELECTION: + case EventType::LOST_SELECTION: { RemoveState( AccessibleStateType::SELECTED ); BroadcastAccEvent( AccessibleEventId::STATE_CHANGED, aEmpty, aSelected ); @@ -153,12 +146,6 @@ bool AccessibleBase::NotifyEvent( EventType eEventType, const AccessibleUniqueId SAL_INFO("chart2.accessibility", "Selection lost by: " << getAccessibleName()); } break; - - case PROPERTY_CHANGE: - { - //not implemented --> rebuild all - } - break; } return true; } diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 77c4457651a9..ec0b11217991 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -338,11 +338,11 @@ void SAL_CALL AccessibleChartView::selectionChanged( const lang::EventObject& /* ObjectIdentifier aSelectedOID( xSelectionSupplier->getSelection() ); if ( m_aCurrentSelectionOID.isValid() ) { - NotifyEvent( LOST_SELECTION, m_aCurrentSelectionOID ); + NotifyEvent( EventType::LOST_SELECTION, m_aCurrentSelectionOID ); } if( aSelectedOID.isValid() ) { - NotifyEvent( GOT_SELECTION, aSelectedOID ); + NotifyEvent( EventType::GOT_SELECTION, aSelectedOID ); } m_aCurrentSelectionOID = aSelectedOID; } diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index 21da0b93180c..b808052c2438 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -93,12 +93,10 @@ class AccessibleBase : public impl::AccessibleBase_Base { public: - enum EventType + enum class EventType { - OBJECT_CHANGE, GOT_SELECTION, - LOST_SELECTION, - PROPERTY_CHANGE + LOST_SELECTION }; AccessibleBase( const AccessibleElementInfo & rAccInfo, |