accessibility/inc/extended/accessibleiconchoicectrl.hxx | 18 ++++---------
accessibility/inc/extended/accessiblelistbox.hxx | 14 ++--------
accessibility/source/extended/accessibleiconchoicectrl.cxx | 8 +----
accessibility/source/extended/accessiblelistbox.cxx | 4 --
4 files changed, 13 insertions(+), 31 deletions(-)
New commits:
commit 7af63ddd93265f6d66aeaa103ba0c5810ea1b158
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Jan 23 15:58:18 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jan 25 18:55:36 2023 +0000
Use ImplInheritanceHelper in AccessibleListBox
Change-Id: I7fd3c43a991300a6180094ef9ac44e0dc3c56764
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146112
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/accessibility/inc/extended/accessiblelistbox.hxx
b/accessibility/inc/extended/accessiblelistbox.hxx
index 339e32f3b0b7..ffb03ad6bd9f 100644
--- a/accessibility/inc/extended/accessiblelistbox.hxx
+++ b/accessibility/inc/extended/accessiblelistbox.hxx
@@ -20,7 +20,7 @@
#pragma once
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vcl/vclevent.hxx>
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
@@ -38,10 +38,10 @@ namespace accessibility
/** the class OAccessibleListBoxEntry represents the base class for an
accessible object of a listbox entry
*/
class AccessibleListBox :
- public cppu::ImplHelper2<
+ public cppu::ImplInheritanceHelper<
+ VCLXAccessibleComponent,
css::accessibility::XAccessible,
- css::accessibility::XAccessibleSelection>,
- public VCLXAccessibleComponent
+ css::accessibility::XAccessibleSelection>
{
css::uno::Reference< css::accessibility::XAccessible > m_xParent;
@@ -76,12 +76,6 @@ namespace accessibility
rtl::Reference<AccessibleListBoxEntry>
implGetAccessible(SvTreeListEntry & rEntry);
- // XTypeProvider
- DECLARE_XTYPEPROVIDER()
-
- // XInterface
- DECLARE_XINTERFACE()
-
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName
) override;
diff --git a/accessibility/source/extended/accessiblelistbox.cxx
b/accessibility/source/extended/accessiblelistbox.cxx
index d9507fefd4b3..5561fa232dfc 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -45,7 +45,7 @@ namespace accessibility
AccessibleListBox::AccessibleListBox( SvTreeListBox const & _rListBox,
const Reference< XAccessible >& _xParent ) :
- VCLXAccessibleComponent( _rListBox.GetWindowPeer() ),
+ ImplInheritanceHelper( _rListBox.GetWindowPeer() ),
m_xParent( _xParent )
{
}
@@ -59,8 +59,6 @@ namespace accessibility
dispose();
}
}
- IMPLEMENT_FORWARD_XINTERFACE2(AccessibleListBox, VCLXAccessibleComponent,
ImplHelper2)
- IMPLEMENT_FORWARD_XTYPEPROVIDER2(AccessibleListBox,
VCLXAccessibleComponent, ImplHelper2)
void AccessibleListBox::ProcessWindowEvent( const VclWindowEvent&
rVclWindowEvent )
{
commit 4bde82182c82bdc3d6bc0f4851a5e100fba47c30
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Jan 23 15:58:12 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jan 25 18:55:21 2023 +0000
Use ImplInheritanceHelper in AccessibleIconChoiceCtrl
Change-Id: Id5dec3b807509a073fcd2383ec37d2712cf24e9d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146111
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/accessibility/inc/extended/accessibleiconchoicectrl.hxx
b/accessibility/inc/extended/accessibleiconchoicectrl.hxx
index cd27fcb7da3f..5ead84ee3466 100644
--- a/accessibility/inc/extended/accessibleiconchoicectrl.hxx
+++ b/accessibility/inc/extended/accessibleiconchoicectrl.hxx
@@ -20,7 +20,7 @@
#pragma once
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vcl/vclevent.hxx>
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
@@ -30,13 +30,13 @@ class SvtIconChoiceCtrl;
namespace accessibility
{
- typedef ::cppu::ImplHelper2< css::accessibility::XAccessible
- , css::accessibility::XAccessibleSelection>
AccessibleIconChoiceCtrl_BASE;
-
/** the class OAccessibleListBoxEntry represents the base class for an
accessible object of a listbox entry
*/
- class AccessibleIconChoiceCtrl final : public AccessibleIconChoiceCtrl_BASE
- ,public VCLXAccessibleComponent
+ class AccessibleIconChoiceCtrl final :
+ public cppu::ImplInheritanceHelper<
+ VCLXAccessibleComponent,
+ css::accessibility::XAccessible,
+ css::accessibility::XAccessibleSelection>
{
css::uno::Reference< css::accessibility::XAccessible > m_xParent;
@@ -60,12 +60,6 @@ namespace accessibility
AccessibleIconChoiceCtrl( SvtIconChoiceCtrl const & _rIconCtrl,
const css::uno::Reference<
css::accessibility::XAccessible >& _xParent );
- // XTypeProvider
- DECLARE_XTYPEPROVIDER()
-
- // XInterface
- DECLARE_XINTERFACE()
-
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName
) override;
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx
b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index 18835b50b95d..1d0dbbe68a7d 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -43,14 +43,11 @@ namespace accessibility
// Ctor() and Dtor()
AccessibleIconChoiceCtrl::AccessibleIconChoiceCtrl( SvtIconChoiceCtrl
const & _rIconCtrl, const Reference< XAccessible >& _xParent ) :
- VCLXAccessibleComponent( _rIconCtrl.GetWindowPeer() ),
+ ImplInheritanceHelper( _rIconCtrl.GetWindowPeer() ),
m_xParent ( _xParent )
{
}
- IMPLEMENT_FORWARD_XINTERFACE2(AccessibleIconChoiceCtrl,
VCLXAccessibleComponent, AccessibleIconChoiceCtrl_BASE)
- IMPLEMENT_FORWARD_XTYPEPROVIDER2(AccessibleIconChoiceCtrl,
VCLXAccessibleComponent, AccessibleIconChoiceCtrl_BASE)
-
void AccessibleIconChoiceCtrl::ProcessWindowEvent( const VclWindowEvent&
rVclWindowEvent )
{
if ( !isAlive() )
@@ -167,8 +164,7 @@ namespace accessibility
if ( !pEntry )
throw RuntimeException("getAccessibleChild: Entry "
+ OUString::number(i) + " not found",
- static_cast<css::lang::XTypeProvider*>(
- static_cast<VCLXAccessibleComponent*>(this)));
+ static_cast<OWeakObject*>(this));
return new AccessibleIconChoiceCtrlEntry( *pCtrl, i, this );
}
