accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx | 18 ++-------
accessibility/inc/standard/vclxaccessiblelist.hxx | 19 ++--------
accessibility/source/standard/vclxaccessibleheaderbaritem.cxx | 12 ------
accessibility/source/standard/vclxaccessiblelist.cxx | 6 ---
4 files changed, 11 insertions(+), 44 deletions(-)
New commits:
commit 4986d195c3100655ec2770e8f9d2e2c642d9b371
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 26 13:53:45 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Jan 26 19:55:55 2023 +0000
Use ImplInheritanceHelper in VCLXAccessibleList
Change-Id: I2412ef089b5b299b131916d21afa5c5d4fd74c39
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146190
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx
b/accessibility/inc/standard/vclxaccessiblelist.hxx
index 74f6d5755d17..bab8b649fa07 100644
--- a/accessibility/inc/standard/vclxaccessiblelist.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelist.hxx
@@ -22,14 +22,9 @@
#include <memory>
#include <vector>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
-typedef ::cppu::ImplHelper2<
- css::accessibility::XAccessible,
- css::accessibility::XAccessibleSelection
- > VCLXAccessibleList_BASE;
-
typedef std::vector< css::uno::WeakReference< css::accessibility::XAccessible
> >
ListItems;
@@ -45,8 +40,10 @@ namespace accessibility
classes for selection.
*/
class VCLXAccessibleList final
- : public VCLXAccessibleComponent,
- public VCLXAccessibleList_BASE
+ : public cppu::ImplInheritanceHelper<
+ VCLXAccessibleComponent,
+ css::accessibility::XAccessible,
+ css::accessibility::XAccessibleSelection>
{
public:
enum BoxType {COMBOBOX, LISTBOX};
@@ -76,12 +73,6 @@ public:
*/
void UpdateSelection (std::u16string_view sTextOfSelectedItem);
- // XInterface
- DECLARE_XINTERFACE()
-
- // XTypeProvider
- DECLARE_XTYPEPROVIDER()
-
// XAccessible
virtual css::uno::Reference< css::accessibility::XAccessibleContext>
SAL_CALL
getAccessibleContext() override;
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx
b/accessibility/source/standard/vclxaccessiblelist.cxx
index 66cb69f97ebf..c38240e3b4e7 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -54,7 +54,7 @@ namespace
VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType
aBoxType,
const Reference< XAccessible >&
_xParent)
- : VCLXAccessibleComponent (pVCLWindow),
+ : ImplInheritanceHelper (pVCLWindow),
m_aBoxType (aBoxType),
m_nVisibleLineCount (0),
m_nIndexInParent (DEFAULT_INDEX_IN_PARENT),
@@ -505,10 +505,6 @@ void VCLXAccessibleList::HandleChangedItemList()
Any(), Any());
}
-
-IMPLEMENT_FORWARD_XINTERFACE2(VCLXAccessibleList, VCLXAccessibleComponent,
VCLXAccessibleList_BASE)
-IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleList, VCLXAccessibleComponent,
VCLXAccessibleList_BASE)
-
// XAccessible
Reference<XAccessibleContext> SAL_CALL
commit 57f103f15895ecd6e1882652206add0c1ed6a3c9
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 26 13:52:04 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Jan 26 19:55:47 2023 +0000
Use ImplInheritanceHelper in VCLXAccessibleHeaderBarItem
Change-Id: I18b54a3cd689aaf4870c073db8d76d41661a05c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146189
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
index e78950bded6f..563e86ff5252 100644
--- a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
+++ b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
@@ -21,7 +21,7 @@
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/accessiblecomponenthelper.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vcl/vclptr.hxx>
@@ -34,12 +34,10 @@ class VclWindowEvent;
// class VCLXAccessibleHeaderBarItem
// ----------------------------------------------------
-typedef ::cppu::ImplHelper2<
- css::accessibility::XAccessible,
- css::lang::XServiceInfo > VCLXAccessibleHeaderBarItem_BASE;
-
-class VCLXAccessibleHeaderBarItem final : public
comphelper::OAccessibleExtendedComponentHelper,
- public VCLXAccessibleHeaderBarItem_BASE
+class VCLXAccessibleHeaderBarItem final : public cppu::ImplInheritanceHelper<
+
comphelper::OAccessibleExtendedComponentHelper,
+ css::accessibility::XAccessible,
+ css::lang::XServiceInfo>
{
private:
VclPtr<HeaderBar> m_pHeadBar;
@@ -54,12 +52,6 @@ public:
VCLXAccessibleHeaderBarItem( HeaderBar* pHeadBar, sal_Int32
_nIndexInParent );
virtual ~VCLXAccessibleHeaderBarItem() override;
- // 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/vclxaccessibleheaderbaritem.cxx
b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
index be077d822e53..d3463f5cdae7 100644
--- a/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
@@ -81,18 +81,6 @@ awt::Rectangle VCLXAccessibleHeaderBarItem::implGetBounds()
}
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleHeaderBarItem,
OAccessibleExtendedComponentHelper, VCLXAccessibleHeaderBarItem_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleHeaderBarItem,
OAccessibleExtendedComponentHelper, VCLXAccessibleHeaderBarItem_BASE )
-
-
// XServiceInfo
OUString VCLXAccessibleHeaderBarItem::getImplementationName()
{
