summaryrefslogtreecommitdiff
path: root/editeng/source/accessibility
diff options
context:
space:
mode:
Diffstat (limited to 'editeng/source/accessibility')
-rw-r--r--editeng/source/accessibility/AccessibleImageBullet.cxx13
-rw-r--r--editeng/source/accessibility/AccessibleImageBullet.hxx3
2 files changed, 4 insertions, 12 deletions
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 00db3b338d0c..0c34e5a5c5b1 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -248,17 +248,12 @@ void AccessibleImageBullet::SetEditSource( SvxEditSource* pEditSource )
}
}
-void AccessibleImageBullet::FireEvent(const sal_Int16 nEventId, const uno::Any& rNewValue, const uno::Any& rOldValue)
-{
- NotifyAccessibleEvent(nEventId, rOldValue, rNewValue);
-}
-
void AccessibleImageBullet::SetState( const sal_Int64 nStateId )
{
if( !(mnStateSet & nStateId) )
{
mnStateSet |= nStateId;
- FireEvent( AccessibleEventId::STATE_CHANGED, uno::Any( nStateId ) );
+ NotifyAccessibleEvent(AccessibleEventId::STATE_CHANGED, uno::Any(), uno::Any(nStateId));
}
}
@@ -267,7 +262,7 @@ void AccessibleImageBullet::UnSetState( const sal_Int64 nStateId )
if( mnStateSet & nStateId )
{
mnStateSet &= ~nStateId;
- FireEvent( AccessibleEventId::STATE_CHANGED, uno::Any(), uno::Any( nStateId ) );
+ NotifyAccessibleEvent(AccessibleEventId::STATE_CHANGED, uno::Any(nStateId), uno::Any());
}
}
@@ -293,8 +288,8 @@ void AccessibleImageBullet::SetParagraphIndex( sal_Int32 nIndex )
if( nOldIndex != nIndex )
{
// index and therefore description changed
- FireEvent( AccessibleEventId::DESCRIPTION_CHANGED, uno::Any( getAccessibleDescription() ), aOldDesc );
- FireEvent( AccessibleEventId::NAME_CHANGED, uno::Any( getAccessibleName() ), aOldName );
+ NotifyAccessibleEvent(AccessibleEventId::DESCRIPTION_CHANGED, aOldDesc, uno::Any(getAccessibleDescription()));
+ NotifyAccessibleEvent(AccessibleEventId::NAME_CHANGED, aOldName, uno::Any(getAccessibleName()));
}
}
catch( const uno::Exception& ) {} // optional behaviour
diff --git a/editeng/source/accessibility/AccessibleImageBullet.hxx b/editeng/source/accessibility/AccessibleImageBullet.hxx
index cca3ea5ebf00..9f58b7ba6c8d 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.hxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.hxx
@@ -119,9 +119,6 @@ public:
*/
sal_Int32 GetParagraphIndex() const { return mnParagraphIndex; }
- /// Calls all Listener objects to tell them the change. Don't hold locks when calling this!
- void FireEvent(const sal_Int16 nEventId, const css::uno::Any& rNewValue, const css::uno::Any& rOldValue = css::uno::Any());
-
private:
AccessibleImageBullet( const AccessibleImageBullet& ) = delete;
AccessibleImageBullet& operator= ( const AccessibleImageBullet& ) = delete;