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

12 files changed, 38 insertions, 63 deletions

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
@@ -214,13 +214,6 @@ public:
     virtual sal_Int32 SAL_CALL getBackground (void)
         throw (::com::sun::star::uno::RuntimeException);
 
-
-
-    //=====  XComponent  ========================================================
-
-    using WeakComponentImplHelperBase::addEventListener;
-    using WeakComponentImplHelperBase::removeEventListener;
-
     //=====  XAccessibleEventBroadcaster  =====================================
 
     /** This call is forwarded to a) the base class and b) to the
@@ -230,7 +223,7 @@ public:
             This listener is informed about accessibility events.
     */
     virtual void SAL_CALL
-        addEventListener (
+        addAccessibleEventListener (
             const ::com::sun::star::uno::Reference<
             ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener)
         throw (::com::sun::star::uno::RuntimeException);
@@ -243,7 +236,7 @@ public:
             anymore.
     */
     virtual void SAL_CALL
-        removeEventListener (
+        removeAccessibleEventListener (
             const ::com::sun::star::uno::Reference<
             ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener)
         throw (::com::sun::star::uno::RuntimeException);
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
@@ -741,7 +741,7 @@ void AccessibleControlShape::startStateMultiplexing()
 
     if ( xBroadcaster.is() )
     {
-        xBroadcaster->addEventListener( this );
+        xBroadcaster->addAccessibleEventListener( this );
         m_bMultiplexingStates = sal_True;
     }
 }
@@ -757,7 +757,7 @@ void AccessibleControlShape::stopStateMultiplexing()
 
     if ( xBroadcaster.is() )
     {
-        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
@@ -520,7 +520,7 @@ sal_Int32 AccFrameSelector::getBackground(  )
 
 // ----------------------------------------------------------------------------
 
-void AccFrameSelector::addEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
+void AccFrameSelector::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
 
@@ -536,7 +536,7 @@ void AccFrameSelector::addEventListener( const Reference< XAccessibleEventListen
 
 // ----------------------------------------------------------------------------
 
-void AccFrameSelector::removeEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
+void AccFrameSelector::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
 
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
@@ -690,7 +690,7 @@ sal_Int32 SAL_CALL AccessibleShape::getBackground (void)
 
 //=====  XAccessibleEventBroadcaster  =========================================
 
-void SAL_CALL AccessibleShape::addEventListener (
+void SAL_CALL AccessibleShape::addAccessibleEventListener (
     const Reference<XAccessibleEventListener >& rxListener)
     throw (uno::RuntimeException)
 {
@@ -702,7 +702,7 @@ void SAL_CALL AccessibleShape::addEventListener (
     }
     else
     {
-        AccessibleContextBase::addEventListener (rxListener);
+        AccessibleContextBase::addAccessibleEventListener (rxListener);
         if (mpText != NULL)
             mpText->AddEventListener (rxListener);
     }
@@ -711,11 +711,11 @@ void SAL_CALL AccessibleShape::addEventListener (
 
 
 
-void SAL_CALL AccessibleShape::removeEventListener (
+void SAL_CALL AccessibleShape::removeAccessibleEventListener (
     const Reference<XAccessibleEventListener >& rxListener)
     throw (uno::RuntimeException)
 {
-    AccessibleContextBase::removeEventListener (rxListener);
+    AccessibleContextBase::removeAccessibleEventListener (rxListener);
     if (mpText != NULL)
         mpText->RemoveEventListener (rxListener);
 }
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
@@ -105,8 +105,8 @@ namespace accessibility
         uno::Reference< XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException));
 
         // 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));
 
         // XAccessibleComponent child related methods
         uno::Reference< XAccessible > SAL_CALL getAccessibleAtPoint( const awt::Point& aPoint ) SAL_THROW((uno::RuntimeException));
@@ -1645,7 +1645,7 @@ namespace accessibility
             return NULL;
     }
 
-    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))
     {
         DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
 
@@ -1653,7 +1653,7 @@ namespace accessibility
             ::comphelper::AccessibleEventNotifier::addEventListener( getNotifierClientId(), xListener );
     }
 
-    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))
     {
         DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
 
@@ -2006,11 +2006,11 @@ namespace accessibility
 #ifdef DBG_UTIL
         mpImpl->CheckInvariants();
 
-        mpImpl->addEventListener( xListener );
+        mpImpl->addAccessibleEventListener( xListener );
 
         mpImpl->CheckInvariants();
 #else
-        mpImpl->addEventListener( xListener );
+        mpImpl->addAccessibleEventListener( xListener );
 #endif
     }
 
@@ -2019,11 +2019,11 @@ namespace accessibility
 #ifdef DBG_UTIL
         mpImpl->CheckInvariants();
 
-        mpImpl->removeEventListener( xListener );
+        mpImpl->removeAccessibleEventListener( xListener );
 
         mpImpl->CheckInvariants();
 #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
