diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-07-10 17:50:12 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-20 07:06:22 +0000 |
| commit | a890a7696ff5dfc3ec8a012ba59cc04db4a1473d (patch) | |
| tree | 9e0d23aadb43f2bbdf3bac2db8aff76307bda5fc /comphelper/source/streaming | |
| parent | 3f0677b86f4831b011a2baece85cf93c68646cd5 (diff) | |
tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants, for comphelper.
This also includes extra changes in other modules
required accordingly.
Change-Id: Id1537f46f1c90f760a0d8987a6dafa0e1da03b8f
Reviewed-on: https://gerrit.libreoffice.org/16929
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'comphelper/source/streaming')
| -rw-r--r-- | comphelper/source/streaming/memorystream.cxx | 6 | ||||
| -rw-r--r-- | comphelper/source/streaming/seqinputstreamserv.cxx | 4 | ||||
| -rw-r--r-- | comphelper/source/streaming/seqoutputstreamserv.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx index 3efe2d1126f2..d4a4ebf8d502 100644 --- a/comphelper/source/streaming/memorystream.cxx +++ b/comphelper/source/streaming/memorystream.cxx @@ -26,14 +26,14 @@ #include <com/sun/star/io/XSeekableInputStream.hpp> #include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> #include <osl/diagnose.h> #include <string.h> #include <vector> using ::cppu::OWeakObject; -using ::cppu::WeakImplHelper4; +using ::cppu::WeakImplHelper; using namespace ::com::sun::star::io; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -42,7 +42,7 @@ using namespace ::osl; namespace comphelper { -class UNOMemoryStream : public WeakImplHelper4 < XStream, XSeekableInputStream, XOutputStream, XTruncate > +class UNOMemoryStream : public WeakImplHelper< XStream, XSeekableInputStream, XOutputStream, XTruncate > { public: UNOMemoryStream(); diff --git a/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx index 1ea60fa5a63f..233cc8dc6524 100644 --- a/comphelper/source/streaming/seqinputstreamserv.cxx +++ b/comphelper/source/streaming/seqinputstreamserv.cxx @@ -26,7 +26,7 @@ #include <osl/mutex.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/implementationentry.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <comphelper/seqstream.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -41,7 +41,7 @@ using namespace ::com::sun::star; namespace { class SequenceInputStreamService: - public ::cppu::WeakImplHelper3< + public ::cppu::WeakImplHelper< lang::XServiceInfo, io::XSeekableInputStream, lang::XInitialization>, diff --git a/comphelper/source/streaming/seqoutputstreamserv.cxx b/comphelper/source/streaming/seqoutputstreamserv.cxx index f1ef3c6ebb48..6d604dc9b03f 100644 --- a/comphelper/source/streaming/seqoutputstreamserv.cxx +++ b/comphelper/source/streaming/seqoutputstreamserv.cxx @@ -26,7 +26,7 @@ #include <osl/mutex.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/implementationentry.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <comphelper/seqstream.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -39,7 +39,7 @@ using namespace ::com::sun::star; namespace { class SequenceOutputStreamService: - public cppu::WeakImplHelper2<lang::XServiceInfo, io::XSequenceOutputStream>, + public cppu::WeakImplHelper<lang::XServiceInfo, io::XSequenceOutputStream>, private boost::noncopyable { public: |