[Libreoffice-commits] core.git: svx/source

[Stephan Bergmann (via logerrit)]

 svx/source/accessibility/AccessibleFrameSelector.cxx |    3 ---
 svx/source/inc/AccessibleFrameSelector.hxx           |    9 ++++-----
 2 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 5b77e5fa5a1b63b76fe82f4b8e96bad7a7af51ab
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Jan 27 15:35:20 2023 +0100
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Sat Jan 28 17:43:36 2023 +0000

    Use ImplInheritanceHelper in AccFrameSelector
    
    Change-Id: Iff6dc76c4fdc105127cde23ae478011da6ff6483
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146277
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx 
b/svx/source/accessibility/AccessibleFrameSelector.cxx
index e7eb4f9a9a0b..8c684865cf84 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -49,9 +49,6 @@ AccFrameSelector::~AccFrameSelector()
 {
 }
 
-IMPLEMENT_FORWARD_XINTERFACE2( AccFrameSelector, OAccessibleComponentHelper, 
OAccessibleHelper_Base )
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccFrameSelector, 
OAccessibleComponentHelper, OAccessibleHelper_Base )
-
 Reference< XAccessibleContext > AccFrameSelector::getAccessibleContext(  )
 {
     return this;
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx 
b/svx/source/inc/AccessibleFrameSelector.hxx
index 7497b438398f..26dfec6d2e6b 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -22,6 +22,7 @@
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include<comphelper/accessiblecomponenthelper.hxx>
 #include <svx/framebordertype.hxx>
@@ -34,16 +35,14 @@ namespace a11y {
 
 typedef ::cppu::ImplHelper1<css::accessibility::XAccessible> 
OAccessibleHelper_Base;
 
-class AccFrameSelector final : public ::comphelper::OAccessibleComponentHelper,
-                               public OAccessibleHelper_Base
+class AccFrameSelector final : public cppu::ImplInheritanceHelper<
+                                   ::comphelper::OAccessibleComponentHelper,
+                                   css::accessibility::XAccessible>
 {
 public:
     explicit            AccFrameSelector(FrameSelector& rFrameSel);
     virtual             ~AccFrameSelector() override;
 
-    DECLARE_XINTERFACE( )
-    DECLARE_XTYPEPROVIDER( )
-
     //XAccessibleComponent
     virtual void SAL_CALL grabFocus(  ) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleAtPoint( const css::awt::Point& aPoint ) override;