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 | |
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')
-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 | ||||
-rw-r--r-- | package/source/xstor/disposelistener.hxx | 4 | ||||
-rw-r--r-- | package/source/xstor/ocompinstream.hxx | 4 | ||||
-rw-r--r-- | package/source/xstor/ohierarchyholder.hxx | 4 | ||||
-rw-r--r-- | package/source/xstor/owriteablestream.hxx | 1 | ||||
-rw-r--r-- | package/source/xstor/selfterminatefilestream.hxx | 4 | ||||
-rw-r--r-- | package/source/xstor/switchpersistencestream.hxx | 4 | ||||
-rw-r--r-- | package/source/xstor/xfactory.hxx | 4 | ||||
-rw-r--r-- | package/source/zipapi/XUnbufferedStream.hxx | 4 | ||||
-rw-r--r-- | package/source/zipapi/blowfishcontext.hxx | 4 | ||||
-rw-r--r-- | package/source/zipapi/sha1context.hxx | 4 | ||||
-rw-r--r-- | package/source/zippackage/ZipPackage.cxx | 6 | ||||
-rw-r--r-- | package/source/zippackage/ZipPackageFolderEnumeration.hxx | 4 | ||||
-rw-r--r-- | package/source/zippackage/ZipPackageSink.hxx | 4 | ||||
-rw-r--r-- | package/source/zippackage/wrapstreamforshare.hxx | 4 |
17 files changed, 33 insertions, 34 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 diff --git a/package/source/xstor/disposelistener.hxx b/package/source/xstor/disposelistener.hxx index 31ce20b5f779..75d02ad2e027 100644 --- a/package/source/xstor/disposelistener.hxx +++ b/package/source/xstor/disposelistener.hxx @@ -21,11 +21,11 @@ #define INCLUDED_PACKAGE_SOURCE_XSTOR_DISPOSELISTENER_HXX #include <com/sun/star/lang/XEventListener.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> class OStorage; -class OChildDispListener_Impl : public ::cppu::WeakImplHelper1 < ::com::sun::star::lang::XEventListener > +class OChildDispListener_Impl : public ::cppu::WeakImplHelper < ::com::sun::star::lang::XEventListener > { ::osl::Mutex m_aMutex; OStorage* m_pStorage; diff --git a/package/source/xstor/ocompinstream.hxx b/package/source/xstor/ocompinstream.hxx index 6fb15ac550ac..20db4035f609 100644 --- a/package/source/xstor/ocompinstream.hxx +++ b/package/source/xstor/ocompinstream.hxx @@ -27,14 +27,14 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/embed/XExtendedStorageStream.hpp> #include <com/sun/star/embed/XRelationshipAccess.hpp> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.h> #include "mutexholder.hxx" struct OWriteStream_Impl; -class OInputCompStream : public cppu::WeakImplHelper4 < ::com::sun::star::io::XInputStream +class OInputCompStream : public cppu::WeakImplHelper < ::com::sun::star::io::XInputStream ,::com::sun::star::embed::XExtendedStorageStream ,::com::sun::star::embed::XRelationshipAccess ,::com::sun::star::beans::XPropertySet > diff --git a/package/source/xstor/ohierarchyholder.hxx b/package/source/xstor/ohierarchyholder.hxx index 680b30c4eb37..46846d24bb10 100644 --- a/package/source/xstor/ohierarchyholder.hxx +++ b/package/source/xstor/ohierarchyholder.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/XTransactionListener.hpp> #include <com/sun/star/embed/XExtendedStorageStream.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <comphelper/sequenceashashmap.hxx> @@ -52,7 +52,7 @@ typedef ::std::vector< OUString > OStringList_Impl; typedef ::std::list< ::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XExtendedStorageStream > > OWeakStorRefList_Impl; -struct OHierarchyElement_Impl : public cppu::WeakImplHelper1< ::com::sun::star::embed::XTransactionListener > +struct OHierarchyElement_Impl : public cppu::WeakImplHelper< ::com::sun::star::embed::XTransactionListener > { ::osl::Mutex m_aMutex; diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx index 2438e260bc61..df1b442aa50e 100644 --- a/package/source/xstor/owriteablestream.hxx +++ b/package/source/xstor/owriteablestream.hxx @@ -40,7 +40,6 @@ #include <com/sun/star/beans/StringPair.hpp> #include <com/sun/star/logging/XSimpleLogRing.hpp> -#include <cppuhelper/implbase1.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.h> diff --git a/package/source/xstor/selfterminatefilestream.hxx b/package/source/xstor/selfterminatefilestream.hxx index 173432b7c9ce..1c303bcd2bd2 100644 --- a/package/source/xstor/selfterminatefilestream.hxx +++ b/package/source/xstor/selfterminatefilestream.hxx @@ -23,11 +23,11 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/ucb/XSimpleFileAccess3.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> struct OWriteStream_Impl; -class OSelfTerminateFileStream : public cppu::WeakImplHelper2< ::com::sun::star::io::XInputStream, +class OSelfTerminateFileStream : public cppu::WeakImplHelper< ::com::sun::star::io::XInputStream, ::com::sun::star::io::XSeekable > { protected: diff --git a/package/source/xstor/switchpersistencestream.hxx b/package/source/xstor/switchpersistencestream.hxx index 6fec12acd5a2..92685bd27175 100644 --- a/package/source/xstor/switchpersistencestream.hxx +++ b/package/source/xstor/switchpersistencestream.hxx @@ -32,7 +32,7 @@ #include <com/sun/star/ucb/XSimpleFileAccess.hpp> #include <com/sun/star/io/XAsyncOutputMonitor.hpp> #include <osl/mutex.hxx> -#include <cppuhelper/implbase6.hxx> +#include <cppuhelper/implbase.hxx> // SwitchablePersistenceStream @@ -42,7 +42,7 @@ struct SPStreamData_Impl; class SwitchablePersistenceStream - : public ::cppu::WeakImplHelper6 < + : public ::cppu::WeakImplHelper < ::com::sun::star::io::XStream, ::com::sun::star::io::XInputStream, ::com::sun::star::io::XOutputStream, diff --git a/package/source/xstor/xfactory.hxx b/package/source/xstor/xfactory.hxx index 8ec725b3928f..59ec46e920eb 100644 --- a/package/source/xstor/xfactory.hxx +++ b/package/source/xstor/xfactory.hxx @@ -23,9 +23,9 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> -class OStorageFactory : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XSingleServiceFactory, +class OStorageFactory : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XSingleServiceFactory, ::com::sun::star::lang::XServiceInfo > { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx index 922aa826f5e1..7fcdaf089c7e 100644 --- a/package/source/zipapi/XUnbufferedStream.hxx +++ b/package/source/zipapi/XUnbufferedStream.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/xml/crypto/XCipherContext.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> #include <package/Inflater.hxx> #include <ZipEntry.hxx> @@ -41,7 +41,7 @@ namespace com { namespace sun { namespace star { namespace uno { #define UNBUFF_STREAM_WRAPPEDRAW 2 class EncryptionData; -class XUnbufferedStream : public cppu::WeakImplHelper1 +class XUnbufferedStream : public cppu::WeakImplHelper < com::sun::star::io::XInputStream > diff --git a/package/source/zipapi/blowfishcontext.hxx b/package/source/zipapi/blowfishcontext.hxx index 9d738c34f294..de43f1faaaee 100644 --- a/package/source/zipapi/blowfishcontext.hxx +++ b/package/source/zipapi/blowfishcontext.hxx @@ -21,10 +21,10 @@ #include <com/sun/star/xml/crypto/XCipherContext.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> -class BlowfishCFB8CipherContext : public cppu::WeakImplHelper1< ::com::sun::star::xml::crypto::XCipherContext > +class BlowfishCFB8CipherContext : public cppu::WeakImplHelper< ::com::sun::star::xml::crypto::XCipherContext > { ::osl::Mutex m_aMutex; void* m_pCipher; diff --git a/package/source/zipapi/sha1context.hxx b/package/source/zipapi/sha1context.hxx index cdd133fe8469..c11a885eb864 100644 --- a/package/source/zipapi/sha1context.hxx +++ b/package/source/zipapi/sha1context.hxx @@ -21,10 +21,10 @@ #include <com/sun/star/xml/crypto/XDigestContext.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> -class SHA1DigestContext : public cppu::WeakImplHelper1< ::com::sun::star::xml::crypto::XDigestContext > +class SHA1DigestContext : public cppu::WeakImplHelper< ::com::sun::star::xml::crypto::XDigestContext > { ::osl::Mutex m_aMutex; void* m_pDigest; 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: |