accessibility/inc/standard/vclxaccessiblebutton.hxx | 20 ++++-----------
accessibility/inc/standard/vclxaccessiblecheckbox.hxx | 18 +++----------
accessibility/source/standard/vclxaccessiblebutton.cxx | 12 ---------
accessibility/source/standard/vclxaccessiblecheckbox.cxx | 14 ----------
4 files changed, 12 insertions(+), 52 deletions(-)
New commits:
commit df4f438e74c444539dcb6dea2ab6c286af155fbf
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 26 13:50:05 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Jan 26 19:55:32 2023 +0000
Use ImplInheritanceHelper in VCLXAccessibleCheckBox
Change-Id: I6cb7926db61590a356db7c55eeda94053dbf189f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146188
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
index 81e36cd42403..dc7b0d3c353e 100644
--- a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
+++ b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
@@ -24,17 +24,15 @@
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
-typedef ::cppu::ImplHelper2<
- css::accessibility::XAccessibleAction,
- css::accessibility::XAccessibleValue > VCLXAccessibleCheckBox_BASE;
-
-class VCLXAccessibleCheckBox final : public VCLXAccessibleTextComponent,
- public VCLXAccessibleCheckBox_BASE
+class VCLXAccessibleCheckBox final : public cppu::ImplInheritanceHelper<
+ VCLXAccessibleTextComponent,
+ css::accessibility::XAccessibleAction,
+ css::accessibility::XAccessibleValue>
{
private:
bool m_bChecked;
@@ -56,12 +54,6 @@ private:
public:
VCLXAccessibleCheckBox( VCLXWindow* pVCLXindow );
- // 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/vclxaccessiblecheckbox.cxx
b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
index 27da7e6bfbe5..8a0ea492911e 100644
--- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
@@ -46,7 +46,7 @@ using namespace ::comphelper;
VCLXAccessibleCheckBox::VCLXAccessibleCheckBox( VCLXWindow* pVCLWindow )
- :VCLXAccessibleTextComponent( pVCLWindow )
+ :ImplInheritanceHelper( pVCLWindow )
{
m_bChecked = IsChecked();
m_bIndeterminate = IsIndeterminate();
@@ -137,18 +137,6 @@ void VCLXAccessibleCheckBox::FillAccessibleStateSet(
sal_Int64& rStateSet )
}
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleCheckBox,
VCLXAccessibleTextComponent, VCLXAccessibleCheckBox_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleCheckBox,
VCLXAccessibleTextComponent, VCLXAccessibleCheckBox_BASE )
-
-
// XServiceInfo
commit 7c63d968bb0c4e1df25bc39e64574326cf83d4ec
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 26 13:46:58 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Jan 26 19:55:22 2023 +0000
Use ImplInheritanceHelper in VCLXAccessibleButton
Change-Id: Ia5c384e7ae4b78e008836fafc5433accd8489f07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146187
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/accessibility/inc/standard/vclxaccessiblebutton.hxx
b/accessibility/inc/standard/vclxaccessiblebutton.hxx
index 282e7ed7e817..460c90c67c41 100644
--- a/accessibility/inc/standard/vclxaccessiblebutton.hxx
+++ b/accessibility/inc/standard/vclxaccessiblebutton.hxx
@@ -24,17 +24,15 @@
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
-typedef ::cppu::ImplHelper2<
- css::accessibility::XAccessibleAction,
- css::accessibility::XAccessibleValue > VCLXAccessibleButton_BASE;
-
-class VCLXAccessibleButton final : public VCLXAccessibleTextComponent,
- public VCLXAccessibleButton_BASE
+class VCLXAccessibleButton final : public cppu::ImplInheritanceHelper<
+ VCLXAccessibleTextComponent,
+ css::accessibility::XAccessibleAction,
+ css::accessibility::XAccessibleValue>
{
virtual ~VCLXAccessibleButton() override = default;
@@ -42,13 +40,7 @@ class VCLXAccessibleButton final : public
VCLXAccessibleTextComponent,
virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override;
public:
- using VCLXAccessibleTextComponent::VCLXAccessibleTextComponent;
-
- // XInterface
- DECLARE_XINTERFACE()
-
- // XTypeProvider
- DECLARE_XTYPEPROVIDER()
+ VCLXAccessibleButton( VCLXWindow* pVCLXWindow ):
ImplInheritanceHelper(pVCLXWindow) {}
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx
b/accessibility/source/standard/vclxaccessiblebutton.cxx
index e73f56c74a22..52153a0c22b9 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -96,18 +96,6 @@ void VCLXAccessibleButton::FillAccessibleStateSet(
sal_Int64& rStateSet )
}
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleButton,
VCLXAccessibleTextComponent, VCLXAccessibleButton_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleButton,
VCLXAccessibleTextComponent, VCLXAccessibleButton_BASE )
-
-
// XServiceInfo
