API CHANGE a11y unpublishing and add/removeListener rename.

The a11y API has never really been picked up by tools vendors, let's
not tie ourselves up here for no good reason.

This unpublishes all css::accessibility, and dependend API.

With that, we can change the rather unfortunately-named add/
removeEventListener to be add/removeAccessibleEventListener, thus
not conflicting with the XComponent methods of the same name.

Change-Id: I595598c3a8e46415f80b2780f333333174865fe4

176 files changed, 356 insertions, 421 deletions

diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Component.java b/accessibility/bridge/org/openoffice/java/accessibility/Component.java
index c92a92015b43..821d2e9e099a 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Component.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Component.java
@@ -48,3 +48,3 @@ public abstract class Component extends java.awt.Component {
         if (broadcaster != null) {
-            broadcaster.addEventListener(createEventListener());
+            broadcaster.addAccessibleEventListener(createEventListener());
         }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Container.java b/accessibility/bridge/org/openoffice/java/accessibility/Container.java
index f56af00fec28..4b447c9c2f92 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Container.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Container.java
@@ -52,3 +52,3 @@ public class Container extends java.awt.Container implements javax.accessibility
         if (broadcaster != null) {
-            broadcaster.addEventListener(createEventListener());
+            broadcaster.addAccessibleEventListener(createEventListener());
         }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java b/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java
index 95dda3e4dcc2..f7c1c08466fb 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java
@@ -53,3 +53,3 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
         if (broadcaster != null) {
-            broadcaster.addEventListener(new AccessibleDialogListener());
+            broadcaster.addAccessibleEventListener(new AccessibleDialogListener());
         }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Frame.java b/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
index 311a32f2e2f6..7ea0877c05ec 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
@@ -47,3 +47,3 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
         if (broadcaster != null) {
-            broadcaster.addEventListener(new AccessibleFrameListener());
+            broadcaster.addAccessibleEventListener(new AccessibleFrameListener());
         }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Window.java b/accessibility/bridge/org/openoffice/java/accessibility/Window.java
index 00300d678256..da4249a07e11 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Window.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Window.java
@@ -42,3 +42,3 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
         if (broadcaster != null) {
-            broadcaster.addEventListener(new AccessibleWindowListener());
+            broadcaster.addAccessibleEventListener(new AccessibleWindowListener());
         }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleEventLog.java b/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleEventLog.java
index e601a1cae4fc..b0d1d7e80d94 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleEventLog.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleEventLog.java
@@ -48,3 +48,3 @@ public class XAccessibleEventLog implements XAccessibleEventListener {
         if (broadcaster != null) {
-            broadcaster.addEventListener(XAccessibleEventLog.get());
+            broadcaster.addAccessibleEventListener(XAccessibleEventLog.get());
 
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
index da27f56be52b..f181818a4c22 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
@@ -237,4 +237,3 @@ public:
     /** Adds a new event listener */
-    using cppu::WeakAggComponentImplHelperBase::addEventListener;
-    virtual void SAL_CALL addEventListener(
+    virtual void SAL_CALL addAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
@@ -244,4 +243,3 @@ public:
     /** Removes an event listener. */
-    using cppu::WeakAggComponentImplHelperBase::removeEventListener;
-    virtual void SAL_CALL removeEventListener(
+    virtual void SAL_CALL removeAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
index 2aca835f6faa..52fdce89540a 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
@@ -210,4 +210,3 @@ public:
     /** Adds a new event listener */
-    using cppu::WeakAggComponentImplHelperBase::addEventListener;
-    virtual void SAL_CALL addEventListener(
+    virtual void SAL_CALL addAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
@@ -217,4 +216,3 @@ public:
     /** Removes an event listener. */
-    using cppu::WeakAggComponentImplHelperBase::removeEventListener;
-    virtual void SAL_CALL removeEventListener(
+    virtual void SAL_CALL removeAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
index 93116ff88e10..0a3d0844d029 100644
--- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
+++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
@@ -171,6 +171,4 @@ namespace accessibility
         // XAccessibleEventBroadcaster
-        using cppu::WeakAggComponentImplHelperBase::addEventListener;
-        virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-        using cppu::WeakAggComponentImplHelperBase::removeEventListener;
-        virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 
diff --git a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
index 2027208305eb..266ca4215d12 100644
--- a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
+++ b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
@@ -185,6 +185,4 @@ namespace accessibility
         // XAccessibleEventBroadcaster
-        using cppu::WeakAggComponentImplHelperBase::addEventListener;
-        virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-        using cppu::WeakAggComponentImplHelperBase::removeEventListener;
-        virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index 6adbd2a0fd41..267d7dec6886 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -354,4 +354,3 @@ private:
 
-    using cppu::WeakAggComponentImplHelperBase::addEventListener;
-    virtual void SAL_CALL addEventListener(
+    virtual void SAL_CALL addAccessibleEventListener(
         ::css::uno::Reference<
@@ -360,4 +359,3 @@ private:
 
-    using cppu::WeakAggComponentImplHelperBase::removeEventListener;
-    virtual void SAL_CALL removeEventListener(
+    virtual void SAL_CALL removeAccessibleEventListener(
         ::css::uno::Reference<
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
index 612cd0aa5356..885d3e48fdc7 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
@@ -180,6 +180,4 @@ public:
     // XAccessibleEventBroadcaster
-    using cppu::WeakAggComponentImplHelperBase::addEventListener;
-    using cppu::WeakAggComponentImplHelperBase::removeEventListener;
-    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 };
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index dfcd8e56428a..ab6f9acb4351 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -290,3 +290,3 @@ void SAL_CALL AccessibleBrowseBoxBase::focusLost( const ::com::sun::star::awt::F
 
-void SAL_CALL AccessibleBrowseBoxBase::addEventListener(
+void SAL_CALL AccessibleBrowseBoxBase::addAccessibleEventListener(
         const Reference< XAccessibleEventListener>& _rxListener )
@@ -304,3 +304,3 @@ void SAL_CALL AccessibleBrowseBoxBase::addEventListener(
 
-void SAL_CALL AccessibleBrowseBoxBase::removeEventListener(
+void SAL_CALL AccessibleBrowseBoxBase::removeAccessibleEventListener(
         const Reference< XAccessibleEventListener>& _rxListener )
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
index 8d71c2605b86..553ccbb19362 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -240,3 +240,3 @@ sal_Bool SAL_CALL AccessibleGridControlBase::isFocusTraversable()
 
-void SAL_CALL AccessibleGridControlBase::addEventListener(
+void SAL_CALL AccessibleGridControlBase::addAccessibleEventListener(
         const Reference< XAccessibleEventListener>& _rxListener )
@@ -254,3 +254,3 @@ void SAL_CALL AccessibleGridControlBase::addEventListener(
 
-void SAL_CALL AccessibleGridControlBase::removeEventListener(
+void SAL_CALL AccessibleGridControlBase::removeAccessibleEventListener(
         const Reference< XAccessibleEventListener>& _rxListener )
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index b1b58fca23f7..fd739fb3941c 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -509,3 +509,3 @@ throw(RuntimeException)
     // -----------------------------------------------------------------------------
-    void SAL_CALL AccessibleIconChoiceCtrlEntry::addEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
+    void SAL_CALL AccessibleIconChoiceCtrlEntry::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
     {
@@ -520,3 +520,3 @@ throw(RuntimeException)
     // -----------------------------------------------------------------------------
-    void SAL_CALL AccessibleIconChoiceCtrlEntry::removeEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
+    void SAL_CALL AccessibleIconChoiceCtrlEntry::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
     {
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 1c038e7b9695..ebb69f1994a7 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -595,3 +595,3 @@ namespace accessibility
     // -----------------------------------------------------------------------------
-    void SAL_CALL AccessibleListBoxEntry::addEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
+    void SAL_CALL AccessibleListBoxEntry::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
     {
@@ -606,3 +606,3 @@ namespace accessibility
     // -----------------------------------------------------------------------------
-    void SAL_CALL AccessibleListBoxEntry::removeEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
+    void SAL_CALL AccessibleListBoxEntry::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
     {
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index f25c46cf64f3..547319ec1711 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -640,3 +640,3 @@ ParagraphImpl::getRunAttributes(::sal_Int32 Index, const ::css::uno::Sequence< O
 // virtual
-void SAL_CALL ParagraphImpl::addEventListener(
+void SAL_CALL ParagraphImpl::addAccessibleEventListener(
     ::css::uno::Reference<
@@ -664,3 +664,3 @@ void SAL_CALL ParagraphImpl::addEventListener(
 // virtual
-void SAL_CALL ParagraphImpl::removeEventListener(
+void SAL_CALL ParagraphImpl::removeAccessibleEventListener(
     ::css::uno::Reference<
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 9676f7828080..1a9471ce967a 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -601,3 +601,3 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_I
 // -----------------------------------------------------------------------------
-void SAL_CALL VCLXAccessibleListItem::addEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
+void SAL_CALL VCLXAccessibleListItem::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
 {
@@ -611,3 +611,3 @@ void SAL_CALL VCLXAccessibleListItem::addEventListener( const Reference< XAccess
 // -----------------------------------------------------------------------------
-void SAL_CALL VCLXAccessibleListItem::removeEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
+void SAL_CALL VCLXAccessibleListItem::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
 {
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 837dc0447980..183945b611e8 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -942,3 +942,3 @@ void SAL_CALL AccessibleBase::disposing( const lang::EventObject& /*Source*/ )
 // ________ XAccessibleEventBroadcasters ________
-void SAL_CALL AccessibleBase::addEventListener( const Reference< XAccessibleEventListener >& xListener )
+void SAL_CALL AccessibleBase::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
     throw (RuntimeException)
@@ -956,3 +956,3 @@ void SAL_CALL AccessibleBase::addEventListener( const Reference< XAccessibleEven
 
-void SAL_CALL AccessibleBase::removeEventListener( const Reference< XAccessibleEventListener >& xListener )
+void SAL_CALL AccessibleBase::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
     throw (RuntimeException)
diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx
index 3b87380b1683..00f2231757d4 100644
--- a/chart2/source/controller/inc/AccessibleBase.hxx
+++ b/chart2/source/controller/inc/AccessibleBase.hxx
@@ -309,6 +309,6 @@ protected:
     // ________ XAccessibleEventBroadcaster ________
-    virtual void SAL_CALL addEventListener(
+    virtual void SAL_CALL addAccessibleEventListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeEventListener(
+    virtual void SAL_CALL removeAccessibleEventListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
diff --git a/comphelper/inc/comphelper/accessiblecontexthelper.hxx b/comphelper/inc/comphelper/accessiblecontexthelper.hxx
index c3a2c34c55d9..ae7712126504 100644
--- a/comphelper/inc/comphelper/accessiblecontexthelper.hxx
+++ b/comphelper/inc/comphelper/accessiblecontexthelper.hxx
@@ -154,6 +154,4 @@ namespace comphelper
         // XAccessibleEventBroadcaster
-        using WeakAggComponentImplHelperBase::addEventListener;
-        virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-        using WeakAggComponentImplHelperBase::removeEventListener;
-        virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 
diff --git a/comphelper/inc/comphelper/accessiblewrapper.hxx b/comphelper/inc/comphelper/accessiblewrapper.hxx
index 1b4ab52cf69b..0867ab5594e9 100644
--- a/comphelper/inc/comphelper/accessiblewrapper.hxx
+++ b/comphelper/inc/comphelper/accessiblewrapper.hxx
@@ -289,4 +289,4 @@ namespace comphelper
         // XAccessibleEventBroadcaster
-        virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 
diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx
index 48410203a21c..c355d50c53f6 100644
--- a/comphelper/source/misc/accessiblecontexthelper.cxx
+++ b/comphelper/source/misc/accessiblecontexthelper.cxx
@@ -135,3 +135,3 @@ namespace comphelper
     //---------------------------------------------------------------------
-    void SAL_CALL OAccessibleContextHelper::addEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException)
+    void SAL_CALL OAccessibleContextHelper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException)
     {
@@ -158,3 +158,3 @@ namespace comphelper
     //---------------------------------------------------------------------
-    void SAL_CALL OAccessibleContextHelper::removeEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException)
+    void SAL_CALL OAccessibleContextHelper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException)
     {
diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx
index 929eb5f76dde..f7ac7389b917 100644
--- a/comphelper/source/misc/accessiblewrapper.cxx
+++ b/comphelper/source/misc/accessiblewrapper.cxx
@@ -407,3 +407,3 @@ namespace comphelper
             if ( xBroadcaster.is() )
-                xBroadcaster->addEventListener( this );
+                xBroadcaster->addAccessibleEventListener( this );
         }
@@ -502,3 +502,3 @@ namespace comphelper
         if ( xBroadcaster.is() )
-            xBroadcaster->removeEventListener( this );
+            xBroadcaster->removeAccessibleEventListener( this );
 
@@ -611,3 +611,3 @@ namespace comphelper
     //--------------------------------------------------------------------
-    void SAL_CALL OAccessibleContextWrapper::addEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException)
+    void SAL_CALL OAccessibleContextWrapper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException)
     {
@@ -620,3 +620,3 @@ namespace comphelper
     //--------------------------------------------------------------------
-    void SAL_CALL OAccessibleContextWrapper::removeEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException)
+    void SAL_CALL OAccessibleContextWrapper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException)
     {
diff --git a/editeng/inc/editeng/AccessibleContextBase.hxx b/editeng/inc/editeng/AccessibleContextBase.hxx
index b54a59c0c74b..ecfd312422a9 100644
--- a/editeng/inc/editeng/AccessibleContextBase.hxx
+++ b/editeng/inc/editeng/AccessibleContextBase.hxx
@@ -236,7 +236,2 @@ public:
 
-    //=====  XComponent  ========================================================
-
-    using WeakComponentImplHelperBase::addEventListener;
-    using WeakComponentImplHelperBase::removeEventListener;
-
     //=====  XAccessibleEventBroadcaster  ========================================
@@ -244,3 +239,3 @@ public:
     virtual void SAL_CALL
-        addEventListener (
+        addAccessibleEventListener (
             const ::com::sun::star::uno::Reference<
@@ -250,3 +245,3 @@ public:
     virtual void SAL_CALL
-        removeEventListener (
+        removeAccessibleEventListener (
             const ::com::sun::star::uno::Reference<
diff --git a/editeng/inc/editeng/AccessibleEditableTextPara.hxx b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
index d44f9afdf60e..afe3d42a0a1f 100644
--- a/editeng/inc/editeng/AccessibleEditableTextPara.hxx
+++ b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
@@ -85,7 +85,2 @@ namespace accessibility
 
-        // XComponent
-
-        using WeakComponentImplHelperBase::addEventListener;
-        using WeakComponentImplHelperBase::removeEventListener;
-
         // XAccessible
@@ -108,4 +103,4 @@ namespace accessibility
         // XAccessibleEventBroadcaster
-        virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 
diff --git a/editeng/inc/editeng/AccessibleImageBullet.hxx b/editeng/inc/editeng/AccessibleImageBullet.hxx
index 1ceeda395f57..2e5e589fbf1a 100644
--- a/editeng/inc/editeng/AccessibleImageBullet.hxx
+++ b/editeng/inc/editeng/AccessibleImageBullet.hxx
@@ -76,4 +76,4 @@ namespace accessibility
         // XAccessibleEventBroadcaster
-        virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx
index 6e2e3f32d813..8a11762b89b2 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -426,3 +426,3 @@ lang::Locale SAL_CALL
 void SAL_CALL
-    AccessibleContextBase::addEventListener (
+    AccessibleContextBase::addAccessibleEventListener (
         const uno::Reference<XAccessibleEventListener >& rxListener)
@@ -450,3 +450,3 @@ void SAL_CALL
 void SAL_CALL
-    AccessibleContextBase::removeEventListener (
+    AccessibleContextBase::removeAccessibleEventListener (
         const uno::Reference<XAccessibleEventListener >& rxListener )
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index cb8252a4dc1f..602879ed7a9e 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -942,3 +942,3 @@ namespace accessibility
 
-    void SAL_CALL AccessibleEditableTextPara::addEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
+    void SAL_CALL AccessibleEditableTextPara::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
     {
@@ -950,3 +950,3 @@ namespace accessibility
 
-    void SAL_CALL AccessibleEditableTextPara::removeEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
+    void SAL_CALL AccessibleEditableTextPara::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
     {
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 13510126203b..8d97477c9a81 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -211,3 +211,3 @@ namespace accessibility
 
-    void SAL_CALL AccessibleImageBullet::addEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
+    void SAL_CALL AccessibleImageBullet::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
     {
@@ -219,3 +219,3 @@ namespace accessibility
 
-    void SAL_CALL AccessibleImageBullet::removeEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
+    void SAL_CALL AccessibleImageBullet::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
     {
diff --git a/odk/examples/DevelopersGuide/Accessibility/RegistrationThread.java b/odk/examples/DevelopersGuide/Accessibility/RegistrationThread.java
index 3dbb03525830..b6a64e439f38 100644
--- a/odk/examples/DevelopersGuide/Accessibility/RegistrationThread.java
+++ b/odk/examples/DevelopersGuide/Accessibility/RegistrationThread.java
@@ -109,5 +109,5 @@ public class RegistrationThread
                 if (mbRegister)
-                    xBroadcaster.addEventListener (maListener);
+                    xBroadcaster.addAccessibleEventListener (maListener);
                 else
-                    xBroadcaster.removeEventListener (maListener);
+                    xBroadcaster.removeAccessibleEventListener (maListener);
                 nNodeCount += 1;
diff --git a/offapi/com/sun/star/accessibility/AccessBridge.idl b/offapi/com/sun/star/accessibility/AccessBridge.idl
index 32c142aac1a8..44703ed8192f 100644
--- a/offapi/com/sun/star/accessibility/AccessBridge.idl
+++ b/offapi/com/sun/star/accessibility/AccessBridge.idl
@@ -37,3 +37,3 @@ module com { module sun { module star { module accessibility {
 
-published service AccessBridge
+service AccessBridge
 {
diff --git a/offapi/com/sun/star/accessibility/Accessible.idl b/offapi/com/sun/star/accessibility/Accessible.idl
index 14299d49451e..a3b5e5bfc8df 100644
--- a/offapi/com/sun/star/accessibility/Accessible.idl
+++ b/offapi/com/sun/star/accessibility/Accessible.idl
@@ -23,3 +23,3 @@ module com { module sun { module star { module accessibility {
 
- published interface    XAccessible;
+ interface    XAccessible;
 
@@ -40,3 +40,3 @@ module com { module sun { module star { module accessibility {
 */
-published service Accessible
+service Accessible
 {
diff --git a/offapi/com/sun/star/accessibility/AccessibleContext.idl b/offapi/com/sun/star/accessibility/AccessibleContext.idl
index 1bb211eda64d..d9fe07c7f288 100644
--- a/offapi/com/sun/star/accessibility/AccessibleContext.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleContext.idl
@@ -23,4 +23,4 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessibleContext;
- published interface XAccessibleEventBroadcaster;
+ interface XAccessibleContext;
+ interface XAccessibleEventBroadcaster;
 
@@ -43,3 +43,3 @@ module com { module sun { module star { module accessibility {
 */
-published service AccessibleContext
+service AccessibleContext
 {
diff --git a/offapi/com/sun/star/accessibility/AccessibleEventId.idl b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
index 674fd4a7acb4..c5d0bdf5e886 100644
--- a/offapi/com/sun/star/accessibility/AccessibleEventId.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
@@ -36,3 +36,3 @@ module com { module sun { module star { module accessibility {
 */
-published constants AccessibleEventId
+constants AccessibleEventId
 {
diff --git a/offapi/com/sun/star/accessibility/AccessibleEventObject.idl b/offapi/com/sun/star/accessibility/AccessibleEventObject.idl
index 142072d814d8..781a8f1cdf0f 100644
--- a/offapi/com/sun/star/accessibility/AccessibleEventObject.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleEventObject.idl
@@ -33,3 +33,3 @@ module com { module sun { module star { module accessibility {
 */
-published struct AccessibleEventObject: ::com::sun::star::lang::EventObject
+struct AccessibleEventObject: ::com::sun::star::lang::EventObject
 {
diff --git a/offapi/com/sun/star/accessibility/AccessibleRelation.idl b/offapi/com/sun/star/accessibility/AccessibleRelation.idl
index a34b2a2537db..b715abf5675d 100644
--- a/offapi/com/sun/star/accessibility/AccessibleRelation.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleRelation.idl
@@ -33,3 +33,3 @@ module com { module sun { module star { module accessibility {
 */
-published struct AccessibleRelation
+struct AccessibleRelation
 {
diff --git a/offapi/com/sun/star/accessibility/AccessibleRelationType.idl b/offapi/com/sun/star/accessibility/AccessibleRelationType.idl
index de79af0d8c63..32a94afc17dd 100644
--- a/offapi/com/sun/star/accessibility/AccessibleRelationType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleRelationType.idl
@@ -35,3 +35,3 @@ module com { module sun { module star { module accessibility {
 */
-published constants AccessibleRelationType
+constants AccessibleRelationType
 {
diff --git a/offapi/com/sun/star/accessibility/AccessibleRole.idl b/offapi/com/sun/star/accessibility/AccessibleRole.idl
index 096ad0aa1e07..9f57f8f53201 100644
--- a/offapi/com/sun/star/accessibility/AccessibleRole.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleRole.idl
@@ -47,3 +47,3 @@ module com { module sun { module star { module accessibility {
 */
-published constants AccessibleRole
+constants AccessibleRole
 {
diff --git a/offapi/com/sun/star/accessibility/AccessibleStateType.idl b/offapi/com/sun/star/accessibility/AccessibleStateType.idl
index 869f6b037ba7..acf0a302db58 100644
--- a/offapi/com/sun/star/accessibility/AccessibleStateType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleStateType.idl
@@ -39,3 +39,3 @@ module com { module sun { module star { module accessibility {
 */
-published constants AccessibleStateType
+constants AccessibleStateType
 {
diff --git a/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl b/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl
index 73eecb3bc868..c79904340610 100644
--- a/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl
@@ -36,3 +36,3 @@ module com { module sun { module star { module accessibility {
 */
-published struct AccessibleTableModelChange
+struct AccessibleTableModelChange
 {
diff --git a/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl b/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
index 4636981f848c..19536b0e265b 100644
--- a/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
@@ -42,3 +42,3 @@ module com { module sun { module star { module accessibility {
 */
-published constants AccessibleTableModelChangeType
+constants AccessibleTableModelChangeType
 {
diff --git a/offapi/com/sun/star/accessibility/AccessibleTextType.idl b/offapi/com/sun/star/accessibility/AccessibleTextType.idl
index a61f178c58a1..7bad07cd62c9 100644
--- a/offapi/com/sun/star/accessibility/AccessibleTextType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleTextType.idl
@@ -33,3 +33,3 @@ module com { module sun { module star { module accessibility {
 */
-published constants AccessibleTextType
+constants AccessibleTextType
 {
diff --git a/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl b/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl
index 1dc6a3577562..adb597f9d036 100644
--- a/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl
+++ b/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl
@@ -36,3 +36,3 @@ module com {  module sun {  module star {  module accessibility {
 */
-published exception IllegalAccessibleComponentStateException
+exception IllegalAccessibleComponentStateException
     : ::com::sun::star::uno::Exception
diff --git a/offapi/com/sun/star/accessibility/TextSegment.idl b/offapi/com/sun/star/accessibility/TextSegment.idl
index 8d1182b6e154..49630e02b61f 100644
--- a/offapi/com/sun/star/accessibility/TextSegment.idl
+++ b/offapi/com/sun/star/accessibility/TextSegment.idl
@@ -53,3 +53,3 @@ module com { module sun { module star { module accessibility {
 
-published struct TextSegment
+struct TextSegment
 {
diff --git a/offapi/com/sun/star/accessibility/XAccessible.idl b/offapi/com/sun/star/accessibility/XAccessible.idl
index 6e28d70de902..a738d2b73b04 100644
--- a/offapi/com/sun/star/accessibility/XAccessible.idl
+++ b/offapi/com/sun/star/accessibility/XAccessible.idl
@@ -26,3 +26,3 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessibleContext;
+ interface XAccessibleContext;
 
@@ -53,3 +53,3 @@ module com { module sun { module star { module accessibility {
 */
-published interface XAccessible : ::com::sun::star::uno::XInterface
+interface XAccessible : ::com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleAction.idl b/offapi/com/sun/star/accessibility/XAccessibleAction.idl
index 706658fe40f8..de46557196ca 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleAction.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleAction.idl
@@ -27,3 +27,3 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessibleKeyBinding;
+ interface XAccessibleKeyBinding;
 
@@ -39,3 +39,3 @@ module com { module sun { module star { module accessibility {
 */
-published interface XAccessibleAction : ::com::sun::star::uno::XInterface
+interface XAccessibleAction : ::com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleComponent.idl b/offapi/com/sun/star/accessibility/XAccessibleComponent.idl
index d2d2414ac332..7d851c63fcc0 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleComponent.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleComponent.idl
@@ -33,3 +33,3 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessible;
+ interface XAccessible;
 
@@ -78,3 +78,3 @@ module com { module sun { module star { module accessibility {
 */
-published interface XAccessibleComponent : ::com::sun::star::uno::XInterface
+interface XAccessibleComponent : ::com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleContext.idl b/offapi/com/sun/star/accessibility/XAccessibleContext.idl
index 8ead5b1251fe..3ed97715b60e 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleContext.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleContext.idl
@@ -29,6 +29,6 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessible;
- published interface XAccessibleRelationSet;
- published interface XAccessibleSelection;
- published interface XAccessibleStateSet;
+ interface XAccessible;
+ interface XAccessibleRelationSet;
+ interface XAccessibleSelection;
+ interface XAccessibleStateSet;
 
@@ -48,3 +48,3 @@ module com { module sun { module star { module accessibility {
 */
-published interface XAccessibleContext : ::com::sun::star::uno::XInterface
+interface XAccessibleContext : ::com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl b/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl
index 5eb80364a8cf..ccfbba3fa2f7 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl
@@ -37,3 +37,3 @@ module com { module sun { module star { module accessibility {
 */
-published interface XAccessibleEditableText
+interface XAccessibleEditableText
     : ::com::sun::star::accessibility::XAccessibleText
diff --git a/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl b/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl
index cce170fba06e..4889191620f3 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl
@@ -26,3 +26,3 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessibleEventListener;
+ interface XAccessibleEventListener;
 
@@ -36,3 +36,3 @@ module com { module sun { module star { module accessibility {
  */
-published interface XAccessibleEventBroadcaster: ::com::sun::star::uno::XInterface
+interface XAccessibleEventBroadcaster: ::com::sun::star::uno::XInterface
 {
@@ -41,3 +41,3 @@ published interface XAccessibleEventBroadcaster: ::com::sun::star::uno::XInterfa
      */
-    [oneway] void addEventListener( [in] XAccessibleEventListener xListener );
+    [oneway] void addAccessibleEventListener( [in] XAccessibleEventListener xListener );
 
@@ -46,3 +46,3 @@ published interface XAccessibleEventBroadcaster: ::com::sun::star::uno::XInterfa
      */
-    [oneway] void removeEventListener( [in] XAccessibleEventListener xListener );
+    [oneway] void removeAccessibleEventListener( [in] XAccessibleEventListener xListener );
 };
diff --git a/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl b/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl
index be38ec0f1bea..396c504bbf4d 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl
@@ -34,3 +34,3 @@ module com { module sun { module star { module accessibility {
  */
-published interface XAccessibleEventListener: ::com::sun::star::lang::XEventListener
+interface XAccessibleEventListener: ::com::sun::star::lang::XEventListener
 {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl b/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
index 85bfb00fb158..00762e053b62 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
@@ -49,3 +49,3 @@ module com { module sun { module star { module accessibility {
 */
-published interface XAccessibleExtendedComponent : XAccessibleComponent
+interface XAccessibleExtendedComponent : XAccessibleComponent
 {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl b/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl
index 9b5612070b1d..e095eb4c6fea 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl
@@ -49,3 +49,3 @@ module com { module sun { module star { module accessibility {
 */
-published interface XAccessibleHyperlink :
+interface XAccessibleHyperlink :
     ::com::sun::star::accessibility::XAccessibleAction
diff --git a/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl b/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl
index 547934d6465c..92707d3178fb 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl
@@ -28,3 +28,3 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessibleHyperlink;
+ interface XAccessibleHyperlink;
 
@@ -45,3 +45,3 @@ module com { module sun { module star { module accessibility {
 */
-published interface XAccessibleHypertext
+interface XAccessibleHypertext
     : ::com::sun::star::accessibility::XAccessibleText
diff --git a/offapi/com/sun/star/accessibility/XAccessibleImage.idl b/offapi/com/sun/star/accessibility/XAccessibleImage.idl
index 6f503c50d832..b63d182fb66a 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleImage.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleImage.idl
@@ -35,3 +35,3 @@ module com { module sun { module star { module accessibility {
 */
-published interface XAccessibleImage : ::com::sun::star::uno::XInterface
+interface XAccessibleImage : ::com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl b/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl
index 7196a99e2e0e..8b374aba1d21 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl
@@ -43,3 +43,3 @@ module com { module sun { module star { module accessibility {
 */
-published interface XAccessibleKeyBinding : ::com::sun::star::uno::XInterface
+interface XAccessibleKeyBinding : ::com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl b/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl
index 59f8f824bf5f..02fbd70bd51a 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl
@@ -42,3 +42,3 @@ module com { module sun { module star { module accessibility {
 */
-published interface XAccessibleRelationSet : ::com::sun::star::uno::XInterface
+interface XAccessibleRelationSet : ::com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleSelection.idl b/offapi/com/sun/star/accessibility/XAccessibleSelection.idl
index 572659f9a2c6..032a5170b369 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleSelection.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleSelection.idl
@@ -27,3 +27,3 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessible;
+ interface XAccessible;
 
@@ -44,3 +44,3 @@ module com { module sun { module star { module accessibility {
 */
-published interface XAccessibleSelection : ::com::sun::star::uno::XInterface
+interface XAccessibleSelection : ::com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl b/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl
index 41eaed202097..170f4e1e9391 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl
@@ -27,3 +27,3 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessible;
+ interface XAccessible;
 
@@ -38,3 +38,3 @@ module com { module sun { module star { module accessibility {
 */
-published interface XAccessibleStateSet : ::com::sun::star::uno::XInterface
+interface XAccessibleStateSet : ::com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleTable.idl b/offapi/com/sun/star/accessibility/XAccessibleTable.idl
index f0ecf7991797..221c92bbd7c4 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleTable.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleTable.idl
@@ -27,3 +27,3 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessible;
+ interface XAccessible;
 
@@ -56,3 +56,3 @@ module com { module sun { module star { module accessibility {
 */
-published interface XAccessibleTable : ::com::sun::star::uno::XInterface
+interface XAccessibleTable : ::com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleText.idl b/offapi/com/sun/star/accessibility/XAccessibleText.idl
index 04ac8009d41d..c020d518d078 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleText.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleText.idl
@@ -58,3 +58,3 @@ module com { module sun { module star { module accessibility {
 */
-published interface XAccessibleText : ::com::sun::star::uno::XInterface
+interface XAccessibleText : ::com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl b/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl
index 19efafd75c0f..b7c30d9a945d 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl
@@ -31,3 +31,3 @@ module com { module sun { module star { module accessibility {
 */
-published interface XAccessibleTextAttributes
+interface XAccessibleTextAttributes
 {
diff --git a/offapi/com/sun/star/accessibility/XAccessibleValue.idl b/offapi/com/sun/star/accessibility/XAccessibleValue.idl
index 2b1db5a6ca00..9d752c88852c 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleValue.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleValue.idl
@@ -35,3 +35,3 @@ module com { module sun { module star { module accessibility {
 */
-published interface XAccessibleValue : ::com::sun::star::uno::XInterface
+interface XAccessibleValue : ::com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/awt/AccessibleButton.idl b/offapi/com/sun/star/awt/AccessibleButton.idl
index 30d9372bbd61..0e9a0c93651b 100644
--- a/offapi/com/sun/star/awt/AccessibleButton.idl
+++ b/offapi/com/sun/star/awt/AccessibleButton.idl
@@ -36,3 +36,3 @@ module com { module sun { module star { module awt {
  */
-published service AccessibleButton
+service AccessibleButton
 {
diff --git a/offapi/com/sun/star/awt/AccessibleCheckBox.idl b/offapi/com/sun/star/awt/AccessibleCheckBox.idl
index 727e50fdad36..506f3da4022c 100644
--- a/offapi/com/sun/star/awt/AccessibleCheckBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleCheckBox.idl
@@ -36,3 +36,3 @@ module com { module sun { module star { module awt {
  */
-published service AccessibleCheckBox
+service AccessibleCheckBox
 {
diff --git a/offapi/com/sun/star/awt/AccessibleComboBox.idl b/offapi/com/sun/star/awt/AccessibleComboBox.idl
index 10c22dffaedc..735d3d43aa34 100644
--- a/offapi/com/sun/star/awt/AccessibleComboBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleComboBox.idl
@@ -26,5 +26,5 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessibleText;
- published interface XAccessibleExtendedComponent;
- published interface XAccessibleComponent;
+ interface XAccessibleText;
+ interface XAccessibleExtendedComponent;
+ interface XAccessibleComponent;
 
@@ -41,3 +41,3 @@ module com { module sun { module star { module awt {
 */
-published service AccessibleComboBox
+service AccessibleComboBox
 {
diff --git a/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl b/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
index c4e59e152c52..9d1173d6bdf9 100644
--- a/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
@@ -27,5 +27,5 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessibleAction;
- published interface XAccessibleExtendedComponent;
- published interface XAccessibleComponent;
+ interface XAccessibleAction;
+ interface XAccessibleExtendedComponent;
+ interface XAccessibleComponent;
 
@@ -45,3 +45,3 @@ module com { module sun { module star { module awt {
 */
-published service AccessibleDropDownComboBox
+service AccessibleDropDownComboBox
 {
diff --git a/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl b/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
index 7af54c572fed..f6609c4c3ba0 100644
--- a/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
@@ -27,5 +27,5 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessibleAction;
- published interface XAccessibleExtendedComponent;
- published interface XAccessibleComponent;
+ interface XAccessibleAction;
+ interface XAccessibleExtendedComponent;
+ interface XAccessibleComponent;
 
@@ -46,3 +46,3 @@ module com { module sun { module star { module awt {
 */
-published service AccessibleDropDownListBox
+service AccessibleDropDownListBox
 {
diff --git a/offapi/com/sun/star/awt/AccessibleEdit.idl b/offapi/com/sun/star/awt/AccessibleEdit.idl
index 82653cbbf90d..62386522af7b 100644
--- a/offapi/com/sun/star/awt/AccessibleEdit.idl
+++ b/offapi/com/sun/star/awt/AccessibleEdit.idl
@@ -35,3 +35,3 @@ module com { module sun { module star { module awt {
  */
-published service AccessibleEdit
+service AccessibleEdit
 {
diff --git a/offapi/com/sun/star/awt/AccessibleFixedText.idl b/offapi/com/sun/star/awt/AccessibleFixedText.idl
index 582c96dc620c..410dba17c882 100644
--- a/offapi/com/sun/star/awt/AccessibleFixedText.idl
+++ b/offapi/com/sun/star/awt/AccessibleFixedText.idl
@@ -34,3 +34,3 @@ module com { module sun { module star { module awt {
  */
-published service AccessibleFixedText
+service AccessibleFixedText
 {
diff --git a/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl b/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
index 4f793d6295c9..0e1125eaacca 100644
--- a/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
+++ b/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
@@ -27,4 +27,4 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessibleSelection;
- published interface XAccessibleComponent;
+ interface XAccessibleSelection;
+ interface XAccessibleComponent;
 
@@ -41,3 +41,3 @@ module com { module sun { module star { module awt {
 */
-published service AccessibleIconChoiceControl
+service AccessibleIconChoiceControl
 {
diff --git a/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl b/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
index a2684c291db1..fcc1b62c12a7 100644
--- a/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
+++ b/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
@@ -27,4 +27,4 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessibleText;
- published interface XAccessibleComponent;
+ interface XAccessibleText;
+ interface XAccessibleComponent;
 
@@ -43,3 +43,3 @@ module com { module sun { module star { module awt {
 */
-published service AccessibleIconChoiceControlEntry
+service AccessibleIconChoiceControlEntry
 {
diff --git a/offapi/com/sun/star/awt/AccessibleList.idl b/offapi/com/sun/star/awt/AccessibleList.idl
index 249a3b880c05..ac9117a3d7aa 100644
--- a/offapi/com/sun/star/awt/AccessibleList.idl
+++ b/offapi/com/sun/star/awt/AccessibleList.idl
@@ -26,6 +26,6 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessible;
- published interface XAccessibleExtendedComponent;
- published interface XAccessibleComponent;
- published interface XAccessibleSelection;
+ interface XAccessible;
+ interface XAccessibleExtendedComponent;
+ interface XAccessibleComponent;
+ interface XAccessibleSelection;
 
@@ -48,3 +48,3 @@ module com { module sun { module star { module awt {
 */
-published service AccessibleList
+service AccessibleList
 {
diff --git a/offapi/com/sun/star/awt/AccessibleListBox.idl b/offapi/com/sun/star/awt/AccessibleListBox.idl
index 04e39e96742d..6e6e4bd28a73 100644
--- a/offapi/com/sun/star/awt/AccessibleListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleListBox.idl
@@ -26,5 +26,5 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessibleSelection;
- published interface XAccessibleExtendedComponent;
- published interface XAccessibleComponent;
+ interface XAccessibleSelection;
+ interface XAccessibleExtendedComponent;
+ interface XAccessibleComponent;
 
@@ -42,3 +42,3 @@ module com { module sun { module star { module awt {
 */
-published service AccessibleListBox
+service AccessibleListBox
 {
diff --git a/offapi/com/sun/star/awt/AccessibleListBoxList.idl b/offapi/com/sun/star/awt/AccessibleListBoxList.idl
index a7e2eea7aece..f178cf046908 100644
--- a/offapi/com/sun/star/awt/AccessibleListBoxList.idl
+++ b/offapi/com/sun/star/awt/AccessibleListBoxList.idl
@@ -34,3 +34,3 @@ module com { module sun { module star { module awt {
 */
-published service AccessibleListBoxList
+service AccessibleListBoxList
 {
diff --git a/offapi/com/sun/star/awt/AccessibleListItem.idl b/offapi/com/sun/star/awt/AccessibleListItem.idl
index b786be8968b1..269ddc8f8861 100644
--- a/offapi/com/sun/star/awt/AccessibleListItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleListItem.idl
@@ -27,4 +27,4 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessibleText;
- published interface XAccessibleComponent;
+ interface XAccessibleText;
+ interface XAccessibleComponent;
 
@@ -42,3 +42,3 @@ module com { module sun { module star { module awt {
 */
-published service AccessibleListItem
+service AccessibleListItem
 {
diff --git a/offapi/com/sun/star/awt/AccessibleMenu.idl b/offapi/com/sun/star/awt/AccessibleMenu.idl
index 2d90e51b083c..41c1f42a0ad0 100644
--- a/offapi/com/sun/star/awt/AccessibleMenu.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenu.idl
@@ -37,3 +37,3 @@ module com { module sun { module star { module awt {
  */
-published service AccessibleMenu
+service AccessibleMenu
 {
diff --git a/offapi/com/sun/star/awt/AccessibleMenuBar.idl b/offapi/com/sun/star/awt/AccessibleMenuBar.idl
index 93c48dd9ddf3..aab1b853ed2a 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuBar.idl
@@ -34,3 +34,3 @@ module com { module sun { module star { module awt {
  */
-published service AccessibleMenuBar
+service AccessibleMenuBar
 {
diff --git a/offapi/com/sun/star/awt/AccessibleMenuItem.idl b/offapi/com/sun/star/awt/AccessibleMenuItem.idl
index 5cb94581048d..1a50da348856 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuItem.idl
@@ -36,3 +36,3 @@ module com { module sun { module star { module awt {
  */
-published service AccessibleMenuItem
+service AccessibleMenuItem
 {
diff --git a/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl b/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
index 906bda368dfa..39b146f686b2 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
@@ -33,3 +33,3 @@ module com { module sun { module star { module awt {
  */
-published service AccessibleMenuSeparator
+service AccessibleMenuSeparator
 {
diff --git a/offapi/com/sun/star/awt/AccessiblePopupMenu.idl b/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
index 46b74c535549..3cc7e3c11b00 100644
--- a/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
+++ b/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
@@ -34,3 +34,3 @@ module com { module sun { module star { module awt {
  */
-published service AccessiblePopupMenu
+service AccessiblePopupMenu
 {
diff --git a/offapi/com/sun/star/awt/AccessibleRadioButton.idl b/offapi/com/sun/star/awt/AccessibleRadioButton.idl
index 3d1f198b8f9d..8830a6f47139 100644
--- a/offapi/com/sun/star/awt/AccessibleRadioButton.idl
+++ b/offapi/com/sun/star/awt/AccessibleRadioButton.idl
@@ -36,3 +36,3 @@ module com { module sun { module star { module awt {
  */
-published service AccessibleRadioButton
+service AccessibleRadioButton
 {
diff --git a/offapi/com/sun/star/awt/AccessibleScrollBar.idl b/offapi/com/sun/star/awt/AccessibleScrollBar.idl
index 7f230084d496..ab35922024df 100644
--- a/offapi/com/sun/star/awt/AccessibleScrollBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleScrollBar.idl
@@ -35,3 +35,3 @@ module com { module sun { module star { module awt {
  */
-published service AccessibleScrollBar
+service AccessibleScrollBar
 {
diff --git a/offapi/com/sun/star/awt/AccessibleStatusBar.idl b/offapi/com/sun/star/awt/AccessibleStatusBar.idl
index bd1be51541a1..b8f21eefa692 100644
--- a/offapi/com/sun/star/awt/AccessibleStatusBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleStatusBar.idl
@@ -33,3 +33,3 @@ module com { module sun { module star { module awt {
  */
-published service AccessibleStatusBar
+service AccessibleStatusBar
 {
diff --git a/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl b/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
index 18406084b2fb..a87b889665a0 100644
--- a/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
@@ -34,3 +34,3 @@ module com { module sun { module star { module awt {
  */
-published service AccessibleStatusBarItem
+service AccessibleStatusBarItem
 {
diff --git a/offapi/com/sun/star/awt/AccessibleTabBar.idl b/offapi/com/sun/star/awt/AccessibleTabBar.idl
index fee3bcbfda9f..962b6f40b0e5 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBar.idl
@@ -33,3 +33,3 @@ module com { module sun { module star { module awt {
  */
-published service AccessibleTabBar
+service AccessibleTabBar
 {
diff --git a/offapi/com/sun/star/awt/AccessibleTabBarPage.idl b/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
index c6051cf636e1..807f5713bfae 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
@@ -33,3 +33,3 @@ module com { module sun { module star { module awt {
  */
-published service AccessibleTabBarPage
+service AccessibleTabBarPage
 {
diff --git a/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl b/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
index efe4407496e9..8adcd5b5826c 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
@@ -34,3 +34,3 @@ module com { module sun { module star { module awt {
  */
-published service AccessibleTabBarPageList
+service AccessibleTabBarPageList
 {
diff --git a/offapi/com/sun/star/awt/AccessibleTabControl.idl b/offapi/com/sun/star/awt/AccessibleTabControl.idl
index e26387798e6f..e77539c2faf3 100644
--- a/offapi/com/sun/star/awt/AccessibleTabControl.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabControl.idl
@@ -34,3 +34,3 @@ module com { module sun { module star { module awt {
  */
-published service AccessibleTabControl
+service AccessibleTabControl
 {
diff --git a/offapi/com/sun/star/awt/AccessibleTabPage.idl b/offapi/com/sun/star/awt/AccessibleTabPage.idl
index 8b793e6887d6..1d4d54355479 100644
--- a/offapi/com/sun/star/awt/AccessibleTabPage.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabPage.idl
@@ -34,3 +34,3 @@ module com { module sun { module star { module awt {
  */
-published service AccessibleTabPage
+service AccessibleTabPage
 {
diff --git a/offapi/com/sun/star/awt/AccessibleTextField.idl b/offapi/com/sun/star/awt/AccessibleTextField.idl
index ea3868b7aa39..0e5f90e5ff33 100644
--- a/offapi/com/sun/star/awt/AccessibleTextField.idl
+++ b/offapi/com/sun/star/awt/AccessibleTextField.idl
@@ -27,5 +27,5 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessibleExtendedComponent;
- published interface XAccessibleComponent;
- published interface XAccessibleText;
+ interface XAccessibleExtendedComponent;
+ interface XAccessibleComponent;
+ interface XAccessibleText;
 
@@ -46,3 +46,3 @@ module com { module sun { module star { module awt {
 */
-published service AccessibleTextField
+service AccessibleTextField
 {
diff --git a/offapi/com/sun/star/awt/AccessibleToolBox.idl b/offapi/com/sun/star/awt/AccessibleToolBox.idl
index 514408fc482f..9cc3a463340e 100644
--- a/offapi/com/sun/star/awt/AccessibleToolBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleToolBox.idl
@@ -27,4 +27,4 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessibleExtendedComponent;
- published interface XAccessibleComponent;
+ interface XAccessibleExtendedComponent;
+ interface XAccessibleComponent;
 
@@ -44,3 +44,3 @@ module com { module sun { module star { module awt {
 */
-published service AccessibleToolBox
+service AccessibleToolBox
 {
diff --git a/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl b/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
index 819737d0b4f0..8ddc562bd974 100644
--- a/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
@@ -27,7 +27,7 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessibleAction;
- published interface XAccessibleText;
- published interface XAccessibleValue;
- published interface XAccessibleExtendedComponent;
- published interface XAccessibleComponent;
+ interface XAccessibleAction;
+ interface XAccessibleText;
+ interface XAccessibleValue;
+ interface XAccessibleExtendedComponent;
+ interface XAccessibleComponent;
 
@@ -50,3 +50,3 @@ module com { module sun { module star { module awt {
 */
-published service AccessibleToolBoxItem
+service AccessibleToolBoxItem
 {
diff --git a/offapi/com/sun/star/awt/AccessibleTreeListBox.idl b/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
index f4b7ce8a1d48..42a20c9ef62b 100644
--- a/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
@@ -27,4 +27,4 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessibleSelection;
- published interface XAccessibleComponent;
+ interface XAccessibleSelection;
+ interface XAccessibleComponent;
 
@@ -43,3 +43,3 @@ module com { module sun { module star { module awt {
 */
-published service AccessibleTreeListBox
+service AccessibleTreeListBox
 {
diff --git a/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl b/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
index 66003a98f4da..fba089312440 100644
--- a/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
+++ b/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
@@ -27,6 +27,6 @@ module com { module sun { module star { module accessibility {
 
- published interface XAccessibleAction;
- published interface XAccessibleSelection;
- published interface XAccessibleText;
- published interface XAccessibleComponent;
+ interface XAccessibleAction;
+ interface XAccessibleSelection;
+ interface XAccessibleText;
+ interface XAccessibleComponent;
 
@@ -47,3 +47,3 @@ module com { module sun { module star { module awt {
 */
-published service AccessibleTreeListBoxEntry
+service AccessibleTreeListBoxEntry
 {
diff --git a/offapi/com/sun/star/awt/AccessibleWindow.idl b/offapi/com/sun/star/awt/AccessibleWindow.idl
index 827882deae85..013cc8eaafaf 100644
--- a/offapi/com/sun/star/awt/AccessibleWindow.idl
+++ b/offapi/com/sun/star/awt/AccessibleWindow.idl
@@ -33,3 +33,3 @@ module com { module sun { module star { module awt {
  */
-published service AccessibleWindow
+service AccessibleWindow
 {
diff --git a/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl b/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl
index a5ce5c9d8f56..0c5606d7fed8 100644
--- a/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl
+++ b/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl
@@ -42,3 +42,3 @@ module com {  module sun {  module star {  module chart {
 */
-published service AccessibleChartDocumentView
+service AccessibleChartDocumentView
 {
diff --git a/offapi/com/sun/star/chart/AccessibleChartElement.idl b/offapi/com/sun/star/chart/AccessibleChartElement.idl
index 6de7df1db840..4f140735b567 100644
--- a/offapi/com/sun/star/chart/AccessibleChartElement.idl
+++ b/offapi/com/sun/star/chart/AccessibleChartElement.idl
@@ -49,3 +49,3 @@ module com {  module sun {  module star {  module chart {
 */
-published service AccessibleChartElement
+service AccessibleChartElement
 {
diff --git a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
index 1bc360a306c0..2ca933ee0d48 100644
--- a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
+++ b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
@@ -59,3 +59,3 @@ module com {  module sun {  module star {  module drawing {
 */
-published service AccessibleDrawDocumentView
+service AccessibleDrawDocumentView
 {
diff --git a/offapi/com/sun/star/drawing/AccessibleGraphControl.idl b/offapi/com/sun/star/drawing/AccessibleGraphControl.idl
index 753e18dc813c..e7a31d5d0d9a 100644
--- a/offapi/com/sun/star/drawing/AccessibleGraphControl.idl
+++ b/offapi/com/sun/star/drawing/AccessibleGraphControl.idl
@@ -24,7 +24,7 @@
 module com {  module sun {  module star {  module accessibility {
-          published interface XAccessible;
-          published interface XAccessibleContext;
-          published interface XAccessibleComponent;
-          published interface XAccessibleEventBroadcaster;
-          published interface XAccessibleSelection;
+          interface XAccessible;
+          interface XAccessibleContext;
+          interface XAccessibleComponent;
+          interface XAccessibleEventBroadcaster;
+          interface XAccessibleSelection;
 }; }; }; };
@@ -44,3 +44,3 @@ module com {  module sun {  module star {  module drawing {
  */
-published service AccessibleGraphControl
+service AccessibleGraphControl
 {
diff --git a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl b/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
index f3c5daa1d0b3..6a92e1610569 100644
--- a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
@@ -39,3 +39,3 @@ module com {  module sun {  module star {  module drawing {
 */
-published service AccessibleGraphicShape
+service AccessibleGraphicShape
 {
diff --git a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl b/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
index 5caabb496cd7..b916348f648e 100644
--- a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
@@ -48,3 +48,3 @@ module com {  module sun {  module star {  module drawing {
 */
-published service AccessibleOLEShape
+service AccessibleOLEShape
 {
diff --git a/offapi/com/sun/star/drawing/AccessibleShape.idl b/offapi/com/sun/star/drawing/AccessibleShape.idl
index 109aeca1990e..122bd44e2b57 100644
--- a/offapi/com/sun/star/drawing/AccessibleShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleShape.idl
@@ -58,3 +58,3 @@ module com {  module sun {  module star {  module drawing {
 */
-published service AccessibleShape
+service AccessibleShape
 {
diff --git a/offapi/com/sun/star/drawing/AccessibleSlideView.idl b/offapi/com/sun/star/drawing/AccessibleSlideView.idl
index 7bca79040c85..86a80130194c 100644
--- a/offapi/com/sun/star/drawing/AccessibleSlideView.idl
+++ b/offapi/com/sun/star/drawing/AccessibleSlideView.idl
@@ -37,3 +37,3 @@ module com {  module sun {  module star {  module drawing {
 */
-published service AccessibleSlideView
+service AccessibleSlideView
 {
diff --git a/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl b/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
index c69ce65e8931..96dbaab63b74 100644
--- a/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
+++ b/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
@@ -37,3 +37,3 @@ module com {  module sun {  module star {  module drawing {
 */
-published service AccessibleSlideViewObject
+service AccessibleSlideViewObject
 {
diff --git a/offapi/com/sun/star/formula/AccessibleFormulaText.idl b/offapi/com/sun/star/formula/AccessibleFormulaText.idl
index ffc970f2ddb0..63442788fd2b 100644
--- a/offapi/com/sun/star/formula/AccessibleFormulaText.idl
+++ b/offapi/com/sun/star/formula/AccessibleFormulaText.idl
@@ -35,3 +35,3 @@ module com {  module sun {  module star {  module formula {
  */
-published service AccessibleFormulaText
+service AccessibleFormulaText
 {
diff --git a/offapi/com/sun/star/formula/AccessibleFormulaView.idl b/offapi/com/sun/star/formula/AccessibleFormulaView.idl
index fab335c024d7..39b2460839e2 100644
--- a/offapi/com/sun/star/formula/AccessibleFormulaView.idl
+++ b/offapi/com/sun/star/formula/AccessibleFormulaView.idl
@@ -35,3 +35,3 @@ module com {  module sun {  module star {  module formula {
  */
-published service AccessibleFormulaView
+service AccessibleFormulaView
 {
diff --git a/offapi/com/sun/star/sheet/AccessibleCell.idl b/offapi/com/sun/star/sheet/AccessibleCell.idl
index 09e9ef0f27ab..a830e588f46a 100644
--- a/offapi/com/sun/star/sheet/AccessibleCell.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCell.idl
@@ -36,3 +36,3 @@ module com {  module sun {  module star {  module sheet {
  */
-published service AccessibleCell
+service AccessibleCell
 {
diff --git a/offapi/com/sun/star/sheet/AccessibleCsvCell.idl b/offapi/com/sun/star/sheet/AccessibleCsvCell.idl
index 931cc890a0bb..1cf8c47f6505 100644
--- a/offapi/com/sun/star/sheet/AccessibleCsvCell.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCsvCell.idl
@@ -36,3 +36,3 @@ module com {  module sun {  module star {  module sheet {
  */
-published service AccessibleCsvCell
+service AccessibleCsvCell
 {
diff --git a/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl b/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl
index 81a9efdd5e32..61342b0e8860 100644
--- a/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl
@@ -36,3 +36,3 @@ module com {  module sun {  module star {  module sheet {
  */
-published service AccessibleCsvRuler
+service AccessibleCsvRuler
 {
diff --git a/offapi/com/sun/star/sheet/AccessibleCsvTable.idl b/offapi/com/sun/star/sheet/AccessibleCsvTable.idl
index 42fab0bc77ae..581a6ef92605 100644
--- a/offapi/com/sun/star/sheet/AccessibleCsvTable.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCsvTable.idl
@@ -38,3 +38,3 @@ module com {  module sun {  module star {  module sheet {
  */
-published service AccessibleCsvTable
+service AccessibleCsvTable
 {
diff --git a/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl b/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
index 6d68c01a3257..76c39b1d37dc 100644
--- a/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
+++ b/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
@@ -34,3 +34,3 @@ module com {  module sun {  module star {  module sheet {
  */
-published service AccessiblePageHeaderFooterAreasView
+service AccessiblePageHeaderFooterAreasView
 {
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
index dec6b2793c01..e4a3bfe9ed40 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
@@ -35,3 +35,3 @@ module com {  module sun {  module star {  module sheet {
 */
-published service AccessibleSpreadsheet
+service AccessibleSpreadsheet
 {
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
index 22db4e808be1..39e22ce3a88d 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
@@ -35,3 +35,3 @@ module com {  module sun {  module star {  module sheet {
  */
-published service AccessibleSpreadsheetDocumentView
+service AccessibleSpreadsheetDocumentView
 {
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
index dc117323ac62..29a065010ee4 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
@@ -34,3 +34,3 @@ module com {  module sun {  module star {  module sheet {
  */
-published service AccessibleSpreadsheetPageView
+service AccessibleSpreadsheetPageView
 {
diff --git a/offapi/com/sun/star/table/AccessibleCellView.idl b/offapi/com/sun/star/table/AccessibleCellView.idl
index d93de2206f19..1d7d5ade6ce1 100644
--- a/offapi/com/sun/star/table/AccessibleCellView.idl
+++ b/offapi/com/sun/star/table/AccessibleCellView.idl
@@ -39,3 +39,3 @@ module com {  module sun {  module star {  module table {
 */
-published service AccessibleCellView
+service AccessibleCellView
 {
diff --git a/offapi/com/sun/star/table/AccessibleTableView.idl b/offapi/com/sun/star/table/AccessibleTableView.idl
index 9cb6d55e32f5..06fe6ca88737 100644
--- a/offapi/com/sun/star/table/AccessibleTableView.idl
+++ b/offapi/com/sun/star/table/AccessibleTableView.idl
@@ -38,3 +38,3 @@ module com {  module sun {  module star {  module table {
 */
-published service AccessibleTableView
+service AccessibleTableView
 {
diff --git a/offapi/com/sun/star/text/AccessibleEndnoteView.idl b/offapi/com/sun/star/text/AccessibleEndnoteView.idl
index 085ba7e017d3..55ef2e24af46 100644
--- a/offapi/com/sun/star/text/AccessibleEndnoteView.idl
+++ b/offapi/com/sun/star/text/AccessibleEndnoteView.idl
@@ -33,3 +33,3 @@ module com {  module sun {  module star {  module text {
  */
-published service AccessibleEndnoteView
+service AccessibleEndnoteView
 {
diff --git a/offapi/com/sun/star/text/AccessibleFootnoteView.idl b/offapi/com/sun/star/text/AccessibleFootnoteView.idl
index b453d25fb284..1846463a78b2 100644
--- a/offapi/com/sun/star/text/AccessibleFootnoteView.idl
+++ b/offapi/com/sun/star/text/AccessibleFootnoteView.idl
@@ -35,3 +35,3 @@ module com {  module sun {  module star {  module text {
  */
-published service AccessibleFootnoteView
+service AccessibleFootnoteView
 {
diff --git a/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl b/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl
index 265839d630f0..466a902b0127 100644
--- a/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl
+++ b/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl
@@ -35,3 +35,3 @@ module com {  module sun {  module star {  module text {
  */
-published service AccessibleHeaderFooterView
+service AccessibleHeaderFooterView
 {
diff --git a/offapi/com/sun/star/text/AccessiblePageView.idl b/offapi/com/sun/star/text/AccessiblePageView.idl
index c0bfb8f1c06d..d03e245c1eb0 100644
--- a/offapi/com/sun/star/text/AccessiblePageView.idl
+++ b/offapi/com/sun/star/text/AccessiblePageView.idl
@@ -35,3 +35,3 @@ module com {  module sun {  module star {  module text {
  */
-published service AccessiblePageView
+service AccessiblePageView
 {
diff --git a/offapi/com/sun/star/text/AccessibleParagraphView.idl b/offapi/com/sun/star/text/AccessibleParagraphView.idl
index 48ad37c7595e..cd2c4c96fdda 100644
--- a/offapi/com/sun/star/text/AccessibleParagraphView.idl
+++ b/offapi/com/sun/star/text/AccessibleParagraphView.idl
@@ -36,3 +36,3 @@ module com {  module sun {  module star {  module text {
  */
-published service AccessibleParagraphView
+service AccessibleParagraphView
 {
diff --git a/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl b/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl
index 56b29d5550b9..eaf38e1766d6 100644
--- a/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl
+++ b/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl
@@ -35,3 +35,3 @@ module com {  module sun {  module star {  module text {
  */
-published service AccessibleTextDocumentPageView
+service AccessibleTextDocumentPageView
 {
diff --git a/offapi/com/sun/star/text/AccessibleTextDocumentView.idl b/offapi/com/sun/star/text/AccessibleTextDocumentView.idl
index 7920e1d23422..3415f9300213 100644
--- a/offapi/com/sun/star/text/AccessibleTextDocumentView.idl
+++ b/offapi/com/sun/star/text/AccessibleTextDocumentView.idl
@@ -35,3 +35,3 @@ module com {  module sun {  module star {  module text {
  */
-published service AccessibleTextDocumentView
+service AccessibleTextDocumentView
 {
diff --git a/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl b/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
index 62dcd272a956..940f969c6e5b 100644
--- a/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
+++ b/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
@@ -40,3 +40,3 @@ module com {  module sun {  module star {  module text {
  */
-published service AccessibleTextEmbeddedObject
+service AccessibleTextEmbeddedObject
 {
diff --git a/offapi/com/sun/star/text/AccessibleTextFrameView.idl b/offapi/com/sun/star/text/AccessibleTextFrameView.idl
index 8aeab7d0a56c..b2c7da8872e3 100644
--- a/offapi/com/sun/star/text/AccessibleTextFrameView.idl
+++ b/offapi/com/sun/star/text/AccessibleTextFrameView.idl
@@ -35,3 +35,3 @@ module com {  module sun {  module star {  module text {
  */
-published service AccessibleTextFrameView
+service AccessibleTextFrameView
 {
diff --git a/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl b/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
index b5f17ccf718a..abd99b0f7840 100644
--- a/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
+++ b/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
@@ -35,3 +35,3 @@ module com {  module sun {  module star {  module text {
  */
-published service AccessibleTextGraphicObject
+service AccessibleTextGraphicObject
 {
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index e792d9962e7e..72b4d588791e 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java
index e4c41d9f1efe..1c345dd51542 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java
@@ -37,4 +37,4 @@ import com.sun.star.uno.UnoRuntime;
  * <ul>
- *  <li><code> addEventListener()</code></li>
- *  <li><code> removeEventListener()</code></li>
+ *  <li><code> addAccessibleEventListener()</code></li>
+ *  <li><code> removeAccessibleEventListener()</code></li>
  * </ul> <p>
@@ -110,3 +110,3 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest {
         log.println("adding listener");
-        oObj.addEventListener(list);
+        oObj.addAccessibleEventListener(list);
         boolean isTransient = chkTransient(tEnv.getTestObject());
@@ -130,3 +130,3 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest {
             }
-            oObj.removeEventListener(list);
+            oObj.removeAccessibleEventListener(list);
         }
@@ -159,3 +159,3 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest {
         log.println("remove listener");
-        oObj.removeEventListener(list);
+        oObj.removeAccessibleEventListener(list);
 
diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx
index a73842e53cbb..339eadbd1635 100644
--- a/sc/inc/AccessibleFilterMenu.hxx
+++ b/sc/inc/AccessibleFilterMenu.hxx
@@ -93,8 +93,4 @@ public:
     // XAccessibleEventBroadcaster
-
-    using ScAccessibleContextBase::addEventListener;
-    using ScAccessibleContextBase::removeEventListener;
-
     virtual void SAL_CALL
-        addEventListener(
+        addAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
@@ -105,3 +101,3 @@ public:
     virtual void SAL_CALL
-        removeEventListener(
+        removeAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index 1245ed9dbe08..751bc70d517a 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -88,3 +88,3 @@ void ScAccessibleContextBase::Init()
         if (xBroadcaster.is())
-            xBroadcaster->addEventListener(this);
+            xBroadcaster->addAccessibleEventListener(this);
     }
@@ -113,3 +113,3 @@ void SAL_CALL ScAccessibleContextBase::disposing()
         if (xBroadcaster.is())
-            xBroadcaster->removeEventListener(this);
+            xBroadcaster->removeAccessibleEventListener(this);
         mxParent = NULL;
@@ -414,3 +414,3 @@ lang::Locale SAL_CALL
 void SAL_CALL
-       ScAccessibleContextBase::addEventListener(
+       ScAccessibleContextBase::addAccessibleEventListener(
            const uno::Reference<XAccessibleEventListener>& xListener)
@@ -432,3 +432,3 @@ void SAL_CALL
 void SAL_CALL
-       ScAccessibleContextBase::removeEventListener(
+       ScAccessibleContextBase::removeAccessibleEventListener(
         const uno::Reference<XAccessibleEventListener>& xListener)
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index 553f29374bfc..3232fe897cba 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -258,3 +258,3 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
 void SAL_CALL
-    ScAccessibleEditObject::addEventListener(const uno::Reference<XAccessibleEventListener>& xListener)
+    ScAccessibleEditObject::addAccessibleEventListener(const uno::Reference<XAccessibleEventListener>& xListener)
         throw (uno::RuntimeException)
@@ -266,3 +266,3 @@ void SAL_CALL
 
-    ScAccessibleContextBase::addEventListener(xListener);
+    ScAccessibleContextBase::addAccessibleEventListener(xListener);
 }
@@ -270,3 +270,3 @@ void SAL_CALL
 void SAL_CALL
-    ScAccessibleEditObject::removeEventListener(const uno::Reference<XAccessibleEventListener>& xListener)
+    ScAccessibleEditObject::removeAccessibleEventListener(const uno::Reference<XAccessibleEventListener>& xListener)
         throw (uno::RuntimeException)
@@ -278,3 +278,3 @@ void SAL_CALL
 
-    ScAccessibleContextBase::removeEventListener(xListener);
+    ScAccessibleContextBase::removeAccessibleEventListener(xListener);
 }
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
index 860760b062f6..dfa54ec017ea 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
@@ -82,5 +82,5 @@ public:
             if (mbAdd)
-                xBc->addEventListener(mxListener);
+                xBc->addAccessibleEventListener(mxListener);
             else
-                xBc->removeEventListener(mxListener);
+                xBc->removeAccessibleEventListener(mxListener);
         }
@@ -176,3 +176,3 @@ OUString ScAccessibleFilterMenu::getImplementationName()
 
-void ScAccessibleFilterMenu::addEventListener(
+void ScAccessibleFilterMenu::addAccessibleEventListener(
         const ::com::sun::star::uno::Reference<
@@ -181,3 +181,3 @@ void ScAccessibleFilterMenu::addEventListener(
 {
-    ScAccessibleContextBase::addEventListener(xListener);
+    ScAccessibleContextBase::addAccessibleEventListener(xListener);
     for_each(maMenuItems.begin(), maMenuItems.end(), AddRemoveEventListener(xListener, true));
@@ -185,3 +185,3 @@ void ScAccessibleFilterMenu::addEventListener(
 
-void ScAccessibleFilterMenu::removeEventListener(
+void ScAccessibleFilterMenu::removeAccessibleEventListener(
         const ::com::sun::star::uno::Reference<
@@ -190,3 +190,3 @@ void ScAccessibleFilterMenu::removeEventListener(
 {
-    ScAccessibleContextBase::removeEventListener(xListener);
+    ScAccessibleContextBase::removeAccessibleEventListener(xListener);
     for_each(maMenuItems.begin(), maMenuItems.end(), AddRemoveEventListener(xListener, false));
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index c86505a1ecbb..3c1cfc16ab79 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -840,3 +840,3 @@ uno::Sequence<sal_Int8> SAL_CALL
 
-void SAL_CALL ScAccessibleSpreadsheet::addEventListener(const uno::Reference<XAccessibleEventListener>& xListener)
+void SAL_CALL ScAccessibleSpreadsheet::addAccessibleEventListener(const uno::Reference<XAccessibleEventListener>& xListener)
         throw (uno::RuntimeException)
@@ -845,3 +845,3 @@ void SAL_CALL ScAccessibleSpreadsheet::addEventListener(const uno::Reference<XAc
     IsObjectValid();
-    ScAccessibleTableBase::addEventListener(xListener);
+    ScAccessibleTableBase::addAccessibleEventListener(xListener);
 
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx
index 0cf0a7451ee8..175264b4bbc2 100644
--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@@ -82,5 +82,2 @@ protected:
 public:
-    using WeakAggComponentImplHelperBase::addEventListener;
-    using WeakAggComponentImplHelperBase::removeEventListener;
-
     ///=====  SfxListener  =====================================================
@@ -206,3 +203,3 @@ public:
     virtual void SAL_CALL
-        addEventListener(
+        addAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
@@ -213,3 +210,3 @@ public:
     virtual void SAL_CALL
-        removeEventListener(
+        removeAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx
index 25faa1aa938e..9b0779e6bb7e 100644
--- a/sc/source/ui/inc/AccessibleEditObject.hxx
+++ b/sc/source/ui/inc/AccessibleEditObject.hxx
@@ -68,4 +68,2 @@ protected:
 public:
-    using ScAccessibleContextBase::addEventListener;
-    using ScAccessibleContextBase::removeEventListener;
     using ScAccessibleContextBase::disposing;
@@ -134,3 +132,3 @@ public:
     virtual void SAL_CALL
-        addEventListener(
+        addAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
@@ -141,3 +139,3 @@ public:
     virtual void SAL_CALL
-        removeEventListener(
+        removeAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
index b0d30744f2a2..d5c7ef198afe 100644
--- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx
+++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
@@ -88,3 +88,2 @@ protected:
 public:
-    using ScAccessibleTableBase::addEventListener;
     using ScAccessibleTableBase::disposing;
@@ -240,3 +239,3 @@ public:
     virtual void SAL_CALL
-        addEventListener(
+        addAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index 198117a12b50..9c066d3ddbbc 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -142,3 +142,3 @@ uno::Reference<XAccessible> SAL_CALL
 
-void SAL_CALL AccessibleOutlineView::addEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
+void SAL_CALL AccessibleOutlineView::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
 {
@@ -149,3 +149,3 @@ void SAL_CALL AccessibleOutlineView::addEventListener( const uno::Reference< XAc
 
-void SAL_CALL AccessibleOutlineView::removeEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
+void SAL_CALL AccessibleOutlineView::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
 {
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index 0b2bde6c83af..1fc462615207 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -296,3 +296,3 @@ lang::Locale SAL_CALL AccessibleSlideSorterObject::getLocale (void)
 
-void SAL_CALL AccessibleSlideSorterObject::addEventListener(
+void SAL_CALL AccessibleSlideSorterObject::addAccessibleEventListener(
     const Reference<XAccessibleEventListener>& rxListener)
@@ -321,3 +321,3 @@ void SAL_CALL AccessibleSlideSorterObject::addEventListener(
 
-void SAL_CALL AccessibleSlideSorterObject::removeEventListener(
+void SAL_CALL AccessibleSlideSorterObject::removeAccessibleEventListener(
     const Reference<XAccessibleEventListener>& rxListener)
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 5b85365c1a77..14ac486a9e07 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -373,3 +373,3 @@ lang::Locale SAL_CALL AccessibleSlideSorterView::getLocale (void)
 
-void SAL_CALL AccessibleSlideSorterView::addEventListener(
+void SAL_CALL AccessibleSlideSorterView::addAccessibleEventListener(
     const Reference<XAccessibleEventListener >& rxListener)
@@ -398,3 +398,3 @@ void SAL_CALL AccessibleSlideSorterView::addEventListener(
 
-void SAL_CALL AccessibleSlideSorterView::removeEventListener(
+void SAL_CALL AccessibleSlideSorterView::removeAccessibleEventListener(
     const Reference<XAccessibleEventListener >& rxListener)
diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
index 5c1a3a80bd68..393e2816dd49 100644
--- a/sd/source/ui/accessibility/AccessibleTreeNode.cxx
+++ b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
@@ -341,3 +341,3 @@ lang::Locale SAL_CALL AccessibleTreeNode::getLocale (void)
 
-void SAL_CALL AccessibleTreeNode::addEventListener(
+void SAL_CALL AccessibleTreeNode::addAccessibleEventListener(
     const Reference<XAccessibleEventListener >& rxListener)
@@ -367,3 +367,3 @@ void SAL_CALL AccessibleTreeNode::addEventListener(
 
-void SAL_CALL AccessibleTreeNode::removeEventListener(
+void SAL_CALL AccessibleTreeNode::removeAccessibleEventListener(
     const Reference<XAccessibleEventListener >& rxListener)
diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx
index d22f96bc2249..2b6c115c3290 100644
--- a/sd/source/ui/inc/AccessibleOutlineView.hxx
+++ b/sd/source/ui/inc/AccessibleOutlineView.hxx
@@ -77,3 +77,3 @@ public:
     virtual void SAL_CALL
-        addEventListener (
+        addAccessibleEventListener (
             const ::com::sun::star::uno::Reference<
@@ -83,3 +83,3 @@ public:
     virtual void SAL_CALL
-        removeEventListener (
+        removeAccessibleEventListener (
             const ::com::sun::star::uno::Reference<
@@ -88,5 +88,2 @@ public:
 
-    using cppu::WeakComponentImplHelperBase::addEventListener;
-    using cppu::WeakComponentImplHelperBase::removeEventListener;
-
     //=====  XServiceInfo  ====================================================
diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
index 8cbad3ac83b7..22f516e3a6fe 100644
--- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
+++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
@@ -107,3 +107,3 @@ public:
     virtual void SAL_CALL
-        addEventListener(
+        addAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
@@ -113,3 +113,3 @@ public:
     virtual void SAL_CALL
-        removeEventListener(
+        removeAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
index b5b7f4144835..aa38601a4944 100644
--- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx
+++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
@@ -112,3 +112,3 @@ public:
     virtual void SAL_CALL
-        addEventListener(
+        addAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
@@ -118,3 +118,3 @@ public:
     virtual void SAL_CALL
-        removeEventListener(
+        removeAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
diff --git a/sd/source/ui/inc/AccessibleTreeNode.hxx b/sd/source/ui/inc/AccessibleTreeNode.hxx
index e28f037b387a..25925fb94bf5 100644
--- a/sd/source/ui/inc/AccessibleTreeNode.hxx
+++ b/sd/source/ui/inc/AccessibleTreeNode.hxx
@@ -115,3 +115,3 @@ public:
     virtual void SAL_CALL
-        addEventListener(
+        addAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
@@ -121,3 +121,3 @@ public:
     virtual void SAL_CALL
-        removeEventListener(
+        removeAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index b3f8048b05e5..9bf043454a58 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -186,3 +186,3 @@ public:
 
-    virtual void SAL_CALL addEventListener (
+    virtual void SAL_CALL addAccessibleEventListener (
             const cssu::Reference<cssa::XAccessibleEventListener>& rxListener)
@@ -190,3 +190,3 @@ public:
 
-    virtual void SAL_CALL removeEventListener (
+    virtual void SAL_CALL removeAccessibleEventListener (
             const cssu::Reference<cssa::XAccessibleEventListener>& rxListener)
@@ -1107,3 +1107,3 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground (void)
 
-void SAL_CALL PresenterAccessible::AccessibleObject::addEventListener (
+void SAL_CALL PresenterAccessible::AccessibleObject::addAccessibleEventListener (
     const Reference<XAccessibleEventListener>& rxListener)
@@ -1127,3 +1127,3 @@ void SAL_CALL PresenterAccessible::AccessibleObject::addEventListener (
 
-void SAL_CALL PresenterAccessible::AccessibleObject::removeEventListener (
+void SAL_CALL PresenterAccessible::AccessibleObject::removeAccessibleEventListener (
     const Reference<XAccessibleEventListener>& rxListener)
@@ -1311,3 +1311,3 @@ void PresenterAccessible::AccessibleObject::FireAccessibleEvent (
             // already.
-            removeEventListener(*iListener);
+            removeAccessibleEventListener(*iListener);
         }
diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx
index 511ad8a49ac5..904612bd7055 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -288,3 +288,3 @@ lang::Locale SAL_CALL ThumbnailViewAcc::getLocale()
 
-void SAL_CALL ThumbnailViewAcc::addEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
+void SAL_CALL ThumbnailViewAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
     throw (uno::RuntimeException)
@@ -312,3 +312,3 @@ void SAL_CALL ThumbnailViewAcc::addEventListener( const uno::Reference< accessib
 
-void SAL_CALL ThumbnailViewAcc::removeEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
+void SAL_CALL ThumbnailViewAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
     throw (uno::RuntimeException)
@@ -828,3 +828,3 @@ lang::Locale SAL_CALL ThumbnailViewItemAcc::getLocale()
 
-void SAL_CALL ThumbnailViewItemAcc::addEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
+void SAL_CALL ThumbnailViewItemAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
     throw (uno::RuntimeException)
@@ -851,3 +851,3 @@ void SAL_CALL ThumbnailViewItemAcc::addEventListener( const uno::Reference< acce
 
-void SAL_CALL ThumbnailViewItemAcc::removeEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
+void SAL_CALL ThumbnailViewItemAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
     throw (uno::RuntimeException)
diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx
index e29f9876af85..0a1c59935c51 100644
--- a/sfx2/source/control/thumbnailviewacc.hxx
+++ b/sfx2/source/control/thumbnailviewacc.hxx
@@ -99,4 +99,4 @@ public:
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 
@@ -209,4 +209,4 @@ public:
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 1140f6003d1f..d88d4906e808 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -406,3 +406,3 @@ Locale SAL_CALL SmGraphicAccessible::getLocale()
 
-void SAL_CALL SmGraphicAccessible::addEventListener(
+void SAL_CALL SmGraphicAccessible::addAccessibleEventListener(
         const Reference< XAccessibleEventListener >& xListener )
@@ -422,3 +422,3 @@ void SAL_CALL SmGraphicAccessible::addEventListener(
 
-void SAL_CALL SmGraphicAccessible::removeEventListener(
+void SAL_CALL SmGraphicAccessible::removeAccessibleEventListener(
         const Reference< XAccessibleEventListener >& xListener )
@@ -1925,3 +1925,3 @@ Locale SAL_CALL SmEditAccessible::getLocale(  )
 // XAccessibleEventBroadcaster
-void SAL_CALL SmEditAccessible::addEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
+void SAL_CALL SmEditAccessible::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
     throw (RuntimeException)
@@ -1932,3 +1932,3 @@ void SAL_CALL SmEditAccessible::addEventListener( const uno::Reference< XAccessi
 
-void SAL_CALL SmEditAccessible::removeEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
+void SAL_CALL SmEditAccessible::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
     throw (RuntimeException)
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 6a05823e22c1..cac3fdc0a170 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -126,4 +126,4 @@ public:
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 
@@ -378,4 +378,4 @@ public:
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index 4c381bec8448..e193c1e38673 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -303,3 +303,3 @@ Locale SAL_CALL ToolbarMenuAcc::getLocale() throw (IllegalAccessibleComponentSta
 
-void SAL_CALL ToolbarMenuAcc::addEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException)
+void SAL_CALL ToolbarMenuAcc::addAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException)
 {
@@ -328,3 +328,3 @@ void SAL_CALL ToolbarMenuAcc::addEventListener( const Reference< XAccessibleEven
 
-void SAL_CALL ToolbarMenuAcc::removeEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException)
+void SAL_CALL ToolbarMenuAcc::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException)
 {
@@ -812,3 +812,3 @@ Locale SAL_CALL ToolbarMenuEntryAcc::getLocale() throw (IllegalAccessibleCompone
 
-void SAL_CALL ToolbarMenuEntryAcc::addEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException)
+void SAL_CALL ToolbarMenuEntryAcc::addAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException)
 {
@@ -836,3 +836,3 @@ void SAL_CALL ToolbarMenuEntryAcc::addEventListener( const Reference< XAccessibl
 
-void SAL_CALL ToolbarMenuEntryAcc::removeEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException)
+void SAL_CALL ToolbarMenuEntryAcc::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException)
 {
diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx
index cb86fd46702c..163e4cc91436 100644
--- a/svtools/source/control/toolbarmenuimp.hxx
+++ b/svtools/source/control/toolbarmenuimp.hxx
@@ -138,4 +138,4 @@ public:
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 
@@ -226,4 +226,4 @@ public:
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 713f35a92afe..f8a5056aee16 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -357,3 +357,3 @@ lang::Locale SAL_CALL ValueSetAcc::getLocale()
 
-void SAL_CALL ValueSetAcc::addEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
+void SAL_CALL ValueSetAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
     throw (uno::RuntimeException)
@@ -383,3 +383,3 @@ void SAL_CALL ValueSetAcc::addEventListener( const uno::Reference< accessibility
 
-void SAL_CALL ValueSetAcc::removeEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
+void SAL_CALL ValueSetAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
     throw (uno::RuntimeException)
@@ -1024,3 +1024,3 @@ lang::Locale SAL_CALL ValueItemAcc::getLocale()
 
-void SAL_CALL ValueItemAcc::addEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
+void SAL_CALL ValueItemAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
     throw (uno::RuntimeException)
@@ -1049,3 +1049,3 @@ void SAL_CALL ValueItemAcc::addEventListener( const uno::Reference< accessibilit
 
-void SAL_CALL ValueItemAcc::removeEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
+void SAL_CALL ValueItemAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
     throw (uno::RuntimeException)
diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx
index a3a25c6e264a..350c175b1f89 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -130,4 +130,4 @@ public:
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 
@@ -254,4 +254,4 @@ public:
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 
diff --git a/svx/inc/svx/AccessibleShape.hxx b/svx/inc/svx/AccessibleShape.hxx
index 81c4d95045d6..00fe4d679dea 100644
--- a/svx/inc/svx/AccessibleShape.hxx
+++ b/svx/inc/svx/AccessibleShape.hxx
@@ -216,9 +216,2 @@ public:
 
-
-
-    //=====  XComponent  ========================================================
-
-    using WeakComponentImplHelperBase::addEventListener;
-    using WeakComponentImplHelperBase::removeEventListener;
-
     //=====  XAccessibleEventBroadcaster  =====================================
@@ -232,3 +225,3 @@ public:
     virtual void SAL_CALL
-        addEventListener (
+        addAccessibleEventListener (
             const ::com::sun::star::uno::Reference<
@@ -245,3 +238,3 @@ public:
     virtual void SAL_CALL
-        removeEventListener (
+        removeAccessibleEventListener (
             const ::com::sun::star::uno::Reference<
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 31b7471f1104..412fb41eb91a 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -743,3 +743,3 @@ void AccessibleControlShape::startStateMultiplexing()
     {
-        xBroadcaster->addEventListener( this );
+        xBroadcaster->addAccessibleEventListener( this );
         m_bMultiplexingStates = sal_True;
@@ -759,3 +759,3 @@ void AccessibleControlShape::stopStateMultiplexing()
     {
-        xBroadcaster->removeEventListener( this );
+        xBroadcaster->removeAccessibleEventListener( this );
         m_bMultiplexingStates = sal_False;
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index 92e5d1439998..a84cc75ef6ec 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -522,3 +522,3 @@ sal_Int32 AccFrameSelector::getBackground(  )
 
-void AccFrameSelector::addEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
+void AccFrameSelector::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
 {
@@ -538,3 +538,3 @@ void AccFrameSelector::addEventListener( const Reference< XAccessibleEventListen
 
-void AccFrameSelector::removeEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
+void AccFrameSelector::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
 {
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 4eb755a15de9..fa634f429db1 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -692,3 +692,3 @@ sal_Int32 SAL_CALL AccessibleShape::getBackground (void)
 
-void SAL_CALL AccessibleShape::addEventListener (
+void SAL_CALL AccessibleShape::addAccessibleEventListener (
     const Reference<XAccessibleEventListener >& rxListener)
@@ -704,3 +704,3 @@ void SAL_CALL AccessibleShape::addEventListener (
     {
-        AccessibleContextBase::addEventListener (rxListener);
+        AccessibleContextBase::addAccessibleEventListener (rxListener);
         if (mpText != NULL)
@@ -713,3 +713,3 @@ void SAL_CALL AccessibleShape::addEventListener (
 
-void SAL_CALL AccessibleShape::removeEventListener (
+void SAL_CALL AccessibleShape::removeAccessibleEventListener (
     const Reference<XAccessibleEventListener >& rxListener)
@@ -717,3 +717,3 @@ void SAL_CALL AccessibleShape::removeEventListener (
 {
-    AccessibleContextBase::removeEventListener (rxListener);
+    AccessibleContextBase::removeAccessibleEventListener (rxListener);
     if (mpText != NULL)
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index e04ee4ce7ce5..08ed92b17720 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -107,4 +107,4 @@ namespace accessibility
         // XAccessibleEventBroadcaster child related methods
-        void SAL_CALL addEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) SAL_THROW((uno::RuntimeException));
-        void SAL_CALL removeEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) SAL_THROW((uno::RuntimeException));
+        void SAL_CALL addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) SAL_THROW((uno::RuntimeException));
+        void SAL_CALL removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) SAL_THROW((uno::RuntimeException));
 
@@ -1647,3 +1647,3 @@ namespace accessibility
 
-    void SAL_CALL AccessibleTextHelper_Impl::addEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) SAL_THROW((uno::RuntimeException))
+    void SAL_CALL AccessibleTextHelper_Impl::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) SAL_THROW((uno::RuntimeException))
     {
@@ -1655,3 +1655,3 @@ namespace accessibility
 
-    void SAL_CALL AccessibleTextHelper_Impl::removeEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) SAL_THROW((uno::RuntimeException))
+    void SAL_CALL AccessibleTextHelper_Impl::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) SAL_THROW((uno::RuntimeException))
     {
@@ -2008,3 +2008,3 @@ namespace accessibility
 
-        mpImpl->addEventListener( xListener );
+        mpImpl->addAccessibleEventListener( xListener );
 
@@ -2012,3 +2012,3 @@ namespace accessibility
 #else
-        mpImpl->addEventListener( xListener );
+        mpImpl->addAccessibleEventListener( xListener );
 #endif
@@ -2021,3 +2021,3 @@ namespace accessibility
 
-        mpImpl->removeEventListener( xListener );
+        mpImpl->removeAccessibleEventListener( xListener );
 
@@ -2025,3 +2025,3 @@ namespace accessibility
 #else
-        mpImpl->removeEventListener( xListener );
+        mpImpl->removeAccessibleEventListener( xListener );
 #endif
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index a0423e769db8..58c34a45d23e 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -451,3 +451,3 @@ lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale( void ) throw( Il
 
-void SAL_CALL SvxGraphCtrlAccessibleContext::addEventListener( const Reference< XAccessibleEventListener >& xListener )
+void SAL_CALL SvxGraphCtrlAccessibleContext::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
     throw( RuntimeException )
@@ -465,3 +465,3 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::addEventListener( const Reference<
 
-void SAL_CALL SvxGraphCtrlAccessibleContext::removeEventListener( const Reference< XAccessibleEventListener >& xListener )
+void SAL_CALL SvxGraphCtrlAccessibleContext::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
     throw( RuntimeException )
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 27766b27d74f..8bb7ad4158c9 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -406,3 +406,3 @@ lang::Locale SAL_CALL SvxRectCtlAccessibleContext::getLocale( void ) throw( Ille
 
-void SAL_CALL SvxRectCtlAccessibleContext::addEventListener( const Reference< XAccessibleEventListener >& xListener )
+void SAL_CALL SvxRectCtlAccessibleContext::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
     throw( RuntimeException )
@@ -418,3 +418,3 @@ void SAL_CALL SvxRectCtlAccessibleContext::addEventListener( const Reference< XA
 
-void SAL_CALL SvxRectCtlAccessibleContext::removeEventListener( const Reference< XAccessibleEventListener >& xListener )
+void SAL_CALL SvxRectCtlAccessibleContext::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
     throw( RuntimeException )
@@ -970,3 +970,3 @@ lang::Locale SAL_CALL SvxRectCtlChildAccessibleContext::getLocale( void ) throw(
 
-void SAL_CALL SvxRectCtlChildAccessibleContext::addEventListener( const Reference< XAccessibleEventListener >& xListener )
+void SAL_CALL SvxRectCtlChildAccessibleContext::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
     throw( RuntimeException )
@@ -985,3 +985,3 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::addEventListener( const Referenc
 
-void SAL_CALL SvxRectCtlChildAccessibleContext::removeEventListener( const Reference< XAccessibleEventListener >& xListener )
+void SAL_CALL SvxRectCtlChildAccessibleContext::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
     throw( RuntimeException )
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx
index 6f111725857f..bfe358b18c9b 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -98,4 +98,4 @@ public:
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addAccessibleEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeAccessibleEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) throw (::com::sun::star::uno::RuntimeException);
 
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index 09fcde2cddf9..bebe0520e0d3 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -137,11 +137,6 @@ public:
 
-    //=====  XComponent  ========================================================
-
-    using ::cppu::WeakAggComponentImplHelperBase::addEventListener;
-    using ::cppu::WeakAggComponentImplHelperBase::removeEventListener;
-
     //=====  XAccessibleEventBroadcaster  =====================================
 
-    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) throw (com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeEventListener(  const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) throw (com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) throw (com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeAccessibleEventListener(  const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) throw (com::sun::star::uno::RuntimeException);
 
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 03b876a0ab12..7b9351fb5544 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -169,7 +169,2 @@ public:
 
-    //=====  XComponent  =====================================================
-
-    using ::cppu::WeakAggComponentImplHelperBase::addEventListener;
-    using ::cppu::WeakAggComponentImplHelperBase::removeEventListener;
-
     //=====  XAccessibleEventBroadcaster  =====================================
@@ -177,3 +172,3 @@ public:
     virtual void SAL_CALL
-        addEventListener(
+        addAccessibleEventListener(
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
@@ -182,3 +177,3 @@ public:
     virtual void SAL_CALL
-        removeEventListener(
+        removeAccessibleEventListener(
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
@@ -428,7 +423,2 @@ public:
 
-    //=====  XComponent  =====================================================
-
-    using ::cppu::WeakAggComponentImplHelperBase::addEventListener;
-    using ::cppu::WeakAggComponentImplHelperBase::removeEventListener;
-
     //=====  XAccessibleEventBroadcaster  =====================================
@@ -436,3 +426,3 @@ public:
     virtual void SAL_CALL
-        addEventListener(
+        addAccessibleEventListener(
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
@@ -441,3 +431,3 @@ public:
     virtual void SAL_CALL
-        removeEventListener(
+        removeAccessibleEventListener(
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index 5878015f0564..4d28f53e3a15 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -441,3 +441,3 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground (void) throw (RuntimeException)
 
-void SAL_CALL AccessibleCell::addEventListener( const Reference<XAccessibleEventListener >& rxListener)  throw (RuntimeException)
+void SAL_CALL AccessibleCell::addAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener)  throw (RuntimeException)
 {
@@ -453,3 +453,3 @@ void SAL_CALL AccessibleCell::addEventListener( const Reference<XAccessibleEvent
     {
-        AccessibleContextBase::addEventListener (rxListener);
+        AccessibleContextBase::addAccessibleEventListener (rxListener);
         if (mpText != NULL)
@@ -461,6 +461,6 @@ void SAL_CALL AccessibleCell::addEventListener( const Reference<XAccessibleEvent
 
-void SAL_CALL AccessibleCell::removeEventListener( const Reference<XAccessibleEventListener >& rxListener) throw (RuntimeException)
+void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener) throw (RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
-    AccessibleContextBase::removeEventListener(rxListener);
+    AccessibleContextBase::removeAccessibleEventListener(rxListener);
     if (mpText != NULL)
diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx
index 35f2a8090f6b..0750e61e112d 100644
--- a/svx/source/table/accessiblecell.hxx
+++ b/svx/source/table/accessiblecell.hxx
@@ -93,4 +93,4 @@ public:
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw(::com::sun::star::uno::RuntimeException);
 
@@ -103,5 +103,2 @@ public:
 
-    using cppu::WeakComponentImplHelperBase::addEventListener;
-    using cppu::WeakComponentImplHelperBase::removeEventListener;
-
     // Misc
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index ee8378706bce..b2c30ed45947 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -708,3 +708,3 @@ lang::Locale SAL_CALL SwAccessibleContext::getLocale (void)
 
-void SAL_CALL SwAccessibleContext::addEventListener(
+void SAL_CALL SwAccessibleContext::addAccessibleEventListener(
             const uno::Reference< XAccessibleEventListener >& xListener )
@@ -721,3 +721,3 @@ void SAL_CALL SwAccessibleContext::addEventListener(
 
-void SAL_CALL SwAccessibleContext::removeEventListener(
+void SAL_CALL SwAccessibleContext::removeAccessibleEventListener(
             const uno::Reference< XAccessibleEventListener >& xListener )
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 0c51298cdcb8..509e4aea6f67 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -273,3 +273,3 @@ public:
 
-    virtual void SAL_CALL addEventListener(
+    virtual void SAL_CALL addAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
@@ -277,3 +277,3 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeEventListener(
+    virtual void SAL_CALL removeAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
diff --git a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
index 62a76ae95afd..33ea9d38440f 100644
--- a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
@@ -156,7 +156,4 @@ class SidebarTxtControlAccessibleContext : public VCLXAccessibleComponent
 
-        using WeakAggComponentImplHelperBase::addEventListener;
-        using WeakAggComponentImplHelperBase::removeEventListener;
-
         virtual void SAL_CALL
-                addEventListener (
+                addAccessibleEventListener (
                     const ::com::sun::star::uno::Reference<
@@ -165,3 +162,3 @@ class SidebarTxtControlAccessibleContext : public VCLXAccessibleComponent
         virtual void SAL_CALL
-                removeEventListener (
+                removeAccessibleEventListener (
                     const ::com::sun::star::uno::Reference<
@@ -235,3 +232,3 @@ css::uno::Reference< css::accessibility::XAccessible > SAL_CALL SidebarTxtContro
 
-void SAL_CALL SidebarTxtControlAccessibleContext::addEventListener (
+void SAL_CALL SidebarTxtControlAccessibleContext::addAccessibleEventListener (
     const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener)
@@ -247,3 +244,3 @@ void SAL_CALL SidebarTxtControlAccessibleContext::addEventListener (
 
-void SAL_CALL SidebarTxtControlAccessibleContext::removeEventListener (
+void SAL_CALL SidebarTxtControlAccessibleContext::removeAccessibleEventListener (
     const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener)
diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java
index 152f4285485e..1ae2b353ba88 100644
--- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java
+++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java
@@ -37,4 +37,4 @@ import com.sun.star.uno.UnoRuntime;
  * <ul>
- *  <li><code> addEventListener()</code></li>
- *  <li><code> removeEventListener()</code></li>
+ *  <li><code> addAccessibleEventEventListener()</code></li>
+ *  <li><code> removeAccessibleEventEventListener()</code></li>
  * </ul> <p>
@@ -117,3 +117,3 @@ public class _XAccessibleEventBroadcaster {
         System.out.println("adding two listeners");
-        oObj.addEventListener(list);
+        oObj.addAccessibleEventEventListener(list);
         boolean isTransient = chkTransient(oObj);
@@ -137,3 +137,3 @@ public class _XAccessibleEventBroadcaster {
             }
-            oObj.removeEventListener(list);
+            oObj.removeAccessibleEventEventListener(list);
         }
@@ -160,3 +160,3 @@ public class _XAccessibleEventBroadcaster {
         System.out.println("remove first listener");
-        oObj.removeEventListener(list);
+        oObj.removeAccessibleEventEventListener(list);
 
diff --git a/toolkit/test/accessibility/AccessibilityTreeModel.java b/toolkit/test/accessibility/AccessibilityTreeModel.java
index bd442ed0912c..a30329c6daf5 100644
--- a/toolkit/test/accessibility/AccessibilityTreeModel.java
+++ b/toolkit/test/accessibility/AccessibilityTreeModel.java
@@ -451,3 +451,3 @@ public class AccessibilityTreeModel
         {
-            xBroadcaster.addEventListener( mxListener );
+            xBroadcaster.addAccessibleEventListener( mxListener );
         }
@@ -460,3 +460,3 @@ public class AccessibilityTreeModel
         {
-            xBroadcaster.removeEventListener( mxListener );
+            xBroadcaster.removeAccessibleEventListener( mxListener );
         }
diff --git a/toolkit/test/accessibility/ov/ListeningObjectView.java b/toolkit/test/accessibility/ov/ListeningObjectView.java
index 1b17ef973d3e..dd9291fe8231 100644
--- a/toolkit/test/accessibility/ov/ListeningObjectView.java
+++ b/toolkit/test/accessibility/ov/ListeningObjectView.java
@@ -49,3 +49,3 @@ abstract class ListeningObjectView
         if (xBroadcaster != null)
-            xBroadcaster.addEventListener (this);
+            xBroadcaster.addAccessibleEventListener (this);
     }
@@ -63,3 +63,3 @@ abstract class ListeningObjectView
         if (xBroadcaster != null)
-            xBroadcaster.removeEventListener (this);
+            xBroadcaster.removeAccessibleEventListener (this);
     }
diff --git a/vcl/aqua/source/a11y/documentfocuslistener.cxx b/vcl/aqua/source/a11y/documentfocuslistener.cxx
index 896f0a002047..ac65f1e84338 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/documentfocuslistener.cxx
@@ -171,3 +171,3 @@ void DocumentFocusListener::attachRecursive(
     {
-        xBroadcaster->addEventListener(static_cast< XAccessibleEventListener *>(this));
+        xBroadcaster->addAccessibleEventListener(static_cast< XAccessibleEventListener *>(this));
 
@@ -224,3 +224,3 @@ void DocumentFocusListener::detachRecursive(
     {
-        xBroadcaster->removeEventListener(static_cast< XAccessibleEventListener *>(this));
+        xBroadcaster->removeAccessibleEventListener(static_cast< XAccessibleEventListener *>(this));
 
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 1424155321f6..ee7fb6e959d3 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -316,3 +316,3 @@ void DocumentFocusListener::attachRecursive(
     {
-        xBroadcaster->addEventListener(static_cast< accessibility::XAccessibleEventListener *>(this));
+        xBroadcaster->addAccessibleEventListener(static_cast< accessibility::XAccessibleEventListener *>(this));
 
@@ -372,3 +372,3 @@ void DocumentFocusListener::detachRecursive(
     {
-        xBroadcaster->removeEventListener(static_cast< accessibility::XAccessibleEventListener *>(this));
+        xBroadcaster->removeAccessibleEventListener(static_cast< accessibility::XAccessibleEventListener *>(this));
 
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index 7a1b9b4d0f1a..2e7824eb0f94 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -824,3 +824,3 @@ atk_object_wrapper_new( const ::com::sun::star::uno::Reference< ::com::sun::star
             if( xBroadcaster.is() )
-                xBroadcaster->addEventListener( static_cast< accessibility::XAccessibleEventListener * > ( new AtkListener(pWrap) ) );
+                xBroadcaster->addAccessibleEventListener( static_cast< accessibility::XAccessibleEventListener * > ( new AtkListener(pWrap) ) );
         else