basctl/source/accessibility/accessibledialogcontrolshape.cxx | 3 basctl/source/accessibility/accessibledialogwindow.cxx | 6 basctl/source/basicide/textwindowaccessibility.hxx | 4 basctl/source/inc/accessibledialogcontrolshape.hxx | 7 basctl/source/inc/accessibledialogwindow.hxx | 6 chart2/source/controller/accessibility/AccessibleBase.cxx | 2 chart2/source/controller/accessibility/AccessibleChartShape.hxx | 2 chart2/source/controller/accessibility/AccessibleTextHelper.cxx | 7 chart2/source/controller/inc/AccessibleBase.hxx | 6 chart2/source/controller/inc/AccessibleChartView.hxx | 3 chart2/source/controller/inc/AccessibleTextHelper.hxx | 4 comphelper/Library_comphelper.mk | 2 comphelper/source/misc/OAccessible.cxx | 84 +++------- compilerplugins/clang/constantparam.numbers.results | 2 dbaccess/source/ui/inc/ConnectionLineAccess.hxx | 2 editeng/source/accessibility/AccessibleContextBase.cxx | 2 editeng/source/accessibility/AccessibleEditableTextPara.cxx | 2 editeng/source/accessibility/AccessibleImageBullet.cxx | 2 editeng/source/accessibility/AccessibleImageBullet.hxx | 5 include/IwyuFilter_include.yaml | 2 include/comphelper/OAccessible.hxx | 21 +- include/comphelper/accessiblecontexthelper.hxx | 24 +- include/comphelper/accessibleselectionhelper.hxx | 5 include/comphelper/accessibletexthelper.hxx | 9 - include/editeng/AccessibleContextBase.hxx | 5 include/editeng/AccessibleEditableTextPara.hxx | 4 include/svx/AccessibleShape.hxx | 2 include/svx/AccessibleTextHelper.hxx | 4 include/vcl/accessibility/AccessibleBrowseBoxBase.hxx | 6 include/vcl/accessibility/vclxaccessiblecomponent.hxx | 5 include/vcl/menu.hxx | 8 sc/source/ui/Accessibility/AccessibleContextBase.cxx | 4 sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 2 sc/source/ui/inc/AccessibleContextBase.hxx | 7 sc/source/ui/inc/AccessibleCsvControl.hxx | 5 sd/source/console/AccessibleObject.cxx | 2 sd/source/console/AccessibleObject.hxx | 8 sd/source/ui/accessibility/AccessiblePageShape.cxx | 2 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 2 sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 2 sd/source/ui/inc/AccessiblePageShape.hxx | 2 sd/source/ui/inc/AccessibleSlideSorterObject.hxx | 4 sd/source/ui/inc/AccessibleSlideSorterView.hxx | 6 sd/source/ui/inc/DrawViewShell.hxx | 2 sd/source/ui/inc/NotesPanelViewShell.hxx | 2 sd/source/ui/inc/OutlineViewShell.hxx | 2 sd/source/ui/inc/SlideSorterViewShell.hxx | 2 sd/source/ui/inc/ViewShell.hxx | 4 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 2 sd/source/ui/view/drviews5.cxx | 2 sd/source/ui/view/outlnvsh.cxx | 2 sd/source/ui/view/viewshel.cxx | 3 sfx2/source/control/thumbnailviewacc.cxx | 2 sfx2/source/control/thumbnailviewacc.hxx | 6 sfx2/source/control/thumbnailviewitemacc.hxx | 6 solenv/clang-format/excludelist | 4 starmath/source/accessibility.cxx | 2 starmath/source/accessibility.hxx | 5 svtools/source/control/accessibleruler.cxx | 2 svtools/source/control/accessibleruler.hxx | 4 svtools/source/control/accessibletabbar.cxx | 4 svtools/source/control/accessibletabbar.hxx | 2 svtools/source/control/accessibletabbarbase.cxx | 2 svtools/source/control/accessibletabbarbase.hxx | 4 svtools/source/control/accessibletabbarpage.cxx | 4 svtools/source/control/accessibletabbarpage.hxx | 2 svtools/source/control/accessibletabbarpagelist.cxx | 4 svtools/source/control/accessibletabbarpagelist.hxx | 2 svtools/source/control/valueacc.cxx | 2 svtools/source/control/valueimp.hxx | 10 - svx/source/accessibility/AccessibleTextHelper.cxx | 6 svx/source/accessibility/GraphCtlAccessibleContext.cxx | 2 svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 2 svx/source/accessibility/svxrectctaccessiblecontext.cxx | 2 svx/source/dialog/weldeditview.cxx | 6 svx/source/inc/AccessibleFrameSelector.hxx | 12 - svx/source/inc/GraphCtlAccessibleContext.hxx | 4 svx/source/inc/charmapacc.hxx | 10 - svx/source/inc/svxpixelctlaccessiblecontext.hxx | 6 svx/source/inc/svxrectctaccessiblecontext.hxx | 6 svx/source/table/accessiblecell.hxx | 2 toolkit/inc/controls/accessiblecontrolcontext.hxx | 8 toolkit/inc/controls/table/AccessibleGridControlBase.hxx | 5 toolkit/source/controls/accessiblecontrolcontext.cxx | 2 toolkit/source/controls/table/AccessibleGridControlBase.cxx | 2 vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx | 8 vcl/inc/accessibility/accessiblelistboxentry.hxx | 8 vcl/inc/accessibility/accessiblemenubasecomponent.hxx | 5 vcl/inc/accessibility/accessiblemenucomponent.hxx | 2 vcl/inc/accessibility/accessiblemenuitemcomponent.hxx | 2 vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx | 7 vcl/inc/accessibility/vclxaccessiblelistitem.hxx | 7 vcl/inc/accessibility/vclxaccessiblestatusbaritem.hxx | 2 vcl/inc/accessibility/vclxaccessibletabpage.hxx | 2 vcl/inc/accessibility/vclxaccessibletabpagewindow.hxx | 2 vcl/source/accessibility/AccessibleBrowseBoxBase.cxx | 2 vcl/source/accessibility/accessibleiconchoicectrlentry.cxx | 2 vcl/source/accessibility/accessiblelistboxentry.cxx | 2 vcl/source/accessibility/accessiblemenubasecomponent.cxx | 2 vcl/source/accessibility/accessiblemenucomponent.cxx | 4 vcl/source/accessibility/accessiblemenuitemcomponent.cxx | 4 vcl/source/accessibility/vclxaccessiblecomponent.cxx | 2 vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx | 2 vcl/source/accessibility/vclxaccessiblelistitem.cxx | 5 vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx | 4 vcl/source/accessibility/vclxaccessibletabpage.cxx | 4 vcl/source/accessibility/vclxaccessibletabpagewindow.cxx | 4 vcl/source/window/menu.cxx | 4 108 files changed, 240 insertions(+), 301 deletions(-)
New commits: commit e7e3a51c325cd6e0379905abdf6e8214fa7af8b5 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Jun 25 10:25:53 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Jun 26 13:09:50 2025 +0200 a11y: Rename OAccessible source and header file Rename files accordingly after the class was renamed in previous commit Change-Id: I33210b47cda5f71820a3c0fa657e4c3548d45732 Author: Michael Weghorn <[email protected]> Date: Wed Jun 25 10:15:23 2025 +0200 a11y: Rename OAccessibleComponentHelper to OAccessible Change-Id: I1d38d124af685960c0170601e930da516ce2ead3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186953 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx index 499052807d7f..b513742ed1e7 100644 --- a/basctl/source/inc/accessibledialogcontrolshape.hxx +++ b/basctl/source/inc/accessibledialogcontrolshape.hxx @@ -21,7 +21,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <cppuhelper/implbase.hxx> #include <vcl/vclptr.hxx> diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index 5b31a6509720..2dd6fae82724 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -21,7 +21,7 @@ #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <cppuhelper/implbase.hxx> #include <svl/lstner.hxx> #include <tools/link.hxx> diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index e71ad0238a2d..011bdfa48b88 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <com/sun/star/accessibility/XAccessibleComponent.hpp> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <tools/color.hxx> diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx index c0cb94c58a00..ccdf1ed6bd61 100644 --- a/chart2/source/controller/inc/AccessibleTextHelper.hxx +++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx @@ -18,7 +18,7 @@ */ #pragma once -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <comphelper/compbase.hxx> #include <svx/AccessibleTextHelper.hxx> #include <vcl/window.hxx> diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index ee0428407d7c..ed0a2eed1dfb 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -80,7 +80,7 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\ $(if $(filter OPENSSL,$(TLS)), comphelper/source/crypto/Crypto_OpenSSL) \ $(if $(filter NSS OPENSSL,$(TLS)),,comphelper/source/crypto/Crypto_None) \ comphelper/source/eventattachermgr/eventattachermgr \ - comphelper/source/misc/accessiblecomponenthelper \ + comphelper/source/misc/OAccessible \ comphelper/source/misc/accessibleeventnotifier \ comphelper/source/misc/accessiblekeybindinghelper \ comphelper/source/misc/accessibleselectionhelper \ diff --git a/comphelper/source/misc/accessiblecomponenthelper.cxx b/comphelper/source/misc/OAccessible.cxx similarity index 99% rename from comphelper/source/misc/accessiblecomponenthelper.cxx rename to comphelper/source/misc/OAccessible.cxx index 7d9be18ee3d6..579d686c1245 100644 --- a/comphelper/source/misc/accessiblecomponenthelper.cxx +++ b/comphelper/source/misc/OAccessible.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <comphelper/accessiblecontexthelper.hxx> #include <osl/diagnose.h> #include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp> diff --git a/compilerplugins/clang/constantparam.numbers.results b/compilerplugins/clang/constantparam.numbers.results index 6a65d29cc757..b68c93cf07fb 100644 --- a/compilerplugins/clang/constantparam.numbers.results +++ b/compilerplugins/clang/constantparam.numbers.results @@ -514,7 +514,7 @@ include/basic/sbxcore.hxx:68 _Bool SbxBase::IsReset(enum SbxFlagBits) const enum SbxFlagBits n 256 -include/comphelper/accessiblecomponenthelper.hxx:107 +include/comphelper/OAccessible.hxx:107 void comphelper::OCommonAccessibleComponent::NotifyAccessibleEvent(const short,const class com::sun::star::uno::Any &,const class com::sun::star::uno::Any &,int) int nIndexHint -1 diff --git a/editeng/source/accessibility/AccessibleImageBullet.hxx b/editeng/source/accessibility/AccessibleImageBullet.hxx index 70945dc14d52..4e14b66c6b15 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.hxx +++ b/editeng/source/accessibility/AccessibleImageBullet.hxx @@ -21,7 +21,7 @@ #include <rtl/ref.hxx> #include <tools/gen.hxx> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <cppuhelper/implbase.hxx> #include <com/sun/star/uno/Reference.hxx> diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 247f381ec28f..39e71cdaca62 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -115,7 +115,7 @@ excludelist: include/comphelper/accessiblekeybindinghelper.hxx: # base class has to be a complete type - com/sun/star/accessibility/XAccessibleKeyBinding.hpp - include/comphelper/accessiblecomponenthelper.hxx: + include/comphelper/OAccessible.hxx: # base class has to be a complete type - com/sun/star/accessibility/XAccessibleContext.hpp - com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp diff --git a/include/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/OAccessible.hxx similarity index 100% rename from include/comphelper/accessiblecomponenthelper.hxx rename to include/comphelper/OAccessible.hxx diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx index 1feba65c5ebf..0e0a1b3b896e 100644 --- a/include/comphelper/accessiblecontexthelper.hxx +++ b/include/comphelper/accessiblecontexthelper.hxx @@ -19,7 +19,7 @@ #pragma once -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <comphelper/solarmutex.hxx> diff --git a/include/comphelper/accessibleselectionhelper.hxx b/include/comphelper/accessibleselectionhelper.hxx index ec7e5fd6c8da..4bcc235693ae 100644 --- a/include/comphelper/accessibleselectionhelper.hxx +++ b/include/comphelper/accessibleselectionhelper.hxx @@ -21,7 +21,7 @@ #define INCLUDED_COMPHELPER_ACCESSIBLESELECTIONHELPER_HXX #include <config_options.h> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <cppuhelper/implbase.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <comphelper/comphelperdllapi.h> diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx index eeb2f2a04745..97bbcb3a7377 100644 --- a/include/comphelper/accessibletexthelper.hxx +++ b/include/comphelper/accessibletexthelper.hxx @@ -23,7 +23,7 @@ #include <config_options.h> #include <com/sun/star/accessibility/XAccessibleText.hpp> #include <com/sun/star/accessibility/TextSegment.hpp> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/comphelperdllapi.h> diff --git a/include/editeng/AccessibleContextBase.hxx b/include/editeng/AccessibleContextBase.hxx index e7c3a3ece96d..291ac7f73c09 100644 --- a/include/editeng/AccessibleContextBase.hxx +++ b/include/editeng/AccessibleContextBase.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <editeng/editengdllapi.h> diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx index 3bbf751fdd3d..5aee049ce2d1 100644 --- a/include/svx/AccessibleTextHelper.hxx +++ b/include/svx/AccessibleTextHelper.hxx @@ -24,7 +24,7 @@ #include <vector> #include <com/sun/star/uno/Reference.hxx> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <rtl/ref.hxx> #include <sal/types.h> #include <svx/svxdllapi.h> diff --git a/include/vcl/accessibility/AccessibleBrowseBoxBase.hxx b/include/vcl/accessibility/AccessibleBrowseBoxBase.hxx index 6109d04d435a..12eb5b7a08d9 100644 --- a/include/vcl/accessibility/AccessibleBrowseBoxBase.hxx +++ b/include/vcl/accessibility/AccessibleBrowseBoxBase.hxx @@ -29,7 +29,7 @@ #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/awt/XFocusListener.hpp> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <vcl/accessibility/AccessibleBrowseBoxObjType.hxx> diff --git a/include/vcl/accessibility/vclxaccessiblecomponent.hxx b/include/vcl/accessibility/vclxaccessiblecomponent.hxx index ef7294be61f8..d4d304c49898 100644 --- a/include/vcl/accessibility/vclxaccessiblecomponent.hxx +++ b/include/vcl/accessibility/vclxaccessiblecomponent.hxx @@ -22,7 +22,7 @@ #include <vcl/dllapi.h> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase.hxx> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <tools/link.hxx> diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 26444b902a66..74dc9534f52c 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -23,7 +23,7 @@ #include <memory> #include <string_view> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <vcl/vclenum.hxx> #include <tools/link.hxx> #include <tools/long.hxx> diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 2fc2f4bdedb2..149e7e0af7d5 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> #include <com/sun/star/uno/Reference.hxx> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.h> diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 21f3b2d67dc9..40b2d6bdae1c 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -28,7 +28,7 @@ #include <tools/gen.hxx> #include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <cppuhelper/implbase.hxx> #include <editeng/AccessibleStaticTextBase.hxx> #include <comphelper/uno3.hxx> diff --git a/sd/source/console/AccessibleObject.hxx b/sd/source/console/AccessibleObject.hxx index 1e38b24fb4a5..83ef97a02236 100644 --- a/sd/source/console/AccessibleObject.hxx +++ b/sd/source/console/AccessibleObject.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <com/sun/star/awt/XWindow2.hpp> #include <com/sun/star/awt/XWindowListener.hpp> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/implbase.hxx> diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index af8b00b0734e..343452a081a1 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -19,7 +19,7 @@ #pragma once -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <cppuhelper/compbase.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index de4bc253b525..ae0ff4af609f 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -19,7 +19,7 @@ #pragma once -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <rtl/ref.hxx> #include <sfx2/viewsh.hxx> #include <svl/typedwhich.hxx> diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx index 9e313225f69f..8746366ea1a0 100644 --- a/sfx2/source/control/thumbnailviewacc.hxx +++ b/sfx2/source/control/thumbnailviewacc.hxx @@ -19,7 +19,7 @@ #pragma once -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/compbase.hxx> diff --git a/sfx2/source/control/thumbnailviewitemacc.hxx b/sfx2/source/control/thumbnailviewitemacc.hxx index c9c15791e8f6..3ce179988ab1 100644 --- a/sfx2/source/control/thumbnailviewitemacc.hxx +++ b/sfx2/source/control/thumbnailviewitemacc.hxx @@ -19,7 +19,7 @@ #pragma once -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <cppuhelper/implbase.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index a9ca8d18a8de..af105abe78db 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -1232,7 +1232,7 @@ comphelper/source/container/interfacecontainer2.cxx comphelper/source/container/namecontainer.cxx comphelper/source/eventattachermgr/eventattachermgr.cxx comphelper/source/misc/SelectionMultiplex.cxx -comphelper/source/misc/accessiblecomponenthelper.cxx +comphelper/source/misc/OAccessible.cxx comphelper/source/misc/accessibleeventnotifier.cxx comphelper/source/misc/accessiblekeybindinghelper.cxx comphelper/source/misc/accessibletexthelper.cxx @@ -4715,7 +4715,7 @@ include/comphelper/MasterPropertySet.hxx include/comphelper/MasterPropertySetInfo.hxx include/comphelper/PropertyInfoHash.hxx include/comphelper/SelectionMultiplex.hxx -include/comphelper/accessiblecomponenthelper.hxx +include/comphelper/OAccessible.hxx include/comphelper/accessiblecontexthelper.hxx include/comphelper/accessibleeventnotifier.hxx include/comphelper/accessiblekeybindinghelper.hxx diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index 854a1705f14c..1cab5d116a3f 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/accessibility/XAccessibleText.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/Reference.h> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <cppuhelper/implbase.hxx> #include <view.hxx> diff --git a/svtools/source/control/accessibleruler.hxx b/svtools/source/control/accessibleruler.hxx index c4cd47e24286..5eebef4aa5a5 100644 --- a/svtools/source/control/accessibleruler.hxx +++ b/svtools/source/control/accessibleruler.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <cppuhelper/interfacecontainer.h> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <comphelper/compbase.hxx> #include <vcl/vclptr.hxx> diff --git a/svtools/source/control/accessibletabbarbase.hxx b/svtools/source/control/accessibletabbarbase.hxx index 31fc3c591d07..1b35eba8cf21 100644 --- a/svtools/source/control/accessibletabbarbase.hxx +++ b/svtools/source/control/accessibletabbarbase.hxx @@ -19,7 +19,7 @@ #pragma once -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <tools/link.hxx> #include <vcl/vclptr.hxx> diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index a36e35ea6d56..a36e324b2be5 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -22,7 +22,7 @@ #include <tools/color.hxx> #include <vcl/image.hxx> #include <cppuhelper/implbase.hxx> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <comphelper/compbase.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> diff --git a/svx/source/dialog/weldeditview.cxx b/svx/source/dialog/weldeditview.cxx index 0f1fd8a1cf93..05cf3132758e 100644 --- a/svx/source/dialog/weldeditview.cxx +++ b/svx/source/dialog/weldeditview.cxx @@ -24,7 +24,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <cppuhelper/supportsservice.hxx> #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <drawinglayer/processor2d/processor2dtools.hxx> diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index 4560d0133a2c..806925a797f8 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <cppuhelper/implbase.hxx> -#include<comphelper/accessiblecomponenthelper.hxx> +#include<comphelper/OAccessible.hxx> #include <svx/framebordertype.hxx> namespace svx { diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index 0a02f28aa0ff..a67ff9550d00 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -29,7 +29,7 @@ #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceName.hpp> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <cppuhelper/basemutex.hxx> #include <svl/lstner.hxx> diff --git a/toolkit/inc/controls/accessiblecontrolcontext.hxx b/toolkit/inc/controls/accessiblecontrolcontext.hxx index 4b3d889e95a7..d58a91b0754d 100644 --- a/toolkit/inc/controls/accessiblecontrolcontext.hxx +++ b/toolkit/inc/controls/accessiblecontrolcontext.hxx @@ -19,7 +19,7 @@ #pragma once -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <com/sun/star/lang/XEventListener.hpp> #include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> diff --git a/toolkit/inc/controls/table/AccessibleGridControlBase.hxx b/toolkit/inc/controls/table/AccessibleGridControlBase.hxx index 25e6f3923ff1..930ddb0a6eb3 100644 --- a/toolkit/inc/controls/table/AccessibleGridControlBase.hxx +++ b/toolkit/inc/controls/table/AccessibleGridControlBase.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/accessibility/XAccessibleComponent.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> #include <comphelper/accessibleeventnotifier.hxx> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <comphelper/uno3.hxx> diff --git a/vcl/inc/accessibility/accessiblemenubasecomponent.hxx b/vcl/inc/accessibility/accessiblemenubasecomponent.hxx index 1a40ab0db886..ff37c596dfcb 100644 --- a/vcl/inc/accessibility/accessiblemenubasecomponent.hxx +++ b/vcl/inc/accessibility/accessiblemenubasecomponent.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/awt/Point.hpp> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <cppuhelper/implbase.hxx> #include <tools/link.hxx> #include <vcl/vclptr.hxx> diff --git a/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx b/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx index c24df7f702b8..42624dac93e4 100644 --- a/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx +++ b/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx @@ -20,7 +20,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <comphelper/accessiblecomponenthelper.hxx> +#include <comphelper/OAccessible.hxx> #include <cppuhelper/implbase.hxx> #include <vcl/vclptr.hxx> commit 671b8cad97747d1d850b0460b412c8d5d44d7296 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Jun 25 10:15:23 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Jun 26 13:09:41 2025 +0200 a11y: Rename OAccessibleComponentHelper to OAccessible The helper class used to implement less functionality in the past and was used less than it is now. But by now it is the central helper/base class used by most a11y classes. Since commit 22049f633b4131f607358db41c7a1fc6b9f4c464 Author: Michael Weghorn <[email protected]> Date: Mon May 26 12:24:52 2025 +0200 vcl a11y: Let OAccessibleComponentHelper implement XAccessible it also implements the XAccessible interface. That will allow to switch parameters and class members from the abstract XAccessible interface to using this more concrete C++ base class in various places. Rename the class to OAccessible to account for the new responsibilities, and adjust its doc accordingly. Renaming source and header file will be done in a separate commit to simplify (git) keeping track. Change-Id: I33210b47cda5f71820a3c0fa657e4c3548d45732 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186952 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index 4159c93a179d..6596eb598b50 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -222,7 +222,6 @@ void AccessibleDialogControlShape::FillAccessibleStateSet( sal_Int64& rStateSet rStateSet |= AccessibleStateType::RESIZABLE; } -// OAccessibleComponentHelper awt::Rectangle AccessibleDialogControlShape::implGetBounds() { return GetBounds(); @@ -231,7 +230,7 @@ awt::Rectangle AccessibleDialogControlShape::implGetBounds() // XComponent void AccessibleDialogControlShape::disposing() { - OAccessibleComponentHelper::disposing(); + OAccessible::disposing(); m_pDialogWindow = nullptr; m_pDlgEdObj = nullptr; diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index 906a1684cdae..0a56c2484a1b 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -400,9 +400,7 @@ void AccessibleDialogWindow::FillAccessibleStateSet( sal_Int64& rStateSet ) rStateSet |= AccessibleStateType::RESIZABLE; } - -// OAccessibleComponentHelper - +// OAccessible awt::Rectangle AccessibleDialogWindow::implGetBounds() { @@ -483,7 +481,7 @@ void AccessibleDialogWindow::Notify( SfxBroadcaster&, const SfxHint& rHint ) void AccessibleDialogWindow::disposing() { - OAccessibleComponentHelper::disposing(); + OAccessible::disposing(); if ( !m_pDialogWindow ) return; diff --git a/basctl/source/basicide/textwindowaccessibility.hxx b/basctl/source/basicide/textwindowaccessibility.hxx index b771369aa5b1..77c63511f7bf 100644 --- a/basctl/source/basicide/textwindowaccessibility.hxx +++ b/basctl/source/basicide/textwindowaccessibility.hxx @@ -114,7 +114,7 @@ private: typedef std::vector< ParagraphInfo > Paragraphs; typedef cppu::ImplInheritanceHelper< - comphelper::OAccessibleComponentHelper, css::accessibility::XAccessibleEditableText, + comphelper::OAccessible, css::accessibility::XAccessibleEditableText, css::accessibility::XAccessibleMultiLineText, css::accessibility::XAccessibleTextAttributes> ParagraphBase; @@ -143,7 +143,7 @@ public: css::uno::Any const & rNewValue); private: - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; // OCommonAccessibleText diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx index d4976ea2e3a9..499052807d7f 100644 --- a/basctl/source/inc/accessibledialogcontrolshape.hxx +++ b/basctl/source/inc/accessibledialogcontrolshape.hxx @@ -34,8 +34,7 @@ class DlgEdObj; class DialogWindow; class AccessibleDialogControlShape final - : public cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper, - css::lang::XServiceInfo, + : public cppu::ImplInheritanceHelper<comphelper::OAccessible, css::lang::XServiceInfo, css::beans::XPropertyChangeListener> { friend class AccessibleDialogWindow; @@ -64,7 +63,7 @@ private: void FillAccessibleStateSet( sal_Int64& rStateSet ); - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; // XComponent diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index 5e1e46a071fe..5b31a6509720 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -40,7 +40,7 @@ class DlgEdObj; class AccessibleDialogControlShape; class AccessibleDialogWindow final - : public cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper, + : public cppu::ImplInheritanceHelper<comphelper::OAccessible, css::accessibility::XAccessibleSelection, css::lang::XServiceInfo>, public SfxListener @@ -82,7 +82,7 @@ private: void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); void FillAccessibleStateSet( sal_Int64& rStateSet ); - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds( ) override; // XComponent diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index 3dd1a5ab5bbd..9add032de702 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -351,7 +351,7 @@ void SAL_CALL AccessibleBase::disposing() MutexGuard aGuard(m_aMutex); OSL_ENSURE(isAlive(), "dispose() called twice"); - OAccessibleComponentHelper::disposing(); + OAccessible::disposing(); // reset pointers m_aAccInfo.m_pWindow.reset(); diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx index 9952ad9312d7..db169bd3b5c1 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx @@ -45,7 +45,7 @@ public: virtual OUString SAL_CALL getAccessibleDescription() override; virtual OUString SAL_CALL getAccessibleName() override; - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; // ________ XAccessibleComponent ________ diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx index cf337c5a8e90..b58cb1c62294 100644 --- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx +++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx @@ -52,10 +52,9 @@ AccessibleTextHelper::~AccessibleTextHelper() { } -void AccessibleTextHelper::initialize( - const OUString& aCID, - const rtl::Reference<comphelper::OAccessibleComponentHelper>& rEventSource, - vcl::Window* pWindow) +void AccessibleTextHelper::initialize(const OUString& aCID, + const rtl::Reference<comphelper::OAccessible>& rEventSource, + vcl::Window* pWindow) { OSL_ENSURE( !aCID.isEmpty(), "Empty CID" ); assert(rEventSource.is() && "Empty Event Source"); diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index 7e16fa767da6..e71ad0238a2d 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -72,7 +72,7 @@ struct AccessibleElementInfo /** Base class for all Chart Accessibility objects */ -class AccessibleBase : public comphelper::OAccessibleComponentHelper +class AccessibleBase : public comphelper::OAccessible { public: enum class EventType @@ -208,7 +208,7 @@ protected: // virtual OUString SAL_CALL getAccessibleDescription() // throw (css::uno::RuntimeException); - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; // ________ XAccessibleComponent ________ diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index b81913d66509..9a973f80843a 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -76,8 +76,7 @@ public: virtual OUString SAL_CALL getAccessibleName() override; virtual sal_Int16 SAL_CALL getAccessibleRole() override; - - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; protected: diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx index e3b4b2510ae4..c0cb94c58a00 100644 --- a/chart2/source/controller/inc/AccessibleTextHelper.hxx +++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx @@ -58,7 +58,7 @@ public: text currently. */ void initialize(const OUString& aCID, - const rtl::Reference<comphelper::OAccessibleComponentHelper>& rEventSource, + const rtl::Reference<comphelper::OAccessible>& rEventSource, vcl::Window* pWindow); // ____ XAccessibleContext ____ diff --git a/comphelper/source/misc/accessiblecomponenthelper.cxx b/comphelper/source/misc/accessiblecomponenthelper.cxx index b3ddd1c3cd0d..7d9be18ee3d6 100644 --- a/comphelper/source/misc/accessiblecomponenthelper.cxx +++ b/comphelper/source/misc/accessiblecomponenthelper.cxx @@ -33,14 +33,13 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; -OAccessibleComponentHelper::OAccessibleComponentHelper() - :WeakComponentImplHelper( GetMutex() ) - ,m_nClientId( 0 ) +OAccessible::OAccessible() + : WeakComponentImplHelper(GetMutex()) + , m_nClientId(0) { } - -OAccessibleComponentHelper::~OAccessibleComponentHelper() +OAccessible::~OAccessible() { // this ensures that the lock, which may be already destroyed as part of the derivee, // is not used anymore @@ -48,8 +47,7 @@ OAccessibleComponentHelper::~OAccessibleComponentHelper() ensureDisposed(); } - -void SAL_CALL OAccessibleComponentHelper::disposing() +void SAL_CALL OAccessible::disposing() { // rhbz#1001768: de facto this class is locked by SolarMutex; // do not lock m_Mutex because it may cause deadlock @@ -63,13 +61,14 @@ void SAL_CALL OAccessibleComponentHelper::disposing() } css::uno::Reference<com::sun::star::accessibility::XAccessibleContext> -OAccessibleComponentHelper::getAccessibleContext() +OAccessible::getAccessibleContext() { OExternalLockGuard aGuard(this); return this; } -void SAL_CALL OAccessibleComponentHelper::addAccessibleEventListener(const Reference< XAccessibleEventListener >& _rxListener) +void SAL_CALL +OAccessible::addAccessibleEventListener(const Reference<XAccessibleEventListener>& _rxListener) { osl::Guard<SolarMutex> aGuard(SolarMutex::get()); // don't use the OContextEntryGuard - it will throw an exception if we're not alive @@ -91,8 +90,8 @@ void SAL_CALL OAccessibleComponentHelper::addAccessibleEventListener(const Refer AccessibleEventNotifier::addEventListener(m_nClientId, _rxListener); } - -void SAL_CALL OAccessibleComponentHelper::removeAccessibleEventListener(const Reference< XAccessibleEventListener >& _rxListener) +void SAL_CALL +OAccessible::removeAccessibleEventListener(const Reference<XAccessibleEventListener>& _rxListener) { osl::Guard<SolarMutex> aGuard(SolarMutex::get()); // don't use the OContextEntryGuard - it will throw an exception if we're not alive @@ -116,9 +115,8 @@ void SAL_CALL OAccessibleComponentHelper::removeAccessibleEventListener(const Re } } - -void OAccessibleComponentHelper::NotifyAccessibleEvent( const sal_Int16 _nEventId, - const Any& _rOldValue, const Any& _rNewValue, sal_Int32 nIndexHint ) +void OAccessible::NotifyAccessibleEvent(const sal_Int16 _nEventId, const Any& _rOldValue, + const Any& _rNewValue, sal_Int32 nIndexHint) { if ( !m_nClientId ) // if we don't have a client id for the notifier, then we don't have listeners, then @@ -132,41 +130,30 @@ void OAccessibleComponentHelper::NotifyAccessibleEvent( const sal_Int16 _nEventI AccessibleEventNotifier::addEvent( m_nClientId, aEvent ); } -bool OAccessibleComponentHelper::hasAccessibleListeners() const -{ - return m_nClientId != 0; -} - -bool OAccessibleComponentHelper::isAlive() const -{ - return !rBHelper.bDisposed && !rBHelper.bInDispose; -} +bool OAccessible::hasAccessibleListeners() const { return m_nClientId != 0; } +bool OAccessible::isAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose; } -void OAccessibleComponentHelper::ensureAlive() const +void OAccessible::ensureAlive() const { if( !isAlive() ) throw DisposedException(); } - -void OAccessibleComponentHelper::ensureDisposed( ) +void OAccessible::ensureDisposed() { if ( !rBHelper.bDisposed ) { - OSL_ENSURE( 0 == m_refCount, "OAccessibleComponentHelper::ensureDisposed: this method _has_ to be called from without your dtor only!" ); + OSL_ENSURE(0 == m_refCount, "OAccessible::ensureDisposed: this method _has_ to be called " + "from without your dtor only!"); acquire(); dispose(); } } -OUString SAL_CALL OAccessibleComponentHelper::getAccessibleId() -{ - return OUString(); -} - +OUString SAL_CALL OAccessible::getAccessibleId() { return OUString(); } -sal_Int64 SAL_CALL OAccessibleComponentHelper::getAccessibleIndexInParent() +sal_Int64 SAL_CALL OAccessible::getAccessibleIndexInParent() { OExternalLockGuard aGuard( this ); @@ -187,14 +174,13 @@ sal_Int64 SAL_CALL OAccessibleComponentHelper::getAccessibleIndexInParent() } catch( const Exception& ) { - OSL_FAIL("OAccessibleComponentHelper::getAccessibleIndexInParent: caught an exception!"); + OSL_FAIL("OAccessible::getAccessibleIndexInParent: caught an exception!"); } return -1; } - -Locale SAL_CALL OAccessibleComponentHelper::getLocale() +Locale SAL_CALL OAccessible::getLocale() { // simply ask the parent Reference< XAccessible > xParent = getAccessibleParent(); @@ -208,8 +194,7 @@ Locale SAL_CALL OAccessibleComponentHelper::getLocale() return xParentContext->getLocale(); } - -Reference< XAccessibleContext > OAccessibleComponentHelper::implGetParentContext() +Reference<XAccessibleContext> OAccessible::implGetParentContext() { Reference< XAccessible > xParent = getAccessibleParent(); Reference< XAccessibleContext > xParentContext; @@ -218,8 +203,7 @@ Reference< XAccessibleContext > OAccessibleComponentHelper::implGetParentContext return xParentContext; } - -sal_Bool SAL_CALL OAccessibleComponentHelper::containsPoint(const awt::Point& _rPoint) +sal_Bool SAL_CALL OAccessible::containsPoint(const awt::Point& _rPoint) { OExternalLockGuard aGuard( this ); awt::Rectangle aBounds( implGetBounds() ); @@ -229,23 +213,21 @@ sal_Bool SAL_CALL OAccessibleComponentHelper::containsPoint(const awt::Point& _r && ( _rPoint.Y < aBounds.Height ); } - -awt::Point SAL_CALL OAccessibleComponentHelper::getLocation() +awt::Point SAL_CALL OAccessible::getLocation() { OExternalLockGuard aGuard( this ); awt::Rectangle aBounds( implGetBounds() ); return awt::Point( aBounds.X, aBounds.Y ); } - -awt::Point SAL_CALL OAccessibleComponentHelper::getLocationOnScreen() +awt::Point SAL_CALL OAccessible::getLocationOnScreen() { OExternalLockGuard aGuard( this ); awt::Point aScreenLoc( 0, 0 ); Reference< XAccessibleComponent > xParentComponent( implGetParentContext(), UNO_QUERY ); - OSL_ENSURE(xParentComponent.is(), "OAccessibleComponentHelper::getLocationOnScreen: no parent component!"); + OSL_ENSURE(xParentComponent.is(), "OAccessible::getLocationOnScreen: no parent component!"); if ( xParentComponent.is() ) { awt::Point aParentScreenLoc( xParentComponent->getLocationOnScreen() ); @@ -257,28 +239,26 @@ awt::Point SAL_CALL OAccessibleComponentHelper::getLocationOnScreen() return aScreenLoc; } - -awt::Size SAL_CALL OAccessibleComponentHelper::getSize() +awt::Size SAL_CALL OAccessible::getSize() { OExternalLockGuard aGuard( this ); awt::Rectangle aBounds( implGetBounds() ); return awt::Size( aBounds.Width, aBounds.Height ); } - -awt::Rectangle SAL_CALL OAccessibleComponentHelper::getBounds() +awt::Rectangle SAL_CALL OAccessible::getBounds() { OExternalLockGuard aGuard( this ); return implGetBounds(); } -OUString SAL_CALL OAccessibleComponentHelper::getTitledBorderText() +OUString SAL_CALL OAccessible::getTitledBorderText() { OExternalLockGuard aGuard(this); return OUString(); } -OUString SAL_CALL OAccessibleComponentHelper::getToolTipText() +OUString SAL_CALL OAccessible::getToolTipText() { OExternalLockGuard aGuard(this); return OUString(); diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx index 1ea10a3c84d8..ad1f4cc7c616 100644 --- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx @@ -55,7 +55,7 @@ namespace dbaui virtual OUString SAL_CALL getAccessibleDescription( ) override; virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; // XAccessibleComponent diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx index 19a390007d25..4ac99e365bad 100644 --- a/editeng/source/accessibility/AccessibleContextBase.cxx +++ b/editeng/source/accessibility/AccessibleContextBase.cxx @@ -327,7 +327,7 @@ void SAL_CALL AccessibleContextBase::disposing() ::osl::MutexGuard aGuard (m_aMutex); - comphelper::OAccessibleComponentHelper::disposing(); + comphelper::OAccessible::disposing(); mxParent.clear(); mxRelationSet.clear(); diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 8860df99da68..49950e52c12b 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -263,7 +263,7 @@ void SAL_CALL AccessibleEditableTextPara::dispose() mxParent = nullptr; mpEditSource = nullptr; - comphelper::OAccessibleComponentHelper::dispose(); + comphelper::OAccessible::dispose(); } void AccessibleEditableTextPara::SetEditSource( SvxEditSourceAdapter* pEditSource ) diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index 37baa2e5cdc7..01e0737c5c95 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -221,7 +221,7 @@ void SAL_CALL AccessibleImageBullet::dispose() mxParent = nullptr; mpEditSource = nullptr; - OAccessibleComponentHelper::dispose(); + OAccessible::dispose(); } void AccessibleImageBullet::SetEditSource( SvxEditSource* pEditSource ) diff --git a/editeng/source/accessibility/AccessibleImageBullet.hxx b/editeng/source/accessibility/AccessibleImageBullet.hxx index 807155e9c1ec..70945dc14d52 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.hxx +++ b/editeng/source/accessibility/AccessibleImageBullet.hxx @@ -38,8 +38,7 @@ namespace accessibility /** This class implements the image bullets for the EditEngine/Outliner UAA */ class AccessibleImageBullet final - : public cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper, - css::lang::XServiceInfo> + : public cppu::ImplInheritanceHelper<comphelper::OAccessible, css::lang::XServiceInfo> { public: diff --git a/include/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx index a5222552ac9a..5eacad576656 100644 --- a/include/comphelper/accessiblecomponenthelper.hxx +++ b/include/comphelper/accessiblecomponenthelper.hxx @@ -34,12 +34,9 @@ namespace comphelper { -//= OAccessibleComponentHelper - -/** a helper class for implementing an AccessibleContext which at the same time - supports an XAccessibleExtendedComponent interface. +/** Central helper/base class for implementing basic accessibility interfaces. */ -class COMPHELPER_DLLPUBLIC OAccessibleComponentHelper +class COMPHELPER_DLLPUBLIC OAccessible : public cppu::BaseMutex, public cppu::WeakComponentImplHelper<css::accessibility::XAccessible, css::accessibility::XAccessibleContext2, @@ -51,15 +48,15 @@ private: AccessibleEventNotifier::TClientId m_nClientId; protected: - virtual ~OAccessibleComponentHelper( ) override; + virtual ~OAccessible() override; - OAccessibleComponentHelper( ); + OAccessible(); private: - OAccessibleComponentHelper(OAccessibleComponentHelper const &) = delete; - OAccessibleComponentHelper(OAccessibleComponentHelper &&) = delete; - void operator =(OAccessibleComponentHelper const &) = delete; - void operator =(OAccessibleComponentHelper &&) = delete; + OAccessible(OAccessible const&) = delete; + OAccessible(OAccessible&&) = delete; + void operator=(OAccessible const&) = delete; + void operator=(OAccessible&&) = delete; public: // XAccessible @@ -87,7 +84,7 @@ public: /** default implementation for retrieving the index of this object within the parent <p>This basic implementation here returns the index <code>i</code> of the child for which <code><parent>.getAccessibleChild(i).getAccessibleContext()</code> returns - a reference to this OAccessibleComponentHelper object.</p> + a reference to this OAccessible object.</p> */ virtual sal_Int64 SAL_CALL getAccessibleIndexInParent( ) override; /** default implementation for retrieving the locale diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx index 3951eb14325f..1feba65c5ebf 100644 --- a/include/comphelper/accessiblecontexthelper.hxx +++ b/include/comphelper/accessiblecontexthelper.hxx @@ -29,11 +29,11 @@ namespace comphelper //= OContextEntryGuard - /** helper class for guarding the entry into OAccessibleComponentHelper methods. + /** helper class for guarding the entry into OAccessible methods. <p>The class has two responsibilities: - <ul><li>it locks the mutex of an OAccessibleComponentHelper instance, as long as the guard lives</li> - <li>it checks if a given OAccessibleComponentHelper instance is alive, else an exception is thrown + <ul><li>it locks the mutex of an OAccessible instance, as long as the guard lives</li> + <li>it checks if a given OAccessible instance is alive, else an exception is thrown our of the constructor of the guard</li> </ul> <br/> @@ -53,11 +53,10 @@ namespace comphelper the context which shall be guarded @precond <arg>_pContext</arg> != NULL */ - inline OContextEntryGuard(OAccessibleComponentHelper* _pContext); + inline OContextEntryGuard(OAccessible* _pContext); }; - - inline OContextEntryGuard::OContextEntryGuard(OAccessibleComponentHelper* _pContext) + inline OContextEntryGuard::OContextEntryGuard(OAccessible* _pContext) : ::osl::ClearableMutexGuard( _pContext->GetMutex() ) { _pContext->ensureAlive(); @@ -71,16 +70,15 @@ namespace comphelper ,public OContextEntryGuard { public: - inline OExternalLockGuard(OAccessibleComponentHelper* _pContext); + inline OExternalLockGuard(OAccessible* _pContext); }; - - inline OExternalLockGuard::OExternalLockGuard(OAccessibleComponentHelper* _pContext) - :osl::Guard<SolarMutex>( SolarMutex::get() ) - ,OContextEntryGuard( _pContext ) + inline OExternalLockGuard::OExternalLockGuard(OAccessible* _pContext) + : osl::Guard<SolarMutex>(SolarMutex::get()) + , OContextEntryGuard(_pContext) { // Only lock the external mutex, - // release the ::osl::Mutex of the OAccessibleComponentHelper instance. + // release the ::osl::Mutex of the OAccessible instance. // If you call into another UNO object with locked ::osl::Mutex, // this may lead to dead locks. clear(); diff --git a/include/comphelper/accessibleselectionhelper.hxx b/include/comphelper/accessibleselectionhelper.hxx index 0c749ac0b682..ec7e5fd6c8da 100644 --- a/include/comphelper/accessibleselectionhelper.hxx +++ b/include/comphelper/accessibleselectionhelper.hxx @@ -87,8 +87,7 @@ protected: supports an XAccessibleSelection interface. */ class UNLESS_MERGELIBS(COMPHELPER_DLLPUBLIC) OAccessibleSelectionHelper - : public cppu::ImplInheritanceHelper<OAccessibleComponentHelper, - css::accessibility::XAccessibleSelection>, + : public cppu::ImplInheritanceHelper<OAccessible, css::accessibility::XAccessibleSelection>, public OCommonAccessibleSelection { private: diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx index 0694c23e85d0..eeb2f2a04745 100644 --- a/include/comphelper/accessibletexthelper.hxx +++ b/include/comphelper/accessibletexthelper.hxx @@ -115,10 +115,9 @@ namespace comphelper /** a helper class for implementing an AccessibleExtendedComponent which at the same time supports an XAccessibleText interface */ - class UNLESS_MERGELIBS_MORE(COMPHELPER_DLLPUBLIC) OAccessibleTextHelper : public cppu::ImplInheritanceHelper< - OAccessibleComponentHelper, - css::accessibility::XAccessibleText>, - public OCommonAccessibleText + class UNLESS_MERGELIBS_MORE(COMPHELPER_DLLPUBLIC) OAccessibleTextHelper + : public cppu::ImplInheritanceHelper<OAccessible, css::accessibility::XAccessibleText>, + public OCommonAccessibleText { private: OAccessibleTextHelper(OAccessibleTextHelper const &) = delete; diff --git a/include/editeng/AccessibleContextBase.hxx b/include/editeng/AccessibleContextBase.hxx index edd99b27fb59..e7c3a3ece96d 100644 --- a/include/editeng/AccessibleContextBase.hxx +++ b/include/editeng/AccessibleContextBase.hxx @@ -33,8 +33,7 @@ namespace utl { class AccessibleRelationSetHelper; } namespace accessibility { class EDITENG_DLLPUBLIC AccessibleContextBase - : public cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper, - css::lang::XServiceInfo> + : public cppu::ImplInheritanceHelper<comphelper::OAccessible, css::lang::XServiceInfo> { public: /** The origin of the accessible name or description. diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx index 455c77685a19..ab64a9399dec 100644 --- a/include/editeng/AccessibleEditableTextPara.hxx +++ b/include/editeng/AccessibleEditableTextPara.hxx @@ -55,7 +55,7 @@ class AccessibleParaManager; */ class UNLESS_MERGELIBS(EDITENG_DLLPUBLIC) AccessibleEditableTextPara final : public cppu::ImplInheritanceHelper< - comphelper::OAccessibleComponentHelper, css::accessibility::XAccessibleEditableText, + comphelper::OAccessible, css::accessibility::XAccessibleEditableText, css::accessibility::XAccessibleTextAttributes, css::accessibility::XAccessibleHypertext, css::accessibility::XAccessibleMultiLineText>, private ::comphelper::OCommonAccessibleText @@ -89,7 +89,7 @@ public: virtual sal_Int64 SAL_CALL getAccessibleStateSet() override; virtual css::lang::Locale SAL_CALL getLocale() override; - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; // XAccessibleComponent diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx index fdd22927527e..aa6f7ebb7fe9 100644 --- a/include/svx/AccessibleShape.hxx +++ b/include/svx/AccessibleShape.hxx @@ -224,7 +224,7 @@ public: virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; //===== XAccessibleComponent ============================================ diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx index 4bf5d8c1cce0..3bbf751fdd3d 100644 --- a/include/svx/AccessibleTextHelper.hxx +++ b/include/svx/AccessibleTextHelper.hxx @@ -206,7 +206,7 @@ public: The accessible that should be set as the source for accessibility events sent by this object. */ - void SetEventSource(const rtl::Reference<comphelper::OAccessibleComponentHelper>& rEventSource); + void SetEventSource(const rtl::Reference<comphelper::OAccessible>& rEventSource); /** Set offset of EditEngine/Outliner from parent diff --git a/include/vcl/accessibility/AccessibleBrowseBoxBase.hxx b/include/vcl/accessibility/AccessibleBrowseBoxBase.hxx index 0ae9f7023e7f..6109d04d435a 100644 --- a/include/vcl/accessibility/AccessibleBrowseBoxBase.hxx +++ b/include/vcl/accessibility/AccessibleBrowseBoxBase.hxx @@ -42,8 +42,8 @@ namespace vcl { /** The BrowseBox accessible objects inherit from this base class. It implements basic functionality for various Accessibility interfaces. */ class VCL_DLLPUBLIC AccessibleBrowseBoxBase - : public cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper, - css::awt::XFocusListener, css::lang::XServiceInfo> + : public cppu::ImplInheritanceHelper<comphelper::OAccessible, css::awt::XFocusListener, + css::lang::XServiceInfo> { public: /** Constructor sets specified name and description. If the constant of a diff --git a/include/vcl/accessibility/vclxaccessiblecomponent.hxx b/include/vcl/accessibility/vclxaccessiblecomponent.hxx index e431f074292b..ef7294be61f8 100644 --- a/include/vcl/accessibility/vclxaccessiblecomponent.hxx +++ b/include/vcl/accessibility/vclxaccessiblecomponent.hxx @@ -38,8 +38,7 @@ class AccessibleRelationSetHelper; } class VCL_DLLPUBLIC VCLXAccessibleComponent - : public cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper, - css::lang::XServiceInfo> + : public cppu::ImplInheritanceHelper<comphelper::OAccessible, css::lang::XServiceInfo> { private: VclPtr<vcl::Window> m_xWindow; diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index ceab8f3453ef..26444b902a66 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -153,7 +153,7 @@ private: bool bInCallback : 1; ///< In Activate/Deactivate bool bKilled : 1; ///< Killed - rtl::Reference<comphelper::OAccessibleComponentHelper> mpAccessible; + rtl::Reference<comphelper::OAccessible> mpAccessible; mutable std::unique_ptr<vcl::MenuLayoutData> mpLayoutData; std::unique_ptr<SalMenu> mpSalMenu; @@ -369,7 +369,7 @@ public: tools::Rectangle GetBoundingRectangle( sal_uInt16 nItemPos ) const; css::uno::Reference<css::accessibility::XAccessible> GetAccessible(); - void SetAccessible(const rtl::Reference<comphelper::OAccessibleComponentHelper>& rAccessible); + void SetAccessible(const rtl::Reference<comphelper::OAccessible>& rAccessible); // gets the activation key of the specified item KeyEvent GetActivationKey( sal_uInt16 nItemId ) const; @@ -405,7 +405,7 @@ public: virtual void DumpAsPropertyTree(tools::JsonWriter&) const; private: - rtl::Reference<comphelper::OAccessibleComponentHelper> CreateAccessible(); + rtl::Reference<comphelper::OAccessible> CreateAccessible(); }; struct MenuBarButtonCallbackArg diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index 0537f874c6ab..1459a5849ce4 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -72,7 +72,7 @@ void SAL_CALL ScAccessibleContextBase::disposing() // hold reference to make sure that the destructor is not called uno::Reference< XAccessibleContext > xKeepAlive(this); - OAccessibleComponentHelper::disposing(); + OAccessible::disposing(); mxParent.clear(); } @@ -89,7 +89,7 @@ void ScAccessibleContextBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -// OAccessibleComponentHelper +// OAccessible awt::Rectangle ScAccessibleContextBase::implGetBounds( ) { diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index 8170c387bd27..ff5a06d103eb 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -81,7 +81,7 @@ void SAL_CALL ScAccessibleCsvControl::disposing() { SolarMutexGuard aGuard; mpControl = nullptr; - comphelper::OAccessibleComponentHelper::disposing(); + comphelper::OAccessible::disposing(); } // XAccessibleComponent ------------------------------------------------------- diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 95d1d13e0bc1..2fc2f4bdedb2 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -34,8 +34,7 @@ namespace tools { class Rectangle; } class AbsoluteScreenPixelRectangle; -class ScAccessibleContextBase : public comphelper::OAccessibleComponentHelper, - public SfxListener +class ScAccessibleContextBase : public comphelper::OAccessible, public SfxListener { public: @@ -59,7 +58,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; ///===== XAccessibleComponent ============================================ diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 937df12b9cc5..21f3b2d67dc9 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -37,8 +37,7 @@ class ScCsvControl; /** Accessible base class used for CSV controls. */ -class ScAccessibleCsvControl - : public comphelper::OAccessibleComponentHelper +class ScAccessibleCsvControl : public comphelper::OAccessible { private: ScCsvControl* mpControl; /// Pointer to the VCL control. diff --git a/sd/source/console/AccessibleObject.cxx b/sd/source/console/AccessibleObject.cxx index bfd89e50470c..5af9d672ac41 100644 --- a/sd/source/console/AccessibleObject.cxx +++ b/sd/source/console/AccessibleObject.cxx @@ -74,7 +74,7 @@ void AccessibleObject::SetAccessibleParent ( void SAL_CALL AccessibleObject::disposing() { - OAccessibleComponentHelper::disposing(); + OAccessible::disposing(); AccessibleFocusManager::Instance()->RemoveFocusableObject(this); SetWindow(nullptr, nullptr); diff --git a/sd/source/console/AccessibleObject.hxx b/sd/source/console/AccessibleObject.hxx index abaa85c7940f..1e38b24fb4a5 100644 --- a/sd/source/console/AccessibleObject.hxx +++ b/sd/source/console/AccessibleObject.hxx @@ -36,8 +36,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; -class AccessibleObject : public cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper, - css::awt::XWindowListener> +class AccessibleObject + : public cppu::ImplInheritanceHelper<comphelper::OAccessible, css::awt::XWindowListener> { public: AccessibleObject(const sal_Int16 nRole, const OUString& rName = OUString()); @@ -123,7 +123,7 @@ protected: css::uno::Reference<css::accessibility::XAccessible> mxParentAccessible; ::std::vector<rtl::Reference<AccessibleObject> > maChildren; - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; virtual awt::Point GetRelativeLocation(); diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index 55e7af36f70a..6b55d5713e20 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -69,7 +69,7 @@ uno::Reference<XAccessible> SAL_CALL static_cast<uno::XWeak*>(this)); } -// OAccessibleComponentHelper +// OAccessible awt::Rectangle AccessiblePageShape::implGetBounds() { diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 5858af5feaf1..d5e70a00b6b9 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -137,7 +137,7 @@ void AccessibleSlideSorterView::FireAccessibleEvent ( void SAL_CALL AccessibleSlideSorterView::disposing() { - OAccessibleComponentHelper::disposing(); + OAccessible::disposing(); mpImpl.reset(); } diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index ec25bc125a39..9432ea7d3232 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -144,7 +144,7 @@ public: virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int64 nIndex) override; - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; //===== XAccessibleComponent ============================================ diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx index 3d9e63dcc058..ffa99bd9baa3 100644 --- a/sd/source/ui/inc/AccessiblePageShape.hxx +++ b/sd/source/ui/inc/AccessiblePageShape.hxx @@ -72,7 +72,7 @@ public: virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int64 nIndex) override; - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; //===== XAccessibleComponent ============================================ diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index 0b84b1485610..a9c8cb1c6652 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -32,7 +32,7 @@ namespace accessibility { /** This class makes page objects of the slide sorter accessible. */ -class AccessibleSlideSorterObject final : public comphelper::OAccessibleComponentHelper +class AccessibleSlideSorterObject final : public comphelper::OAccessible { public: /** Create a new object that represents a page object in the slide @@ -95,7 +95,7 @@ public: virtual css::lang::Locale SAL_CALL getLocale() override; - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; //===== XAccessibleComponent ================================================ diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index bfe8578f15cd..af8b00b0734e 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -40,7 +40,7 @@ class AccessibleSlideSorterObject; accessible. */ class AccessibleSlideSorterView final - : public cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper, + : public cppu::ImplInheritanceHelper<comphelper::OAccessible, css::accessibility::XAccessibleSelection, css::lang::XServiceInfo> { @@ -104,7 +104,7 @@ public: virtual css::lang::Locale SAL_CALL getLocale() override; - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; //===== XAccessibleComponent ================================================ diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 65744b1423f0..76a129e7f70c 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -317,7 +317,7 @@ public: @return Returns an <type>AccessibleDrawDocumentView</type> object. */ - virtual rtl::Reference<comphelper::OAccessibleComponentHelper> + virtual rtl::Reference<comphelper::OAccessible> CreateAccessibleDocumentView(::sd::Window* pWindow) override; /** Return the number of layers managed by the layer tab control. This diff --git a/sd/source/ui/inc/NotesPanelViewShell.hxx b/sd/source/ui/inc/NotesPanelViewShell.hxx index b6fa39043e60..19e1bf26e547 100644 --- a/sd/source/ui/inc/NotesPanelViewShell.hxx +++ b/sd/source/ui/inc/NotesPanelViewShell.hxx @@ -81,7 +81,7 @@ public: virtual void ReadFrameViewData(FrameView* pView) override; virtual void WriteFrameViewData() override; - virtual rtl::Reference<comphelper::OAccessibleComponentHelper> + virtual rtl::Reference<comphelper::OAccessible> CreateAccessibleDocumentView(::sd::Window* /*pWindow*/) override { // TODO diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index f3323b3db021..a75f74332a0e 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -125,7 +125,7 @@ public: @return Returns an <type>AccessibleDrawDocumentView</type> object. */ - virtual rtl::Reference<comphelper::OAccessibleComponentHelper> + virtual rtl::Reference<comphelper::OAccessible> CreateAccessibleDocumentView(::sd::Window* pWindow) override; /** Update the preview to show the specified page. diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index 0646010091b7..d91332c3e900 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -176,7 +176,7 @@ public: @return Returns an <type>AccessibleSlideSorterView</type> object. */ - virtual rtl::Reference<comphelper::OAccessibleComponentHelper> + virtual rtl::Reference<comphelper::OAccessible> CreateAccessibleDocumentView(::sd::Window* pWindow) override; // handle SlideSorterView specially because AccessibleSlideSorterView doesn't inherit from AccessibleDocumentViewBase virtual void SwitchViewFireFocus( const css::uno::Reference< css::accessibility::XAccessible >& xAcc ) override; diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index e40ab13b9a80..de4bc253b525 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -293,7 +293,7 @@ public: @return This default implementation returns an empty reference. */ - virtual rtl::Reference<comphelper::OAccessibleComponentHelper> + virtual rtl::Reference<comphelper::OAccessible> CreateAccessibleDocumentView(::sd::Window* pWindow); virtual void SwitchViewFireFocus( const css::uno::Reference< css::accessibility::XAccessible >& xAcc ); diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 54dade147687..ce46154f77af 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -251,7 +251,7 @@ Reference<drawing::XDrawSubController> SlideSorterViewShell::CreateSubController to the base class to return a default object (probably an empty reference). */ -rtl::Reference<comphelper::OAccessibleComponentHelper> +rtl::Reference<comphelper::OAccessible> SlideSorterViewShell::CreateAccessibleDocumentView(::sd::Window* pWindow) { // When the view is not set then the initialization is not yet complete diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index d7ce9642542e..bed64c9758ab 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -587,7 +587,7 @@ void DrawViewShell::VisAreaChanged(const ::tools::Rectangle& rRect) <type>AccessibleDrawDocumentView</type>. Otherwise return an empty reference. */ -rtl::Reference<comphelper::OAccessibleComponentHelper> +rtl::Reference<comphelper::OAccessible> DrawViewShell::CreateAccessibleDocumentView(::sd::Window* pWindow) { if (GetViewShellBase().GetController() != nullptr) diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 5904e354ea78..66e451524456 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -1820,7 +1820,7 @@ void OutlineViewShell::VisAreaChanged(const ::tools::Rectangle& rRect) <type>AccessibleDrawDocumentView</type>. Otherwise return an empty reference. */ -rtl::Reference<comphelper::OAccessibleComponentHelper> +rtl::Reference<comphelper::OAccessible> OutlineViewShell::CreateAccessibleDocumentView(::sd::Window* pWindow) { OSL_ASSERT (GetViewShell()!=nullptr); diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index fee6cb4adc33..fae4776dfd97 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -1512,8 +1512,7 @@ void ViewShell::ExecReq( SfxRequest& rReq ) /** This default implementation returns only an empty reference. See derived classes for more interesting examples. */ -rtl::Reference<comphelper::OAccessibleComponentHelper> -ViewShell::CreateAccessibleDocumentView(::sd::Window*) +rtl::Reference<comphelper::OAccessible> ViewShell::CreateAccessibleDocumentView(::sd::Window*) { OSL_FAIL("ViewShell::CreateAccessibleDocumentView should not be called!, perhaps Meyers, 3rd edition, Item 9:"); diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx index 6021367394c4..92e9de4fe965 100644 --- a/sfx2/source/control/thumbnailviewacc.cxx +++ b/sfx2/source/control/thumbnailviewacc.cxx @@ -315,7 +315,7 @@ void ThumbnailViewAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOld bool ThumbnailViewAcc::HasAccessibleListeners() const { - return OAccessibleComponentHelper::hasAccessibleListeners(); + return OAccessible::hasAccessibleListeners(); } void ThumbnailViewAcc::GetFocus() diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx index c67b0b4a7e14..9e313225f69f 100644 --- a/sfx2/source/control/thumbnailviewacc.hxx +++ b/sfx2/source/control/thumbnailviewacc.hxx @@ -30,7 +30,7 @@ class ThumbnailView; class ThumbnailViewItem; class ThumbnailViewAcc - : public cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper, + : public cppu::ImplInheritanceHelper<comphelper::OAccessible, css::accessibility::XAccessibleSelection> { public: @@ -66,7 +66,7 @@ public: virtual sal_Int64 SAL_CALL getAccessibleStateSet( ) override; virtual css::lang::Locale SAL_CALL getLocale( ) override; - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; // XAccessibleComponent diff --git a/sfx2/source/control/thumbnailviewitemacc.hxx b/sfx2/source/control/thumbnailviewitemacc.hxx index 58f7ac091e03..c9c15791e8f6 100644 --- a/sfx2/source/control/thumbnailviewitemacc.hxx +++ b/sfx2/source/control/thumbnailviewitemacc.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> class ThumbnailViewItem; -class ThumbnailViewItemAcc : public comphelper::OAccessibleComponentHelper +class ThumbnailViewItemAcc : public comphelper::OAccessible { private: ThumbnailViewItem* mpThumbnailViewItem; @@ -48,7 +48,7 @@ public: virtual sal_Int64 SAL_CALL getAccessibleStateSet( ) override; virtual css::lang::Locale SAL_CALL getLocale( ) override; - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; // XAccessibleComponent diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index 1139833142c5..aefd55e3bc21 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -80,7 +80,7 @@ void SAL_CALL SmGraphicAccessible::disposing() { pWin = nullptr; // implicitly results in AccessibleStateType::DEFUNC set - comphelper::OAccessibleComponentHelper::disposing(); + comphelper::OAccessible::disposing(); } void SmGraphicAccessible::LaunchEvent( diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index 8a40dc6895d2..854a1705f14c 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -36,8 +36,7 @@ namespace accessibility { class AccessibleTextHelper; } // class used for accessibility in the graphic-window class SmGraphicAccessible final - : public cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper, - css::lang::XServiceInfo, + : public cppu::ImplInheritanceHelper<comphelper::OAccessible, css::lang::XServiceInfo, css::accessibility::XAccessibleText> { OUString aAccName; diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx index d22dc33225da..145dc40d8726 100644 --- a/svtools/source/control/accessibleruler.cxx +++ b/svtools/source/control/accessibleruler.cxx @@ -179,7 +179,7 @@ void SAL_CALL SvtRulerAccessible::disposing() { mpRepr = nullptr; // object dies with representation - comphelper::OAccessibleComponentHelper::disposing(); + comphelper::OAccessible::disposing(); mxParent.clear(); } diff --git a/svtools/source/control/accessibleruler.hxx b/svtools/source/control/accessibleruler.hxx index 389192a71446..c4cd47e24286 100644 --- a/svtools/source/control/accessibleruler.hxx +++ b/svtools/source/control/accessibleruler.hxx @@ -32,7 +32,7 @@ namespace tools { class Rectangle; } class Ruler; -class SvtRulerAccessible final : public comphelper::OAccessibleComponentHelper +class SvtRulerAccessible final : public comphelper::OAccessible { public: SvtRulerAccessible( diff --git a/svtools/source/control/accessibletabbar.cxx b/svtools/source/control/accessibletabbar.cxx index d391a72bc88b..51ca4e56e798 100644 --- a/svtools/source/control/accessibletabbar.cxx +++ b/svtools/source/control/accessibletabbar.cxx @@ -134,9 +134,7 @@ void AccessibleTabBar::FillAccessibleStateSet( sal_Int64& rStateSet ) rStateSet |= AccessibleStateType::RESIZABLE; } - -// OAccessibleComponentHelper - +// OAccessible awt::Rectangle AccessibleTabBar::implGetBounds() { diff --git a/svtools/source/control/accessibletabbar.hxx b/svtools/source/control/accessibletabbar.hxx index 641b149993b0..c66700707889 100644 --- a/svtools/source/control/accessibletabbar.hxx +++ b/svtools/source/control/accessibletabbar.hxx @@ -38,7 +38,7 @@ class AccessibleTabBar final virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; void FillAccessibleStateSet( sal_Int64& rStateSet ); - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds( ) override; // XComponent diff --git a/svtools/source/control/accessibletabbarbase.cxx b/svtools/source/control/accessibletabbarbase.cxx index 32252bd6bc0e..dfde22b70d35 100644 --- a/svtools/source/control/accessibletabbarbase.cxx +++ b/svtools/source/control/accessibletabbarbase.cxx @@ -66,7 +66,7 @@ void AccessibleTabBarBase::ProcessWindowEvent( const VclWindowEvent& rVclWindowE void AccessibleTabBarBase::disposing() { - OAccessibleComponentHelper::disposing(); + OAccessible::disposing(); ClearTabBarPointer(); } diff --git a/svtools/source/control/accessibletabbarbase.hxx b/svtools/source/control/accessibletabbarbase.hxx index 806cd311ee62..31fc3c591d07 100644 --- a/svtools/source/control/accessibletabbarbase.hxx +++ b/svtools/source/control/accessibletabbarbase.hxx @@ -30,7 +30,7 @@ class VclWindowEvent; namespace accessibility { -class AccessibleTabBarBase : public comphelper::OAccessibleComponentHelper +class AccessibleTabBarBase : public comphelper::OAccessible { public: explicit AccessibleTabBarBase( TabBar* pTabBar ); diff --git a/svtools/source/control/accessibletabbarpage.cxx b/svtools/source/control/accessibletabbarpage.cxx index f99574eaeb38..bc466cbcce53 100644 --- a/svtools/source/control/accessibletabbarpage.cxx +++ b/svtools/source/control/accessibletabbarpage.cxx @@ -152,9 +152,7 @@ void AccessibleTabBarPage::FillAccessibleStateSet( sal_Int64& rStateSet ) rStateSet |= AccessibleStateType::SELECTED; } - -// OAccessibleComponentHelper - +// OAccessible awt::Rectangle AccessibleTabBarPage::implGetBounds() { diff --git a/svtools/source/control/accessibletabbarpage.hxx b/svtools/source/control/accessibletabbarpage.hxx index bbf3b86edd3a..9a3048579884 100644 --- a/svtools/source/control/accessibletabbarpage.hxx +++ b/svtools/source/control/accessibletabbarpage.hxx @@ -51,7 +51,7 @@ private: void FillAccessibleStateSet( sal_Int64& rStateSet ); - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds( ) override; // XComponent diff --git a/svtools/source/control/accessibletabbarpagelist.cxx b/svtools/source/control/accessibletabbarpagelist.cxx index 08d1ce6eb9c2..83b70c3754c1 100644 --- a/svtools/source/control/accessibletabbarpagelist.cxx +++ b/svtools/source/control/accessibletabbarpagelist.cxx @@ -296,9 +296,7 @@ void AccessibleTabBarPageList::FillAccessibleStateSet( sal_Int64& rStateSet ) rStateSet |= AccessibleStateType::SHOWING; } - -// OAccessibleComponentHelper - +// OAccessible awt::Rectangle AccessibleTabBarPageList::implGetBounds() { diff --git a/svtools/source/control/accessibletabbarpagelist.hxx b/svtools/source/control/accessibletabbarpagelist.hxx index 18c507202fc0..52d224eb8590 100644 --- a/svtools/source/control/accessibletabbarpagelist.hxx +++ b/svtools/source/control/accessibletabbarpagelist.hxx @@ -54,7 +54,7 @@ private: virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; void FillAccessibleStateSet( sal_Int64& rStateSet ); - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds( ) override; // XComponent diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 7c7be71e81ee..37496a9b25fd 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -296,7 +296,7 @@ void ValueSetAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValue bool ValueSetAcc::HasAccessibleListeners() const { - return comphelper::OAccessibleComponentHelper::hasAccessibleListeners(); + return comphelper::OAccessible::hasAccessibleListeners(); } void ValueSetAcc::GetFocus() diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index f8876f1298dc..a36e35ea6d56 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -63,7 +63,7 @@ struct ValueSetItem }; class ValueSetAcc final - : public cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper, + : public cppu::ImplInheritanceHelper<comphelper::OAccessible, css::accessibility::XAccessibleSelection> { public: @@ -101,7 +101,7 @@ public: virtual sal_Int64 SAL_CALL getAccessibleStateSet( ) override; virtual css::lang::Locale SAL_CALL getLocale( ) override; - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; // XAccessibleComponent @@ -158,7 +158,7 @@ private: bool HasNoneField() const; }; -class ValueItemAcc : public comphelper::OAccessibleComponentHelper +class ValueItemAcc : public comphelper::OAccessible { private: ValueSetItem* mpValueSetItem; @@ -184,7 +184,7 @@ public: virtual sal_Int64 SAL_CALL getAccessibleStateSet( ) override; virtual css::lang::Locale SAL_CALL getLocale( ) override; - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; // XAccessibleComponent diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index e77041cf62f7..0a51e5a8b9c1 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -98,7 +98,7 @@ public: void SetEditSource( ::std::unique_ptr< SvxEditSource > && pEditSource ); - void SetEventSource(const rtl::Reference<comphelper::OAccessibleComponentHelper>& rEventSource) + void SetEventSource(const rtl::Reference<comphelper::OAccessible>& rEventSource) { mpFrontEnd = rEventSource; } @@ -176,7 +176,7 @@ private: // our frontend class (the one implementing the actual // interface). That's not necessarily the one containing the impl // pointer! - rtl::Reference<comphelper::OAccessibleComponentHelper> mpFrontEnd; + rtl::Reference<comphelper::OAccessible> mpFrontEnd; // a wrapper for the text forwarders (guarded by solar mutex) mutable SvxEditSourceAdapter maEditSource; @@ -1544,7 +1544,7 @@ void AccessibleTextHelper::SetEditSource( ::std::unique_ptr< SvxEditSource > && } void AccessibleTextHelper::SetEventSource( - const rtl::Reference<comphelper::OAccessibleComponentHelper>& rEventSource) + const rtl::Reference<comphelper::OAccessible>& rEventSource) { #ifdef DBG_UTIL mpImpl->CheckInvariants(); diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 137ee428e9f9..e02017f8e709 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -489,7 +489,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::disposing() mxShapes.clear(); } - comphelper::OAccessibleComponentHelper::disposing(); + comphelper::OAccessible::disposing(); } void SvxGraphCtrlAccessibleContext::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index 209775a1230a..ea6ab55b4247 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -405,7 +405,7 @@ sal_Int64 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleStateSet() void SAL_CALL SvxPixelCtlAccessibleChild::disposing() { - OAccessibleComponentHelper::disposing(); + OAccessible::disposing(); mxParent.clear(); } diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index e77c1f49b92f..8d6b983b7c08 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -594,7 +594,7 @@ Reference< XAccessibleKeyBinding > SvxRectCtlChildAccessibleContext::getAccessib void SAL_CALL SvxRectCtlChildAccessibleContext::disposing() { - OAccessibleComponentHelper::disposing(); + OAccessible::disposing(); mxParent.clear(); } diff --git a/svx/source/dialog/weldeditview.cxx b/svx/source/dialog/weldeditview.cxx index 28426e0952f4..0f1fd8a1cf93 100644 --- a/svx/source/dialog/weldeditview.cxx +++ b/svx/source/dialog/weldeditview.cxx @@ -507,7 +507,7 @@ public: }; } -class WeldEditAccessible : public comphelper::OAccessibleComponentHelper +class WeldEditAccessible : public comphelper::OAccessible { weld::CustomWidgetController* m_pController; EditEngine* m_pEditEngine; @@ -557,7 +557,7 @@ public: m_xTextHelper->Dispose(); m_xTextHelper.reset(); - OAccessibleComponentHelper::dispose(); + OAccessible::dispose(); } // XAccessibleComponent diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index 1567ce52ca48..4560d0133a2c 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -32,7 +32,7 @@ class FrameSelector; namespace a11y { -class AccFrameSelector final : public comphelper::OAccessibleComponentHelper +class AccFrameSelector final : public comphelper::OAccessible { public: explicit AccFrameSelector(FrameSelector& rFrameSel); @@ -59,7 +59,7 @@ public: void Invalidate(); private: - // OAccessibleComponentHelper + // OAccessible /// implements the calculation of the bounding rectangle virtual css::awt::Rectangle implGetBounds( ) override; @@ -69,7 +69,7 @@ private: FrameSelector* mpFrameSel; }; -class AccFrameSelectorChild final : public comphelper::OAccessibleComponentHelper +class AccFrameSelectorChild final : public comphelper::OAccessible { public: explicit AccFrameSelectorChild( FrameSelector& rFrameSel, FrameBorderType eBorder ); @@ -95,13 +95,13 @@ public: void NotifyAccessibleEvent(const sal_Int16 _nEventId, const css::uno::Any& _rOldValue, const css::uno::Any& _rNewValue) { - ::comphelper::OAccessibleComponentHelper::NotifyAccessibleEvent(_nEventId, _rOldValue, _rNewValue); + ::comphelper::OAccessible::NotifyAccessibleEvent(_nEventId, _rOldValue, _rNewValue); } void Invalidate(); private: - // OAccessibleComponentHelper + // OAccessible /// implements the calculation of the bounding rectangle virtual css::awt::Rectangle implGetBounds( ) override; diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index 4c0a07d18dda..0a02f28aa0ff 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -51,7 +51,7 @@ class SdrView; */ class SvxGraphCtrlAccessibleContext final - : public cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper, + : public cppu::ImplInheritanceHelper<comphelper::OAccessible, css::accessibility::XAccessibleSelection, css::lang::XServiceInfo, css::lang::XServiceName>, public SfxListener, diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index 1eda19a0c786..61b10e49ad64 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -75,7 +75,7 @@ namespace svx virtual void SAL_CALL grabFocus( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; - //OAccessibleComponentHelper + // OAccessible // XAccessibleContext - still waiting to be overwritten virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 i ) override; @@ -134,7 +134,7 @@ namespace svx virtual void implSelect( sal_Int64 nAccessibleChildIndex, bool bSelect ) override; - // OAccessibleComponentHelper + // OAccessible /// implements the calculation of the bounding rectangle - still waiting to be overwritten virtual css::awt::Rectangle implGetBounds( ) override; }; @@ -145,7 +145,7 @@ namespace svx /** The child implementation of the table. */ class SvxShowCharSetItemAcc final - : public cppu::ImplInheritanceHelper<::comphelper::OAccessibleComponentHelper, + : public cppu::ImplInheritanceHelper<::comphelper::OAccessible, css::accessibility::XAccessibleAction> { private: @@ -153,7 +153,7 @@ namespace svx virtual ~SvxShowCharSetItemAcc() override; - // OAccessibleComponentHelper + // OAccessible /// implements the calculation of the bounding rectangle - still waiting to be overwritten virtual css::awt::Rectangle implGetBounds( ) override; public: @@ -166,7 +166,7 @@ namespace svx virtual void SAL_CALL grabFocus( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; - //OAccessibleComponentHelper + // OAccessible // XAccessibleContext - still waiting to be overwritten virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 i ) override; diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx index 4974f694c037..48f408c10962 100644 --- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx +++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx @@ -33,7 +33,7 @@ class SvxPixelCtl; class SvxPixelCtlAccessible; -class SvxPixelCtlAccessibleChild final : public comphelper::OAccessibleComponentHelper +class SvxPixelCtlAccessibleChild final : public comphelper::OAccessible { public: SvxPixelCtlAccessibleChild( @@ -70,7 +70,7 @@ private: virtual void SAL_CALL disposing() override; - // OAccessibleComponentHelper + // OAccessible /// implements the calculation of the bounding rectangle virtual css::awt::Rectangle implGetBounds( ) override; @@ -117,7 +117,7 @@ private: // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) virtual void implSelect(sal_Int64 nAccessibleChildIndex, bool bSelect) override; - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; virtual void SAL_CALL disposing() override; diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 22a46f5ce76e..9031cba259bd 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -81,7 +81,7 @@ private: // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) virtual void implSelect(sal_Int64 nAccessibleChildIndex, bool bSelect) override; - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; virtual void SAL_CALL disposing() override; @@ -118,7 +118,7 @@ private: }; class SvxRectCtlChildAccessibleContext final - : public cppu::ImplInheritanceHelper<::comphelper::OAccessibleComponentHelper, + : public cppu::ImplInheritanceHelper<::comphelper::OAccessible, css::accessibility::XAccessibleValue, css::accessibility::XAccessibleAction> { @@ -178,7 +178,7 @@ private: virtual void SAL_CALL disposing() override; - // OAccessibleComponentHelper + // OAccessible /// implements the calculation of the bounding rectangle virtual css::awt::Rectangle implGetBounds( ) override; diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index 7638de0d3bcb..d29fa23e768d 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -61,7 +61,7 @@ public: void UpdateChildren(); static OUString getCellName( sal_Int32 nCol, sal_Int32 nRow ); - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; // XAccessibleComponent diff --git a/toolkit/inc/controls/accessiblecontrolcontext.hxx b/toolkit/inc/controls/accessiblecontrolcontext.hxx index 025ce57ba102..4b3d889e95a7 100644 --- a/toolkit/inc/controls/accessiblecontrolcontext.hxx +++ b/toolkit/inc/controls/accessiblecontrolcontext.hxx @@ -43,7 +43,7 @@ namespace toolkit is being disposed.</p> */ class OAccessibleControlContext final - : public cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper, css::lang::XEventListener> + : public cppu::ImplInheritanceHelper<comphelper::OAccessible, css::lang::XEventListener> { public: /** creates an accessible context for a uno control @@ -73,7 +73,7 @@ namespace toolkit virtual sal_Int32 SAL_CALL getBackground( ) override; // XEventListener - using comphelper::OAccessibleComponentHelper::disposing; + using comphelper::OAccessible::disposing; virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // retrieves the value of a string property from the model, if the property is present @@ -89,7 +89,7 @@ namespace toolkit OAccessibleControlContext(const css::uno::Reference<css::awt::XControl>& rxControl); virtual ~OAccessibleControlContext() override; - // OAccessibleComponentHelper overridables + // OAccessible overridables virtual css::awt::Rectangle implGetBounds( ) override; css::uno::Reference< css::beans::XPropertySet > diff --git a/toolkit/inc/controls/table/AccessibleGridControlBase.hxx b/toolkit/inc/controls/table/AccessibleGridControlBase.hxx index 9c7c33f8b6ee..25e6f3923ff1 100644 --- a/toolkit/inc/controls/table/AccessibleGridControlBase.hxx +++ b/toolkit/inc/controls/table/AccessibleGridControlBase.hxx @@ -43,8 +43,7 @@ namespace accessibility { /** The GridControl accessible objects inherit from this base class. It implements basic functionality. */ class AccessibleGridControlBase - : public cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper, - css::lang::XServiceInfo> + : public cppu::ImplInheritanceHelper<comphelper::OAccessible, css::lang::XServiceInfo> { public: /** Constructor. diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index 28c25e3058f4..0b54cf1dbf33 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -173,7 +173,7 @@ namespace toolkit m_xControlModel.clear(); m_xModelPropsInfo.clear(); - comphelper::OAccessibleComponentHelper::disposing(); + comphelper::OAccessible::disposing(); } diff --git a/toolkit/source/controls/table/AccessibleGridControlBase.cxx b/toolkit/source/controls/table/AccessibleGridControlBase.cxx index eda130f6daf3..e15970630ff3 100644 --- a/toolkit/source/controls/table/AccessibleGridControlBase.cxx +++ b/toolkit/source/controls/table/AccessibleGridControlBase.cxx @@ -58,7 +58,7 @@ void SAL_CALL AccessibleGridControlBase::disposing() { SolarMutexGuard g; - OAccessibleComponentHelper::disposing(); + OAccessible::disposing(); m_xParent = nullptr; //m_aTable = NULL; diff --git a/vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx b/vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx index 92454ad42efe..7892a377bd4f 100644 --- a/vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx +++ b/vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx @@ -32,9 +32,9 @@ class SvtIconChoiceCtrl; -typedef ::cppu::ImplInheritanceHelper< - comphelper::OAccessibleComponentHelper, css::accessibility::XAccessibleText, - css::accessibility::XAccessibleAction, css::lang::XServiceInfo, css::lang::XEventListener> +typedef ::cppu::ImplInheritanceHelper<comphelper::OAccessible, css::accessibility::XAccessibleText, + css::accessibility::XAccessibleAction, + css::lang::XServiceInfo, css::lang::XEventListener> AccessibleIconChoiceCtrlEntry_BASE; /** the class AccessibleListBoxEntry represents the class for an accessible object of a listbox entry */ @@ -63,7 +63,7 @@ class AccessibleIconChoiceCtrlEntry final : public AccessibleIconChoiceCtrlEntry */ virtual void SAL_CALL disposing() override; - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds() override; // OCommonAccessibleText diff --git a/vcl/inc/accessibility/accessiblelistboxentry.hxx b/vcl/inc/accessibility/accessiblelistboxentry.hxx index 47c0ec4eb908..148a5844959e 100644 --- a/vcl/inc/accessibility/accessiblelistboxentry.hxx +++ b/vcl/inc/accessibility/accessiblelistboxentry.hxx @@ -36,10 +36,10 @@ class AccessibleListBox; class SvTreeListEntry; // class AccessibleListBoxEntry ------------------------------------------ -typedef cppu::ImplInheritanceHelper< - comphelper::OAccessibleComponentHelper, css::accessibility::XAccessibleAction, - css::accessibility::XAccessibleSelection, css::accessibility::XAccessibleText, - css::accessibility::XAccessibleValue, css::lang::XServiceInfo> +typedef cppu::ImplInheritanceHelper<comphelper::OAccessible, css::accessibility::XAccessibleAction, + css::accessibility::XAccessibleSelection, + css::accessibility::XAccessibleText, + css::accessibility::XAccessibleValue, css::lang::XServiceInfo> AccessibleListBoxEntry_BASE; /** the class AccessibleListBoxEntry represents the class for an accessible object of a listbox entry */ diff --git a/vcl/inc/accessibility/accessiblemenubasecomponent.hxx b/vcl/inc/accessibility/accessiblemenubasecomponent.hxx index d6b0c7941c94..1a40ab0db886 100644 --- a/vcl/inc/accessibility/accessiblemenubasecomponent.hxx +++ b/vcl/inc/accessibility/accessiblemenubasecomponent.hxx @@ -35,8 +35,7 @@ class VclMenuEvent; class OAccessibleMenuItemComponent; class OAccessibleMenuBaseComponent - : public cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper, - css::lang::XServiceInfo> + : public cppu::ImplInheritanceHelper<comphelper::OAccessible, css::lang::XServiceInfo> { friend class OAccessibleMenuItemComponent; friend class VCLXAccessibleMenuItem; diff --git a/vcl/inc/accessibility/accessiblemenucomponent.hxx b/vcl/inc/accessibility/accessiblemenucomponent.hxx index 87ae918996f5..afb661a37a44 100644 --- a/vcl/inc/accessibility/accessiblemenucomponent.hxx +++ b/vcl/inc/accessibility/accessiblemenucomponent.hxx @@ -36,7 +36,7 @@ protected: virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override; - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds( ) override; public: diff --git a/vcl/inc/accessibility/accessiblemenuitemcomponent.hxx b/vcl/inc/accessibility/accessiblemenuitemcomponent.hxx index 63a19d2c658a..2d7b74d9cf4f 100644 --- a/vcl/inc/accessibility/accessiblemenuitemcomponent.hxx +++ b/vcl/inc/accessibility/accessiblemenuitemcomponent.hxx @@ -50,7 +50,7 @@ protected: virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override; - // OAccessibleComponentHelper + // OAccessible virtual css::awt::Rectangle implGetBounds( ) override; // XComponent diff --git a/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx b/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx index f9577bdc8957..c24df7f702b8 100644 --- a/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx +++ b/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx @@ -33,8 +33,7 @@ class HeaderBar; // ---------------------------------------------------- -e ... etc. - the rest is truncated