@@ -449,7 +449,7 @@ lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale( void ) throw( Il
 
 //=====  XAccessibleEventListener  ============================================
 
-void SAL_CALL SvxGraphCtrlAccessibleContext::addEventListener( const Reference< XAccessibleEventListener >& xListener )
+void SAL_CALL SvxGraphCtrlAccessibleContext::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
     throw( RuntimeException )
 {
     if (xListener.is())
@@ -463,7 +463,7 @@ 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 )
 {
     if (xListener.is())
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
@@ -404,7 +404,7 @@ lang::Locale SAL_CALL SvxRectCtlAccessibleContext::getLocale( void ) throw( Ille
     throw IllegalAccessibleComponentStateException();
 }
 
-void SAL_CALL SvxRectCtlAccessibleContext::addEventListener( const Reference< XAccessibleEventListener >& xListener )
+void SAL_CALL SvxRectCtlAccessibleContext::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
     throw( RuntimeException )
 {
     if (xListener.is())
@@ -416,7 +416,7 @@ 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 )
 {
     if (xListener.is())
@@ -968,7 +968,7 @@ lang::Locale SAL_CALL SvxRectCtlChildAccessibleContext::getLocale( void ) throw(
     throw IllegalAccessibleComponentStateException();
 }
 
-void SAL_CALL SvxRectCtlChildAccessibleContext::addEventListener( const Reference< XAccessibleEventListener >& xListener )
+void SAL_CALL SvxRectCtlChildAccessibleContext::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
     throw( RuntimeException )
 {
     if (xListener.is())
@@ -983,7 +983,7 @@ 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 )
 {
     if (xListener.is())
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
@@ -96,8 +96,8 @@ public:
     virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // 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);
 
     //XServiceInfo
     virtual ::rtl::OUString SAL_CALL getImplementationName(  ) 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
@@ -135,15 +135,10 @@ public:
 //  virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) {}
 //  virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) {}
 
-    //=====  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);
 
     //=====  XServiceInfo  ====================================================
 
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
@@ -167,20 +167,15 @@ public:
             throw(  ::com::sun::star::uno::RuntimeException,
                     ::com::sun::star::accessibility::IllegalAccessibleComponentStateException );
 
-    //=====  XComponent  =====================================================
-
-    using ::cppu::WeakAggComponentImplHelperBase::addEventListener;
-    using ::cppu::WeakAggComponentImplHelperBase::removeEventListener;
-
     //=====  XAccessibleEventBroadcaster  =====================================
 
     virtual void SAL_CALL
-        addEventListener(
+        addAccessibleEventListener(
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
             throw( com::sun::star::uno::RuntimeException );
 
     virtual void SAL_CALL
-        removeEventListener(
+        removeAccessibleEventListener(
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
             throw( com::sun::star::uno::RuntimeException );
 
@@ -426,20 +421,15 @@ public:
         getLocale( void )
             throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException );
 
-    //=====  XComponent  =====================================================
-
-    using ::cppu::WeakAggComponentImplHelperBase::addEventListener;
-    using ::cppu::WeakAggComponentImplHelperBase::removeEventListener;
-
     //=====  XAccessibleEventBroadcaster  =====================================
 
     virtual void SAL_CALL
-        addEventListener(
+        addAccessibleEventListener(
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
             throw( ::com::sun::star::uno::RuntimeException );
 
     virtual void SAL_CALL
-        removeEventListener(
+        removeAccessibleEventListener(
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
             throw( com::sun::star::uno::RuntimeException );
 
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
@@ -439,7 +439,7 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground (void) throw (RuntimeException)
 // XAccessibleEventBroadcaster
 // --------------------------------------------------------------------
 
-void SAL_CALL AccessibleCell::addEventListener( const Reference<XAccessibleEventListener >& rxListener)  throw (RuntimeException)
+void SAL_CALL AccessibleCell::addAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener)  throw (RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard (maMutex);
@@ -451,7 +451,7 @@ void SAL_CALL AccessibleCell::addEventListener( const Reference<XAccessibleEvent
     }
     else
     {
-        AccessibleContextBase::addEventListener (rxListener);
+        AccessibleContextBase::addAccessibleEventListener (rxListener);
         if (mpText != NULL)
             mpText->AddEventListener (rxListener);
     }
@@ -459,10 +459,10 @@ 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)
         mpText->RemoveEventListener (rxListener);
 }
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
@@ -91,8 +91,8 @@ public:
     virtual ::rtl::OUString SAL_CALL getToolTipText (void) throw (::com::sun::star::uno::RuntimeException);
 
     // 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);
 
     // XServiceInfo
     virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw(::com::sun::star::uno::RuntimeException);
@@ -101,9 +101,6 @@ public:
     // IAccessibleViewForwarderListener
     virtual void ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder);
 
-    using cppu::WeakComponentImplHelperBase::addEventListener;
-    using cppu::WeakComponentImplHelperBase::removeEventListener;
-
     // Misc
 
     /** set the index _nIndex at the accessible cell param  _nIndex The new index in parent.