From 0c6087df82e2705db718548b0b230e7b415b75e6 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri, 8 Sep 2023 14:58:42 +0200
Subject: [PATCH] FastPropertySet does not need to implement XAggreggation

Checked on jenkins using 'make check' and

+void SAL_CALL setDelegator(css::uno::Reference<css::uno::XInterface> const &) final { assert(false); }

Change-Id: I6ec236f317d4da7559422a82acdc8d1b2ae8a44e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156723
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 svx/source/table/propertyset.hxx | 8 +++-----
 svx/source/table/tablecolumn.hxx | 2 +-
 svx/source/table/tablerow.hxx    | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx
index bb2bb103a317..0ce3cf59bdbe 100644
--- a/svx/source/table/propertyset.hxx
+++ b/svx/source/table/propertyset.hxx
@@ -23,19 +23,17 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 #include <unordered_map>
 #include <vector>
 
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
-
 namespace sdr::table {
 
 typedef std::vector< css::beans::Property > PropertyVector;
 typedef std::unordered_map< OUString, ::sal_uInt32 > PropertyMap;
 
-class FastPropertySetInfo : public ::cppu::WeakAggImplHelper1< css::beans::XPropertySetInfo >
+class FastPropertySetInfo : public ::cppu::WeakImplHelper< css::beans::XPropertySetInfo >
 {
 public:
     explicit FastPropertySetInfo( const PropertyVector& rProps );
@@ -58,7 +56,7 @@ private:
 };
 
 
-class FastPropertySet : public ::cppu::WeakAggImplHelper3<  css::beans::XPropertySet, css::beans::XMultiPropertySet, css::beans::XFastPropertySet >
+class FastPropertySet : public ::cppu::WeakImplHelper<  css::beans::XPropertySet, css::beans::XMultiPropertySet, css::beans::XFastPropertySet >
 {
 public:
     explicit FastPropertySet( rtl::Reference< FastPropertySetInfo > xInfo );
diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx
index 7e7b19fb0dfd..52134e079e27 100644
--- a/svx/source/table/tablecolumn.hxx
+++ b/svx/source/table/tablecolumn.hxx
@@ -30,7 +30,7 @@
 
 namespace sdr::table {
 
-typedef ::cppu::AggImplInheritanceHelper2< FastPropertySet, css::table::XCellRange, css::container::XNamed > TableColumnBase;
+typedef ::cppu::ImplInheritanceHelper2< FastPropertySet, css::table::XCellRange, css::container::XNamed > TableColumnBase;
 
 class TableColumn : public TableColumnBase
 {
diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx
index 1a70ab44b280..797312c810f6 100644
--- a/svx/source/table/tablerow.hxx
+++ b/svx/source/table/tablerow.hxx
@@ -30,7 +30,7 @@
 
 namespace sdr::table {
 
-typedef ::cppu::AggImplInheritanceHelper2< FastPropertySet, css::table::XCellRange, css::container::XNamed > TableRowBase;
+typedef ::cppu::ImplInheritanceHelper2< FastPropertySet, css::table::XCellRange, css::container::XNamed > TableRowBase;
 
 class TableRow : public TableRowBase
 {