diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-08-25 16:10:12 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-26 06:35:34 +0000 |
| commit | 5ba6aafa20f78c6209c91a399a8110a415a274e1 (patch) | |
| tree | c850fbb2ea02060abd918ba2d6b8e88041fa30cc /package/source/manifest | |
| parent | 9a050db847b465d12606c1e52657e05ef95fc2a4 (diff) | |
package: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: If88e1d741075e86997c91dc2c59eeebe45f67c1f
Reviewed-on: https://gerrit.libreoffice.org/17980
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'package/source/manifest')
| -rw-r--r-- | package/source/manifest/ManifestImport.hxx | 4 | ||||
| -rw-r--r-- | package/source/manifest/ManifestReader.hxx | 4 | ||||
| -rw-r--r-- | package/source/manifest/ManifestWriter.hxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx index 7bebfb1f13f1..59a272ba611a 100644 --- a/package/source/manifest/ManifestImport.hxx +++ b/package/source/manifest/ManifestImport.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_PACKAGE_SOURCE_MANIFEST_MANIFESTIMPORT_HXX #define INCLUDED_PACKAGE_SOURCE_MANIFEST_MANIFESTIMPORT_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <vector> @@ -51,7 +51,7 @@ struct ManifestScopeEntry typedef ::std::vector< ManifestScopeEntry > ManifestStack; -class ManifestImport : public cppu::WeakImplHelper1 < com::sun::star::xml::sax::XDocumentHandler > +class ManifestImport : public cppu::WeakImplHelper < com::sun::star::xml::sax::XDocumentHandler > { protected: std::vector< com::sun::star::beans::PropertyValue > aSequence; diff --git a/package/source/manifest/ManifestReader.hxx b/package/source/manifest/ManifestReader.hxx index 38c6af817363..7242f7fc2d69 100644 --- a/package/source/manifest/ManifestReader.hxx +++ b/package/source/manifest/ManifestReader.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_PACKAGE_SOURCE_MANIFEST_MANIFESTREADER_HXX #define INCLUDED_PACKAGE_SOURCE_MANIFEST_MANIFESTREADER_HXX -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/packages/manifest/XManifestReader.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -class ManifestReader: public ::cppu::WeakImplHelper2 +class ManifestReader: public ::cppu::WeakImplHelper < ::com::sun::star::packages::manifest::XManifestReader, ::com::sun::star::lang::XServiceInfo diff --git a/package/source/manifest/ManifestWriter.hxx b/package/source/manifest/ManifestWriter.hxx index c73fae6dcff1..7bdba65fdec2 100644 --- a/package/source/manifest/ManifestWriter.hxx +++ b/package/source/manifest/ManifestWriter.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_PACKAGE_SOURCE_MANIFEST_MANIFESTWRITER_HXX #define INCLUDED_PACKAGE_SOURCE_MANIFEST_MANIFESTWRITER_HXX -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/packages/manifest/XManifestWriter.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -class ManifestWriter: public ::cppu::WeakImplHelper2 +class ManifestWriter: public ::cppu::WeakImplHelper < ::com::sun::star::packages::manifest::XManifestWriter, ::com::sun::star::lang::XServiceInfo |