summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2023-01-26 11:40:54 +0100
committerStephan Bergmann <sbergman@redhat.com>2023-01-26 19:01:09 +0000
commitce1fbb09746bbc007c6286ead29e351ec5c06c0e (patch)
tree62605d091fa25e3515048c0e9c1d0afaea032a25
parenta03dbcf786481d7b9294354399c83b46972ac85a (diff)
Use ImplInheritanceHelper in OAccessibleMenuBaseComponent
Change-Id: I9527ea68c3fbb1637ea08cea6340b49bab9eac6b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146181 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--accessibility/inc/standard/accessiblemenubasecomponent.hxx18
-rw-r--r--accessibility/source/standard/accessiblemenubasecomponent.cxx12
2 files changed, 5 insertions, 25 deletions
diff --git a/accessibility/inc/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
index 4bb176b8fcc1..e56120f7fb38 100644
--- a/accessibility/inc/standard/accessiblemenubasecomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/awt/Point.hpp>
#include <comphelper/accessiblecomponenthelper.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <tools/link.hxx>
#include <vcl/vclptr.hxx>
@@ -34,12 +34,10 @@ class VclSimpleEvent;
class VclMenuEvent;
-typedef ::cppu::ImplHelper2<
- css::accessibility::XAccessible,
- css::lang::XServiceInfo > OAccessibleMenuBaseComponent_BASE;
-
-class OAccessibleMenuBaseComponent : public comphelper::OAccessibleExtendedComponentHelper,
- public OAccessibleMenuBaseComponent_BASE
+class OAccessibleMenuBaseComponent : public cppu::ImplInheritanceHelper<
+ comphelper::OAccessibleExtendedComponentHelper,
+ css::accessibility::XAccessible,
+ css::lang::XServiceInfo>
{
friend class OAccessibleMenuItemComponent;
friend class VCLXAccessibleMenuItem;
@@ -112,12 +110,6 @@ public:
void SetStates();
- // XInterface
- DECLARE_XINTERFACE()
-
- // XTypeProvider
- DECLARE_XTYPEPROVIDER()
-
// XServiceInfo
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index d288dfb30ceb..e1ab9e326ebf 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -629,18 +629,6 @@ void OAccessibleMenuBaseComponent::ProcessMenuEvent( const VclMenuEvent& rVclMen
}
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleMenuBaseComponent, OAccessibleExtendedComponentHelper, OAccessibleMenuBaseComponent_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleMenuBaseComponent, OAccessibleExtendedComponentHelper, OAccessibleMenuBaseComponent_BASE )
-
-
// XComponent