diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-26 17:42:55 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-27 11:47:59 +0000 |
| commit | 3f39e4b674089a9243064e1204e1d9c67f7b2bd8 (patch) | |
| tree | d16ff754da284d663e794b625a7b957578ad8707 /accessibility | |
| parent | 148caa36121ddc37b18226308cec0e7f535477de (diff) | |
Use ImplInheritanceHelper in VCLXAccessibleToolBox
Change-Id: I3b37cd67d6d32001ae6ac72f01ce156aeb93ca7e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146240
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/inc/standard/vclxaccessibletoolbox.hxx | 12 | ||||
| -rw-r--r-- | accessibility/source/standard/vclxaccessibletoolbox.cxx | 8 |
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() { |