2 files changed, 6 insertions, 26 deletions
diff --git a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
index 81e36cd42403..dc7b0d3c353e 100644
--- a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
+++ b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
@@ -24,17 +24,15 @@
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 #include <com/sun/star/accessibility/XAccessibleValue.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 
 
-typedef ::cppu::ImplHelper2<
-    css::accessibility::XAccessibleAction,
-    css::accessibility::XAccessibleValue > VCLXAccessibleCheckBox_BASE;
-
-class VCLXAccessibleCheckBox final : public VCLXAccessibleTextComponent,
-                               public VCLXAccessibleCheckBox_BASE
+class VCLXAccessibleCheckBox final : public cppu::ImplInheritanceHelper<
+                                         VCLXAccessibleTextComponent,
+                                         css::accessibility::XAccessibleAction,
+                                         css::accessibility::XAccessibleValue>
 {
 private:
     bool    m_bChecked;
@@ -56,12 +54,6 @@ private:
 public:
     VCLXAccessibleCheckBox( VCLXWindow* pVCLXindow );
 
-    // XInterface
-    DECLARE_XINTERFACE()
-
-    // XTypeProvider
-    DECLARE_XTYPEPROVIDER()
-
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override;
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
index 27da7e6bfbe5..8a0ea492911e 100644
--- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
@@ -46,7 +46,7 @@ using namespace ::comphelper;
 
 
 VCLXAccessibleCheckBox::VCLXAccessibleCheckBox( VCLXWindow* pVCLWindow )
-    :VCLXAccessibleTextComponent( pVCLWindow )
+    :ImplInheritanceHelper( pVCLWindow )
 {
     m_bChecked = IsChecked();
     m_bIndeterminate = IsIndeterminate();
@@ -137,18 +137,6 @@ void VCLXAccessibleCheckBox::FillAccessibleStateSet( sal_Int64& rStateSet )
 }
 
 
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleCheckBox, VCLXAccessibleTextComponent, VCLXAccessibleCheckBox_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleCheckBox, VCLXAccessibleTextComponent, VCLXAccessibleCheckBox_BASE )
-
-
 // XServiceInfo