diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-27 15:44:13 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-28 17:43:52 +0000 |
| commit | 131904c23ab539a3eb2aba5467cbbeee0650632b (patch) | |
| tree | 1cd83e9d206e8356d77dade3c67716d3b10fbc6b /svx/source | |
| parent | e71c718426e4f5694df04c91d391c7d064573b34 (diff) | |
Use ImplInheritanceHelper in SvxShowCharSetAcc
Change-Id: I9009b6168c66a1b340a34aaf804e097bfe614d21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146279
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/accessibility/charmapacc.cxx | 3 | ||||
| -rw-r--r-- | svx/source/inc/charmapacc.hxx | 14 |
2 files changed, 5 insertions, 12 deletions
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index 46fe8b11ac15..89e0b62199dc 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -91,9 +91,6 @@ void SAL_CALL SvxShowCharSetAcc::disposing() m_pParent = nullptr; } -IMPLEMENT_FORWARD_XINTERFACE2( SvxShowCharSetAcc, OAccessibleSelectionHelper, OAccessibleHelper_Base ) -IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetAcc, OAccessibleSelectionHelper, OAccessibleHelper_Base ) - bool SvxShowCharSetAcc::implIsSelected( sal_Int64 nAccessibleChildIndex ) { if (!m_pParent) diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index e94567e8c32d..339192ced108 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -23,6 +23,7 @@ #include <comphelper/accessibleselectionhelper.hxx> #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/accessibility/XAccessibleTable.hpp> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> #include <tools/gen.hxx> @@ -60,17 +61,15 @@ namespace svx }; - typedef ::cppu::ImplHelper2 < css::accessibility::XAccessible, - css::accessibility::XAccessibleTable - > OAccessibleHelper_Base; - // - SvxShowCharSetAcc - /** The table implementation of the vcl control. */ - class SvxShowCharSetAcc final : public ::comphelper::OAccessibleSelectionHelper, - public OAccessibleHelper_Base + class SvxShowCharSetAcc final : public cppu::ImplInheritanceHelper< + ::comphelper::OAccessibleSelectionHelper, + css::accessibility::XAccessible, + css::accessibility::XAccessibleTable> { ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > m_aChildren; SvxShowCharSet* m_pParent; // the vcl control @@ -78,9 +77,6 @@ namespace svx public: SvxShowCharSetAcc(SvxShowCharSet* pParent); - 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; |