diff options
author | Thorsten Behrens <tbehrens@suse.com> | 2012-11-29 00:27:03 +0100 |
---|---|---|
committer | Thorsten Behrens <tbehrens@suse.com> | 2012-11-29 16:58:16 +0100 |
commit | 70626249cd247d9acdad417b8eaf252bae22c059 (patch) | |
tree | 2327193318672b583f12be99cdcaec5ef4d3830d /accessibility | |
parent | dda524a71145441b336f5f9f6e559fa31d32d3d2 (diff) |
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
Diffstat (limited to 'accessibility')
18 files changed, 30 insertions, 42 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 @@ -46,7 +46,7 @@ public abstract class Component extends java.awt.Component { XAccessibleEventBroadcaster broadcaster = UnoRuntime.queryInterface(XAccessibleEventBroadcaster.class, unoAccessibleComponent); 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 @@ -50,7 +50,7 @@ public class Container extends java.awt.Container implements javax.accessibility XAccessibleEventBroadcaster broadcaster = UnoRuntime.queryInterface(XAccessibleEventBroadcaster.class, unoAccessibleContext); 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 @@ -51,7 +51,7 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces XAccessibleEventBroadcaster broadcaster = UnoRuntime.queryInterface(XAccessibleEventBroadcaster.class, xAccessibleComponent); 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 @@ -45,7 +45,7 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi XAccessibleEventBroadcaster broadcaster = UnoRuntime.queryInterface(XAccessibleEventBroadcaster.class, unoAccessibleComponent); 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 @@ -40,7 +40,7 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces XAccessibleEventBroadcaster broadcaster = UnoRuntime.queryInterface(XAccessibleEventBroadcaster.class, unoAccessibleComponent); 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 @@ -46,7 +46,7 @@ public class XAccessibleEventLog implements XAccessibleEventListener { public static void addEventListener(XAccessibleContext xac, java.awt.Component c) { XAccessibleEventBroadcaster broadcaster = UnoRuntime.queryInterface(XAccessibleEventBroadcaster.class, xac); if (broadcaster != null) { - broadcaster.addEventListener(XAccessibleEventLog.get()); + broadcaster.addAccessibleEventListener(XAccessibleEventLog.get()); // remember the proxy objects synchronized (proxyList) { 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 @@ -235,15 +235,13 @@ public: // XAccessibleEventBroadcaster -------------------------------------------- /** 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< ::com::sun::star::accessibility::XAccessibleEventListener>& rxListener ) throw ( ::com::sun::star::uno::RuntimeException ); /** Removes an event listener. */ - using cppu::WeakAggComponentImplHelperBase::removeEventListener; - virtual void SAL_CALL removeEventListener( + virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& rxListener ) throw ( ::com::sun::star::uno::RuntimeException ); 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 @@ -208,15 +208,13 @@ public: // XAccessibleEventBroadcaster -------------------------------------------- /** 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< ::com::sun::star::accessibility::XAccessibleEventListener>& rxListener ) throw ( ::com::sun::star::uno::RuntimeException ); /** Removes an event listener. */ - using cppu::WeakAggComponentImplHelperBase::removeEventListener; - virtual void SAL_CALL removeEventListener( + virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& rxListener ) throw ( ::com::sun::star::uno::RuntimeException ); 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 @@ -169,10 +169,8 @@ namespace accessibility virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // 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); // XAccessibleAction virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) 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 @@ -183,10 +183,8 @@ namespace accessibility virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // 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); // XAccessibleAction virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) 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 @@ -352,14 +352,12 @@ private: virtual ::sal_Int32 SAL_CALL getNumberOfLineWithCaret( ) throw (::com::sun::star::uno::RuntimeException); - using cppu::WeakAggComponentImplHelperBase::addEventListener; - virtual void SAL_CALL addEventListener( + virtual void SAL_CALL addAccessibleEventListener( ::css::uno::Reference< ::css::accessibility::XAccessibleEventListener > const & rListener) throw (::css::uno::RuntimeException); - using cppu::WeakAggComponentImplHelperBase::removeEventListener; - virtual void SAL_CALL removeEventListener( + virtual void SAL_CALL removeAccessibleEventListener( ::css::uno::Reference< ::css::accessibility::XAccessibleEventListener > const & rListener) throw (::css::uno::RuntimeException); 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 @@ -178,10 +178,8 @@ public: virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // 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); }; #endif // ACCESSIBILITY_STANDARD_ACCESSIBLELISTBOXENTRY_HXX 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 @@ -288,7 +288,7 @@ void SAL_CALL AccessibleBrowseBoxBase::focusLost( const ::com::sun::star::awt::F } // XAccessibleEventBroadcaster ------------------------------------------------ -void SAL_CALL AccessibleBrowseBoxBase::addEventListener( +void SAL_CALL AccessibleBrowseBoxBase::addAccessibleEventListener( const Reference< XAccessibleEventListener>& _rxListener ) throw ( uno::RuntimeException ) { @@ -302,7 +302,7 @@ void SAL_CALL AccessibleBrowseBoxBase::addEventListener( } } -void SAL_CALL AccessibleBrowseBoxBase::removeEventListener( +void SAL_CALL AccessibleBrowseBoxBase::removeAccessibleEventListener( const Reference< XAccessibleEventListener>& _rxListener ) throw ( uno::RuntimeException ) { 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 @@ -238,7 +238,7 @@ sal_Bool SAL_CALL AccessibleGridControlBase::isFocusTraversable() } // XAccessibleEventBroadcaster ------------------------------------------------ -void SAL_CALL AccessibleGridControlBase::addEventListener( +void SAL_CALL AccessibleGridControlBase::addAccessibleEventListener( const Reference< XAccessibleEventListener>& _rxListener ) throw ( uno::RuntimeException ) { @@ -252,7 +252,7 @@ void SAL_CALL AccessibleGridControlBase::addEventListener( } } -void SAL_CALL AccessibleGridControlBase::removeEventListener( +void SAL_CALL AccessibleGridControlBase::removeAccessibleEventListener( const Reference< XAccessibleEventListener>& _rxListener ) throw ( uno::RuntimeException ) { 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 @@ -507,7 +507,7 @@ throw(RuntimeException) // ----------------------------------------------------------------------------- // XAccessibleEventBroadcaster // ----------------------------------------------------------------------------- - void SAL_CALL AccessibleIconChoiceCtrlEntry::addEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) + void SAL_CALL AccessibleIconChoiceCtrlEntry::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) { if (xListener.is()) { @@ -518,7 +518,7 @@ throw(RuntimeException) } } // ----------------------------------------------------------------------------- - void SAL_CALL AccessibleIconChoiceCtrlEntry::removeEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) + void SAL_CALL AccessibleIconChoiceCtrlEntry::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) { if (xListener.is()) { 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 @@ -593,7 +593,7 @@ namespace accessibility // ----------------------------------------------------------------------------- // XAccessibleEventBroadcaster // ----------------------------------------------------------------------------- - void SAL_CALL AccessibleListBoxEntry::addEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) + void SAL_CALL AccessibleListBoxEntry::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) { if (xListener.is()) { @@ -604,7 +604,7 @@ namespace accessibility } } // ----------------------------------------------------------------------------- - void SAL_CALL AccessibleListBoxEntry::removeEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) + void SAL_CALL AccessibleListBoxEntry::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) { if (xListener.is()) { 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 @@ -638,7 +638,7 @@ ParagraphImpl::getRunAttributes(::sal_Int32 Index, const ::css::uno::Sequence< O // virtual -void SAL_CALL ParagraphImpl::addEventListener( +void SAL_CALL ParagraphImpl::addAccessibleEventListener( ::css::uno::Reference< ::css::accessibility::XAccessibleEventListener > const & rListener) throw (::css::uno::RuntimeException) @@ -662,7 +662,7 @@ void SAL_CALL ParagraphImpl::addEventListener( } // virtual -void SAL_CALL ParagraphImpl::removeEventListener( +void SAL_CALL ParagraphImpl::removeAccessibleEventListener( ::css::uno::Reference< ::css::accessibility::XAccessibleEventListener > const & rListener) throw (::css::uno::RuntimeException) 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 @@ -599,7 +599,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_I // ----------------------------------------------------------------------------- // XAccessibleEventBroadcaster // ----------------------------------------------------------------------------- -void SAL_CALL VCLXAccessibleListItem::addEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) +void SAL_CALL VCLXAccessibleListItem::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) { if (xListener.is()) { @@ -609,7 +609,7 @@ 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) { if ( xListener.is() && m_nClientId ) { |