accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx | 18 ++--------
accessibility/inc/standard/vclxaccessibletabcontrol.hxx | 16 ++------
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx | 12 ------
accessibility/source/standard/vclxaccessibletabcontrol.cxx | 14 -------
4 files changed, 10 insertions(+), 50 deletions(-)
New commits:
commit b1883a0ff9f8e62a83bdcc94f4ff0dd01b2a56d6
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 26 17:35:32 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Jan 27 11:47:10 2023 +0000
Use ImplInheritanceHelper in VCLXAccessibleTabControl
Change-Id: I9426bac6b26feaa555842142dd3ce62bbe5f4a69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146237
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
index 9827f9ba6b67..dcf515775bd7 100644
--- a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
+++ b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
@@ -21,7 +21,7 @@
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vcl/tabctrl.hxx>
#include <vcl/vclptr.hxx>
@@ -30,11 +30,9 @@
-typedef ::cppu::ImplHelper1 <
- css::accessibility::XAccessibleSelection > VCLXAccessibleTabControl_BASE;
-
-class VCLXAccessibleTabControl final : public VCLXAccessibleComponent,
- public VCLXAccessibleTabControl_BASE
+class VCLXAccessibleTabControl final : public cppu::ImplInheritanceHelper<
+ VCLXAccessibleComponent,
+
css::accessibility::XAccessibleSelection>
{
private:
typedef std::vector< css::uno::Reference< css::accessibility::XAccessible
> > AccessibleChildren;
@@ -64,12 +62,6 @@ private:
public:
VCLXAccessibleTabControl( VCLXWindow* pVCLXWindow );
- // 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/vclxaccessibletabcontrol.cxx
b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index a3c9eb03c476..9963b51aef5f 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -42,7 +42,7 @@ using namespace ::comphelper;
VCLXAccessibleTabControl::VCLXAccessibleTabControl( VCLXWindow* pVCLXWindow )
- :VCLXAccessibleComponent( pVCLXWindow )
+ :ImplInheritanceHelper( pVCLXWindow )
{
m_pTabControl = GetAs<TabControl>();
if (!m_pTabControl)
@@ -291,18 +291,6 @@ void VCLXAccessibleTabControl::FillAccessibleStateSet(
sal_Int64& rStateSet )
}
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleTabControl,
VCLXAccessibleComponent, VCLXAccessibleTabControl_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleTabControl,
VCLXAccessibleComponent, VCLXAccessibleTabControl_BASE )
-
-
// XComponent
commit 90a64d3ca1fdf75df1dcebebbd250e09b21cc7bf
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 26 17:31:28 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Jan 27 11:47:01 2023 +0000
Use ImplInheritanceHelper in VCLXAccessibleStatusBarItem
Change-Id: I7ec38650b0ef44b59b57bd64ba74fcac918f8b6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146236
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
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
