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/unocoll.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/unocoll.hxx')
| -rw-r--r-- | sw/inc/unocoll.hxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx index ee43c986588d..bb3cd7ca0ffc 100644 --- a/sw/inc/unocoll.hxx +++ b/sw/inc/unocoll.hxx @@ -25,10 +25,7 @@ #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase3.hxx> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> #include <IMark.hxx> #include <unobaseclass.hxx> #include "swdllapi.h" @@ -260,7 +257,7 @@ public: }; typedef -cppu::WeakImplHelper3 +cppu::WeakImplHelper < ::com::sun::star::container::XNameAccess, ::com::sun::star::container::XIndexAccess, @@ -297,7 +294,7 @@ public: }; typedef -cppu::WeakImplHelper4 +cppu::WeakImplHelper < ::com::sun::star::container::XEnumerationAccess, ::com::sun::star::container::XNameAccess, @@ -438,7 +435,7 @@ class SwXBookmarks : public SwCollectionBaseClass, }; -class SwXNumberingRulesCollection : public cppu::WeakImplHelper1 +class SwXNumberingRulesCollection : public cppu::WeakImplHelper < ::com::sun::star::container::XIndexAccess >, @@ -460,7 +457,7 @@ public: }; typedef -cppu::WeakImplHelper2 +cppu::WeakImplHelper < ::com::sun::star::container::XIndexAccess, ::com::sun::star::lang::XServiceInfo |