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

8 files changed, 23 insertions, 33 deletions

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
@@ -91,19 +91,15 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
 
     // XAccessibleEventBroadcaster
-
-    using ScAccessibleContextBase::addEventListener;
-    using ScAccessibleContextBase::removeEventListener;
-
     virtual void SAL_CALL
-        addEventListener(
+        addAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::accessibility::XAccessibleEventListener>& xListener)
         throw (com::sun::star::uno::RuntimeException);
 
     ///  Remove an existing event listener.
     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/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
@@ -86,7 +86,7 @@ void ScAccessibleContextBase::Init()
     {
         uno::Reference< XAccessibleEventBroadcaster > xBroadcaster (mxParent->getAccessibleContext(), uno::UNO_QUERY);
         if (xBroadcaster.is())
-            xBroadcaster->addEventListener(this);
+            xBroadcaster->addAccessibleEventListener(this);
     }
     msName = createAccessibleName();
     msDescription = createAccessibleDescription();
@@ -111,7 +111,7 @@ void SAL_CALL ScAccessibleContextBase::disposing()
     {
         uno::Reference< XAccessibleEventBroadcaster > xBroadcaster (mxParent->getAccessibleContext(), uno::UNO_QUERY);
         if (xBroadcaster.is())
-            xBroadcaster->removeEventListener(this);
+            xBroadcaster->removeAccessibleEventListener(this);
         mxParent = NULL;
     }
 
@@ -412,7 +412,7 @@ lang::Locale SAL_CALL
     //=====  XAccessibleEventBroadcaster  =====================================
 
 void SAL_CALL
-       ScAccessibleContextBase::addEventListener(
+       ScAccessibleContextBase::addAccessibleEventListener(
            const uno::Reference<XAccessibleEventListener>& xListener)
     throw (uno::RuntimeException)
 {
@@ -430,7 +430,7 @@ void SAL_CALL
 }
 
 void SAL_CALL
-       ScAccessibleContextBase::removeEventListener(
+       ScAccessibleContextBase::removeAccessibleEventListener(
         const uno::Reference<XAccessibleEventListener>& xListener)
     throw (uno::RuntimeException)
 {
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
@@ -256,7 +256,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
     ///=====  XAccessibleEventBroadcaster  =====================================
 
 void SAL_CALL
-    ScAccessibleEditObject::addEventListener(const uno::Reference<XAccessibleEventListener>& xListener)
+    ScAccessibleEditObject::addAccessibleEventListener(const uno::Reference<XAccessibleEventListener>& xListener)
         throw (uno::RuntimeException)
 {
     if (!mpTextHelper)
@@ -264,11 +264,11 @@ void SAL_CALL
 
     mpTextHelper->AddEventListener(xListener);
 
-    ScAccessibleContextBase::addEventListener(xListener);
+    ScAccessibleContextBase::addAccessibleEventListener(xListener);
 }
 
 void SAL_CALL
-    ScAccessibleEditObject::removeEventListener(const uno::Reference<XAccessibleEventListener>& xListener)
+    ScAccessibleEditObject::removeAccessibleEventListener(const uno::Reference<XAccessibleEventListener>& xListener)
         throw (uno::RuntimeException)
 {
     if (!mpTextHelper)
@@ -276,7 +276,7 @@ void SAL_CALL
 
     mpTextHelper->RemoveEventListener(xListener);
 
-    ScAccessibleContextBase::removeEventListener(xListener);
+    ScAccessibleContextBase::removeAccessibleEventListener(xListener);
 }
 
     //=====  XServiceInfo  ====================================================
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
@@ -80,9 +80,9 @@ public:
         if (xBc.is())
         {
             if (mbAdd)
-                xBc->addEventListener(mxListener);
+                xBc->addAccessibleEventListener(mxListener);
             else
-                xBc->removeEventListener(mxListener);
+                xBc->removeAccessibleEventListener(mxListener);
         }
     }
 private:
@@ -174,21 +174,21 @@ OUString ScAccessibleFilterMenu::getImplementationName()
 
 // XAccessibleEventBroadcaster
 
-void ScAccessibleFilterMenu::addEventListener(
+void ScAccessibleFilterMenu::addAccessibleEventListener(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::accessibility::XAccessibleEventListener>& xListener)
     throw (com::sun::star::uno::RuntimeException)
 {
-    ScAccessibleContextBase::addEventListener(xListener);
+    ScAccessibleContextBase::addAccessibleEventListener(xListener);
     for_each(maMenuItems.begin(), maMenuItems.end(), AddRemoveEventListener(xListener, true));
 }
 
-void ScAccessibleFilterMenu::removeEventListener(
+void ScAccessibleFilterMenu::removeAccessibleEventListener(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::accessibility::XAccessibleEventListener>& xListener)
     throw (com::sun::star::uno::RuntimeException)
 {
-    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
@@ -838,12 +838,12 @@ uno::Sequence<sal_Int8> SAL_CALL
 
 ///=====  XAccessibleEventBroadcaster  =====================================
 
-void SAL_CALL ScAccessibleSpreadsheet::addEventListener(const uno::Reference<XAccessibleEventListener>& xListener)
+void SAL_CALL ScAccessibleSpreadsheet::addAccessibleEventListener(const uno::Reference<XAccessibleEventListener>& xListener)
         throw (uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
-    ScAccessibleTableBase::addEventListener(xListener);
+    ScAccessibleTableBase::addAccessibleEventListener(xListener);
 
     if (!mbIsFocusSend)
     {
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
@@ -80,9 +80,6 @@ public:
 protected:
     virtual ~ScAccessibleContextBase(void);
 public:
-    using WeakAggComponentImplHelperBase::addEventListener;
-    using WeakAggComponentImplHelperBase::removeEventListener;
-
     ///=====  SfxListener  =====================================================
 
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
@@ -204,14 +201,14 @@ public:
           description and so on events.
     */
     virtual void SAL_CALL
-        addEventListener(
+        addAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::accessibility::XAccessibleEventListener>& xListener)
         throw (com::sun::star::uno::RuntimeException);
 
     //  Remove an existing event listener.
     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/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
@@ -66,8 +66,6 @@ protected:
     using ScAccessibleContextBase::IsDefunc;
 
 public:
-    using ScAccessibleContextBase::addEventListener;
-    using ScAccessibleContextBase::removeEventListener;
     using ScAccessibleContextBase::disposing;
 
     virtual void SAL_CALL disposing();
@@ -132,14 +130,14 @@ public:
           description and so on events.
     */
     virtual void SAL_CALL
-        addEventListener(
+        addAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::accessibility::XAccessibleEventListener>& xListener)
         throw (com::sun::star::uno::RuntimeException);
 
     //  Remove an existing event listener.
     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/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
@@ -86,7 +86,6 @@ protected:
     using ScAccessibleTableBase::IsDefunc;
 
 public:
-    using ScAccessibleTableBase::addEventListener;
     using ScAccessibleTableBase::disposing;
 
      virtual void SAL_CALL disposing();
@@ -238,7 +237,7 @@ public:
           description and so on events.
     */
     virtual void SAL_CALL
-        addEventListener(
+        addAccessibleEventListener(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::accessibility::XAccessibleEventListener>& xListener)
         throw (com::sun::star::uno::RuntimeException);