diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-26 13:52:04 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-26 19:55:47 +0000 |
| commit | 57f103f15895ecd6e1882652206add0c1ed6a3c9 (patch) | |
| tree | 5b5bc1c52021fd2ecb602215134a124c54ad6ac2 /accessibility | |
| parent | df4f438e74c444539dcb6dea2ab6c286af155fbf (diff) | |
Use ImplInheritanceHelper in VCLXAccessibleHeaderBarItem
Change-Id: I18b54a3cd689aaf4870c073db8d76d41661a05c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146189
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx | 18 | ||||
| -rw-r--r-- | accessibility/source/standard/vclxaccessibleheaderbaritem.cxx | 12 |
2 files changed, 5 insertions, 25 deletions
diff --git a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx index e78950bded6f..563e86ff5252 100644 --- a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx +++ b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx @@ -21,7 +21,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/accessiblecomponenthelper.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <vcl/vclptr.hxx> @@ -34,12 +34,10 @@ class VclWindowEvent; // class VCLXAccessibleHeaderBarItem // ---------------------------------------------------- -typedef ::cppu::ImplHelper2< - css::accessibility::XAccessible, - css::lang::XServiceInfo > VCLXAccessibleHeaderBarItem_BASE; - -class VCLXAccessibleHeaderBarItem final : public comphelper::OAccessibleExtendedComponentHelper, - public VCLXAccessibleHeaderBarItem_BASE +class VCLXAccessibleHeaderBarItem final : public cppu::ImplInheritanceHelper< + comphelper::OAccessibleExtendedComponentHelper, + css::accessibility::XAccessible, + css::lang::XServiceInfo> { private: VclPtr<HeaderBar> m_pHeadBar; @@ -54,12 +52,6 @@ public: VCLXAccessibleHeaderBarItem( HeaderBar* pHeadBar, sal_Int32 _nIndexInParent ); virtual ~VCLXAccessibleHeaderBarItem() override; - // 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/vclxaccessibleheaderbaritem.cxx b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx index be077d822e53..d3463f5cdae7 100644 --- a/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx +++ b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx @@ -81,18 +81,6 @@ awt::Rectangle VCLXAccessibleHeaderBarItem::implGetBounds() } -// XInterface - - -IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleHeaderBarItem, OAccessibleExtendedComponentHelper, VCLXAccessibleHeaderBarItem_BASE ) - - -// XTypeProvider - - -IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleHeaderBarItem, OAccessibleExtendedComponentHelper, VCLXAccessibleHeaderBarItem_BASE ) - - // XServiceInfo OUString VCLXAccessibleHeaderBarItem::getImplementationName() { |