accessibility/Library_acc.mk
| 1
accessibility/inc/extended/accessibletabbar.hxx
| 1
accessibility/inc/extended/accessibletabbarpage.hxx
| 1
accessibility/inc/extended/accessibletabbarpagelist.hxx
| 1
accessibility/inc/pch/precompiled_acc.hxx
| 2
accessibility/inc/standard/accessiblemenucomponent.hxx
| 1
accessibility/inc/standard/accessiblemenuitemcomponent.hxx
| 1
accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
| 1
accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
| 1
accessibility/inc/standard/vclxaccessibletabpage.hxx
| 1
accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
| 1
accessibility/source/extended/accessibletabbar.cxx
| 25 ---------
accessibility/source/extended/accessibletabbarpage.cxx
| 18 ------
accessibility/source/extended/accessibletabbarpagelist.cxx
| 18 ------
accessibility/source/standard/accessiblemenucomponent.cxx
| 27 ----------
accessibility/source/standard/accessiblemenuitemcomponent.cxx
| 18 ------
accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
| 7 --
accessibility/source/standard/vclxaccessiblemenuitem.cxx
| 2
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
| 20 -------
accessibility/source/standard/vclxaccessibletabpage.cxx
| 20 -------
accessibility/source/standard/vclxaccessibletextcomponent.cxx
| 2
accessibility/source/standard/vclxaccessibletoolboxitem.cxx
| 4 -
basctl/source/accessibility/accessibledialogcontrolshape.cxx
| 26 ---------
basctl/source/accessibility/accessibledialogwindow.cxx
| 25 ---------
basctl/source/inc/accessibledialogcontrolshape.hxx
| 1
basctl/source/inc/accessibledialogwindow.hxx
| 1
chart2/source/controller/accessibility/AccessibleChartElement.cxx
| 19 -------
chart2/source/controller/accessibility/AccessibleChartElement.hxx
| 1
chart2/source/controller/accessibility/AccessibleChartShape.cxx
| 9 ---
chart2/source/controller/accessibility/AccessibleChartShape.hxx
| 1
editeng/source/accessibility/AccessibleComponentBase.cxx
| 6 --
include/editeng/AccessibleComponentBase.hxx
| 1
include/toolkit/awt/vclxaccessiblecomponent.hxx
| 1
include/vcl/accessibility/characterattributeshelper.hxx
| 3 -
offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
| 8 --
qadevOOo/objdsc/svtools/com.sun.star.comp.svtools.AccessibleTabBar.csv
| 1
qadevOOo/objdsc/svtools/com.sun.star.comp.svtools.AccessibleTabBarPage.csv
| 1
qadevOOo/objdsc/svtools/com.sun.star.comp.svtools.AccessibleTabBarPageList.csv
| 1
qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessibleControlShape.csv
| 1
qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessibleGraphicShape.csv
| 1
qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessibleOLEShape.csv
| 1
qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessiblePageShape.csv
| 1
qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessiblePresentationGraphicShape.csv
| 1
qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessiblePresentationOLEShape.csv
| 1
qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessiblePresentationShape.csv
| 1
qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessibleShape.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleButton.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleCheckBox.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleComboBox.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleDropDownComboBox.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleDropDownListBox.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleEdit.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleFixedText.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleList.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleListBox.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleMenu.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleMenuBar.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleMenuItem.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleMenuSeparator.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessiblePopupMenu.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleRadioButton.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleScrollBar.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleStatusBar.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleStatusBarItem.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleTabControl.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleTabPage.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleToolBox.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleToolBoxItem.csv
| 1
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleWindow.csv
| 1
qadevOOo/tests/java/ifc/accessibility/_XAccessibleExtendedComponent.java
| 10 ---
solenv/clang-format/excludelist
| 2
svx/source/table/accessiblecell.cxx
| 8 --
svx/source/table/accessiblecell.hxx
| 1
toolkit/qa/complex/toolkit/AccessibleStatusBarItem.java
| 1
toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent.java
| 10 ---
toolkit/qa/cppunit/a11y/XAccessibleExtendedComponentTester.cxx
| 9 ---
toolkit/qa/cppunit/a11y/XAccessibleExtendedComponentTester.hxx
| 2
toolkit/source/awt/vclxaccessiblecomponent.cxx
| 24 --------
vcl/Library_vcl.mk
| 1
vcl/osx/a11ytextattributeswrapper.mm
| 1
vcl/source/accessibility/characterattributeshelper.cxx
| 2
81 files changed, 11 insertions(+), 369 deletions(-)
New commits:
commit d7fc76217f931555dde2e0bb711e70653f6ccbfe
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Dec 4 11:45:44 2024 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Dec 6 14:06:17 2024 +0100
a11y: Move CharacterAttributeshelper from accessibility to vcl
This is in preparation of moving more from
the accessibility module to vcl.
Currently, the a11y implementations for vcl widgets
are implemented in the accessibility module (in
directory of the same name), which in turn depends
on the toolkit module.
To break the dependency cycle (vcl needs accessibility
to create a11y objects for its widgets), there's a UNO
service.
At least some a11y classes don't really need toolkit,
however, so the plan is to decouple this and move those
from the accessibility module into vcl in upcoming
commits.
Change-Id: I6aeee104f271c804c85727002822b89a9263628f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177810
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
(cherry picked from commit b28f16520bff4a8bd8b09661f7393a4d91a853f5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177934
diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk
index 1382e00019fa..7080203fccaf 100644
--- a/accessibility/Library_acc.mk
+++ b/accessibility/Library_acc.mk
@@ -71,7 +71,6 @@ $(eval $(call gb_Library_add_exception_objects,acc,\
accessibility/source/extended/textwindowaccessibility \
accessibility/source/helper/acc_factory \
accessibility/source/helper/accresmgr \
- accessibility/source/helper/characterattributeshelper \
accessibility/source/helper/IComboListBoxHelper \
accessibility/source/standard/accessiblemenubasecomponent \
accessibility/source/standard/accessiblemenucomponent \
diff --git a/accessibility/inc/pch/precompiled_acc.hxx
b/accessibility/inc/pch/precompiled_acc.hxx
index 885d43ce436f..1bc2832a650f 100644
--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ b/accessibility/inc/pch/precompiled_acc.hxx
@@ -90,6 +90,7 @@
#include <vcl/NotebookbarContextControl.hxx>
#include <vcl/Scanline.hxx>
#include <vcl/WindowPosSize.hxx>
+#include <vcl/accessibility/characterattributeshelper.hxx>
#include <vcl/accessibletable.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <vcl/alpha.hxx>
@@ -290,7 +291,6 @@
#include <extended/AccessibleGridControlTableCell.hxx>
#include <extended/accessiblebrowseboxcell.hxx>
#include <helper/accresmgr.hxx>
-#include <helper/characterattributeshelper.hxx>
#include <i18nlangtag/lang.h>
#include <i18nlangtag/languagetag.hxx>
#include <o3tl/cow_wrapper.hxx>
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index b505920aed93..b48d35ad7637 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -18,7 +18,6 @@
*/
#include <standard/vclxaccessiblemenuitem.hxx>
-#include <helper/characterattributeshelper.hxx>
#include <comphelper/accessiblecontexthelper.hxx>
#include <comphelper/accessiblekeybindinghelper.hxx>
#include <com/sun/star/awt/KeyModifier.hpp>
@@ -31,6 +30,7 @@
#include <comphelper/sequence.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/accessibility/characterattributeshelper.hxx>
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index b309d6c39c9d..f47cffd1b148 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -19,7 +19,6 @@
#include <standard/vclxaccessiblestatusbaritem.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-#include <helper/characterattributeshelper.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -30,6 +29,7 @@
#include <comphelper/accessiblecontexthelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
+#include <vcl/accessibility/characterattributeshelper.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/svapp.hxx>
#include <vcl/unohelp2.hxx>
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx
b/accessibility/source/standard/vclxaccessibletabpage.cxx
index 9c1b2d3db303..90cd8807170c 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -19,7 +19,6 @@
#include <standard/vclxaccessibletabpage.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-#include <helper/characterattributeshelper.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -30,6 +29,7 @@
#include <comphelper/accessiblecontexthelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
+#include <vcl/accessibility/characterattributeshelper.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/svapp.hxx>
#include <vcl/unohelp2.hxx>
diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
index 8085759cc948..0c38f6f522c7 100644
--- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
+++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
@@ -19,13 +19,13 @@
#include <standard/vclxaccessibletextcomponent.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-#include <helper/characterattributeshelper.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <comphelper/accessiblecontexthelper.hxx>
+#include <vcl/accessibility/characterattributeshelper.hxx>
#include <vcl/window.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/svapp.hxx>
diff --git a/accessibility/inc/helper/characterattributeshelper.hxx
b/include/vcl/accessibility/characterattributeshelper.hxx
similarity index 95%
rename from accessibility/inc/helper/characterattributeshelper.hxx
rename to include/vcl/accessibility/characterattributeshelper.hxx
index a73ee76c09f2..2e58761ea27e 100644
--- a/accessibility/inc/helper/characterattributeshelper.hxx
+++ b/include/vcl/accessibility/characterattributeshelper.hxx
@@ -21,12 +21,13 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
+#include <vcl/dllapi.h>
#include <vcl/font.hxx>
#include <map>
#include <vector>
-class CharacterAttributesHelper
+class VCL_DLLPUBLIC CharacterAttributesHelper
{
private:
typedef std::map<OUString, css::uno::Any> AttributeMap;
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 6eff59432b41..2e50309b96d6 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -100,7 +100,6 @@ accessibility/source/extended/accessibletablistbox.cxx
accessibility/source/extended/accessibletablistboxtable.cxx
accessibility/source/extended/textwindowaccessibility.cxx
accessibility/source/helper/acc_factory.cxx
-accessibility/source/helper/characterattributeshelper.cxx
accessibility/source/standard/accessiblemenubasecomponent.cxx
accessibility/source/standard/accessiblemenucomponent.cxx
accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -14523,6 +14522,7 @@ vcl/quartz/salgdi.cxx
vcl/quartz/salgdicommon.cxx
vcl/quartz/salvd.cxx
vcl/quartz/utils.cxx
+vcl/source/accessibility/characterattributeshelper.cxx
vcl/source/animate/AnimationRenderer.cxx
vcl/source/app/IconThemeInfo.cxx
vcl/source/app/IconThemeScanner.cxx
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 8f2e7ccf35df..ae12cf9cfda7 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -98,6 +98,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/rendercontext/drawmode \
vcl/skia/SkiaHelper \
vcl/source/accessibility/AccessibleTextAttributeHelper \
+ vcl/source/accessibility/characterattributeshelper \
vcl/source/animate/Animation \
vcl/source/animate/AnimationFrame \
vcl/source/animate/AnimationRenderer \
diff --git a/accessibility/source/helper/characterattributeshelper.cxx
b/vcl/source/accessibility/characterattributeshelper.cxx
similarity index 98%
rename from accessibility/source/helper/characterattributeshelper.cxx
rename to vcl/source/accessibility/characterattributeshelper.cxx
index 7e2a2334bf57..e01d2d8625f5 100644
--- a/accessibility/source/helper/characterattributeshelper.cxx
+++ b/vcl/source/accessibility/characterattributeshelper.cxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <helper/characterattributeshelper.hxx>
#include <tools/gen.hxx>
+#include <vcl/accessibility/characterattributeshelper.hxx>
#include <vcl/unohelp.hxx>
#include <comphelper/sequence.hxx>
commit 302897e5c96bb273a9cb7263e3d4e3265d93c20e
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Dec 4 15:36:59 2024 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Dec 6 14:06:07 2024 +0100
[API CHANGE] a11y: Drop XAccessibleExtendedComponent::getFont
This method from the unpublished XAccessibleExtendedComponent
interface is not used by any of the a11y platform bridges, and
I don't know of any platform a11y API that would need it.
In order to report character/font attributes, there is the
XAccessibleText interface and its
XAccessiText::getCharacterAttributes method instead, which
actually gets used by the platform a11y bridges.
Therefore, drop this method to simplify code, and also decouple
the accessibility module a bit further from the toolkit
module without having to reorganize code further.
(VCLXFont from the toolkit module currently gets used in
various implementations.)
Change-Id: I06ea3cc5998a13927b3f869877b28f03ac07c89b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177809
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
(cherry picked from commit a2c1a337f0bd02353433c2f944049e9f3ee72bcb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177933
diff --git a/accessibility/inc/extended/accessibletabbar.hxx
b/accessibility/inc/extended/accessibletabbar.hxx
index 86848679ffbb..6d75c83a7e23 100644
--- a/accessibility/inc/extended/accessibletabbar.hxx
+++ b/accessibility/inc/extended/accessibletabbar.hxx
@@ -79,7 +79,6 @@ namespace accessibility
virtual sal_Int32 SAL_CALL getBackground( ) override;
// XAccessibleExtendedComponent
- virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( )
override;
virtual OUString SAL_CALL getTitledBorderText( ) override;
virtual OUString SAL_CALL getToolTipText( ) override;
};
diff --git a/accessibility/inc/extended/accessibletabbarpage.hxx
b/accessibility/inc/extended/accessibletabbarpage.hxx
index 052650c19de0..a8266b55c2a5 100644
--- a/accessibility/inc/extended/accessibletabbarpage.hxx
+++ b/accessibility/inc/extended/accessibletabbarpage.hxx
@@ -93,7 +93,6 @@ namespace accessibility
virtual sal_Int32 SAL_CALL getBackground( ) override;
// XAccessibleExtendedComponent
- virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( )
override;
virtual OUString SAL_CALL getTitledBorderText( ) override;
virtual OUString SAL_CALL getToolTipText( ) override;
};
diff --git a/accessibility/inc/extended/accessibletabbarpagelist.hxx
b/accessibility/inc/extended/accessibletabbarpagelist.hxx
index b3045aa77c6f..950a37167086 100644
--- a/accessibility/inc/extended/accessibletabbarpagelist.hxx
+++ b/accessibility/inc/extended/accessibletabbarpagelist.hxx
@@ -89,7 +89,6 @@ namespace accessibility
virtual sal_Int32 SAL_CALL getBackground( ) override;
// XAccessibleExtendedComponent
- virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( )
override;
virtual OUString SAL_CALL getTitledBorderText( ) override;
virtual OUString SAL_CALL getToolTipText( ) override;
diff --git a/accessibility/inc/standard/accessiblemenucomponent.hxx
b/accessibility/inc/standard/accessiblemenucomponent.hxx
index 90c89922654a..e9d46dcfa70a 100644
--- a/accessibility/inc/standard/accessiblemenucomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenucomponent.hxx
@@ -60,7 +60,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground( ) override;
// XAccessibleExtendedComponent
- virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( )
override;
virtual OUString SAL_CALL getTitledBorderText( ) override;
virtual OUString SAL_CALL getToolTipText( ) override;
diff --git a/accessibility/inc/standard/accessiblemenuitemcomponent.hxx
b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx
index b6adebbde81e..fae6e577b590 100644
--- a/accessibility/inc/standard/accessiblemenuitemcomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx
@@ -78,7 +78,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground( ) override;
// XAccessibleExtendedComponent
- virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( )
override;
virtual OUString SAL_CALL getTitledBorderText( ) override;
virtual OUString SAL_CALL getToolTipText( ) override;
};
diff --git a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
index 563e86ff5252..337a3db65845 100644
--- a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
+++ b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
@@ -79,7 +79,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground() override;
// XAccessibleExtendedComponent
- virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( )
override;
virtual OUString SAL_CALL getTitledBorderText( ) override;
virtual OUString SAL_CALL getToolTipText( ) override;
};
diff --git a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
index 9556f961d140..87bed611bf0a 100644
--- a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
@@ -92,7 +92,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground( ) override;
// XAccessibleExtendedComponent
- virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( )
override;
virtual OUString SAL_CALL getTitledBorderText( ) override;
virtual OUString SAL_CALL getToolTipText( ) override;
diff --git a/accessibility/inc/standard/vclxaccessibletabpage.hxx
b/accessibility/inc/standard/vclxaccessibletabpage.hxx
index efdc75e2c677..fece8744721a 100644
--- a/accessibility/inc/standard/vclxaccessibletabpage.hxx
+++ b/accessibility/inc/standard/vclxaccessibletabpage.hxx
@@ -102,7 +102,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground( ) override;
// XAccessibleExtendedComponent
- virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( )
override;
virtual OUString SAL_CALL getTitledBorderText( ) override;
virtual OUString SAL_CALL getToolTipText( ) override;
diff --git a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
index 6fbfc1e55138..e33e61eb568e 100644
--- a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
+++ b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
@@ -127,7 +127,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground( ) override;
// XAccessibleExtendedComponent
- virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( )
override;
virtual OUString SAL_CALL getTitledBorderText( ) override;
virtual OUString SAL_CALL getToolTipText( ) override;
diff --git a/accessibility/source/extended/accessibletabbar.cxx
b/accessibility/source/extended/accessibletabbar.cxx
index f6b722c09d88..58f8ab58539f 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -427,31 +427,6 @@ namespace accessibility
// XAccessibleExtendedComponent
-
- Reference< awt::XFont > AccessibleTabBar::getFont( )
- {
- OExternalLockGuard aGuard( this );
-
- Reference< awt::XFont > xFont;
- if ( m_pTabBar )
- {
- Reference< awt::XDevice > xDev(
m_pTabBar->GetComponentInterface(), UNO_QUERY );
- if ( xDev.is() )
- {
- vcl::Font aFont;
- if ( m_pTabBar->IsControlFont() )
- aFont = m_pTabBar->GetControlFont();
- else
- aFont = m_pTabBar->GetFont();
- rtl::Reference<VCLXFont> pVCLXFont = new VCLXFont(*xDev,
aFont);
- xFont = pVCLXFont;
- }
- }
-
- return xFont;
- }
-
-
OUString AccessibleTabBar::getTitledBorderText( )
{
OExternalLockGuard aGuard( this );
diff --git a/accessibility/source/extended/accessibletabbarpage.cxx
b/accessibility/source/extended/accessibletabbarpage.cxx
index 97af7f39d8b1..4f9249ce9099 100644
--- a/accessibility/source/extended/accessibletabbarpage.cxx
+++ b/accessibility/source/extended/accessibletabbarpage.cxx
@@ -371,24 +371,6 @@ namespace accessibility
// XAccessibleExtendedComponent
-
- Reference< awt::XFont > AccessibleTabBarPage::getFont( )
- {
- OExternalLockGuard aGuard( this );
-
- Reference< awt::XFont > xFont;
- Reference< XAccessible > xParent = getAccessibleParent();
- if ( xParent.is() )
- {
- Reference< XAccessibleExtendedComponent > xParentComp(
xParent->getAccessibleContext(), UNO_QUERY );
- if ( xParentComp.is() )
- xFont = xParentComp->getFont();
- }
-
- return xFont;
- }
-
-
OUString AccessibleTabBarPage::getTitledBorderText( )
{
OExternalLockGuard aGuard( this );
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx
b/accessibility/source/extended/accessibletabbarpagelist.cxx
index db553e40e0ce..a1e1f0a6f893 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -548,24 +548,6 @@ namespace accessibility
// XAccessibleExtendedComponent
-
- Reference< awt::XFont > AccessibleTabBarPageList::getFont( )
- {
- OExternalLockGuard aGuard( this );
-
- Reference< awt::XFont > xFont;
- Reference< XAccessible > xParent = getAccessibleParent();
- if ( xParent.is() )
- {
- Reference< XAccessibleExtendedComponent > xParentComp(
xParent->getAccessibleContext(), UNO_QUERY );
- if ( xParentComp.is() )
- xFont = xParentComp->getFont();
- }
-
- return xFont;
- }
-
-
OUString AccessibleTabBarPageList::getTitledBorderText( )
{
return OUString();
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx
b/accessibility/source/standard/accessiblemenucomponent.cxx
index 470a87fc8234..4fbbd394e92f 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -277,33 +277,6 @@ sal_Int32 OAccessibleMenuComponent::getBackground( )
// XAccessibleExtendedComponent
-
-Reference< awt::XFont > OAccessibleMenuComponent::getFont( )
-{
- OExternalLockGuard aGuard( this );
-
- Reference< awt::XFont > xFont;
-
- if ( m_pMenu )
- {
- vcl::Window* pWindow = m_pMenu->GetWindow();
- if ( pWindow )
- {
- Reference< awt::XDevice > xDev( pWindow->GetComponentInterface(),
UNO_QUERY );
- if ( xDev.is() )
- {
- const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
- rtl::Reference<VCLXFont> pVCLXFont
- = new VCLXFont(*xDev, rStyleSettings.GetMenuFont());
- xFont = pVCLXFont;
- }
- }
- }
-
- return xFont;
-}
-
-
OUString OAccessibleMenuComponent::getTitledBorderText( )
{
OExternalLockGuard aGuard( this );
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index 011e05f9dadf..0fa008b11aff 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -417,24 +417,6 @@ sal_Int32 OAccessibleMenuItemComponent::getBackground( )
// XAccessibleExtendedComponent
-
-Reference< awt::XFont > OAccessibleMenuItemComponent::getFont( )
-{
- OExternalLockGuard aGuard( this );
-
- Reference< awt::XFont > xFont;
- Reference< XAccessible > xParent = getAccessibleParent();
- if ( xParent.is() )
- {
- Reference< XAccessibleExtendedComponent > xParentComp(
xParent->getAccessibleContext(), UNO_QUERY );
- if ( xParentComp.is() )
- xFont = xParentComp->getFont();
- }
-
- return xFont;
-}
-
-
OUString OAccessibleMenuItemComponent::getTitledBorderText( )
{
OExternalLockGuard aGuard( this );
diff --git a/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
index df740cd7cf62..7e9f03f061d9 100644
--- a/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
@@ -227,13 +227,6 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getBackground()
// XAccessibleExtendedComponent
-
-Reference< awt::XFont > VCLXAccessibleHeaderBarItem::getFont()
-{
- return Reference< awt::XFont >();
-}
-
-
OUString VCLXAccessibleHeaderBarItem::getTitledBorderText()
{
return OUString();
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index b49f3cbecd4b..b309d6c39c9d 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -378,24 +378,6 @@ sal_Int32 VCLXAccessibleStatusBarItem::getBackground( )
// XAccessibleExtendedComponent
-
-Reference< awt::XFont > VCLXAccessibleStatusBarItem::getFont( )
-{
- OExternalLockGuard aGuard( this );
-
- Reference< awt::XFont > xFont;
- Reference< XAccessible > xParent = getAccessibleParent();
- if ( xParent.is() )
- {
- Reference< XAccessibleExtendedComponent > xParentComp(
xParent->getAccessibleContext(), UNO_QUERY );
- if ( xParentComp.is() )
- xFont = xParentComp->getFont();
- }
-
- return xFont;
-}
-
-
OUString VCLXAccessibleStatusBarItem::getTitledBorderText( )
{
OExternalLockGuard aGuard( this );
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx
b/accessibility/source/standard/vclxaccessibletabpage.cxx
index 1cf1330cfbe9..9c1b2d3db303 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -469,24 +469,6 @@ sal_Int32 VCLXAccessibleTabPage::getBackground( )
// XAccessibleExtendedComponent
-
-Reference< awt::XFont > VCLXAccessibleTabPage::getFont( )
-{
- OExternalLockGuard aGuard( this );
-
- Reference< awt::XFont > xFont;
- Reference< XAccessible > xParent = getAccessibleParent();
- if ( xParent.is() )
- {
- Reference< XAccessibleExtendedComponent > xParentComp(
xParent->getAccessibleContext(), UNO_QUERY );
- if ( xParentComp.is() )
- xFont = xParentComp->getFont();
- }
-
- return xFont;
-}
-
-
OUString VCLXAccessibleTabPage::getTitledBorderText( )
{
OExternalLockGuard aGuard( this );
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index bb6796ba4d76..b7e31f3bd1be 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -594,10 +594,6 @@ sal_Int32 SAL_CALL
VCLXAccessibleToolBoxItem::getBackground( )
}
// XAccessibleExtendedComponent
-Reference< awt::XFont > SAL_CALL VCLXAccessibleToolBoxItem::getFont( )
-{
- return uno::Reference< awt::XFont >();
-}
OUString SAL_CALL VCLXAccessibleToolBoxItem::getTitledBorderText( )
{
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index 0dbe0bbbf364..0d929b144f47 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -480,32 +480,6 @@ sal_Int32 AccessibleDialogControlShape::getBackground( )
// XAccessibleExtendedComponent
-
-Reference< awt::XFont > AccessibleDialogControlShape::getFont( )
-{
- OExternalLockGuard aGuard( this );
-
- Reference< awt::XFont > xFont;
- vcl::Window* pWindow = GetWindow();
- if ( pWindow )
- {
- Reference< awt::XDevice > xDev( pWindow->GetComponentInterface(),
UNO_QUERY );
- if ( xDev.is() )
- {
- vcl::Font aFont;
- if ( pWindow->IsControlFont() )
- aFont = pWindow->GetControlFont();
- else
- aFont = pWindow->GetFont();
- rtl::Reference<VCLXFont> pVCLXFont = new VCLXFont(*xDev, aFont);
- xFont = pVCLXFont;
- }
- }
-
- return xFont;
-}
-
-
OUString AccessibleDialogControlShape::getTitledBorderText( )
{
OExternalLockGuard aGuard( this );
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx
b/basctl/source/accessibility/accessibledialogwindow.cxx
index 48e887e34dd2..9e31a8783cc4 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -750,31 +750,6 @@ sal_Int32 AccessibleDialogWindow::getBackground( )
// XAccessibleExtendedComponent
-
-Reference< awt::XFont > AccessibleDialogWindow::getFont( )
-{
- OExternalLockGuard aGuard( this );
-
- Reference< awt::XFont > xFont;
- if ( m_pDialogWindow )
- {
- Reference< awt::XDevice > xDev(
m_pDialogWindow->GetComponentInterface(), UNO_QUERY );
- if ( xDev.is() )
- {
- vcl::Font aFont;
- if ( m_pDialogWindow->IsControlFont() )
- aFont = m_pDialogWindow->GetControlFont();
- else
- aFont = m_pDialogWindow->GetFont();
- rtl::Reference<VCLXFont> pVCLXFont = new VCLXFont(*xDev, aFont);
- xFont = pVCLXFont;
- }
- }
-
- return xFont;
-}
-
-
OUString AccessibleDialogWindow::getTitledBorderText( )
{
OExternalLockGuard aGuard( this );
diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx
b/basctl/source/inc/accessibledialogcontrolshape.hxx
index 3af6e3da90ee..6979fee0f025 100644
--- a/basctl/source/inc/accessibledialogcontrolshape.hxx
+++ b/basctl/source/inc/accessibledialogcontrolshape.hxx
@@ -110,7 +110,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground( ) override;
// XAccessibleExtendedComponent
- virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( )
override;
virtual OUString SAL_CALL getTitledBorderText( ) override;
virtual OUString SAL_CALL getToolTipText( ) override;
};
diff --git a/basctl/source/inc/accessibledialogwindow.hxx
b/basctl/source/inc/accessibledialogwindow.hxx
index 0332b98a4175..42c1f9390433 100644
--- a/basctl/source/inc/accessibledialogwindow.hxx
+++ b/basctl/source/inc/accessibledialogwindow.hxx
@@ -124,7 +124,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground( ) override;
// XAccessibleExtendedComponent
- virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( )
override;
virtual OUString SAL_CALL getTitledBorderText( ) override;
virtual OUString SAL_CALL getToolTipText( ) override;
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index 2ed0d06e29c4..adec462c4db3 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -138,25 +138,6 @@ OUString SAL_CALL
AccessibleChartElement::getAccessibleDescription()
}
// ________ AccessibleChartElement::XAccessibleExtendedComponent ________
-Reference< awt::XFont > SAL_CALL AccessibleChartElement::getFont()
-{
- CheckDisposeState();
-
- Reference< awt::XFont > xFont;
- Reference< awt::XDevice > xDevice( Reference< awt::XWindow >(
GetInfo().m_xWindow ), uno::UNO_QUERY );
-
- if( xDevice.is())
- {
- Reference< beans::XMultiPropertySet > xObjProp(
- ObjectIdentifier::getObjectPropertySet(
- GetInfo().m_aOID.getObjectCID(), GetInfo().m_xChartDocument ),
uno::UNO_QUERY );
- awt::FontDescriptor aDescr(
- CharacterProperties::createFontDescriptorFromPropertySet( xObjProp
));
- xFont = xDevice->getFont( aDescr );
- }
-
- return xFont;
-}
OUString SAL_CALL AccessibleChartElement::getTitledBorderText()
{
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx
b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
index 283efed69d80..e2a94bf69ff8 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
@@ -70,7 +70,6 @@ public:
virtual OUString SAL_CALL getAccessibleDescription() override;
// ________ XAccessibleExtendedComponent ________
- virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() override;
virtual OUString SAL_CALL getTitledBorderText() override;
virtual OUString SAL_CALL getToolTipText() override;
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx
b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
index f0ebacf77a86..6d573762eb95 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
@@ -215,15 +215,6 @@ sal_Int32 AccessibleChartShape::getBackground()
}
// ________ XAccessibleExtendedComponent ________
-Reference< awt::XFont > AccessibleChartShape::getFont()
-{
- Reference< awt::XFont > xFont;
- if ( m_pAccShape.is() )
- {
- xFont.set( m_pAccShape->getFont() );
- }
- return xFont;
-}
OUString AccessibleChartShape::getTitledBorderText()
{
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx
b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
index c31204ed3c8a..3f8975921e68 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
@@ -69,7 +69,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground() override;
// ________ XAccessibleExtendedComponent ________
- virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() override;
virtual OUString SAL_CALL getTitledBorderText() override;
virtual OUString SAL_CALL getToolTipText() override;
diff --git a/editeng/source/accessibility/AccessibleComponentBase.cxx
b/editeng/source/accessibility/AccessibleComponentBase.cxx
index 5e95afbd2f70..4b1d5438b735 100644
--- a/editeng/source/accessibility/AccessibleComponentBase.cxx
+++ b/editeng/source/accessibility/AccessibleComponentBase.cxx
@@ -114,12 +114,6 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getBackground()
// XAccessibleExtendedComponent
-css::uno::Reference< css::awt::XFont > SAL_CALL
- AccessibleComponentBase::getFont()
-{
- return uno::Reference<awt::XFont>();
-}
-
OUString SAL_CALL AccessibleComponentBase::getTitledBorderText()
{
diff --git a/include/editeng/AccessibleComponentBase.hxx
b/include/editeng/AccessibleComponentBase.hxx
index 80b0c2b95030..cf73a5bd2144 100644
--- a/include/editeng/AccessibleComponentBase.hxx
+++ b/include/editeng/AccessibleComponentBase.hxx
@@ -92,7 +92,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground() override;
//===== XAccessibleExtendedComponent ====================================
- virtual css::uno::Reference<css::awt::XFont> SAL_CALL getFont() override;
virtual OUString SAL_CALL getTitledBorderText() override;
virtual OUString SAL_CALL getToolTipText() override;
diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx
b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index d3aaa30f5646..9227f6958035 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -100,7 +100,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground( ) override;
// css::accessibility::XAccessibleExtendedComponent
- virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( )
override;
virtual OUString SAL_CALL getTitledBorderText( ) override;
virtual OUString SAL_CALL getToolTipText( ) override;
diff --git a/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
b/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
index d8d755fe0b2a..ea9afea783b1 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleExtendedComponent.idl
@@ -37,14 +37,6 @@ module com { module sun { module star { module accessibility
{
*/
interface XAccessibleExtendedComponent : XAccessibleComponent
{
- /** Returns the font of this object.
-
- @return
- The returned reference to a font object is empty if a font is not
- supported by this object.
- */
- ::com::sun::star::awt::XFont getFont ();
-
/** Returns the titled border text.
<p>This method stems from the Java interface
diff --git
a/qadevOOo/objdsc/svtools/com.sun.star.comp.svtools.AccessibleTabBar.csv
b/qadevOOo/objdsc/svtools/com.sun.star.comp.svtools.AccessibleTabBar.csv
index 73948b2fc6f0..93aca238e1fc 100644
--- a/qadevOOo/objdsc/svtools/com.sun.star.comp.svtools.AccessibleTabBar.csv
+++ b/qadevOOo/objdsc/svtools/com.sun.star.comp.svtools.AccessibleTabBar.csv
@@ -1,4 +1,3 @@
-"AccessibleTabBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleTabBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleTabBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleTabBar";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
diff --git
a/qadevOOo/objdsc/svtools/com.sun.star.comp.svtools.AccessibleTabBarPage.csv
b/qadevOOo/objdsc/svtools/com.sun.star.comp.svtools.AccessibleTabBarPage.csv
index 32b30d64b1a5..0390988618e1 100644
--- a/qadevOOo/objdsc/svtools/com.sun.star.comp.svtools.AccessibleTabBarPage.csv
+++ b/qadevOOo/objdsc/svtools/com.sun.star.comp.svtools.AccessibleTabBarPage.csv
@@ -1,4 +1,3 @@
-"AccessibleTabBarPage";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleTabBarPage";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleTabBarPage";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleTabBarPage";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
diff --git
a/qadevOOo/objdsc/svtools/com.sun.star.comp.svtools.AccessibleTabBarPageList.csv
b/qadevOOo/objdsc/svtools/com.sun.star.comp.svtools.AccessibleTabBarPageList.csv
index b4f87286f6b7..fcb2912662d8 100644
---
a/qadevOOo/objdsc/svtools/com.sun.star.comp.svtools.AccessibleTabBarPageList.csv
+++
b/qadevOOo/objdsc/svtools/com.sun.star.comp.svtools.AccessibleTabBarPageList.csv
@@ -1,4 +1,3 @@
-"AccessibleTabBarPageList";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleTabBarPageList";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleTabBarPageList";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleTabBarPageList";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
diff --git
a/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessibleControlShape.csv
b/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessibleControlShape.csv
index 887d3151b4c5..832b17a4368f 100644
--- a/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessibleControlShape.csv
+++ b/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessibleControlShape.csv
@@ -1,4 +1,3 @@
-"AccessibleControlShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getFont()"
"AccessibleControlShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getTitledBorderText()"
"AccessibleControlShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getToolTipText()"
"AccessibleControlShape";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
diff --git
a/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessibleGraphicShape.csv
b/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessibleGraphicShape.csv
index 2db06b3e8b53..35ca0d8dc5f5 100644
--- a/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessibleGraphicShape.csv
+++ b/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessibleGraphicShape.csv
@@ -1,4 +1,3 @@
-"AccessibleGraphicShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getFont()"
"AccessibleGraphicShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getTitledBorderText()"
"AccessibleGraphicShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getToolTipText()"
"AccessibleGraphicShape";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
diff --git
a/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessibleOLEShape.csv
b/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessibleOLEShape.csv
index e5db4c6989e8..a8a99d8561f9 100644
--- a/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessibleOLEShape.csv
+++ b/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessibleOLEShape.csv
@@ -1,4 +1,3 @@
-"AccessibleOLEShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getFont()"
"AccessibleOLEShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getTitledBorderText()"
"AccessibleOLEShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getToolTipText()"
"AccessibleOLEShape";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
diff --git
a/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessiblePageShape.csv
b/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessiblePageShape.csv
index 8a61c76902dd..0ac7da9bf9b9 100644
--- a/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessiblePageShape.csv
+++ b/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessiblePageShape.csv
@@ -1,4 +1,3 @@
-"AccessiblePageShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getFont()"
"AccessiblePageShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getTitledBorderText()"
"AccessiblePageShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getToolTipText()"
"AccessiblePageShape";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
diff --git
a/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessiblePresentationGraphicShape.csv
b/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessiblePresentationGraphicShape.csv
index 991f2b8f078c..1e57d8568041 100644
---
a/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessiblePresentationGraphicShape.csv
+++
b/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessiblePresentationGraphicShape.csv
@@ -1,4 +1,3 @@
-"AccessiblePresentationGraphicShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getFont()"
"AccessiblePresentationGraphicShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getTitledBorderText()"
"AccessiblePresentationGraphicShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getToolTipText()"
"AccessiblePresentationGraphicShape";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
diff --git
a/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessiblePresentationOLEShape.csv
b/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessiblePresentationOLEShape.csv
index c37eea41cb82..c69cbd7e00b1 100644
---
a/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessiblePresentationOLEShape.csv
+++
b/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessiblePresentationOLEShape.csv
@@ -1,4 +1,3 @@
-"AccessiblePresentationOLEShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getFont()"
"AccessiblePresentationOLEShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getTitledBorderText()"
"AccessiblePresentationOLEShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getToolTipText()"
"AccessiblePresentationOLEShape";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
diff --git
a/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessiblePresentationShape.csv
b/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessiblePresentationShape.csv
index 84d3ebc1fe12..6ba64047c3ab 100644
---
a/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessiblePresentationShape.csv
+++
b/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessiblePresentationShape.csv
@@ -1,4 +1,3 @@
-"AccessiblePresentationShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getFont()"
"AccessiblePresentationShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getTitledBorderText()"
"AccessiblePresentationShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getToolTipText()"
"AccessiblePresentationShape";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessibleShape.csv
b/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessibleShape.csv
index 154ee27961c0..24c5fbdb945a 100644
--- a/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessibleShape.csv
+++ b/qadevOOo/objdsc/svx/com.sun.star.comp.unknown.AccessibleShape.csv
@@ -1,4 +1,3 @@
-"AccessibleShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getFont()"
"AccessibleShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getTitledBorderText()"
"AccessibleShape";"com::sun::star::accessibility::XAccessibleExtendedComponent#optional";"getToolTipText()"
"AccessibleShape";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleButton.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleButton.csv
index b5074fae0796..ebef697030df 100644
--- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleButton.csv
+++ b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleButton.csv
@@ -1,4 +1,3 @@
-"AccessibleButton";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleButton";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleButton";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleButton";"com::sun::star::accessibility::XAccessibleValue";"getCurrentValue()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleCheckBox.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleCheckBox.csv
index f55d013eae03..59e2efe3799a 100644
--- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleCheckBox.csv
+++ b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleCheckBox.csv
@@ -1,4 +1,3 @@
-"AccessibleCheckBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleCheckBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleCheckBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleCheckBox";"com::sun::star::accessibility::XAccessibleValue";"getCurrentValue()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleComboBox.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleComboBox.csv
index 30956a4ef8a0..b2c7d4414714 100644
--- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleComboBox.csv
+++ b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleComboBox.csv
@@ -1,4 +1,3 @@
-"AccessibleComboBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleComboBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleComboBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleComboBox";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleDropDownComboBox.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleDropDownComboBox.csv
index 96e3d27f3ba4..593fdcab0416 100644
---
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleDropDownComboBox.csv
+++
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleDropDownComboBox.csv
@@ -1,4 +1,3 @@
-"AccessibleDropDownComboBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleDropDownComboBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleDropDownComboBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleDropDownComboBox";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleDropDownListBox.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleDropDownListBox.csv
index 2df3ecb2f6a3..be66442c2e93 100644
---
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleDropDownListBox.csv
+++
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleDropDownListBox.csv
@@ -1,4 +1,3 @@
-"AccessibleDropDownListBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleDropDownListBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleDropDownListBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleDropDownListBox";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleEdit.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleEdit.csv
index ab60d7412017..004352673b9d 100644
--- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleEdit.csv
+++ b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleEdit.csv
@@ -1,4 +1,3 @@
-"AccessibleEdit";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleEdit";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleEdit";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleEdit";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleFixedText.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleFixedText.csv
index 0a58a7933a6c..c736c47d402f 100644
--- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleFixedText.csv
+++ b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleFixedText.csv
@@ -1,4 +1,3 @@
-"AccessibleFixedText";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleFixedText";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleFixedText";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleFixedText";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleList.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleList.csv
index ddbc2a586b70..4952e9f2b1dc 100644
--- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleList.csv
+++ b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleList.csv
@@ -1,4 +1,3 @@
-"AccessibleList";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleList";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleList";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleList";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleListBox.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleListBox.csv
index fbf420288a74..819e661c184a 100644
--- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleListBox.csv
+++ b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleListBox.csv
@@ -1,4 +1,3 @@
-"AccessibleListBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleListBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleListBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleListBox";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleMenu.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleMenu.csv
index 017a8ff4e902..8d0e92af515a 100644
--- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleMenu.csv
+++ b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleMenu.csv
@@ -1,4 +1,3 @@
-"AccessibleMenu";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleMenu";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleMenu";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleMenu";"com::sun::star::accessibility::XAccessibleValue";"getCurrentValue()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleMenuBar.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleMenuBar.csv
index 580dcf2b2bb8..f1c3c3696961 100644
--- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleMenuBar.csv
+++ b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleMenuBar.csv
@@ -1,4 +1,3 @@
-"AccessibleMenuBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleMenuBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleMenuBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleMenuBar";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleMenuItem.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleMenuItem.csv
index 12978754ab68..9c69804ab849 100644
--- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleMenuItem.csv
+++ b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleMenuItem.csv
@@ -1,4 +1,3 @@
-"AccessibleMenuItem";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleMenuItem";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleMenuItem";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleMenuItem";"com::sun::star::accessibility::XAccessibleValue";"getCurrentValue()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleMenuSeparator.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleMenuSeparator.csv
index d0fd63b66dce..ada369f7263f 100644
---
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleMenuSeparator.csv
+++
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleMenuSeparator.csv
@@ -1,4 +1,3 @@
-"AccessibleMenuSeparator";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleMenuSeparator";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleMenuSeparator";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleMenuSeparator";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessiblePopupMenu.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessiblePopupMenu.csv
index ec26fdf299e8..205f80cd9c08 100644
--- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessiblePopupMenu.csv
+++ b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessiblePopupMenu.csv
@@ -1,4 +1,3 @@
-"AccessiblePopupMenu";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessiblePopupMenu";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessiblePopupMenu";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessiblePopupMenu";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleRadioButton.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleRadioButton.csv
index e6b09510472c..b64a3aa8ed24 100644
---
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleRadioButton.csv
+++
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleRadioButton.csv
@@ -1,4 +1,3 @@
-"AccessibleRadioButton";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleRadioButton";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleRadioButton";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleRadioButton";"com::sun::star::accessibility::XAccessibleValue";"getCurrentValue()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleScrollBar.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleScrollBar.csv
index 38ef1161a39e..e5d9daee7c10 100644
--- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleScrollBar.csv
+++ b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleScrollBar.csv
@@ -1,4 +1,3 @@
-"AccessibleScrollBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleScrollBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleScrollBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleScrollBar";"com::sun::star::accessibility::XAccessibleValue";"getCurrentValue()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleStatusBar.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleStatusBar.csv
index 3850e15f2969..e2c8e4e2c009 100644
--- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleStatusBar.csv
+++ b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleStatusBar.csv
@@ -1,4 +1,3 @@
-"AccessibleStatusBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleStatusBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleStatusBar";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleStatusBar";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleStatusBarItem.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleStatusBarItem.csv
index 78254662dd4b..0d08841628d0 100644
---
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleStatusBarItem.csv
+++
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleStatusBarItem.csv
@@ -1,4 +1,3 @@
-"AccessibleStatusBarItem";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleStatusBarItem";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleStatusBarItem";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleStatusBarItem";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleTabControl.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleTabControl.csv
index 34936b28a5c1..d8434f71616a 100644
--- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleTabControl.csv
+++ b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleTabControl.csv
@@ -1,4 +1,3 @@
-"AccessibleTabControl";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleTabControl";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleTabControl";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleTabControl";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleTabPage.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleTabPage.csv
index 9df4ff13dc9c..de2248619165 100644
--- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleTabPage.csv
+++ b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleTabPage.csv
@@ -1,4 +1,3 @@
-"AccessibleTabPage";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleTabPage";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleTabPage";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleTabPage";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleToolBox.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleToolBox.csv
index 38b6e66890d4..a230ea8b3282 100644
--- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleToolBox.csv
+++ b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleToolBox.csv
@@ -1,4 +1,3 @@
-"AccessibleToolBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleToolBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleToolBox";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleToolBox";"com::sun::star::accessibility::XAccessibleEventBroadcaster#optional";"addEventListener()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleToolBoxItem.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleToolBoxItem.csv
index c37673d7e271..b38537283fc9 100644
---
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleToolBoxItem.csv
+++
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleToolBoxItem.csv
@@ -1,4 +1,3 @@
-"AccessibleToolBoxItem";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleToolBoxItem";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleToolBoxItem";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleToolBoxItem";"com::sun::star::accessibility::XAccessibleValue";"getCurrentValue()"
diff --git
a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleWindow.csv
b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleWindow.csv
index c59a575c8fb2..b8679d33948a 100644
--- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleWindow.csv
+++ b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.AccessibleWindow.csv
@@ -1,4 +1,3 @@
-"AccessibleWindow";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getFont()"
"AccessibleWindow";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getTitledBorderText()"
"AccessibleWindow";"com::sun::star::accessibility::XAccessibleExtendedComponent";"getToolTipText()"
"AccessibleWindow";"com::sun::star::accessibility::XAccessibleEventBroadcaster";"addEventListener()"
diff --git
a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleExtendedComponent.java
b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleExtendedComponent.java
index 2156c09a00dc..902722a6a1a5 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleExtendedComponent.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleExtendedComponent.java
@@ -29,7 +29,6 @@ import com.sun.star.awt.XFont;
* <ul>
* <li><code> getForeground()</code></li>
* <li><code> getBackground()</code></li>
- * <li><code> getFont()</code></li>
* <li><code> isEnabled()</code></li>
* <li><code> getTitledBorderText()</code></li>
* <li><code> getToolTipText()</code></li>
@@ -60,15 +59,6 @@ public class _XAccessibleExtendedComponent extends
MultiMethodTest {
tRes.tested("getBackground()", true);
}
- /**
- * Just calls the method.
- */
- public void _getFont() {
- XFont font = oObj.getFont();
- log.println("getFont(): " + font);
- tRes.tested("getFont()", true);
- }
-
/**
* Calls the method and checks returned value.
* Has OK status if returned value isn't null.
diff --git a/svx/source/table/accessiblecell.cxx
b/svx/source/table/accessiblecell.cxx
index e74674d9ba26..65b74d4ae6de 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -385,14 +385,6 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground()
// XAccessibleExtendedComponent
-
-css::uno::Reference< css::awt::XFont > SAL_CALL AccessibleCell::getFont()
-{
-//todo
- return AccessibleComponentBase::getFont();
-}
-
-
OUString SAL_CALL AccessibleCell::getTitledBorderText()
{
return AccessibleComponentBase::getTitledBorderText();
diff --git a/svx/source/table/accessiblecell.hxx
b/svx/source/table/accessiblecell.hxx
index 39c45da3d890..4218225cc064 100644
--- a/svx/source/table/accessiblecell.hxx
+++ b/svx/source/table/accessiblecell.hxx
@@ -84,7 +84,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground() override;
// XAccessibleExtendedComponent
- virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() override;
virtual OUString SAL_CALL getTitledBorderText() override;
virtual OUString SAL_CALL getToolTipText() override;
diff --git a/toolkit/qa/complex/toolkit/AccessibleStatusBarItem.java
b/toolkit/qa/complex/toolkit/AccessibleStatusBarItem.java
index d2c9b0f68a43..153bdd494aaf 100644
--- a/toolkit/qa/complex/toolkit/AccessibleStatusBarItem.java
+++ b/toolkit/qa/complex/toolkit/AccessibleStatusBarItem.java
@@ -305,7 +305,6 @@ public class AccessibleStatusBarItem {
System.out.println("*** Now testing XAccessibleExtendedComponent
***");
_XAccessibleExtendedComponent _xAccExtComp =
new _XAccessibleExtendedComponent(object);
- assertTrue("failed: "+accName+" -
XAccessibleExtendedComponent::getFont", _xAccExtComp._getFont());
assertTrue("failed: "+accName+" -
XAccessibleExtendedComponent::getTitledBorderText",
_xAccExtComp._getTitledBorderText());
assertTrue("failed: "+accName+" -
XAccessibleExtendedComponent::getToolTipText", _xAccExtComp._getToolTipText());
diff --git
a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent.java
b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent.java
index 64dd66fcb71f..c26dd83403f0 100644
---
a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent.java
+++
b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent.java
@@ -29,7 +29,6 @@ import com.sun.star.uno.UnoRuntime;
* <ul>
* <li><code> getForeground()</code></li>
* <li><code> getBackground()</code></li>
- * <li><code> getFont()</code></li>
* <li><code> isEnabled()</code></li>
* <li><code> getTitledBorderText()</code></li>
* <li><code> getToolTipText()</code></li>
@@ -44,15 +43,6 @@ public class _XAccessibleExtendedComponent {
oObj = UnoRuntime.queryInterface(XAccessibleExtendedComponent.class,
object);
}
- /**
- * Just calls the method.
- */
- public boolean _getFont() {
- XFont font = oObj.getFont();
- System.out.println("getFont(): " + font);
- return true;
- }
-
/**
* Calls the method and checks returned value.
* Has OK status if returned value isn't null.
diff --git a/toolkit/qa/cppunit/a11y/XAccessibleExtendedComponentTester.cxx
b/toolkit/qa/cppunit/a11y/XAccessibleExtendedComponentTester.cxx
index a7137c4ba5ac..ec192bdf0f47 100644
--- a/toolkit/qa/cppunit/a11y/XAccessibleExtendedComponentTester.cxx
+++ b/toolkit/qa/cppunit/a11y/XAccessibleExtendedComponentTester.cxx
@@ -23,15 +23,6 @@
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
-/**
- * @brief Just calls the method.
- */
-void XAccessibleExtendedComponentTester::testGetFont()
-{
- auto font = mxExtendedComponent->getFont();
- std::cout << "font: " << font << std::endl;
-}
-
/**
* @brief Just calls the method.
*/
diff --git a/toolkit/qa/cppunit/a11y/XAccessibleExtendedComponentTester.hxx
b/toolkit/qa/cppunit/a11y/XAccessibleExtendedComponentTester.hxx
index 12970528229e..353fd663b1a9 100644
--- a/toolkit/qa/cppunit/a11y/XAccessibleExtendedComponentTester.hxx
+++ b/toolkit/qa/cppunit/a11y/XAccessibleExtendedComponentTester.hxx
@@ -35,13 +35,11 @@ public:
{
}
- void testGetFont();
void testGetTitledBorderText();
void testGetToolTipText();
void testAll()
{
- testGetFont();
testGetTitledBorderText();
testGetToolTipText();
}
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx
b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index e415f353c848..2f709a2329a8 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -804,30 +804,6 @@ sal_Int32 SAL_CALL VCLXAccessibleComponent::getBackground(
)
// XAccessibleExtendedComponent
-uno::Reference< awt::XFont > SAL_CALL VCLXAccessibleComponent::getFont( )
-{
- OExternalLockGuard aGuard( this );
-
- uno::Reference< awt::XFont > xFont;
- VclPtr<vcl::Window> pWindow = GetWindow();
- if ( pWindow )
- {
- uno::Reference< awt::XDevice > xDev( pWindow->GetComponentInterface(),
uno::UNO_QUERY );
- if ( xDev.is() )
- {
- vcl::Font aFont;
- if ( pWindow->IsControlFont() )
- aFont = pWindow->GetControlFont();
- else
- aFont = pWindow->GetFont();
- rtl::Reference<VCLXFont> pVCLXFont = new VCLXFont(*xDev, aFont);
- xFont = pVCLXFont;
- }
- }
-
- return xFont;
-}
-
OUString SAL_CALL VCLXAccessibleComponent::getTitledBorderText( )
{
OExternalLockGuard aGuard( this );
diff --git a/vcl/osx/a11ytextattributeswrapper.mm
b/vcl/osx/a11ytextattributeswrapper.mm
index 11b205a8039b..9310ae137726 100644
--- a/vcl/osx/a11ytextattributeswrapper.mm
+++ b/vcl/osx/a11ytextattributeswrapper.mm
@@ -25,6 +25,7 @@
#include "a11ytextattributeswrapper.h"
#include <com/sun/star/accessibility/AccessibleTextType.hpp>
+#include <com/sun/star/awt/FontSlant.hpp>
#include <com/sun/star/awt/FontUnderline.hpp>
#include <com/sun/star/awt/FontWeight.hpp>
#include <com/sun/star/awt/FontStrikeout.hpp>
