accessibility/inc/standard/vclxaccessibleedit.hxx | 18 ++--------
accessibility/inc/standard/vclxaccessibletextcomponent.hxx | 18 ++--------
accessibility/source/standard/vclxaccessibleedit.cxx | 14 -------
accessibility/source/standard/vclxaccessibletextcomponent.cxx | 14 -------
4 files changed, 12 insertions(+), 52 deletions(-)
New commits:
commit fd92a175b5bbb5cb1e0a5188630d9872276a545a
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 26 12:12:23 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Jan 26 19:01:58 2023 +0000
Use ImplInheritanceHelper in VCLXAccessibleEdit
Change-Id: Ia81117c1819b4d3b5791a0d8ca66d79a26a3c9a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146184
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/accessibility/inc/standard/vclxaccessibleedit.hxx
b/accessibility/inc/standard/vclxaccessibleedit.hxx
index 267f71e19632..e10e8cecd6ff 100644
--- a/accessibility/inc/standard/vclxaccessibleedit.hxx
+++ b/accessibility/inc/standard/vclxaccessibleedit.hxx
@@ -24,17 +24,15 @@
#include <com/sun/star/accessibility/XAccessibleEditableText.hpp>
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
-typedef ::cppu::ImplHelper2<
- css::accessibility::XAccessibleAction,
- css::accessibility::XAccessibleEditableText > VCLXAccessibleEdit_BASE;
-
-class VCLXAccessibleEdit : public VCLXAccessibleTextComponent,
- public VCLXAccessibleEdit_BASE
+class VCLXAccessibleEdit : public cppu::ImplInheritanceHelper<
+ VCLXAccessibleTextComponent,
+ css::accessibility::XAccessibleAction,
+ css::accessibility::XAccessibleEditableText>
{
friend class VCLXAccessibleBox;
@@ -55,12 +53,6 @@ protected:
public:
VCLXAccessibleEdit( 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/vclxaccessibleedit.cxx
b/accessibility/source/standard/vclxaccessibleedit.cxx
index ea7c5c91b5bf..96a8d6986cf8 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -56,7 +56,7 @@ using namespace ::comphelper;
VCLXAccessibleEdit::VCLXAccessibleEdit( VCLXWindow* pVCLWindow )
- :VCLXAccessibleTextComponent( pVCLWindow )
+ :ImplInheritanceHelper( pVCLWindow )
{
m_nCaretPosition = getCaretPosition();
}
@@ -158,18 +158,6 @@ void VCLXAccessibleEdit::implGetSelection( sal_Int32&
nStartIndex, sal_Int32& nE
}
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleEdit,
VCLXAccessibleTextComponent, VCLXAccessibleEdit_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleEdit,
VCLXAccessibleTextComponent, VCLXAccessibleEdit_BASE )
-
-
// XServiceInfo
commit b50d9685e8bbb9549e68e3ff0a1b625fa44e6907
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 26 12:09:44 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Jan 26 19:01:45 2023 +0000
Use ImplInheritanceHelper in VCLXAccessibleTextComponent
Change-Id: Iad1ae727e31908949d61d32b3828a67ac74398e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146183
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
index 7bc47ac79679..cb2e20694663 100644
--- a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
+++ b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
@@ -22,17 +22,15 @@
#include <com/sun/star/accessibility/AccessibleScrollType.hpp>
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
#include <comphelper/accessibletexthelper.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
-typedef ::cppu::ImplHelper1 <
- css::accessibility::XAccessibleText > VCLXAccessibleTextComponent_BASE;
-
-class VCLXAccessibleTextComponent : public VCLXAccessibleComponent,
- public ::comphelper::OCommonAccessibleText,
- public VCLXAccessibleTextComponent_BASE
+class VCLXAccessibleTextComponent : public cppu::ImplInheritanceHelper<
+ VCLXAccessibleComponent,
+ css::accessibility::XAccessibleText>,
+ public ::comphelper::OCommonAccessibleText
{
OUString m_sText;
@@ -52,12 +50,6 @@ protected:
public:
VCLXAccessibleTextComponent( VCLXWindow* pVCLXWindow );
- // XInterface
- DECLARE_XINTERFACE()
-
- // XTypeProvider
- DECLARE_XTYPEPROVIDER()
-
// XAccessibleText
virtual sal_Int32 SAL_CALL getCaretPosition() override;
virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
index 8a406acb207d..ef3cbed4b1ec 100644
--- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
+++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
@@ -45,7 +45,7 @@ using namespace ::comphelper;
VCLXAccessibleTextComponent::VCLXAccessibleTextComponent( VCLXWindow*
pVCLXWindow )
- :VCLXAccessibleComponent( pVCLXWindow )
+ :ImplInheritanceHelper( pVCLXWindow )
{
VclPtr<vcl::Window> pWindow = GetWindow();
if ( pWindow )
@@ -118,18 +118,6 @@ void VCLXAccessibleTextComponent::disposing()
}
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleTextComponent,
VCLXAccessibleComponent, VCLXAccessibleTextComponent_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleTextComponent,
VCLXAccessibleComponent, VCLXAccessibleTextComponent_BASE )
-
-
// XAccessibleText
