[Libreoffice-commits] core.git: toolkit/source

[Noel Grandin (via logerrit)]

 toolkit/source/controls/tree/treedatamodel.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d9ecb98b3060dfc7f6291391792d1a3d73a282ba
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Sep 8 15:02:15 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Sep 10 16:11:09 2023 +0200

    MutableTreeDataModel 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: I81b0c46be19bfafb220f0ae908eedfd9c5b20b71
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156726
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/toolkit/source/controls/tree/treedatamodel.cxx 
b/toolkit/source/controls/tree/treedatamodel.cxx
index d2590a361ef7..970f59416f3a 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <o3tl/safeint.hxx>
 #include <rtl/ref.hxx>
@@ -45,7 +45,7 @@ class MutableTreeDataModel;
 
 typedef std::vector< rtl::Reference< MutableTreeNode > > TreeNodeVector;
 
-class MutableTreeDataModel : public ::cppu::WeakAggImplHelper2< 
XMutableTreeDataModel, XServiceInfo >
+class MutableTreeDataModel : public ::cppu::WeakImplHelper< 
XMutableTreeDataModel, XServiceInfo >
 {
 public:
     MutableTreeDataModel();
@@ -81,7 +81,7 @@ private:
     Reference< XTreeNode > mxRootNode;
 };
 
-class MutableTreeNode: public ::cppu::WeakAggImplHelper2< XMutableTreeNode, 
XServiceInfo >
+class MutableTreeNode: public ::cppu::WeakImplHelper< XMutableTreeNode, 
XServiceInfo >
 {
     friend class MutableTreeDataModel;