[Libreoffice-commits] core.git: accessibility/inc accessibility/source

[Stephan Bergmann (via logerrit)]

 accessibility/inc/standard/svtaccessiblenumericfield.hxx    |   14 ++----------
 accessibility/source/standard/svtaccessiblenumericfield.cxx |   10 --------
 2 files changed, 4 insertions(+), 20 deletions(-)

New commits:
commit e547fb841d242ed3bd33623c4a1dc4cdb0e239a8
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 26 12:15:18 2023 +0100
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Jan 26 19:02:16 2023 +0000

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

diff --git a/accessibility/inc/standard/svtaccessiblenumericfield.hxx 
b/accessibility/inc/standard/svtaccessiblenumericfield.hxx
index fb3b30e594fb..3537b9d6ef1d 100644
--- a/accessibility/inc/standard/svtaccessiblenumericfield.hxx
+++ b/accessibility/inc/standard/svtaccessiblenumericfield.hxx
@@ -19,25 +19,17 @@
 
 #pragma once
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <standard/vclxaccessibleedit.hxx>
 
 #include <com/sun/star/accessibility/XAccessibleValue.hpp>
 
-typedef ::cppu::ImplHelper1<css::accessibility::XAccessibleValue> 
SVTXAccessibleNumericField_BASE;
-
-class SVTXAccessibleNumericField final : public VCLXAccessibleEdit,
-                                         public SVTXAccessibleNumericField_BASE
+class SVTXAccessibleNumericField final
+    : public cppu::ImplInheritanceHelper<VCLXAccessibleEdit, 
css::accessibility::XAccessibleValue>
 {
 public:
     SVTXAccessibleNumericField(VCLXWindow* pVCLXindow);
 
-    // XInterface
-    DECLARE_XINTERFACE()
-
-    // XTypeProvider
-    DECLARE_XTYPEPROVIDER()
-
     // XAccessibleContext
     virtual sal_Int16 SAL_CALL getAccessibleRole() override;
 
diff --git a/accessibility/source/standard/svtaccessiblenumericfield.cxx 
b/accessibility/source/standard/svtaccessiblenumericfield.cxx
index 4f696f71a9f3..2862a3a2b670 100644
--- a/accessibility/source/standard/svtaccessiblenumericfield.cxx
+++ b/accessibility/source/standard/svtaccessiblenumericfield.cxx
@@ -27,18 +27,10 @@ using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
 SVTXAccessibleNumericField::SVTXAccessibleNumericField(VCLXWindow* pVCLWindow)
-    : VCLXAccessibleEdit(pVCLWindow)
+    : ImplInheritanceHelper(pVCLWindow)
 {
 }
 
-// XInterface
-IMPLEMENT_FORWARD_XINTERFACE2(SVTXAccessibleNumericField, 
VCLXAccessibleTextComponent,
-                              SVTXAccessibleNumericField_BASE)
-
-// XTypeProvider
-IMPLEMENT_FORWARD_XTYPEPROVIDER2(SVTXAccessibleNumericField, 
VCLXAccessibleTextComponent,
-                                 SVTXAccessibleNumericField_BASE)
-
 sal_Int16 SVTXAccessibleNumericField::getAccessibleRole() { return 
AccessibleRole::SPIN_BOX; }
 
 css::uno::Any SAL_CALL SVTXAccessibleNumericField::getCurrentValue()