diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-04-06 18:44:54 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-04-06 20:23:13 +0000 |
| commit | 403fa5ec2a9a3459f8e62aadf451626386fdd9dc (patch) | |
| tree | d534b03b75142ca2d7ec7c5b23a910a834419e27 /sw/inc/unoframe.hxx | |
| parent | 9f1ffa641b67a4359611bb62d147a9a1e09312cd (diff) | |
sw: use variadic cppu::WeakImplHelper
Change-Id: I2c03ffad8d935bad126c19a8647c924af5a9bce5
Reviewed-on: https://gerrit.libreoffice.org/15174
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw/inc/unoframe.hxx')
| -rw-r--r-- | sw/inc/unoframe.hxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index edea72c932d7..6434a34035fe 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -29,9 +29,7 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase3.hxx> -#include <cppuhelper/implbase6.hxx> +#include <cppuhelper/implbase.hxx> #include <sfx2/objsh.hxx> @@ -45,7 +43,7 @@ class SwFmt; class SwFlyFrmFmt; class BaseFrameProperties_Impl; -class SwXFrame : public cppu::WeakImplHelper6 +class SwXFrame : public cppu::WeakImplHelper < ::com::sun::star::lang::XServiceInfo, ::com::sun::star::beans::XPropertySet, @@ -158,7 +156,7 @@ public: static SW_DLLPUBLIC SdrObject *GetOrCreateSdrObject(SwFlyFrmFmt &rFmt); }; -typedef cppu::WeakImplHelper3 +typedef cppu::WeakImplHelper < ::com::sun::star::text::XTextFrame, ::com::sun::star::container::XEnumerationAccess, @@ -241,7 +239,7 @@ public: void SAL_CALL operator delete( void * ) throw(); }; -typedef cppu::WeakImplHelper2 +typedef cppu::WeakImplHelper < ::com::sun::star::text::XTextContent, ::com::sun::star::document::XEventsSupplier @@ -292,7 +290,7 @@ public: }; class SwOLENode; -typedef cppu::WeakImplHelper3 +typedef cppu::WeakImplHelper < ::com::sun::star::text::XTextContent, ::com::sun::star::document::XEmbeddedObjectSupplier2, @@ -351,7 +349,7 @@ public: void SAL_CALL operator delete( void * ) throw(); }; -class SwXOLEListener : public cppu::WeakImplHelper1 +class SwXOLEListener : public cppu::WeakImplHelper < ::com::sun::star::util::XModifyListener >, |