summaryrefslogtreecommitdiff
authorThorsten Behrens <tbehrens@suse.com>2012-11-28 23:27:03 (GMT)
committer Thorsten Behrens <tbehrens@suse.com>2012-11-29 15:58:16 (GMT)
commit70626249cd247d9acdad417b8eaf252bae22c059 (patch) (side-by-side diff)
tree2327193318672b583f12be99cdcaec5ef4d3830d
parentdda524a71145441b336f5f9f6e559fa31d32d3d2 (diff)
downloadcore-70626249cd247d9acdad417b8eaf252bae22c059.zip
core-70626249cd247d9acdad417b8eaf252bae22c059.tar.gz
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 (more/less context) (ignore whitespace changes)
-rw-r--r--accessibility/bridge/org/openoffice/java/accessibility/Component.java2
-rw-r--r--accessibility/bridge/org/openoffice/java/accessibility/Container.java2
-rw-r--r--accessibility/bridge/org/openoffice/java/accessibility/Dialog.java2
-rw-r--r--accessibility/bridge/org/openoffice/java/accessibility/Frame.java2
-rw-r--r--accessibility/bridge/org/openoffice/java/accessibility/Window.java2
-rw-r--r--accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleEventLog.java2
-rw-r--r--accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx6
-rw-r--r--accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx6
-rw-r--r--accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx6
-rw-r--r--accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx6
-rw-r--r--accessibility/inc/accessibility/extended/textwindowaccessibility.hxx6
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx6
-rw-r--r--accessibility/source/extended/AccessibleBrowseBoxBase.cxx4
-rw-r--r--accessibility/source/extended/AccessibleGridControlBase.cxx4
-rw-r--r--accessibility/source/extended/accessibleiconchoicectrlentry.cxx4
-rw-r--r--accessibility/source/extended/accessiblelistboxentry.cxx4
-rw-r--r--accessibility/source/extended/textwindowaccessibility.cxx4
-rw-r--r--accessibility/source/standard/vclxaccessiblelistitem.cxx4
-rw-r--r--chart2/source/controller/accessibility/AccessibleBase.cxx4
-rw-r--r--chart2/source/controller/inc/AccessibleBase.hxx4
-rw-r--r--comphelper/inc/comphelper/accessiblecontexthelper.hxx6
-rw-r--r--comphelper/inc/comphelper/accessiblewrapper.hxx4
-rw-r--r--comphelper/source/misc/accessiblecontexthelper.cxx4
-rw-r--r--comphelper/source/misc/accessiblewrapper.cxx8
-rw-r--r--editeng/inc/editeng/AccessibleContextBase.hxx9
-rw-r--r--editeng/inc/editeng/AccessibleEditableTextPara.hxx9
-rw-r--r--editeng/inc/editeng/AccessibleImageBullet.hxx4
-rw-r--r--editeng/source/accessibility/AccessibleContextBase.cxx4
-rw-r--r--editeng/source/accessibility/AccessibleEditableTextPara.cxx4
-rw-r--r--editeng/source/accessibility/AccessibleImageBullet.cxx4
-rw-r--r--odk/examples/DevelopersGuide/Accessibility/RegistrationThread.java4
-rw-r--r--offapi/com/sun/star/accessibility/AccessBridge.idl2
-rw-r--r--offapi/com/sun/star/accessibility/Accessible.idl4
-rw-r--r--offapi/com/sun/star/accessibility/AccessibleContext.idl6
-rw-r--r--offapi/com/sun/star/accessibility/AccessibleEventId.idl2
-rw-r--r--offapi/com/sun/star/accessibility/AccessibleEventObject.idl2
-rw-r--r--offapi/com/sun/star/accessibility/AccessibleRelation.idl2
-rw-r--r--offapi/com/sun/star/accessibility/AccessibleRelationType.idl2
-rw-r--r--offapi/com/sun/star/accessibility/AccessibleRole.idl2
-rw-r--r--offapi/com/sun/star/accessibility/AccessibleStateType.idl2
-rw-r--r--offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl2
-rw-r--r--offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl2
-rw-r--r--offapi/com/sun/star/accessibility/AccessibleTextType.idl2
-rw-r--r--offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl2
-rw-r--r--offapi/com/sun/star/accessibility/TextSegment.idl2
-rw-r--r--offapi/com/sun/star/accessibility/XAccessible.idl4
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleAction.idl4
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleComponent.idl4
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleContext.idl10
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleEditableText.idl2
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl8
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleEventListener.idl2
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl2
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl2
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleHypertext.idl4
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleImage.idl2
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl2
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl2
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleSelection.idl4
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleStateSet.idl4
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleTable.idl4
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleText.idl2
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl2
-rw-r--r--offapi/com/sun/star/accessibility/XAccessibleValue.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleButton.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleCheckBox.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleComboBox.idl8
-rw-r--r--offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl8
-rw-r--r--offapi/com/sun/star/awt/AccessibleDropDownListBox.idl8
-rw-r--r--offapi/com/sun/star/awt/AccessibleEdit.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleFixedText.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl6
-rw-r--r--offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl6
-rw-r--r--offapi/com/sun/star/awt/AccessibleList.idl10
-rw-r--r--offapi/com/sun/star/awt/AccessibleListBox.idl8
-rw-r--r--offapi/com/sun/star/awt/AccessibleListBoxList.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleListItem.idl6
-rw-r--r--offapi/com/sun/star/awt/AccessibleMenu.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleMenuBar.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleMenuItem.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleMenuSeparator.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessiblePopupMenu.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleRadioButton.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleScrollBar.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleStatusBar.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleStatusBarItem.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleTabBar.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleTabBarPage.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleTabBarPageList.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleTabControl.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleTabPage.idl2
-rw-r--r--offapi/com/sun/star/awt/AccessibleTextField.idl8
-rw-r--r--offapi/com/sun/star/awt/AccessibleToolBox.idl6
-rw-r--r--offapi/com/sun/star/awt/AccessibleToolBoxItem.idl12
-rw-r--r--offapi/com/sun/star/awt/AccessibleTreeListBox.idl6
-rw-r--r--offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl10
-rw-r--r--offapi/com/sun/star/awt/AccessibleWindow.idl2
-rw-r--r--offapi/com/sun/star/chart/AccessibleChartDocumentView.idl2
-rw-r--r--offapi/com/sun/star/chart/AccessibleChartElement.idl2
-rw-r--r--offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl2
-rw-r--r--offapi/com/sun/star/drawing/AccessibleGraphControl.idl12
-rw-r--r--offapi/com/sun/star/drawing/AccessibleGraphicShape.idl2
-rw-r--r--offapi/com/sun/star/drawing/AccessibleOLEShape.idl2
-rw-r--r--offapi/com/sun/star/drawing/AccessibleShape.idl2
-rw-r--r--offapi/com/sun/star/drawing/AccessibleSlideView.idl2
-rw-r--r--offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl2
-rw-r--r--offapi/com/sun/star/formula/AccessibleFormulaText.idl2
-rw-r--r--offapi/com/sun/star/formula/AccessibleFormulaView.idl2
-rw-r--r--offapi/com/sun/star/sheet/AccessibleCell.idl2
-rw-r--r--offapi/com/sun/star/sheet/AccessibleCsvCell.idl2
-rw-r--r--offapi/com/sun/star/sheet/AccessibleCsvRuler.idl2
-rw-r--r--offapi/com/sun/star/sheet/AccessibleCsvTable.idl2
-rw-r--r--offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl2
-rw-r--r--offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl2
-rw-r--r--offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl2
-rw-r--r--offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl2
-rw-r--r--offapi/com/sun/star/table/AccessibleCellView.idl2
-rw-r--r--offapi/com/sun/star/table/AccessibleTableView.idl2
-rw-r--r--offapi/com/sun/star/text/AccessibleEndnoteView.idl2
-rw-r--r--offapi/com/sun/star/text/AccessibleFootnoteView.idl2
-rw-r--r--offapi/com/sun/star/text/AccessibleHeaderFooterView.idl2
-rw-r--r--offapi/com/sun/star/text/AccessiblePageView.idl2
-rw-r--r--offapi/com/sun/star/text/AccessibleParagraphView.idl2
-rw-r--r--offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl2
-rw-r--r--offapi/com/sun/star/text/AccessibleTextDocumentView.idl2
-rw-r--r--offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl2
-rw-r--r--offapi/com/sun/star/text/AccessibleTextFrameView.idl2
-rw-r--r--offapi/com/sun/star/text/AccessibleTextGraphicObject.idl2
-rw-r--r--offapi/type_reference/types.rdbbin7646208 -> 7481856 bytes
-rw-r--r--qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java10
-rw-r--r--sc/inc/AccessibleFilterMenu.hxx8
-rw-r--r--sc/source/ui/Accessibility/AccessibleContextBase.cxx8
-rw-r--r--sc/source/ui/Accessibility/AccessibleEditObject.cxx8
-rw-r--r--sc/source/ui/Accessibility/AccessibleFilterMenu.cxx12
-rw-r--r--sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx4
-rw-r--r--sc/source/ui/inc/AccessibleContextBase.hxx7
-rw-r--r--sc/source/ui/inc/AccessibleEditObject.hxx6
-rw-r--r--sc/source/ui/inc/AccessibleSpreadsheet.hxx3
-rw-r--r--sd/source/ui/accessibility/AccessibleOutlineView.cxx4
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx4
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterView.cxx4
-rw-r--r--sd/source/ui/accessibility/AccessibleTreeNode.cxx4
-rw-r--r--sd/source/ui/inc/AccessibleOutlineView.hxx7
-rw-r--r--sd/source/ui/inc/AccessibleSlideSorterObject.hxx4
-rw-r--r--sd/source/ui/inc/AccessibleSlideSorterView.hxx4
-rw-r--r--sd/source/ui/inc/AccessibleTreeNode.hxx4
-rw-r--r--sdext/source/presenter/PresenterAccessibility.cxx10
-rw-r--r--sfx2/source/control/thumbnailviewacc.cxx8
-rw-r--r--sfx2/source/control/thumbnailviewacc.hxx8
-rw-r--r--starmath/source/accessibility.cxx8
-rw-r--r--starmath/source/accessibility.hxx8
-rw-r--r--svtools/source/control/toolbarmenuacc.cxx8
-rw-r--r--svtools/source/control/toolbarmenuimp.hxx8
-rw-r--r--svtools/source/control/valueacc.cxx8
-rw-r--r--svtools/source/control/valueimp.hxx8
-rw-r--r--svx/inc/svx/AccessibleShape.hxx11
-rw-r--r--svx/source/accessibility/AccessibleControlShape.cxx4
-rw-r--r--svx/source/accessibility/AccessibleFrameSelector.cxx4
-rw-r--r--svx/source/accessibility/AccessibleShape.cxx8
-rw-r--r--svx/source/accessibility/AccessibleTextHelper.cxx16
-rw-r--r--svx/source/accessibility/GraphCtlAccessibleContext.cxx4
-rw-r--r--svx/source/accessibility/svxrectctaccessiblecontext.cxx8
-rw-r--r--svx/source/inc/AccessibleFrameSelector.hxx4
-rw-r--r--svx/source/inc/GraphCtlAccessibleContext.hxx9
-rw-r--r--svx/source/inc/svxrectctaccessiblecontext.hxx18
-rw-r--r--svx/source/table/accessiblecell.cxx8
-rw-r--r--svx/source/table/accessiblecell.hxx7
-rw-r--r--sw/source/core/access/acccontext.cxx4
-rw-r--r--sw/source/core/access/acccontext.hxx4
-rw-r--r--sw/source/ui/docvw/SidebarTxtControlAcc.cxx11
-rw-r--r--toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java10
-rw-r--r--toolkit/test/accessibility/AccessibilityTreeModel.java4
-rw-r--r--toolkit/test/accessibility/ov/ListeningObjectView.java4
-rw-r--r--vcl/aqua/source/a11y/documentfocuslistener.cxx4
-rw-r--r--vcl/unx/gtk/a11y/atkutil.cxx4
-rw-r--r--vcl/unx/gtk/a11y/atkwrapper.cxx2
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 c92a920..821d2e9 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 f56af00..4b447c9 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 95dda3e..f7c1c08 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 311a32f..7ea0877 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 00300d6..da4249a 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 e601a1c..b0d1d7e 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 da27f56..f181818 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 2aca835..52fdce8 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 93116ff..0a3d084 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 2027208..266ca42 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 6adbd2a..267d7de 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 612cd0a..885d3e4 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 dfcd8e5..ab6f9ac 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 8d71c26..553ccbb 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 b1b58fc..fd739fb 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 1c038e7..ebb69f1 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 f25c46c..547319e 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 9676f78..1a9471c 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 )
{
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 837dc04..183945b 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -940,7 +940,7 @@ 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)
{
MutexGuard aGuard( GetMutex() );
@@ -954,7 +954,7 @@ 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)
{
MutexGuard aGuard( GetMutex() );
diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx
index 3b87380..00f2231 100644
--- a/chart2/source/controller/inc/AccessibleBase.hxx
+++ b/chart2/source/controller/inc/AccessibleBase.hxx
@@ -307,10 +307,10 @@ protected:
throw (::com::sun::star::uno::RuntimeException);
// ________ 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 )
throw (::com::sun::star::uno::RuntimeException);
diff --git a/comphelper/inc/comphelper/accessiblecontexthelper.hxx b/comphelper/inc/comphelper/accessiblecontexthelper.hxx
index c3a2c34..ae77121 100644
--- a/comphelper/inc/comphelper/accessiblecontexthelper.hxx
+++ b/comphelper/inc/comphelper/accessiblecontexthelper.hxx
@@ -152,10 +152,8 @@ namespace comphelper
public:
// 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);
// XAccessibleContext - still waiting to be overwritten
virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException) = 0;
diff --git a/comphelper/inc/comphelper/accessiblewrapper.hxx b/comphelper/inc/comphelper/accessiblewrapper.hxx
index 1b4ab52..0867ab5 100644
--- a/comphelper/inc/comphelper/accessiblewrapper.hxx
+++ b/comphelper/inc/comphelper/accessiblewrapper.hxx
@@ -287,8 +287,8 @@ namespace comphelper
virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::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);
// OAccessibleContextWrapper
virtual void notifyTranslatedEvent( const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx
index 4841020..c355d50 100644
--- a/comphelper/source/misc/accessiblecontexthelper.cxx
+++ b/comphelper/source/misc/accessiblecontexthelper.cxx
@@ -133,7 +133,7 @@ namespace comphelper
}
//---------------------------------------------------------------------
- void SAL_CALL OAccessibleContextHelper::addEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException)
+ void SAL_CALL OAccessibleContextHelper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException)
{
OMutexGuard aGuard( getExternalLock() );
// don't use the OContextEntryGuard - it will throw an exception if we're not alive
@@ -156,7 +156,7 @@ namespace comphelper
}
//---------------------------------------------------------------------
- void SAL_CALL OAccessibleContextHelper::removeEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException)
+ void SAL_CALL OAccessibleContextHelper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException)
{
OMutexGuard aGuard( getExternalLock() );
// don't use the OContextEntryGuard - it will throw an exception if we're not alive
diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx
index 929eb5f..f7ac738 100644
--- a/comphelper/source/misc/accessiblewrapper.cxx
+++ b/comphelper/source/misc/accessiblewrapper.cxx
@@ -405,7 +405,7 @@ namespace comphelper
{
Reference< XAccessibleEventBroadcaster > xBroadcaster( m_xInner, UNO_QUERY );
if ( xBroadcaster.is() )
- xBroadcaster->addEventListener( this );
+ xBroadcaster->addAccessibleEventListener( this );
}
osl_atomic_decrement( &_rRefCount );
}
@@ -500,7 +500,7 @@ namespace comphelper
Reference< XAccessibleEventBroadcaster > xBroadcaster( m_xInner, UNO_QUERY );
OSL_ENSURE( xBroadcaster.is(), "OAccessibleContextWrapperHelper::disposing(): inner context is no broadcaster!" );
if ( xBroadcaster.is() )
- xBroadcaster->removeEventListener( this );
+ xBroadcaster->removeAccessibleEventListener( this );
// dispose the child cache/map
m_pChildMapper->dispose();
@@ -609,7 +609,7 @@ namespace comphelper
}
//--------------------------------------------------------------------
- void SAL_CALL OAccessibleContextWrapper::addEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException)
+ void SAL_CALL OAccessibleContextWrapper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
if ( !m_nNotifierClient )
@@ -618,7 +618,7 @@ namespace comphelper
}
//--------------------------------------------------------------------
- void SAL_CALL OAccessibleContextWrapper::removeEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException)
+ void SAL_CALL OAccessibleContextWrapper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
if ( m_nNotifierClient )
diff --git a/editeng/inc/editeng/AccessibleContextBase.hxx b/editeng/inc/editeng/AccessibleContextBase.hxx
index b54a59c..ecfd312 100644
--- a/editeng/inc/editeng/AccessibleContextBase.hxx
+++ b/editeng/inc/editeng/AccessibleContextBase.hxx
@@ -234,21 +234,16 @@ public:
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::accessibility::IllegalAccessibleComponentStateException);
- //===== XComponent ========================================================
-
- using WeakComponentImplHelperBase::addEventListener;
- using WeakComponentImplHelperBase::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/editeng/inc/editeng/AccessibleEditableTextPara.hxx b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
index d44f9af..afe3d42 100644
--- a/editeng/inc/editeng/AccessibleEditableTextPara.hxx
+++ b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
@@ -83,11 +83,6 @@ namespace accessibility
// XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface (const ::com::sun::star::uno::Type & rType) throw (::com::sun::star::uno::RuntimeException);
- // XComponent
-
- using WeakComponentImplHelperBase::addEventListener;
- using WeakComponentImplHelperBase::removeEventListener;
-
// XAccessible
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException);
@@ -106,8 +101,8 @@ namespace accessibility
virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::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);
// XAccessibleComponent
virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/editeng/inc/editeng/AccessibleImageBullet.hxx b/editeng/inc/editeng/AccessibleImageBullet.hxx
index 1ceeda3..2e5e589 100644
--- a/editeng/inc/editeng/AccessibleImageBullet.hxx
+++ b/editeng/inc/editeng/AccessibleImageBullet.hxx
@@ -74,8 +74,8 @@ namespace accessibility
virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::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);
// XAccessibleComponent
virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx
index 6e2e3f3..8a11762 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -424,7 +424,7 @@ lang::Locale SAL_CALL
//===== XAccessibleEventListener ============================================
void SAL_CALL
- AccessibleContextBase::addEventListener (
+ AccessibleContextBase::addAccessibleEventListener (
const uno::Reference<XAccessibleEventListener >& rxListener)
throw (uno::RuntimeException)
{
@@ -448,7 +448,7 @@ void SAL_CALL
void SAL_CALL
- AccessibleContextBase::removeEventListener (
+ AccessibleContextBase::removeAccessibleEventListener (
const uno::Reference<XAccessibleEventListener >& rxListener )
throw (uno::RuntimeException)
{
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index cb8252a..602879e 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -940,7 +940,7 @@ namespace accessibility
return implGetLocale();
}
- 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)
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
@@ -948,7 +948,7 @@ namespace accessibility
::comphelper::AccessibleEventNotifier::addEventListener( getNotifierClientId(), xListener );
}
- 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)
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 1351012..8d97477 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -209,7 +209,7 @@ namespace accessibility
return LanguageTag(GetTextForwarder().GetLanguage( static_cast< sal_uInt16 >( GetParagraphIndex() ), 0 )).getLocale();
}
- 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)
{
DBG_CHKTHIS( AccessibleImageBullet, NULL );
@@ -217,7 +217,7 @@ namespace accessibility
::comphelper::AccessibleEventNotifier::addEventListener( getNotifierClientId(), xListener );
}
- 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)
{
DBG_CHKTHIS( AccessibleImageBullet, NULL );
diff --git a/odk/examples/DevelopersGuide/Accessibility/RegistrationThread.java b/odk/examples/DevelopersGuide/Accessibility/RegistrationThread.java
index 3dbb035..b6a64e4 100644
--- a/odk/examples/DevelopersGuide/Accessibility/RegistrationThread.java
+++ b/odk/examples/DevelopersGuide/Accessibility/RegistrationThread.java
@@ -107,9 +107,9 @@ public class RegistrationThread
if (xBroadcaster != null)
{
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 32c142aa..44703ed 100644
--- a/offapi/com/sun/star/accessibility/AccessBridge.idl
+++ b/offapi/com/sun/star/accessibility/AccessBridge.idl
@@ -35,7 +35,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published service AccessBridge
+service AccessBridge
{
/** Expects and instance of XExtendedToolkit as first parameter */
interface ::com::sun::star::lang::XInitialization;
diff --git a/offapi/com/sun/star/accessibility/Accessible.idl b/offapi/com/sun/star/accessibility/Accessible.idl
index 14299d4..a3b5e5b 100644
--- a/offapi/com/sun/star/accessibility/Accessible.idl
+++ b/offapi/com/sun/star/accessibility/Accessible.idl
@@ -21,7 +21,7 @@
module com { module sun { module star { module accessibility {
- published interface XAccessible;
+ interface XAccessible;
/** Every class has to support this service in order to be accessible.
@@ -38,7 +38,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published service Accessible
+service Accessible
{
interface XAccessible;
};
diff --git a/offapi/com/sun/star/accessibility/AccessibleContext.idl b/offapi/com/sun/star/accessibility/AccessibleContext.idl
index 1bb211e..d9fe07c 100644
--- a/offapi/com/sun/star/accessibility/AccessibleContext.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleContext.idl
@@ -21,8 +21,8 @@
module com { module sun { module star { module accessibility {
- published interface XAccessibleContext;
- published interface XAccessibleEventBroadcaster;
+ interface XAccessibleContext;
+ interface XAccessibleEventBroadcaster;
/** Central service of the Accessibility API that gives access to various
facets of an object's content.
@@ -41,7 +41,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published service AccessibleContext
+service AccessibleContext
{
interface XAccessibleContext;
diff --git a/offapi/com/sun/star/accessibility/AccessibleEventId.idl b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
index 674fd4a..c5d0bdf5 100644
--- a/offapi/com/sun/star/accessibility/AccessibleEventId.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
@@ -34,7 +34,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published constants AccessibleEventId
+constants AccessibleEventId
{
/** Use this event type to indicate a change of the name string
of an accessible object. The
diff --git a/offapi/com/sun/star/accessibility/AccessibleEventObject.idl b/offapi/com/sun/star/accessibility/AccessibleEventObject.idl
index 142072d..781a8f1 100644
--- a/offapi/com/sun/star/accessibility/AccessibleEventObject.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleEventObject.idl
@@ -31,7 +31,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published struct AccessibleEventObject: ::com::sun::star::lang::EventObject
+struct AccessibleEventObject: ::com::sun::star::lang::EventObject
{
/** specifies the type of this event.
diff --git a/offapi/com/sun/star/accessibility/AccessibleRelation.idl b/offapi/com/sun/star/accessibility/AccessibleRelation.idl
index a34b2a2..b715abf 100644
--- a/offapi/com/sun/star/accessibility/AccessibleRelation.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleRelation.idl
@@ -31,7 +31,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published struct AccessibleRelation
+struct AccessibleRelation
{
/** Type of the relation.
diff --git a/offapi/com/sun/star/accessibility/AccessibleRelationType.idl b/offapi/com/sun/star/accessibility/AccessibleRelationType.idl
index de79af0..32a94af 100644
--- a/offapi/com/sun/star/accessibility/AccessibleRelationType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleRelationType.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published constants AccessibleRelationType
+constants AccessibleRelationType
{
/** Invalid relation type.
diff --git a/offapi/com/sun/star/accessibility/AccessibleRole.idl b/offapi/com/sun/star/accessibility/AccessibleRole.idl
index 096ad0a..9f57f8f 100644
--- a/offapi/com/sun/star/accessibility/AccessibleRole.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleRole.idl
@@ -45,7 +45,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published constants AccessibleRole
+constants AccessibleRole
{
/** Unknown role.
diff --git a/offapi/com/sun/star/accessibility/AccessibleStateType.idl b/offapi/com/sun/star/accessibility/AccessibleStateType.idl
index 869f6b0..acf0a30 100644
--- a/offapi/com/sun/star/accessibility/AccessibleStateType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleStateType.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published constants AccessibleStateType
+constants AccessibleStateType
{
/** Indicates an invalid state.
*/
diff --git a/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl b/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl
index 73eecb3..c799043 100644
--- a/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleTableModelChange.idl
@@ -34,7 +34,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published struct AccessibleTableModelChange
+struct AccessibleTableModelChange
{
/** The type of the event as defined in
<type>AccessibleTableModelChangeType</type>.
diff --git a/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl b/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
index 4636981..19536b0 100644
--- a/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published constants AccessibleTableModelChangeType
+constants AccessibleTableModelChangeType
{
/** One or more rows and/or columns have been inserted.
diff --git a/offapi/com/sun/star/accessibility/AccessibleTextType.idl b/offapi/com/sun/star/accessibility/AccessibleTextType.idl
index a61f178..7bad07c 100644
--- a/offapi/com/sun/star/accessibility/AccessibleTextType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleTextType.idl
@@ -31,7 +31,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published constants AccessibleTextType
+constants AccessibleTextType
{
/** Single character.
diff --git a/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl b/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl
index 1dc6a35..adb597f 100644
--- a/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl
+++ b/offapi/com/sun/star/accessibility/IllegalAccessibleComponentStateException.idl
@@ -34,7 +34,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-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 8d1182b..49630e0 100644
--- a/offapi/com/sun/star/accessibility/TextSegment.idl
+++ b/offapi/com/sun/star/accessibility/TextSegment.idl
@@ -51,7 +51,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published struct TextSegment
+struct TextSegment
{
/** A copy of the text segment of the enclosing text delimited by the
text indices <member>TextSegment::SegmentStart</member> and
diff --git a/offapi/com/sun/star/accessibility/XAccessible.idl b/offapi/com/sun/star/accessibility/XAccessible.idl
index 6e28d70..a738d2b 100644
--- a/offapi/com/sun/star/accessibility/XAccessible.idl
+++ b/offapi/com/sun/star/accessibility/XAccessible.idl
@@ -24,7 +24,7 @@
module com { module sun { module star { module accessibility {
- published interface XAccessibleContext;
+ interface XAccessibleContext;
/** This interface has to be implemented by any class that wants to be
accessible.
@@ -51,7 +51,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published interface XAccessible : ::com::sun::star::uno::XInterface
+interface XAccessible : ::com::sun::star::uno::XInterface
{
/** Returns the AccessibleContext associated with this object.
diff --git a/offapi/com/sun/star/accessibility/XAccessibleAction.idl b/offapi/com/sun/star/accessibility/XAccessibleAction.idl
index 706658f..de46557 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleAction.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleAction.idl
@@ -25,7 +25,7 @@
module com { module sun { module star { module accessibility {
- published interface XAccessibleKeyBinding;
+ interface XAccessibleKeyBinding;
/** Implement this interface to give access to actions that can be executed
for accessible objects.
@@ -37,7 +37,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published interface XAccessibleAction : ::com::sun::star::uno::XInterface
+interface XAccessibleAction : ::com::sun::star::uno::XInterface
{
/** Returns the number of accessible actions available in this object.
diff --git a/offapi/com/sun/star/accessibility/XAccessibleComponent.idl b/offapi/com/sun/star/accessibility/XAccessibleComponent.idl
index d2d2414..7d851c6 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleComponent.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleComponent.idl
@@ -31,7 +31,7 @@
module com { module sun { module star { module accessibility {
- published interface XAccessible;
+ interface XAccessible;
/** The <type>XAccessibleComponent</type> interface should be supported by
any class that can be rendered on the screen.
@@ -76,7 +76,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published interface XAccessibleComponent : ::com::sun::star::uno::XInterface
+interface XAccessibleComponent : ::com::sun::star::uno::XInterface
{
/** Tests whether the specified point lies within this object's bounds.
diff --git a/offapi/com/sun/star/accessibility/XAccessibleContext.idl b/offapi/com/sun/star/accessibility/XAccessibleContext.idl
index 8ead5b1..3ed9771 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleContext.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleContext.idl
@@ -27,10 +27,10 @@
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;
/** Implement this interface for exposing various aspects of a class's
content.
@@ -46,7 +46,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published interface XAccessibleContext : ::com::sun::star::uno::XInterface
+interface XAccessibleContext : ::com::sun::star::uno::XInterface
{
/** Return the number of children.
diff --git a/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl b/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl
index 5eb8036..ccfbba3 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleEditableText.idl
@@ -35,7 +35,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published interface XAccessibleEditableText
+interface XAccessibleEditableText
: ::com::sun::star::accessibility::XAccessibleText
{
/** Copies the text range into the clipboard.
diff --git a/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl b/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl
index cce170f..4889191 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleEventBroadcaster.idl
@@ -24,7 +24,7 @@
module com { module sun { module star { module accessibility {
- published interface XAccessibleEventListener;
+ interface XAccessibleEventListener;
/** makes it possible to register listeners which are called whenever
an accessibility event (see <type>AccessibleEventObject</type>) occurs.
@@ -34,17 +34,17 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published interface XAccessibleEventBroadcaster: ::com::sun::star::uno::XInterface
+interface XAccessibleEventBroadcaster: ::com::sun::star::uno::XInterface
{
/** registers the given <type>XAccessibleEventListener</type>.
*/
- [oneway] void addEventListener( [in] XAccessibleEventListener xListener );
+ [oneway] void addAccessibleEventListener( [in] XAccessibleEventListener xListener );
/** unregisters the given <type>XAccessibleEventListener</type>.
*/
- [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 be38ec0..396c504 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleEventListener.idl
@@ -32,7 +32,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published interface XAccessibleEventListener: ::com::sun::star::lang::XEventListener
+interface XAccessibleEventListener: ::com::sun::star::lang::XEventListener
{
/** is called whenever a accessible event (see <type>AccessibleEventObject</type>) occurs.
diff --git a/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl b/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
index 85bfb00..00762e0 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
@@ -47,7 +47,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published interface XAccessibleExtendedComponent : XAccessibleComponent
+interface XAccessibleExtendedComponent : XAccessibleComponent
{
/** Returns the font of this object.
diff --git a/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl b/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl
index 9b561207..e095eb4 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleHyperlink.idl
@@ -47,7 +47,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published interface XAccessibleHyperlink :
+interface XAccessibleHyperlink :
::com::sun::star::accessibility::XAccessibleAction
{
/** Returns an object that represents the link anchor, as appropriate
diff --git a/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl b/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl
index 547934d..92707d3 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleHypertext.idl
@@ -26,7 +26,7 @@
module com { module sun { module star { module accessibility {
- published interface XAccessibleHyperlink;
+ interface XAccessibleHyperlink;
/** Implement this interface to expose the hypertext structure of a document.
@@ -43,7 +43,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published interface XAccessibleHypertext
+interface XAccessibleHypertext
: ::com::sun::star::accessibility::XAccessibleText
{
/** Returns the number of links and link groups contained within this
diff --git a/offapi/com/sun/star/accessibility/XAccessibleImage.idl b/offapi/com/sun/star/accessibility/XAccessibleImage.idl
index 6f503c5..b63d182 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleImage.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleImage.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published interface XAccessibleImage : ::com::sun::star::uno::XInterface
+interface XAccessibleImage : ::com::sun::star::uno::XInterface
{
/** Returns the localized description of the image.
diff --git a/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl b/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl
index 7196a99..8b374ab 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleKeyBinding.idl
@@ -41,7 +41,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published interface XAccessibleKeyBinding : ::com::sun::star::uno::XInterface
+interface XAccessibleKeyBinding : ::com::sun::star::uno::XInterface
{
/** Return the number of available key bindings.
@return
diff --git a/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl b/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl
index 59f8f82..02fbd70 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published interface XAccessibleRelationSet : ::com::sun::star::uno::XInterface
+interface XAccessibleRelationSet : ::com::sun::star::uno::XInterface
{
/** Returns the number of relations in this relation set.
diff --git a/offapi/com/sun/star/accessibility/XAccessibleSelection.idl b/offapi/com/sun/star/accessibility/XAccessibleSelection.idl
index 572659f..032a5170 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleSelection.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleSelection.idl
@@ -25,7 +25,7 @@
module com { module sun { module star { module accessibility {
- published interface XAccessible;
+ interface XAccessible;
/** Implement this interface to represent a selection of accessible objects.
@@ -42,7 +42,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published interface XAccessibleSelection : ::com::sun::star::uno::XInterface
+interface XAccessibleSelection : ::com::sun::star::uno::XInterface
{
/** Selects the specified <type>Accessible</type> child of the
object.
diff --git a/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl b/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl
index 41eaed2..170f4e1 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleStateSet.idl
@@ -25,7 +25,7 @@
module com { module sun { module star { module accessibility {
- published interface XAccessible;
+ interface XAccessible;
/** Implement this interface to represent a set of states.
@@ -36,7 +36,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published interface XAccessibleStateSet : ::com::sun::star::uno::XInterface
+interface XAccessibleStateSet : ::com::sun::star::uno::XInterface
{
/** Checks whether the current state set is empty.
diff --git a/offapi/com/sun/star/accessibility/XAccessibleTable.idl b/offapi/com/sun/star/accessibility/XAccessibleTable.idl
index f0ecf79..221c92b 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleTable.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleTable.idl
@@ -25,7 +25,7 @@
module com { module sun { module star { module accessibility {
- published interface XAccessible;
+ interface XAccessible;
/** Implement this interface to give access to a two-dimensional table.
@@ -54,7 +54,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published interface XAccessibleTable : ::com::sun::star::uno::XInterface
+interface XAccessibleTable : ::com::sun::star::uno::XInterface
{
/** Returns the number of used rows in the table.
diff --git a/offapi/com/sun/star/accessibility/XAccessibleText.idl b/offapi/com/sun/star/accessibility/XAccessibleText.idl
index 04ac800..c020d51 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleText.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleText.idl
@@ -56,7 +56,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published interface XAccessibleText : ::com::sun::star::uno::XInterface
+interface XAccessibleText : ::com::sun::star::uno::XInterface
{
/** Return the position of the caret.
diff --git a/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl b/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl
index 19efafd..b7c30d9 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl
@@ -29,7 +29,7 @@ module com { module sun { module star { module accessibility {
@since OOo 2.0.4
*/
-published interface XAccessibleTextAttributes
+interface XAccessibleTextAttributes
{
/** Get the default attribute set for the text.
diff --git a/offapi/com/sun/star/accessibility/XAccessibleValue.idl b/offapi/com/sun/star/accessibility/XAccessibleValue.idl
index 2b1db5a..9d752c8 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleValue.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleValue.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module accessibility {
@since OOo 1.1.2
*/
-published interface XAccessibleValue : ::com::sun::star::uno::XInterface
+interface XAccessibleValue : ::com::sun::star::uno::XInterface
{
/** Returns the value of this object as a number.
diff --git a/offapi/com/sun/star/awt/AccessibleButton.idl b/offapi/com/sun/star/awt/AccessibleButton.idl
index 30d9372..0e9a0c9 100644
--- a/offapi/com/sun/star/awt/AccessibleButton.idl
+++ b/offapi/com/sun/star/awt/AccessibleButton.idl
@@ -34,7 +34,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleButton
+service AccessibleButton
{
/** This interface gives access to the structural information of a button:
diff --git a/offapi/com/sun/star/awt/AccessibleCheckBox.idl b/offapi/com/sun/star/awt/AccessibleCheckBox.idl
index 727e50f..506f3da 100644
--- a/offapi/com/sun/star/awt/AccessibleCheckBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleCheckBox.idl
@@ -34,7 +34,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleCheckBox
+service AccessibleCheckBox
{
/** This interface gives access to the structural information of a
check box:
diff --git a/offapi/com/sun/star/awt/AccessibleComboBox.idl b/offapi/com/sun/star/awt/AccessibleComboBox.idl
index 10c22df..735d3d4 100644
--- a/offapi/com/sun/star/awt/AccessibleComboBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleComboBox.idl
@@ -24,9 +24,9 @@
module com { module sun { module star { module accessibility {
- published interface XAccessibleText;
- published interface XAccessibleExtendedComponent;
- published interface XAccessibleComponent;
+ interface XAccessibleText;
+ interface XAccessibleExtendedComponent;
+ interface XAccessibleComponent;
}; }; }; };
@@ -39,7 +39,7 @@ module com { module sun { module star { module awt {
@see com::sun::star::accessibility::XAccessibleExtendedComponent
@since OOo 1.1.2
*/
-published service AccessibleComboBox
+service AccessibleComboBox
{
/** This interface gives access to the structural information of a combo box:
diff --git a/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl b/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
index c4e59e1..9d1173d 100644
--- a/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleDropDownComboBox.idl
@@ -25,9 +25,9 @@
module com { module sun { module star { module accessibility {
- published interface XAccessibleAction;
- published interface XAccessibleExtendedComponent;
- published interface XAccessibleComponent;
+ interface XAccessibleAction;
+ interface XAccessibleExtendedComponent;
+ interface XAccessibleComponent;
}; }; }; };
@@ -43,7 +43,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleDropDownComboBox
+service AccessibleDropDownComboBox
{
/** This interface gives access to the structural information of a dropdown combo box:
diff --git a/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl b/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
index 7af54c5..f6609c4 100644
--- a/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleDropDownListBox.idl
@@ -25,9 +25,9 @@
module com { module sun { module star { module accessibility {
- published interface XAccessibleAction;
- published interface XAccessibleExtendedComponent;
- published interface XAccessibleComponent;
+ interface XAccessibleAction;
+ interface XAccessibleExtendedComponent;
+ interface XAccessibleComponent;
}; }; }; };
@@ -44,7 +44,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleDropDownListBox
+service AccessibleDropDownListBox
{
/** This interface gives access to the structural information of a dropdown list box:
diff --git a/offapi/com/sun/star/awt/AccessibleEdit.idl b/offapi/com/sun/star/awt/AccessibleEdit.idl
index 82653cb..6238652 100644
--- a/offapi/com/sun/star/awt/AccessibleEdit.idl
+++ b/offapi/com/sun/star/awt/AccessibleEdit.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleEdit
+service AccessibleEdit
{
/** This interface gives access to the structural information of an edit:
diff --git a/offapi/com/sun/star/awt/AccessibleFixedText.idl b/offapi/com/sun/star/awt/AccessibleFixedText.idl
index 582c96d..410dba1 100644
--- a/offapi/com/sun/star/awt/AccessibleFixedText.idl
+++ b/offapi/com/sun/star/awt/AccessibleFixedText.idl
@@ -32,7 +32,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleFixedText
+service AccessibleFixedText
{
/** This interface gives access to the structural information of a
fixed text:
diff --git a/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl b/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
index 4f793d6..0e1125e 100644
--- a/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
+++ b/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl
@@ -25,8 +25,8 @@
module com { module sun { module star { module accessibility {
- published interface XAccessibleSelection;
- published interface XAccessibleComponent;
+ interface XAccessibleSelection;
+ interface XAccessibleComponent;
}; }; }; };
@@ -39,7 +39,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleIconChoiceControl
+service AccessibleIconChoiceControl
{
/** This interface gives access to the structural information of an icon choice control:
diff --git a/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl b/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
index a2684c2..fcc1b62 100644
--- a/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
+++ b/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl
@@ -25,8 +25,8 @@
module com { module sun { module star { module accessibility {
- published interface XAccessibleText;
- published interface XAccessibleComponent;
+ interface XAccessibleText;
+ interface XAccessibleComponent;
}; }; }; };
@@ -41,7 +41,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleIconChoiceControlEntry
+service AccessibleIconChoiceControlEntry
{
/** This interface gives access to the structural information of an icon choice control entry:
diff --git a/offapi/com/sun/star/awt/AccessibleList.idl b/offapi/com/sun/star/awt/AccessibleList.idl
index 249a3b8..ac9117a 100644
--- a/offapi/com/sun/star/awt/AccessibleList.idl
+++ b/offapi/com/sun/star/awt/AccessibleList.idl
@@ -24,10 +24,10 @@
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;
}; }; }; };
@@ -46,7 +46,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleList
+service AccessibleList
{
/** This interface gives access to the structural information of a list:
diff --git a/offapi/com/sun/star/awt/AccessibleListBox.idl b/offapi/com/sun/star/awt/AccessibleListBox.idl
index 04e39e9..6e6e4bd 100644
--- a/offapi/com/sun/star/awt/AccessibleListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleListBox.idl
@@ -24,9 +24,9 @@
module com { module sun { module star { module accessibility {
- published interface XAccessibleSelection;
- published interface XAccessibleExtendedComponent;
- published interface XAccessibleComponent;
+ interface XAccessibleSelection;
+ interface XAccessibleExtendedComponent;
+ interface XAccessibleComponent;
}; }; }; };
@@ -40,7 +40,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleListBox
+service AccessibleListBox
{
/** This interface gives access to the structural information of a list box:
diff --git a/offapi/com/sun/star/awt/AccessibleListBoxList.idl b/offapi/com/sun/star/awt/AccessibleListBoxList.idl
index a7e2eea..f178cf0 100644
--- a/offapi/com/sun/star/awt/AccessibleListBoxList.idl
+++ b/offapi/com/sun/star/awt/AccessibleListBoxList.idl
@@ -32,7 +32,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleListBoxList
+service AccessibleListBoxList
{
service AccessibleList;
};
diff --git a/offapi/com/sun/star/awt/AccessibleListItem.idl b/offapi/com/sun/star/awt/AccessibleListItem.idl
index b786be8..269ddc8f 100644
--- a/offapi/com/sun/star/awt/AccessibleListItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleListItem.idl
@@ -25,8 +25,8 @@
module com { module sun { module star { module accessibility {
- published interface XAccessibleText;
- published interface XAccessibleComponent;
+ interface XAccessibleText;
+ interface XAccessibleComponent;
}; }; }; };
@@ -40,7 +40,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleListItem
+service AccessibleListItem
{
/** This interface gives access to the structural information of a list item:
diff --git a/offapi/com/sun/star/awt/AccessibleMenu.idl b/offapi/com/sun/star/awt/AccessibleMenu.idl
index 2d90e51..41c1f42 100644
--- a/offapi/com/sun/star/awt/AccessibleMenu.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenu.idl
@@ -35,7 +35,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleMenu
+service AccessibleMenu
{
/** This interface gives access to the structural information of a menu:
diff --git a/offapi/com/sun/star/awt/AccessibleMenuBar.idl b/offapi/com/sun/star/awt/AccessibleMenuBar.idl
index 93c48dd..aab1b85 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuBar.idl
@@ -32,7 +32,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleMenuBar
+service AccessibleMenuBar
{
/** This interface gives access to the structural information of a
menu bar:
diff --git a/offapi/com/sun/star/awt/AccessibleMenuItem.idl b/offapi/com/sun/star/awt/AccessibleMenuItem.idl
index 5cb9458..1a50da3 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuItem.idl
@@ -34,7 +34,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleMenuItem
+service AccessibleMenuItem
{
/** This interface gives access to the structural information of a
menu item:
diff --git a/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl b/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
index 906bda3..39b146f 100644
--- a/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
+++ b/offapi/com/sun/star/awt/AccessibleMenuSeparator.idl
@@ -31,7 +31,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleMenuSeparator
+service AccessibleMenuSeparator
{
/** This interface gives access to the structural information of a
menu separator:
diff --git a/offapi/com/sun/star/awt/AccessiblePopupMenu.idl b/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
index 46b74c5..3cc7e3c 100644
--- a/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
+++ b/offapi/com/sun/star/awt/AccessiblePopupMenu.idl
@@ -32,7 +32,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessiblePopupMenu
+service AccessiblePopupMenu
{
/** This interface gives access to the structural information of a
pop-up menu:
diff --git a/offapi/com/sun/star/awt/AccessibleRadioButton.idl b/offapi/com/sun/star/awt/AccessibleRadioButton.idl
index 3d1f198..8830a6f 100644
--- a/offapi/com/sun/star/awt/AccessibleRadioButton.idl
+++ b/offapi/com/sun/star/awt/AccessibleRadioButton.idl
@@ -34,7 +34,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleRadioButton
+service AccessibleRadioButton
{
/** This interface gives access to the structural information of a
radio button:
diff --git a/offapi/com/sun/star/awt/AccessibleScrollBar.idl b/offapi/com/sun/star/awt/AccessibleScrollBar.idl
index 7f23008..ab35922 100644
--- a/offapi/com/sun/star/awt/AccessibleScrollBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleScrollBar.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleScrollBar
+service AccessibleScrollBar
{
/** This interface gives access to the structural information of a
scroll bar:
diff --git a/offapi/com/sun/star/awt/AccessibleStatusBar.idl b/offapi/com/sun/star/awt/AccessibleStatusBar.idl
index bd1be51..b8f21ee 100644
--- a/offapi/com/sun/star/awt/AccessibleStatusBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleStatusBar.idl
@@ -31,7 +31,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleStatusBar
+service AccessibleStatusBar
{
/** This interface gives access to the structural information of a
status bar:
diff --git a/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl b/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
index 1840608..a87b889 100644
--- a/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleStatusBarItem.idl
@@ -32,7 +32,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleStatusBarItem
+service AccessibleStatusBarItem
{
/** This interface gives access to the structural information of a
status bar item:
diff --git a/offapi/com/sun/star/awt/AccessibleTabBar.idl b/offapi/com/sun/star/awt/AccessibleTabBar.idl
index fee3bcb..962b6f4 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBar.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBar.idl
@@ -31,7 +31,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleTabBar
+service AccessibleTabBar
{
/** This interface gives access to the structural information of a
tabbar:
diff --git a/offapi/com/sun/star/awt/AccessibleTabBarPage.idl b/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
index c6051cf..807f571 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBarPage.idl
@@ -31,7 +31,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleTabBarPage
+service AccessibleTabBarPage
{
/** This interface gives access to the structural information of a
tabbar page:
diff --git a/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl b/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
index efe4407..8adcd5b 100644
--- a/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabBarPageList.idl
@@ -32,7 +32,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleTabBarPageList
+service AccessibleTabBarPageList
{
/** This interface gives access to the structural information of a
tabbar page list:
diff --git a/offapi/com/sun/star/awt/AccessibleTabControl.idl b/offapi/com/sun/star/awt/AccessibleTabControl.idl
index e263877..e77539c 100644
--- a/offapi/com/sun/star/awt/AccessibleTabControl.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabControl.idl
@@ -32,7 +32,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleTabControl
+service AccessibleTabControl
{
/** This interface gives access to the structural information of a
tab control:
diff --git a/offapi/com/sun/star/awt/AccessibleTabPage.idl b/offapi/com/sun/star/awt/AccessibleTabPage.idl
index 8b793e6..1d4d543 100644
--- a/offapi/com/sun/star/awt/AccessibleTabPage.idl
+++ b/offapi/com/sun/star/awt/AccessibleTabPage.idl
@@ -32,7 +32,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleTabPage
+service AccessibleTabPage
{
/** This interface gives access to the structural information of a
tab page:
diff --git a/offapi/com/sun/star/awt/AccessibleTextField.idl b/offapi/com/sun/star/awt/AccessibleTextField.idl
index ea3868b..0e5f90e 100644
--- a/offapi/com/sun/star/awt/AccessibleTextField.idl
+++ b/offapi/com/sun/star/awt/AccessibleTextField.idl
@@ -25,9 +25,9 @@
module com { module sun { module star { module accessibility {
- published interface XAccessibleExtendedComponent;
- published interface XAccessibleComponent;
- published interface XAccessibleText;
+ interface XAccessibleExtendedComponent;
+ interface XAccessibleComponent;
+ interface XAccessibleText;
}; }; }; };
@@ -44,7 +44,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleTextField
+service AccessibleTextField
{
/** This interface gives access to the structural information of a text filed:
diff --git a/offapi/com/sun/star/awt/AccessibleToolBox.idl b/offapi/com/sun/star/awt/AccessibleToolBox.idl
index 514408f..9cc3a46 100644
--- a/offapi/com/sun/star/awt/AccessibleToolBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleToolBox.idl
@@ -25,8 +25,8 @@
module com { module sun { module star { module accessibility {
- published interface XAccessibleExtendedComponent;
- published interface XAccessibleComponent;
+ interface XAccessibleExtendedComponent;
+ interface XAccessibleComponent;
}; }; }; };
@@ -42,7 +42,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleToolBox
+service AccessibleToolBox
{
/** This interface gives access to the structural information of a tool box:
diff --git a/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl b/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
index 819737d..8ddc562 100644
--- a/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
+++ b/offapi/com/sun/star/awt/AccessibleToolBoxItem.idl
@@ -25,11 +25,11 @@
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;
}; }; }; };
@@ -48,7 +48,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleToolBoxItem
+service AccessibleToolBoxItem
{
/** This interface gives access to the structural information of a tool box item:
diff --git a/offapi/com/sun/star/awt/AccessibleTreeListBox.idl b/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
index f4b7ce8..42a20c9 100644
--- a/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
+++ b/offapi/com/sun/star/awt/AccessibleTreeListBox.idl
@@ -25,8 +25,8 @@
module com { module sun { module star { module accessibility {
- published interface XAccessibleSelection;
- published interface XAccessibleComponent;
+ interface XAccessibleSelection;
+ interface XAccessibleComponent;
}; }; }; };
@@ -41,7 +41,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleTreeListBox
+service AccessibleTreeListBox
{
/** This interface gives access to the structural information of a tree list box:
diff --git a/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl b/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
index 66003a9..fba0893 100644
--- a/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
+++ b/offapi/com/sun/star/awt/AccessibleTreeListBoxEntry.idl
@@ -25,10 +25,10 @@
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;
}; }; }; };
@@ -45,7 +45,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleTreeListBoxEntry
+service AccessibleTreeListBoxEntry
{
/** This interface gives access to the structural information of a tree list box entry:
diff --git a/offapi/com/sun/star/awt/AccessibleWindow.idl b/offapi/com/sun/star/awt/AccessibleWindow.idl
index 827882d..013cc8e 100644
--- a/offapi/com/sun/star/awt/AccessibleWindow.idl
+++ b/offapi/com/sun/star/awt/AccessibleWindow.idl
@@ -31,7 +31,7 @@ module com { module sun { module star { module awt {
@since OOo 1.1.2
*/
-published service AccessibleWindow
+service AccessibleWindow
{
/** This interface gives access to the structural information of a window:
diff --git a/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl b/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl
index a5ce5c9d..0c5606d 100644
--- a/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl
+++ b/offapi/com/sun/star/chart/AccessibleChartDocumentView.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module chart {
@since OOo 1.1.2
*/
-published service AccessibleChartDocumentView
+service AccessibleChartDocumentView
{
/** Base interface for being accessible. It gives access to the
<type scope="::com::sun::star::accessibility">XAccessibleContext</type>
diff --git a/offapi/com/sun/star/chart/AccessibleChartElement.idl b/offapi/com/sun/star/chart/AccessibleChartElement.idl
index 6de7df1..4f14073 100644
--- a/offapi/com/sun/star/chart/AccessibleChartElement.idl
+++ b/offapi/com/sun/star/chart/AccessibleChartElement.idl
@@ -47,7 +47,7 @@ module com { module sun { module star { module chart {
@since OOo 1.1.2
*/
-published service AccessibleChartElement
+service AccessibleChartElement
{
/** Base interface for being accessible. It gives access to the
<type scope="::com::sun::star::accessibility">XAccessibleContext</type>
diff --git a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
index 1bc360a..2ca933e 100644
--- a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
+++ b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl
@@ -57,7 +57,7 @@ module com { module sun { module star { module drawing {
@since OOo 1.1.2
*/
-published service AccessibleDrawDocumentView
+service AccessibleDrawDocumentView
{
/** Base interface for being accessible. It gives access to the
<type scope="::com::sun::star::accessibility">XAccessibleContext</type>
diff --git a/offapi/com/sun/star/drawing/AccessibleGraphControl.idl b/offapi/com/sun/star/drawing/AccessibleGraphControl.idl
index 753e18d..e7a31d5 100644
--- a/offapi/com/sun/star/drawing/AccessibleGraphControl.idl
+++ b/offapi/com/sun/star/drawing/AccessibleGraphControl.idl
@@ -22,11 +22,11 @@
// Declarations of interfaces to avoid inclusion of IDL files.
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;
}; }; }; };
@@ -42,7 +42,7 @@ module com { module sun { module star { module drawing {
@since OOo 1.1.2
*/
-published service AccessibleGraphControl
+service AccessibleGraphControl
{
/** Base interface for being accessible. It gives access to the
<type scope="::com::sun::star::accessibility">XAccessibleContext</type>
diff --git a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl b/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
index f3c5daa..6a92e16 100644
--- a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module drawing {
@since OOo 1.1.2
*/
-published service AccessibleGraphicShape
+service AccessibleGraphicShape
{
/** Give access to information of generic shapes.
diff --git a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl b/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
index 5caabb4..b916348 100644
--- a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleOLEShape.idl
@@ -46,7 +46,7 @@ module com { module sun { module star { module drawing {
@since OOo 1.1.2
*/
-published service AccessibleOLEShape
+service AccessibleOLEShape
{
/** Give access to information of generic shapes.
diff --git a/offapi/com/sun/star/drawing/AccessibleShape.idl b/offapi/com/sun/star/drawing/AccessibleShape.idl
index 109aeca..122bd44 100644
--- a/offapi/com/sun/star/drawing/AccessibleShape.idl
+++ b/offapi/com/sun/star/drawing/AccessibleShape.idl
@@ -56,7 +56,7 @@ module com { module sun { module star { module drawing {
@since OOo 1.1.2
*/
-published service AccessibleShape
+service AccessibleShape
{
/** Base interface for being accessible. It gives access to the
<type scope="::com::sun::star::accessibility">XAccessibleContext</type>
diff --git a/offapi/com/sun/star/drawing/AccessibleSlideView.idl b/offapi/com/sun/star/drawing/AccessibleSlideView.idl
index 7bca790..86a8013 100644
--- a/offapi/com/sun/star/drawing/AccessibleSlideView.idl
+++ b/offapi/com/sun/star/drawing/AccessibleSlideView.idl
@@ -35,7 +35,7 @@ module com { module sun { module star { module drawing {
@since OOo 1.1.2
*/
-published service AccessibleSlideView
+service AccessibleSlideView
{
interface ::com::sun::star::accessibility::XAccessible;
interface ::com::sun::star::accessibility::XAccessibleContext;
diff --git a/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl b/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
index c69ce65..96dbaab 100644
--- a/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
+++ b/offapi/com/sun/star/drawing/AccessibleSlideViewObject.idl
@@ -35,7 +35,7 @@ module com { module sun { module star { module drawing {
@since OOo 1.1.2
*/
-published service AccessibleSlideViewObject
+service AccessibleSlideViewObject
{
interface ::com::sun::star::accessibility::XAccessible;
interface ::com::sun::star::accessibility::XAccessibleContext;
diff --git a/offapi/com/sun/star/formula/AccessibleFormulaText.idl b/offapi/com/sun/star/formula/AccessibleFormulaText.idl
index ffc970f..6344278 100644
--- a/offapi/com/sun/star/formula/AccessibleFormulaText.idl
+++ b/offapi/com/sun/star/formula/AccessibleFormulaText.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module formula {
@since OOo 1.1.2
*/
-published service AccessibleFormulaText
+service AccessibleFormulaText
{
interface ::com::sun::star::accessibility::XAccessible;
interface ::com::sun::star::accessibility::XAccessibleComponent;
diff --git a/offapi/com/sun/star/formula/AccessibleFormulaView.idl b/offapi/com/sun/star/formula/AccessibleFormulaView.idl
index fab335c..39b2460 100644
--- a/offapi/com/sun/star/formula/AccessibleFormulaView.idl
+++ b/offapi/com/sun/star/formula/AccessibleFormulaView.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module formula {
@since OOo 1.1.2
*/
-published service AccessibleFormulaView
+service AccessibleFormulaView
{
interface ::com::sun::star::accessibility::XAccessible;
interface ::com::sun::star::accessibility::XAccessibleComponent;
diff --git a/offapi/com/sun/star/sheet/AccessibleCell.idl b/offapi/com/sun/star/sheet/AccessibleCell.idl
index 09e9ef0..a830e58 100644
--- a/offapi/com/sun/star/sheet/AccessibleCell.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCell.idl
@@ -34,7 +34,7 @@ module com { module sun { module star { module sheet {
@since OOo 1.1.2
*/
-published service AccessibleCell
+service AccessibleCell
{
/** This interface gives access to the whole content of the cell.
diff --git a/offapi/com/sun/star/sheet/AccessibleCsvCell.idl b/offapi/com/sun/star/sheet/AccessibleCsvCell.idl
index 931cc89..1cf8c47 100644
--- a/offapi/com/sun/star/sheet/AccessibleCsvCell.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCsvCell.idl
@@ -34,7 +34,7 @@ module com { module sun { module star { module sheet {
@since OOo 1.1.2
*/
-published service AccessibleCsvCell
+service AccessibleCsvCell
{
/** This interface gives access to the whole content of the cell.
diff --git a/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl b/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl
index 81a9efd..61342b0 100644
--- a/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCsvRuler.idl
@@ -34,7 +34,7 @@ module com { module sun { module star { module sheet {
@since OOo 1.1.2
*/
-published service AccessibleCsvRuler
+service AccessibleCsvRuler
{
/** This interface gives access to the whole content of the ruler.
diff --git a/offapi/com/sun/star/sheet/AccessibleCsvTable.idl b/offapi/com/sun/star/sheet/AccessibleCsvTable.idl
index 42fab0b..581a6ef 100644
--- a/offapi/com/sun/star/sheet/AccessibleCsvTable.idl
+++ b/offapi/com/sun/star/sheet/AccessibleCsvTable.idl
@@ -36,7 +36,7 @@ module com { module sun { module star { module sheet {
@since OOo 1.1.2
*/
-published service AccessibleCsvTable
+service AccessibleCsvTable
{
/** This interface gives access to the whole content of the table.
diff --git a/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl b/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
index 6d68c01..76c39b1 100644
--- a/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
+++ b/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl
@@ -32,7 +32,7 @@ module com { module sun { module star { module sheet {
@since OOo 1.1.2
*/
-published service AccessiblePageHeaderFooterAreasView
+service AccessiblePageHeaderFooterAreasView
{
/** This interface gives access to the three Header/Footer areas in the
page preview.
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
index dec6b27..e4a3bfe 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module sheet {
@since OOo 1.1.2
*/
-published service AccessibleSpreadsheet
+service AccessibleSpreadsheet
{
/** This interface gives access to any object in the currently visible table
on the desktop.
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
index 22db4e8..39e22ce 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module sheet {
@since OOo 1.1.2
*/
-published service AccessibleSpreadsheetDocumentView
+service AccessibleSpreadsheetDocumentView
{
/** This interface gives access to any object that is contained in this
document.
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
index dc11732..29a0650 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
@@ -32,7 +32,7 @@ module com { module sun { module star { module sheet {
@since OOo 1.1.2
*/
-published service AccessibleSpreadsheetPageView
+service AccessibleSpreadsheetPageView
{
/** This interface gives access to any object that is at least partially
visible on the screen in the page preview.
diff --git a/offapi/com/sun/star/table/AccessibleCellView.idl b/offapi/com/sun/star/table/AccessibleCellView.idl
index d93de22..1d7d5ad 100644
--- a/offapi/com/sun/star/table/AccessibleCellView.idl
+++ b/offapi/com/sun/star/table/AccessibleCellView.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module table {
the edit view of a spreadsheet.
@since OOo 1.1.2
*/
-published service AccessibleCellView
+service AccessibleCellView
{
/** This interface gives access to the visible content of a cell in a
accessible spreadsheet page preview or accessible text document view.
diff --git a/offapi/com/sun/star/table/AccessibleTableView.idl b/offapi/com/sun/star/table/AccessibleTableView.idl
index 9cb6d55..06fe6ca 100644
--- a/offapi/com/sun/star/table/AccessibleTableView.idl
+++ b/offapi/com/sun/star/table/AccessibleTableView.idl
@@ -36,7 +36,7 @@ module com { module sun { module star { module table {
tables in the edit view of a spreadsheet.
@since OOo 1.1.2
*/
-published service AccessibleTableView
+service AccessibleTableView
{
/** This interface gives access to any table cell that is contained in
a table fragment that is at least partially visible. A table fragment
diff --git a/offapi/com/sun/star/text/AccessibleEndnoteView.idl b/offapi/com/sun/star/text/AccessibleEndnoteView.idl
index 085ba7e..55ef2e2 100644
--- a/offapi/com/sun/star/text/AccessibleEndnoteView.idl
+++ b/offapi/com/sun/star/text/AccessibleEndnoteView.idl
@@ -31,7 +31,7 @@ module com { module sun { module star { module text {
/** The accessible view of endnotes.
@since OOo 1.1.2
*/
-published service AccessibleEndnoteView
+service AccessibleEndnoteView
{
/** This interface gives access to any paragraph fragment and table
fragment that is contained in a endnote and is at least
diff --git a/offapi/com/sun/star/text/AccessibleFootnoteView.idl b/offapi/com/sun/star/text/AccessibleFootnoteView.idl
index b453d25..1846463 100644
--- a/offapi/com/sun/star/text/AccessibleFootnoteView.idl
+++ b/offapi/com/sun/star/text/AccessibleFootnoteView.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module text {
@since OOo 1.1.2
*/
-published service AccessibleFootnoteView
+service AccessibleFootnoteView
{
/** This interface gives access to any paragraph fragment and table
fragment that is contained in a footnote and is at least
diff --git a/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl b/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl
index 265839d..466a902 100644
--- a/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl
+++ b/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module text {
@since OOo 1.1.2
*/
-published service AccessibleHeaderFooterView
+service AccessibleHeaderFooterView
{
/** This interface gives access to any paragraph and table that is
contained in the header and footer and is at least partially visible
diff --git a/offapi/com/sun/star/text/AccessiblePageView.idl b/offapi/com/sun/star/text/AccessiblePageView.idl
index c0bfb8f..d03e245 100644
--- a/offapi/com/sun/star/text/AccessiblePageView.idl
+++ b/offapi/com/sun/star/text/AccessiblePageView.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module text {
@since OOo 1.1.2
*/
-published service AccessiblePageView
+service AccessiblePageView
{
/** This interface gives access to any page that is visible in the
page preview of a text document.
diff --git a/offapi/com/sun/star/text/AccessibleParagraphView.idl b/offapi/com/sun/star/text/AccessibleParagraphView.idl
index 48ad37c..cd2c4c9 100644
--- a/offapi/com/sun/star/text/AccessibleParagraphView.idl
+++ b/offapi/com/sun/star/text/AccessibleParagraphView.idl
@@ -34,7 +34,7 @@ module com { module sun { module star { module text {
@since OOo 1.1.2
*/
-published service AccessibleParagraphView
+service AccessibleParagraphView
{
/** This interface gives access to a paragraph fragment that is at least
partially visible on the screen. A paragraph fragment is the portion
diff --git a/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl b/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl
index 56b29d5..eaf38e1 100644
--- a/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl
+++ b/offapi/com/sun/star/text/AccessibleTextDocumentPageView.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module text {
@since OOo 1.1.2
*/
-published service AccessibleTextDocumentPageView
+service AccessibleTextDocumentPageView
{
/** This interface gives access to page that are visible in the
page preview of a text document.
diff --git a/offapi/com/sun/star/text/AccessibleTextDocumentView.idl b/offapi/com/sun/star/text/AccessibleTextDocumentView.idl
index 7920e1d..3415f93 100644
--- a/offapi/com/sun/star/text/AccessibleTextDocumentView.idl
+++ b/offapi/com/sun/star/text/AccessibleTextDocumentView.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module text {
@since OOo 1.1.2
*/
-published service AccessibleTextDocumentView
+service AccessibleTextDocumentView
{
/** This interface gives access to any text, table, graphic, embedded
object and drawing that is at least partially visible on the screen.
diff --git a/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl b/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
index 62dcd27..940f969 100644
--- a/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
+++ b/offapi/com/sun/star/text/AccessibleTextEmbeddedObject.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module text {
@since OOo 1.1.2
*/
-published service AccessibleTextEmbeddedObject
+service AccessibleTextEmbeddedObject
{
/** This interface comprises the basic accessibility of embedded objects.
diff --git a/offapi/com/sun/star/text/AccessibleTextFrameView.idl b/offapi/com/sun/star/text/AccessibleTextFrameView.idl
index 8aeab7d..b2c7da8 100644
--- a/offapi/com/sun/star/text/AccessibleTextFrameView.idl
+++ b/offapi/com/sun/star/text/AccessibleTextFrameView.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module text {
@since OOo 1.1.2
*/
-published service AccessibleTextFrameView
+service AccessibleTextFrameView
{
/** This interface gives access to any paragraph fragment and table
fragment that is contained in a text frame and at least
diff --git a/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl b/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
index b5f17cc..abd99b0 100644
--- a/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
+++ b/offapi/com/sun/star/text/AccessibleTextGraphicObject.idl
@@ -33,7 +33,7 @@ module com { module sun { module star { module text {
@since OOo 1.1.2
*/
-published service AccessibleTextGraphicObject
+service AccessibleTextGraphicObject
{
/** This interface comprises the basic accessibility of text graphics.
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index e792d99..72b4d58 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb
Binary files differ
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java
index e4c41d9f..1c345dd 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java
@@ -35,8 +35,8 @@ import com.sun.star.uno.UnoRuntime;
* com.sun.star.accessibility.XAccessibleEventBroadcaster</code>
* interface methods :
* <ul>
- * <li><code> addEventListener()</code></li>
- * <li><code> removeEventListener()</code></li>
+ * <li><code> addAccessibleEventListener()</code></li>
+ * <li><code> removeAccessibleEventListener()</code></li>
* </ul> <p>
*
* This test needs the following object relations :
@@ -108,7 +108,7 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest {
*/
public void _addEventListener() {
log.println("adding listener");
- oObj.addEventListener(list);
+ oObj.addAccessibleEventListener(list);
boolean isTransient = chkTransient(tEnv.getTestObject());
log.println("fire event");
prod.fireEvent() ;
@@ -128,7 +128,7 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest {
} else {
log.println("Object is Transient, listener isn't expected to be called");
}
- oObj.removeEventListener(list);
+ oObj.removeAccessibleEventListener(list);
}
if (EventMsg != null) {
@@ -157,7 +157,7 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest {
list.notifiedEvent = null;
log.println("remove listener");
- oObj.removeEventListener(list);
+ oObj.removeAccessibleEventListener(list);
log.println("fire event");
prod.fireEvent() ;
diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx
index a73842e..339eadb 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 1245ed9..751bc70 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 553f293..3232fe8 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 860760b..dfa54ec 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 c86505a..3c1cfc1 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 0cf0a74..175264b 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 25faa1a..9b0779e 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 b0d3074..d5c7ef1 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);
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index 198117a..9c066d3 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -140,14 +140,14 @@ uno::Reference<XAccessible> SAL_CALL
//===== XAccessibleEventBroadcaster ========================================
-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)
{
// delegate listener handling to children manager.
if ( ! IsDisposed())
maTextHelper.AddEventListener(xListener);
}
-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)
{
// forward
if ( ! IsDisposed())
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index 0b2bde6..1fc4626 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -294,7 +294,7 @@ lang::Locale SAL_CALL AccessibleSlideSorterObject::getLocale (void)
//===== XAccessibleEventBroadcaster ===========================================
-void SAL_CALL AccessibleSlideSorterObject::addEventListener(
+void SAL_CALL AccessibleSlideSorterObject::addAccessibleEventListener(
const Reference<XAccessibleEventListener>& rxListener)
throw (RuntimeException)
{
@@ -319,7 +319,7 @@ void SAL_CALL AccessibleSlideSorterObject::addEventListener(
-void SAL_CALL AccessibleSlideSorterObject::removeEventListener(
+void SAL_CALL AccessibleSlideSorterObject::removeAccessibleEventListener(
const Reference<XAccessibleEventListener>& rxListener)
throw (uno::RuntimeException)
{
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 5b85365..14ac486 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -371,7 +371,7 @@ lang::Locale SAL_CALL AccessibleSlideSorterView::getLocale (void)
-void SAL_CALL AccessibleSlideSorterView::addEventListener(
+void SAL_CALL AccessibleSlideSorterView::addAccessibleEventListener(
const Reference<XAccessibleEventListener >& rxListener)
throw (RuntimeException)
{
@@ -396,7 +396,7 @@ void SAL_CALL AccessibleSlideSorterView::addEventListener(
-void SAL_CALL AccessibleSlideSorterView::removeEventListener(
+void SAL_CALL AccessibleSlideSorterView::removeAccessibleEventListener(
const Reference<XAccessibleEventListener >& rxListener)
throw (RuntimeException)
{
diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
index 5c1a3a8..393e281 100644
--- a/sd/source/ui/accessibility/AccessibleTreeNode.cxx
+++ b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
@@ -339,7 +339,7 @@ lang::Locale SAL_CALL AccessibleTreeNode::getLocale (void)
-void SAL_CALL AccessibleTreeNode::addEventListener(
+void SAL_CALL AccessibleTreeNode::addAccessibleEventListener(
const Reference<XAccessibleEventListener >& rxListener)
throw (RuntimeException)
{
@@ -365,7 +365,7 @@ void SAL_CALL AccessibleTreeNode::addEventListener(
-void SAL_CALL AccessibleTreeNode::removeEventListener(
+void SAL_CALL AccessibleTreeNode::removeAccessibleEventListener(
const Reference<XAccessibleEventListener >& rxListener)
throw (RuntimeException)
{
diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx
index d22f96b..2b6c115 100644
--- a/sd/source/ui/inc/AccessibleOutlineView.hxx
+++ b/sd/source/ui/inc/AccessibleOutlineView.hxx
@@ -75,20 +75,17 @@ public:
//===== 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);
- using cppu::WeakComponentImplHelperBase::addEventListener;
- using cppu::WeakComponentImplHelperBase::removeEventListener;
-
//===== XServiceInfo ====================================================
/** Returns an identifier for the implementation of this object.
diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
index 8cbad3a..22f516e 100644
--- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
+++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
@@ -105,13 +105,13 @@ public:
//===== XAccessibleEventBroadcaster =======================================
virtual void SAL_CALL
- addEventListener(
+ addAccessibleEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleEventListener >& rxListener)
throw (::com::sun::star::uno::RuntimeException);
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/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
index b5b7f41..aa38601 100644
--- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx
+++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
@@ -110,13 +110,13 @@ public:
//===== XAccessibleEventBroadcaster =======================================
virtual void SAL_CALL
- addEventListener(
+ addAccessibleEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleEventListener >& rxListener)
throw (::com::sun::star::uno::RuntimeException);
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/sd/source/ui/inc/AccessibleTreeNode.hxx b/sd/source/ui/inc/AccessibleTreeNode.hxx
index e28f037..25925fb 100644
--- a/sd/source/ui/inc/AccessibleTreeNode.hxx
+++ b/sd/source/ui/inc/AccessibleTreeNode.hxx
@@ -113,13 +113,13 @@ public:
//===== XAccessibleEventBroadcaster =======================================
virtual void SAL_CALL
- addEventListener(
+ addAccessibleEventListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleEventListener >& rxListener)
throw (::com::sun::star::uno::RuntimeException);
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/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index b3f8048..9bf0434 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -184,11 +184,11 @@ public:
//----- XAccessibleEventBroadcaster --------------------------------------
- virtual void SAL_CALL addEventListener (
+ virtual void SAL_CALL addAccessibleEventListener (
const cssu::Reference<cssa::XAccessibleEventListener>& rxListener)
throw (cssu::RuntimeException);
- virtual void SAL_CALL removeEventListener (
+ virtual void SAL_CALL removeAccessibleEventListener (
const cssu::Reference<cssa::XAccessibleEventListener>& rxListener)
throw (cssu::RuntimeException);
@@ -1105,7 +1105,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground (void)
//----- XAccessibleEventBroadcaster -------------------------------------------
-void SAL_CALL PresenterAccessible::AccessibleObject::addEventListener (
+void SAL_CALL PresenterAccessible::AccessibleObject::addAccessibleEventListener (
const Reference<XAccessibleEventListener>& rxListener)
throw (RuntimeException)
{
@@ -1125,7 +1125,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::addEventListener (
}
}
-void SAL_CALL PresenterAccessible::AccessibleObject::removeEventListener (
+void SAL_CALL PresenterAccessible::AccessibleObject::removeAccessibleEventListener (
const Reference<XAccessibleEventListener>& rxListener)
throw (RuntimeException)
{
@@ -1309,7 +1309,7 @@ void PresenterAccessible::AccessibleObject::FireAccessibleEvent (
{
// Listener has been disposed and should have been removed
// already.
- removeEventListener(*iListener);
+ removeAccessibleEventListener(*iListener);
}
catch(Exception&)
{
diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx
index 511ad8a..904612b 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -286,7 +286,7 @@ lang::Locale SAL_CALL ThumbnailViewAcc::getLocale()
return aRet;
}
-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)
{
ThrowIfDisposed();
@@ -310,7 +310,7 @@ 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)
{
ThrowIfDisposed();
@@ -826,7 +826,7 @@ lang::Locale SAL_CALL ThumbnailViewItemAcc::getLocale()
return aRet;
}
-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)
{
const ::osl::MutexGuard aGuard( maMutex );
@@ -849,7 +849,7 @@ 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)
{
const ::osl::MutexGuard aGuard( maMutex );
diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx
index e29f987..0a1c599 100644
--- a/sfx2/source/control/thumbnailviewacc.hxx
+++ b/sfx2/source/control/thumbnailviewacc.hxx
@@ -97,8 +97,8 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) 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);
// XAccessibleContext
virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException);
@@ -207,8 +207,8 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) 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);
// XAccessibleContext
virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 1140f60..d88d490 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -404,7 +404,7 @@ Locale SAL_CALL SmGraphicAccessible::getLocale()
}
-void SAL_CALL SmGraphicAccessible::addEventListener(
+void SAL_CALL SmGraphicAccessible::addAccessibleEventListener(
const Reference< XAccessibleEventListener >& xListener )
throw (RuntimeException)
{
@@ -420,7 +420,7 @@ void SAL_CALL SmGraphicAccessible::addEventListener(
}
}
-void SAL_CALL SmGraphicAccessible::removeEventListener(
+void SAL_CALL SmGraphicAccessible::removeAccessibleEventListener(
const Reference< XAccessibleEventListener >& xListener )
throw (RuntimeException)
{
@@ -1923,14 +1923,14 @@ 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)
{
if (pTextHelper) // not disposing (about to destroy view shell)
pTextHelper->AddEventListener( xListener );
}
-void SAL_CALL SmEditAccessible::removeEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
+void SAL_CALL SmEditAccessible::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
throw (RuntimeException)
{
if (pTextHelper) // not disposing (about to destroy view shell)
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 6a05823..cac3fdc 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -124,8 +124,8 @@ public:
virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::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);
// XAccessibleText
virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException);
@@ -376,8 +376,8 @@ public:
virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::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/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index 4c381be..e193c1e 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -301,7 +301,7 @@ 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)
{
ThrowIfDisposed();
::osl::MutexGuard aGuard(m_aMutex);
@@ -326,7 +326,7 @@ 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)
{
ThrowIfDisposed();
::osl::MutexGuard aGuard(m_aMutex);
@@ -810,7 +810,7 @@ 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)
{
const ::osl::MutexGuard aGuard( maMutex );
@@ -834,7 +834,7 @@ 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)
{
const ::osl::MutexGuard aGuard( maMutex );
diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx
index cb86fd4..163e4cc 100644
--- a/svtools/source/control/toolbarmenuimp.hxx
+++ b/svtools/source/control/toolbarmenuimp.hxx
@@ -136,8 +136,8 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) 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);
// XAccessibleContext
virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException);
@@ -224,8 +224,8 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) 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);
// XAccessibleContext
virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 713f35a..f8a5056 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -355,7 +355,7 @@ 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)
{
ThrowIfDisposed();
@@ -381,7 +381,7 @@ 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)
{
ThrowIfDisposed();
@@ -1022,7 +1022,7 @@ 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)
{
const ::osl::MutexGuard aGuard( maMutex );
@@ -1047,7 +1047,7 @@ 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)
{
const ::osl::MutexGuard aGuard( maMutex );
diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx
index a3a25c6..350c175 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -128,8 +128,8 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) 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);
// XAccessibleContext
virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException);
@@ -252,8 +252,8 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) 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);
// XAccessibleContext
virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/svx/inc/svx/AccessibleShape.hxx b/svx/inc/svx/AccessibleShape.hxx
index 81c4d95..00fe4d6 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 31b7471..412fb41 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 92e5d14..a84cc75 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 4eb755a..fa634f4 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 e04ee4c..08ed92b 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 a0423e7..58c34a4 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 27766b2..8bb7ad4 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 6f11172..bfe358b 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 09fcde2c..bebe052 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 03b876a..7b9351f 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 5878015..4d28f53 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 35f2a80..0750e61 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.
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index ee83787..b2c30ed 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -706,7 +706,7 @@ lang::Locale SAL_CALL SwAccessibleContext::getLocale (void)
return aLoc;
}
-void SAL_CALL SwAccessibleContext::addEventListener(
+void SAL_CALL SwAccessibleContext::addAccessibleEventListener(
const uno::Reference< XAccessibleEventListener >& xListener )
throw (uno::RuntimeException)
{
@@ -719,7 +719,7 @@ void SAL_CALL SwAccessibleContext::addEventListener(
}
}
-void SAL_CALL SwAccessibleContext::removeEventListener(
+void SAL_CALL SwAccessibleContext::removeAccessibleEventListener(
const uno::Reference< XAccessibleEventListener >& xListener )
throw (uno::RuntimeException)
{
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 0c51298..509e4ae 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -271,11 +271,11 @@ public:
//===== 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 )
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
index 62a76ae..33ea9d3 100644
--- a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
@@ -154,16 +154,13 @@ class SidebarTxtControlAccessibleContext : public VCLXAccessibleComponent
getAccessibleChild( sal_Int32 i )
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- using WeakAggComponentImplHelperBase::addEventListener;
- using WeakAggComponentImplHelperBase::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);
virtual void SAL_CALL
- removeEventListener (
+ removeAccessibleEventListener (
const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleEventListener >& xListener)
throw (::com::sun::star::uno::RuntimeException);
@@ -233,7 +230,7 @@ css::uno::Reference< css::accessibility::XAccessible > SAL_CALL SidebarTxtContro
return xChild;
}
-void SAL_CALL SidebarTxtControlAccessibleContext::addEventListener (
+void SAL_CALL SidebarTxtControlAccessibleContext::addAccessibleEventListener (
const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener)
throw (css::uno::RuntimeException)
{
@@ -245,7 +242,7 @@ void SAL_CALL SidebarTxtControlAccessibleContext::addEventListener (
}
}
-void SAL_CALL SidebarTxtControlAccessibleContext::removeEventListener (
+void SAL_CALL SidebarTxtControlAccessibleContext::removeAccessibleEventListener (
const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener)
throw (css::uno::RuntimeException)
{
diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java
index 152f428..1ae2b35 100644
--- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java
+++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java
@@ -35,8 +35,8 @@ import com.sun.star.uno.UnoRuntime;
* com.sun.star.accessibility.XAccessibleEventBroadcaster</code>
* interface methods :
* <ul>
- * <li><code> addEventListener()</code></li>
- * <li><code> removeEventListener()</code></li>
+ * <li><code> addAccessibleEventEventListener()</code></li>
+ * <li><code> removeAccessibleEventEventListener()</code></li>
* </ul> <p>
*
* This test needs the following object relations :
@@ -115,7 +115,7 @@ public class _XAccessibleEventBroadcaster {
*/
public boolean _addEventListener() {
System.out.println("adding two listeners");
- oObj.addEventListener(list);
+ oObj.addAccessibleEventEventListener(list);
boolean isTransient = chkTransient(oObj);
System.out.println("fire event");
prod.fireEvent() ;
@@ -135,7 +135,7 @@ public class _XAccessibleEventBroadcaster {
} else {
System.out.println("Object is Transient, listener isn't expected to be called");
}
- oObj.removeEventListener(list);
+ oObj.removeAccessibleEventEventListener(list);
}
return works;
@@ -158,7 +158,7 @@ public class _XAccessibleEventBroadcaster {
list.notifiedEvent = null;
System.out.println("remove first listener");
- oObj.removeEventListener(list);
+ oObj.removeAccessibleEventEventListener(list);
System.out.println("fire event");
prod.fireEvent() ;
diff --git a/toolkit/test/accessibility/AccessibilityTreeModel.java b/toolkit/test/accessibility/AccessibilityTreeModel.java
index bd442ed..a30329c 100644
--- a/toolkit/test/accessibility/AccessibilityTreeModel.java
+++ b/toolkit/test/accessibility/AccessibilityTreeModel.java
@@ -449,7 +449,7 @@ public class AccessibilityTreeModel
XAccessibleEventBroadcaster xBroadcaster = getBroadcaster( aObject );
if (xBroadcaster != null)
{
- xBroadcaster.addEventListener( mxListener );
+ xBroadcaster.addAccessibleEventListener( mxListener );
}
}
@@ -458,7 +458,7 @@ public class AccessibilityTreeModel
XAccessibleEventBroadcaster xBroadcaster = getBroadcaster( aObject );
if (xBroadcaster != null)
{
- xBroadcaster.removeEventListener( mxListener );
+ xBroadcaster.removeAccessibleEventListener( mxListener );
}
}
diff --git a/toolkit/test/accessibility/ov/ListeningObjectView.java b/toolkit/test/accessibility/ov/ListeningObjectView.java
index 1b17ef9..dd9291f 100644
--- a/toolkit/test/accessibility/ov/ListeningObjectView.java
+++ b/toolkit/test/accessibility/ov/ListeningObjectView.java
@@ -47,7 +47,7 @@ abstract class ListeningObjectView
UnoRuntime.queryInterface(
XAccessibleEventBroadcaster.class, xContext);
if (xBroadcaster != null)
- xBroadcaster.addEventListener (this);
+ xBroadcaster.addAccessibleEventListener (this);
}
@@ -61,7 +61,7 @@ abstract class ListeningObjectView
UnoRuntime.queryInterface(
XAccessibleEventBroadcaster.class, mxContext);
if (xBroadcaster != null)
- xBroadcaster.removeEventListener (this);
+ xBroadcaster.removeAccessibleEventListener (this);
}
/** Derived classes have to implement this method to handle incoming
diff --git a/vcl/aqua/source/a11y/documentfocuslistener.cxx b/vcl/aqua/source/a11y/documentfocuslistener.cxx
index 896f0a0..ac65f1e 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/documentfocuslistener.cxx
@@ -169,7 +169,7 @@ void DocumentFocusListener::attachRecursive(
// If not already done, add the broadcaster to the list and attach as listener.
if( xBroadcaster.is() && m_aRefList.insert(xBroadcaster).second )
{
- xBroadcaster->addEventListener(static_cast< XAccessibleEventListener *>(this));
+ xBroadcaster->addAccessibleEventListener(static_cast< XAccessibleEventListener *>(this));
if( ! xStateSet->contains(AccessibleStateType::MANAGES_DESCENDANTS ) )
{
@@ -222,7 +222,7 @@ void DocumentFocusListener::detachRecursive(
if( xBroadcaster.is() && 0 < m_aRefList.erase(xBroadcaster) )
{
- xBroadcaster->removeEventListener(static_cast< XAccessibleEventListener *>(this));
+ xBroadcaster->removeAccessibleEventListener(static_cast< XAccessibleEventListener *>(this));
if( ! xStateSet->contains(AccessibleStateType::MANAGES_DESCENDANTS ) )
{
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 1424155..ee7fb6e 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -314,7 +314,7 @@ void DocumentFocusListener::attachRecursive(
uno::Reference< uno::XInterface > xInterface = xBroadcaster;
if( m_aRefList.insert(xInterface).second )
{
- xBroadcaster->addEventListener(static_cast< accessibility::XAccessibleEventListener *>(this));
+ xBroadcaster->addAccessibleEventListener(static_cast< accessibility::XAccessibleEventListener *>(this));
if( ! xStateSet->contains(accessibility::AccessibleStateType::MANAGES_DESCENDANTS ) )
{
@@ -370,7 +370,7 @@ void DocumentFocusListener::detachRecursive(
if( xBroadcaster.is() && 0 < m_aRefList.erase(xBroadcaster) )
{
- xBroadcaster->removeEventListener(static_cast< accessibility::XAccessibleEventListener *>(this));
+ xBroadcaster->removeAccessibleEventListener(static_cast< accessibility::XAccessibleEventListener *>(this));
if( ! xStateSet->contains(accessibility::AccessibleStateType::MANAGES_DESCENDANTS ) )
{
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index 7a1b9b4..2e7824e 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -822,7 +822,7 @@ atk_object_wrapper_new( const ::com::sun::star::uno::Reference< ::com::sun::star
{
uno::Reference< accessibility::XAccessibleEventBroadcaster > xBroadcaster(xContext, uno::UNO_QUERY);
if( xBroadcaster.is() )
- xBroadcaster->addEventListener( static_cast< accessibility::XAccessibleEventListener * > ( new AtkListener(pWrap) ) );
+ xBroadcaster->addAccessibleEventListener( static_cast< accessibility::XAccessibleEventListener * > ( new AtkListener(pWrap) ) );
else
OSL_ASSERT( false );
}