diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-26 17:31:28 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-27 11:47:01 +0000 |
| commit | 90a64d3ca1fdf75df1dcebebbd250e09b21cc7bf (patch) | |
| tree | 32f342d6ce5dacce730f1cd3372c58e10e80754a /accessibility | |
| parent | c1b17b0e9191901e8110ef14acce86c810a11491 (diff) | |
Use ImplInheritanceHelper in VCLXAccessibleStatusBarItem
Change-Id: I7ec38650b0ef44b59b57bd64ba74fcac918f8b6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146236
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx | 18 | ||||
| -rw-r--r-- | accessibility/source/standard/vclxaccessiblestatusbaritem.cxx | 12 |
2 files changed, 5 insertions, 25 deletions
diff --git a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx index 0e82ed4b3ab7..8bcf8e33024b 100644 --- a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx +++ b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/accessibletexthelper.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <vcl/status.hxx> #include <vcl/vclptr.hxx> @@ -32,12 +32,10 @@ typedef ::comphelper::OAccessibleTextHelper AccessibleTextHelper_BASE; -typedef ::cppu::ImplHelper2< - css::accessibility::XAccessible, - css::lang::XServiceInfo > VCLXAccessibleStatusBarItem_BASE; - -class VCLXAccessibleStatusBarItem final : public AccessibleTextHelper_BASE, - public VCLXAccessibleStatusBarItem_BASE +class VCLXAccessibleStatusBarItem final : public cppu::ImplInheritanceHelper< + AccessibleTextHelper_BASE, + css::accessibility::XAccessible, + css::lang::XServiceInfo> { friend class VCLXAccessibleStatusBar; @@ -72,12 +70,6 @@ private: public: VCLXAccessibleStatusBarItem( StatusBar* pStatusBar, sal_uInt16 nItemId ); - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx index 6b56af0220f6..4c4bf6234741 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx @@ -176,18 +176,6 @@ void VCLXAccessibleStatusBarItem::implGetSelection( sal_Int32& nStartIndex, sal_ } -// XInterface - - -IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleStatusBarItem, AccessibleTextHelper_BASE, VCLXAccessibleStatusBarItem_BASE ) - - -// XTypeProvider - - -IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleStatusBarItem, AccessibleTextHelper_BASE, VCLXAccessibleStatusBarItem_BASE ) - - // XComponent |