include/editeng/unonrule.hxx | 4 ++-- xmloff/source/forms/gridcolumnproptranslator.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 67e0e7f57c37162ce5a8f888094c46a8267c1cc3 Author: Noel Grandin <noelgran...@gmail.com> AuthorDate: Sat Sep 9 13:58:19 2023 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Sun Sep 10 13:16:24 2023 +0200 OMergedPropertySetInfo 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: I8623da7e9962df1dbb09327933fccbddd82a4562 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156773 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx index af52a89602b4..bd14f77ecd97 100644 --- a/xmloff/source/forms/gridcolumnproptranslator.cxx +++ b/xmloff/source/forms/gridcolumnproptranslator.cxx @@ -23,7 +23,7 @@ #include <com/sun/star/awt/TextAlign.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> #include <osl/diagnose.h> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <algorithm> @@ -111,7 +111,7 @@ namespace xmloff } //= OMergedPropertySetInfo - typedef ::cppu::WeakAggImplHelper1 < XPropertySetInfo + typedef ::cppu::WeakImplHelper < XPropertySetInfo > OMergedPropertySetInfo_Base; class OMergedPropertySetInfo : public OMergedPropertySetInfo_Base { commit d3ad7b534774f3cbef9d400170fefedccfe70b60 Author: Noel Grandin <noelgran...@gmail.com> AuthorDate: Sat Sep 9 13:51:17 2023 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Sun Sep 10 13:16:12 2023 +0200 SvxUnoNumberingRules 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: Ifc02ca4c3173f593912a6d40d55922ff737b2b99 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156770 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/include/editeng/unonrule.hxx b/include/editeng/unonrule.hxx index 3e793877907d..52650dd33940 100644 --- a/include/editeng/unonrule.hxx +++ b/include/editeng/unonrule.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/ucb/XAnyCompare.hpp> #include <editeng/editengdllapi.h> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <editeng/numitem.hxx> @@ -36,7 +36,7 @@ css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule(); const SvxNumRule& SvxGetNumRule( css::uno::Reference< css::container::XIndexReplace > const & xRule ); EDITENG_DLLPUBLIC css::uno::Reference< css::ucb::XAnyCompare > SvxCreateNumRuleCompare() noexcept; -class SvxUnoNumberingRules final : public ::cppu::WeakAggImplHelper4< css::container::XIndexReplace, css::ucb::XAnyCompare, +class SvxUnoNumberingRules final : public ::cppu::WeakImplHelper< css::container::XIndexReplace, css::ucb::XAnyCompare, css::util::XCloneable, css::lang::XServiceInfo > { private: