svx/source/table/tablecolumn.hxx | 4 ++--
svx/source/table/tablerow.hxx | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 53a809ac9caca22062d33ce97c25d0a8a9b84c47
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Jan 20 09:39:11 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Jan 20 10:14:13 2023 +0000
Fix TableColumn/-Row queryAggregation
The base FastPropertySet uses WeakAggImplHelper3, so (for better or worse)
derives from XAggregation, but SbaXGridControl failed to properly implement
the
XAggregation protocol.
Change-Id: I31378f13256b1fa20775890b206f455d782ea864
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145868
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx
index 9f24cb1822cb..7e7b19fb0dfd 100644
--- a/svx/source/table/tablecolumn.hxx
+++ b/svx/source/table/tablecolumn.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/container/XNamed.hpp>
-#include <cppuhelper/implbase.hxx>
+#include <cppuhelper/implbase2.hxx>
#include "propertyset.hxx"
#include <celltypes.hxx>
@@ -30,7 +30,7 @@
namespace sdr::table {
-typedef ::cppu::ImplInheritanceHelper< FastPropertySet,
css::table::XCellRange, css::container::XNamed > TableColumnBase;
+typedef ::cppu::AggImplInheritanceHelper2< 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 59c67b60989a..1a70ab44b280 100644
--- a/svx/source/table/tablerow.hxx
+++ b/svx/source/table/tablerow.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/container/XNamed.hpp>
-#include <cppuhelper/implbase.hxx>
+#include <cppuhelper/implbase2.hxx>
#include "propertyset.hxx"
#include <celltypes.hxx>
@@ -30,7 +30,7 @@
namespace sdr::table {
-typedef ::cppu::ImplInheritanceHelper< FastPropertySet,
css::table::XCellRange, css::container::XNamed > TableRowBase;
+typedef ::cppu::AggImplInheritanceHelper2< FastPropertySet,
css::table::XCellRange, css::container::XNamed > TableRowBase;
class TableRow : public TableRowBase
{
