diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-07-10 17:50:12 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-20 07:06:22 +0000 |
| commit | a890a7696ff5dfc3ec8a012ba59cc04db4a1473d (patch) | |
| tree | 9e0d23aadb43f2bbdf3bac2db8aff76307bda5fc /comphelper/source/eventattachermgr/eventattachermgr.cxx | |
| parent | 3f0677b86f4831b011a2baece85cf93c68646cd5 (diff) | |
tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants, for comphelper.
This also includes extra changes in other modules
required accordingly.
Change-Id: Id1537f46f1c90f760a0d8987a6dafa0e1da03b8f
Reviewed-on: https://gerrit.libreoffice.org/16929
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'comphelper/source/eventattachermgr/eventattachermgr.cxx')
| -rw-r--r-- | comphelper/source/eventattachermgr/eventattachermgr.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index 5074a577b185..19e534ce75fb 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -40,8 +40,7 @@ #include <com/sun/star/script/XScriptListener.hpp> #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <deque> #include <algorithm> @@ -76,7 +75,7 @@ struct AttacherIndex_Impl class ImplEventAttacherManager - : public WeakImplHelper2< XEventAttacherManager, XPersistObject > + : public WeakImplHelper< XEventAttacherManager, XPersistObject > { friend class AttacherAllListener_Impl; ::std::deque< AttacherIndex_Impl > aIndex; @@ -143,7 +142,7 @@ private: // Implementation of an EventAttacher-subclass 'AllListeners', which // only passes individual events of the general AllListeners. -class AttacherAllListener_Impl : public WeakImplHelper1< XAllListener > +class AttacherAllListener_Impl : public WeakImplHelper< XAllListener > { ImplEventAttacherManager* mpManager; Reference< XEventAttacherManager > xManager; |