accessibility/inc/standard/vclxaccessiblemenu.hxx | 19 ++++--------
accessibility/inc/standard/vclxaccessiblemenuitem.hxx | 22 ++++-----------
accessibility/source/standard/vclxaccessiblemenu.cxx | 12 --------
accessibility/source/standard/vclxaccessiblemenuitem.cxx | 14 ---------
4 files changed, 14 insertions(+), 53 deletions(-)
New commits:
commit 2f7dee3a2dd6c8696fc2929275fb6ab05b44a30d
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 26 17:24:43 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Jan 27 08:32:21 2023 +0000
Use ImplInheritanceHelper in VCLXAccessibleMenu
Change-Id: Ia086713b06cd9525e5bb03e74a1908bdd6058b18
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146233
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/accessibility/inc/standard/vclxaccessiblemenu.hxx
b/accessibility/inc/standard/vclxaccessiblemenu.hxx
index e866a53a3d8a..ce7b3f0580de 100644
--- a/accessibility/inc/standard/vclxaccessiblemenu.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenu.hxx
@@ -22,29 +22,22 @@
#include <standard/vclxaccessiblemenuitem.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
-typedef ::cppu::ImplHelper1 <
- css::accessibility::XAccessibleSelection > VCLXAccessibleMenu_BASE;
-
-class VCLXAccessibleMenu final : public VCLXAccessibleMenuItem,
- public VCLXAccessibleMenu_BASE
+class VCLXAccessibleMenu final :
+ public cppu::ImplInheritanceHelper<
+ VCLXAccessibleMenuItem, css::accessibility::XAccessibleSelection>
{
virtual bool IsFocused() override;
virtual bool IsPopupMenuOpen() override;
sal_Int64 implGetSelectedAccessibleChildCount();
public:
- using VCLXAccessibleMenuItem::VCLXAccessibleMenuItem;
-
- // XInterface
- DECLARE_XINTERFACE()
-
- // XTypeProvider
- DECLARE_XTYPEPROVIDER()
+ VCLXAccessibleMenu( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu =
nullptr ):
+ ImplInheritanceHelper(pParent, nItemPos, pMenu) {}
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx
b/accessibility/source/standard/vclxaccessiblemenu.cxx
index e3ad7c118014..5d1d54e4009f 100644
--- a/accessibility/source/standard/vclxaccessiblemenu.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenu.cxx
@@ -61,18 +61,6 @@ bool VCLXAccessibleMenu::IsPopupMenuOpen()
}
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleMenu, VCLXAccessibleMenuItem,
VCLXAccessibleMenu_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenu, VCLXAccessibleMenuItem,
VCLXAccessibleMenu_BASE )
-
-
// XServiceInfo
commit 969b3f1e5416bfbec8d8bf2871a8176393ddaa22
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 26 17:22:50 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Jan 27 08:32:11 2023 +0000
Use ImplInheritanceHelper in VCLXAccessibleMenuItem
Change-Id: I0eca36225c2a43e2ba90253c013fefe43b2f29a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146232
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
index e67be7f09e53..ddc50a8f3577 100644
--- a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
@@ -25,20 +25,18 @@
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/accessibletexthelper.hxx>
-typedef ::cppu::ImplHelper3<
- css::accessibility::XAccessibleText,
- css::accessibility::XAccessibleAction,
- css::accessibility::XAccessibleValue > VCLXAccessibleMenuItem_BASE;
-
-class VCLXAccessibleMenuItem : public OAccessibleMenuItemComponent,
- public ::comphelper::OCommonAccessibleText,
- public VCLXAccessibleMenuItem_BASE
+class VCLXAccessibleMenuItem : public cppu::ImplInheritanceHelper<
+ OAccessibleMenuItemComponent,
+ css::accessibility::XAccessibleText,
+ css::accessibility::XAccessibleAction,
+ css::accessibility::XAccessibleValue>,
+ public ::comphelper::OCommonAccessibleText
{
protected:
virtual bool IsFocused() override;
@@ -57,12 +55,6 @@ protected:
public:
VCLXAccessibleMenuItem( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu =
nullptr );
- // XInterface
- DECLARE_XINTERFACE()
-
- // XTypeProvider
- DECLARE_XTYPEPROVIDER()
-
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index 307b1246b873..2c4e8043c00b 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -50,7 +50,7 @@ using namespace ::comphelper;
VCLXAccessibleMenuItem::VCLXAccessibleMenuItem( Menu* pParent, sal_uInt16
nItemPos, Menu* pMenu )
- :OAccessibleMenuItemComponent( pParent, nItemPos, pMenu )
+ :ImplInheritanceHelper( pParent, nItemPos, pMenu )
{
}
@@ -134,18 +134,6 @@ void VCLXAccessibleMenuItem::implGetSelection( sal_Int32&
nStartIndex, sal_Int32
}
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleMenuItem,
OAccessibleMenuItemComponent, VCLXAccessibleMenuItem_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenuItem,
OAccessibleMenuItemComponent, VCLXAccessibleMenuItem_BASE )
-
-
// XServiceInfo
