sw/inc/unodraw.hxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 30af50006fd31076ea2fccd1a842038e203f15c6
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Jan 20 13:37:40 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Jan 20 14:36:57 2023 +0000
Base SwXShapeBaseClass on WeakImplHelper
...rather than on the deprecated WeakAggImplHelper6.
The two classes SwXShape and SwXGroupShape, both deriving from
SwXShapeBaseClass, had been found to implement their respective
queryInterface
in a way that is incompatible with the XAggregation protocol inherited via
WeakAggImplHelper6. It looks like no code actually made use of the
XAggregation
offered by this class hierarchy, so the easiest fix for those queryInterface
implementations appears to switch from WeakAggImplHelper6 to WeakImplHelper
(thereby dropping XAggregation, and thus rendering the existing
queryInterface
implementations OK).
Change-Id: I47dd177db7f3ddbd53482c3b4c194b6e7f15f69c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145892
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 947d3817cded..0c926e28e16b 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -30,8 +30,8 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase6.hxx>
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/drawing/HomogenMatrix3.hpp>
@@ -104,7 +104,7 @@ public:
class SwShapeDescriptor_Impl;
typedef
-cppu::WeakAggImplHelper6
+cppu::WeakImplHelper
<
css::beans::XPropertySet,
css::beans::XPropertyState,
