accessibility/inc/standard/accessiblemenubasecomponent.hxx | 18 ++--------
accessibility/inc/standard/accessiblemenucomponent.hxx | 18 ++--------
accessibility/source/standard/accessiblemenubasecomponent.cxx | 12 ------
accessibility/source/standard/accessiblemenucomponent.cxx | 12 ------
4 files changed, 10 insertions(+), 50 deletions(-)
New commits:
commit fc2f4eb5ca457860605d0d93baa0d2198800bcbf
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 26 11:51:42 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Jan 26 19:01:24 2023 +0000
Use ImplInheritanceHelper in OAccessibleMenuComponent
Change-Id: I7399a7e707d4a5915925d2e1b606ed7f6a364337
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146182
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/accessibility/inc/standard/accessiblemenucomponent.hxx
b/accessibility/inc/standard/accessiblemenucomponent.hxx
index 1e3feb81cb29..90c89922654a 100644
--- a/accessibility/inc/standard/accessiblemenucomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenucomponent.hxx
@@ -21,15 +21,13 @@
#include <standard/accessiblemenubasecomponent.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
-typedef ::cppu::ImplHelper1<
- css::accessibility::XAccessibleSelection > OAccessibleMenuComponent_BASE;
-
-class OAccessibleMenuComponent : public OAccessibleMenuBaseComponent,
- public OAccessibleMenuComponent_BASE
+class OAccessibleMenuComponent : public cppu::ImplInheritanceHelper<
+ OAccessibleMenuBaseComponent,
+ css::accessibility::XAccessibleSelection>
{
protected:
virtual bool IsEnabled() override;
@@ -40,15 +38,9 @@ protected:
// OCommonAccessibleComponent
virtual css::awt::Rectangle implGetBounds( ) override;
- using OAccessibleMenuBaseComponent::OAccessibleMenuBaseComponent;
-
public:
- // XInterface
- DECLARE_XINTERFACE()
-
- // XTypeProvider
- DECLARE_XTYPEPROVIDER()
+ OAccessibleMenuComponent( Menu* pMenu ): ImplInheritanceHelper(pMenu) {}
// XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx
b/accessibility/source/standard/accessiblemenucomponent.cxx
index 4b6323126252..92718c9b52ba 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -121,18 +121,6 @@ awt::Rectangle OAccessibleMenuComponent::implGetBounds()
}
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleMenuComponent,
OAccessibleMenuBaseComponent, OAccessibleMenuComponent_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleMenuComponent,
OAccessibleMenuBaseComponent, OAccessibleMenuComponent_BASE )
-
-
// XAccessibleContext
commit ce1fbb09746bbc007c6286ead29e351ec5c06c0e
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 26 11:40:54 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Jan 26 19:01:09 2023 +0000
Use ImplInheritanceHelper in OAccessibleMenuBaseComponent
Change-Id: I9527ea68c3fbb1637ea08cea6340b49bab9eac6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146181
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
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
