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/zippackage | |
| 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/zippackage')
4 files changed, 9 insertions, 9 deletions
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 1f2747b160ae..eae3fa4dd84f 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -58,7 +58,7 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/xml/crypto/DigestID.hpp> #include <com/sun/star/xml/crypto/CipherID.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <ContentInfo.hxx> #include <cppuhelper/typeprovider.hxx> #include <rtl/uri.hxx> @@ -104,7 +104,7 @@ using namespace com::sun::star::packages::zip::ZipConstants; #define THROW_WHERE "" #endif -class ActiveDataStreamer : public ::cppu::WeakImplHelper1< XActiveDataStreamer > +class ActiveDataStreamer : public ::cppu::WeakImplHelper< XActiveDataStreamer > { uno::Reference< XStream > mStream; public: @@ -118,7 +118,7 @@ public: { mStream = stream; } }; -class DummyInputStream : public ::cppu::WeakImplHelper1< XInputStream > +class DummyInputStream : public ::cppu::WeakImplHelper< XInputStream > { virtual sal_Int32 SAL_CALL readBytes( uno::Sequence< sal_Int8 >&, sal_Int32 ) throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) SAL_OVERRIDE diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.hxx b/package/source/zippackage/ZipPackageFolderEnumeration.hxx index 7c8e79ebefba..c978bf69f8c6 100644 --- a/package/source/zippackage/ZipPackageFolderEnumeration.hxx +++ b/package/source/zippackage/ZipPackageFolderEnumeration.hxx @@ -19,12 +19,12 @@ #ifndef INCLUDED_PACKAGE_SOURCE_ZIPPACKAGE_ZIPPACKAGEFOLDERENUMERATION_HXX #define INCLUDED_PACKAGE_SOURCE_ZIPPACKAGE_ZIPPACKAGEFOLDERENUMERATION_HXX -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <HashMaps.hxx> -class ZipPackageFolderEnumeration : public cppu::WeakImplHelper2 +class ZipPackageFolderEnumeration : public cppu::WeakImplHelper < com::sun::star::container::XEnumeration, com::sun::star::lang::XServiceInfo diff --git a/package/source/zippackage/ZipPackageSink.hxx b/package/source/zippackage/ZipPackageSink.hxx index cd46fd054f7a..e0494401a6f0 100644 --- a/package/source/zippackage/ZipPackageSink.hxx +++ b/package/source/zippackage/ZipPackageSink.hxx @@ -20,9 +20,9 @@ #define INCLUDED_PACKAGE_SOURCE_ZIPPACKAGE_ZIPPACKAGESINK_HXX #include <com/sun/star/io/XActiveDataSink.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> -class ZipPackageSink : public ::cppu::WeakImplHelper1 +class ZipPackageSink : public ::cppu::WeakImplHelper < com::sun::star::io::XActiveDataSink > diff --git a/package/source/zippackage/wrapstreamforshare.hxx b/package/source/zippackage/wrapstreamforshare.hxx index 79a7fe273f95..78b71e34c579 100644 --- a/package/source/zippackage/wrapstreamforshare.hxx +++ b/package/source/zippackage/wrapstreamforshare.hxx @@ -22,11 +22,11 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XSeekable.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <mutexholder.hxx> -class WrapStreamForShare : public cppu::WeakImplHelper2 < ::com::sun::star::io::XInputStream +class WrapStreamForShare : public cppu::WeakImplHelper < ::com::sun::star::io::XInputStream , ::com::sun::star::io::XSeekable > { protected: |