diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-08-04 17:52:31 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-06 08:14:23 +0000 |
| commit | 975875d53a8afa7ae2df944f7a584870c663bc6a (patch) | |
| tree | b75252bae121d6604edef4d017714f2dcac8fa86 /extensions/source/resource | |
| parent | c268bfd4715186bf0623fdd757de7bf68298f3c3 (diff) | |
tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants in extensions.
Change-Id: I45e9dc5769150181df88791b3f748002ca713c02
Reviewed-on: https://gerrit.libreoffice.org/17517
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'extensions/source/resource')
4 files changed, 8 insertions, 7 deletions
diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx index 77cdc21d5e6d..9b47ae23fb30 100644 --- a/extensions/source/resource/ResourceIndexAccess.cxx +++ b/extensions/source/resource/ResourceIndexAccess.cxx @@ -11,6 +11,7 @@ #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/beans/PropertyValue.hpp> +#include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> #include <tools/rcid.h> #include <tools/resary.hxx> @@ -36,7 +37,7 @@ namespace return ::boost::shared_ptr<ResMgr>(ResMgr::CreateResMgr(sEncName.getStr())); } - class ResourceIndexAccessBase : public cppu::WeakImplHelper1< ::com::sun::star::container::XIndexAccess> + class ResourceIndexAccessBase : public cppu::WeakImplHelper< ::com::sun::star::container::XIndexAccess> { public: ResourceIndexAccessBase( ::boost::shared_ptr<ResMgr> pResMgr) diff --git a/extensions/source/resource/ResourceIndexAccess.hxx b/extensions/source/resource/ResourceIndexAccess.hxx index 9a837cb0d1c1..596c0afd390d 100644 --- a/extensions/source/resource/ResourceIndexAccess.hxx +++ b/extensions/source/resource/ResourceIndexAccess.hxx @@ -16,7 +16,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/XInterface.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; @@ -26,7 +26,7 @@ class ResMgr; namespace extensions { namespace resource { /** This class provides access to tools library text resources */ - class ResourceIndexAccess : public cppu::WeakImplHelper1< ::com::sun::star::container::XNameAccess> + class ResourceIndexAccess : public cppu::WeakImplHelper< ::com::sun::star::container::XNameAccess> { public: /** The ctor takes a sequence with one element: the name of the resource, e.g. svt */ diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx index 1db99c6a2918..edba15919be8 100644 --- a/extensions/source/resource/oooresourceloader.cxx +++ b/extensions/source/resource/oooresourceloader.cxx @@ -23,7 +23,7 @@ #include <vcl/settings.hxx> #include <tools/simplerm.hxx> #include <tools/rcid.h> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> #include <boost/shared_ptr.hpp> @@ -89,7 +89,7 @@ namespace extensions { namespace resource return aResource; } - typedef ::cppu::WeakImplHelper1 < XResourceBundle + typedef ::cppu::WeakImplHelper < XResourceBundle > OpenOfficeResourceBundle_Base; class OpenOfficeResourceBundle : public OpenOfficeResourceBundle_Base { diff --git a/extensions/source/resource/oooresourceloader.hxx b/extensions/source/resource/oooresourceloader.hxx index 99350c779fcc..cdb131b88f26 100644 --- a/extensions/source/resource/oooresourceloader.hxx +++ b/extensions/source/resource/oooresourceloader.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/resource/XResourceBundleLoader.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <functional> #include <map> @@ -49,7 +49,7 @@ namespace extensions { namespace resource } }; - class OpenOfficeResourceLoader : public ::cppu::WeakImplHelper1< ::com::sun::star::resource::XResourceBundleLoader> + class OpenOfficeResourceLoader : public ::cppu::WeakImplHelper< ::com::sun::star::resource::XResourceBundleLoader> { public: typedef ::std::map< |