sw/inc/unosett.hxx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
New commits: commit 43ad56252d788dd1e7f4a14d07662e5b1854adee Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Fri Sep 8 15:01:24 2023 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Sat Sep 9 11:54:05 2023 +0200 SwXFootnoteProperties 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); } WIP SwXFootnoteProperties Change-Id: Id1e1a0195e770bcbcebd9b55355de230c8641547 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156725 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx index 590046b97412..7cc4794e8dff 100644 --- a/sw/inc/unosett.hxx +++ b/sw/inc/unosett.hxx @@ -29,8 +29,7 @@ #include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNamed.hpp> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> #include "unobaseclass.hxx" class SwDoc; @@ -41,7 +40,7 @@ class SwNumFormat; class SfxItemPropertySet; namespace com::sun::star::beans { struct PropertyValue; } -class SwXFootnoteProperties final : public cppu::WeakAggImplHelper2 +class SwXFootnoteProperties final : public cppu::WeakImplHelper < css::beans::XPropertySet, css::lang::XServiceInfo @@ -71,7 +70,7 @@ public: void Invalidate() {m_pDoc = nullptr;} }; -class SwXEndnoteProperties final : public cppu::WeakAggImplHelper2 +class SwXEndnoteProperties final : public cppu::WeakImplHelper < css::beans::XPropertySet, css::lang::XServiceInfo @@ -101,7 +100,7 @@ public: void Invalidate() {m_pDoc = nullptr;} }; -class SwXLineNumberingProperties final : public cppu::WeakAggImplHelper2 +class SwXLineNumberingProperties final : public cppu::WeakImplHelper < css::beans::XPropertySet, css::lang::XServiceInfo @@ -131,7 +130,7 @@ public: void Invalidate() {m_pDoc = nullptr;} }; -class SwXNumberingRules : public cppu::WeakAggImplHelper4 +class SwXNumberingRules : public cppu::WeakImplHelper < css::container::XIndexReplace, css::beans::XPropertySet,