2 files changed, 3 insertions, 17 deletions
diff --git a/accessibility/inc/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/standard/vclxaccessibletoolbox.hxx
index 352c3c07edfa..2fba09d80e79 100644
--- a/accessibility/inc/standard/vclxaccessibletoolbox.hxx
+++ b/accessibility/inc/standard/vclxaccessibletoolbox.hxx
@@ -22,19 +22,17 @@
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
 #include <vcl/toolbox.hxx>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 
 
-typedef ::cppu::ImplHelper1 < css::accessibility::XAccessibleSelection > VCLXAccessibleToolBox_BASE;
-
 typedef std::map< sal_Int32, css::uno::Reference< css::accessibility::XAccessible > > ToolBoxItemsMap;
 
 class VCLXAccessibleToolBoxItem;
 class ToolBox;
 
-class VCLXAccessibleToolBox final : public VCLXAccessibleComponent, public VCLXAccessibleToolBox_BASE
+class VCLXAccessibleToolBox final : public cppu::ImplInheritanceHelper<VCLXAccessibleComponent, css::accessibility::XAccessibleSelection>
 {
 private:
     ToolBoxItemsMap             m_aAccessibleChildren;
@@ -69,12 +67,6 @@ private:
 public:
     VCLXAccessibleToolBox( VCLXWindow* pVCLXWindow );
 
-    // 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/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 4722db1a0de9..a1a2d5b03d54 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -119,7 +119,7 @@ namespace
 
 VCLXAccessibleToolBox::VCLXAccessibleToolBox( VCLXWindow* pVCLXWindow ) :
 
-    VCLXAccessibleComponent( pVCLXWindow )
+    ImplInheritanceHelper( pVCLXWindow )
 
 {
 }
@@ -596,12 +596,6 @@ void VCLXAccessibleToolBox::ProcessWindowChildEvent( const VclWindowEvent& rVclW
     }
 }
 
-// XInterface
-IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleToolBox, VCLXAccessibleComponent, VCLXAccessibleToolBox_BASE )
-
-// XTypeProvider
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleToolBox, VCLXAccessibleComponent, VCLXAccessibleToolBox_BASE )
-
 // XComponent
 void SAL_CALL VCLXAccessibleToolBox::disposing()
 {