comphelper/source/property/opropertybag.hxx | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 925dfcb507c4054e00e5aa9acdbfa095b6a32d05
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 19 14:10:22 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Jan 19 15:00:56 2023 +0000
Base OPropertyBag on WeakImplHelper
...rather than on the deprecated WeakAggImplHellper5
Change-Id: Id9e61341cba10c4a497500d41479629ff3af30ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145790
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/comphelper/source/property/opropertybag.hxx
b/comphelper/source/property/opropertybag.hxx
index 28333901c2e3..66c38d870c10 100644
--- a/comphelper/source/property/opropertybag.hxx
+++ b/comphelper/source/property/opropertybag.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/beans/XPropertyBag.hpp>
#include <com/sun/star/container/XSet.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/interfacecontainer3.hxx>
#include <comphelper/propstate.hxx>
#include <comphelper/broadcasthelper.hxx>
@@ -55,12 +55,12 @@ namespace comphelper
typedef std::map< sal_Int32, css::uno::Any > MapInt2Any;
typedef std::set< css::uno::Type, UnoTypeLess > TypeBag;
- typedef ::cppu::WeakAggImplHelper5 < css::beans::XPropertyBag
- , css::util::XModifiable
- , css::lang::XServiceInfo
- , css::lang::XInitialization
- , css::container::XSet
- > OPropertyBag_Base;
+ typedef ::cppu::WeakImplHelper < css::beans::XPropertyBag
+ , css::util::XModifiable
+ , css::lang::XServiceInfo
+ , css::lang::XInitialization
+ , css::container::XSet
+ > OPropertyBag_Base;
typedef ::comphelper::OPropertyStateHelper OPropertyBag_PBase;
class OPropertyBag final : public ::comphelper::OMutexAndBroadcastHelper
// must be before OPropertyBag_PBase
