summaryrefslogtreecommitdiff
path: root/sfx2/source/notify
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2015-09-01 18:13:22 +0900
committerCaolán McNamara <caolanm@redhat.com>2015-09-03 08:14:03 +0000
commitd465e8273f1ee54450f0bf59c41bda93c54b3db4 (patch)
tree88d951bdce2d78df440e959a630f84a6940a2e70 /sfx2/source/notify
parent32b6f11132dec25212f6ed6df4c2aa2419ebb065 (diff)
sfx2: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants. Change-Id: Id9b4ad4d1fa700c5ea3dd7417292cf2ddb7ade50 Reviewed-on: https://gerrit.libreoffice.org/18229 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2/source/notify')
-rw-r--r--sfx2/source/notify/globalevents.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx
index 702f2de3b148..d1f4a474b78f 100644
--- a/sfx2/source/notify/globalevents.cxx
+++ b/sfx2/source/notify/globalevents.cxx
@@ -29,8 +29,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/Type.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ref.hxx>
@@ -57,7 +56,7 @@ public:
typedef ::std::vector< css::uno::Reference< css::frame::XModel > > TModelList;
class ModelCollectionEnumeration : public ModelCollectionMutexBase
- , public ::cppu::WeakImplHelper1< css::container::XEnumeration >
+ , public ::cppu::WeakImplHelper< css::container::XEnumeration >
{
private:
TModelList m_lModels;
@@ -81,7 +80,7 @@ public:
//TODO: remove support of obsolete document::XEventBroadcaster/Listener
class SfxGlobalEvents_Impl : public ModelCollectionMutexBase
- , public ::cppu::WeakImplHelper3< css::lang::XServiceInfo
+ , public ::cppu::WeakImplHelper< css::lang::XServiceInfo
, css::frame::XGlobalEventBroadcaster
, css::document::XEventListener
>