diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-12-06 14:56:26 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-12-08 10:30:36 +0000 |
commit | a238c829b209d0708714aa753fb686525411825f (patch) | |
tree | bdac6e14c37e8afea0811d06e9cf67b508c84a8b /include | |
parent | lokit: support password protected binary MS and OOXML documents (diff) | |
download | core-a238c829b209d0708714aa753fb686525411825f.tar.gz core-a238c829b209d0708714aa753fb686525411825f.zip |
tdf#88206 replace cppu::WeakImplHelper* in unotools
[needs 288386f6986622461f28276ff7ff3e7172143159 "Another 'Do not export whole
class to avoid MS C++ implicitly exporting...'" to build with MSVC]
Change-Id: I8de7c4a1947ce91f9a629536e481c012e7c5c7ec
Reviewed-on: https://gerrit.libreoffice.org/31679
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/unotools/accessiblerelationsethelper.hxx | 4 | ||||
-rw-r--r-- | include/unotools/accessiblestatesethelper.hxx | 4 | ||||
-rw-r--r-- | include/unotools/eventcfg.hxx | 4 | ||||
-rw-r--r-- | include/unotools/streamhelper.hxx | 4 | ||||
-rw-r--r-- | include/unotools/streamwrap.hxx | 23 |
5 files changed, 19 insertions, 20 deletions
diff --git a/include/unotools/accessiblerelationsethelper.hxx b/include/unotools/accessiblerelationsethelper.hxx index a96550f18bed..7f67eb8b2235 100644 --- a/include/unotools/accessiblerelationsethelper.hxx +++ b/include/unotools/accessiblerelationsethelper.hxx @@ -28,7 +28,7 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XServiceName.hpp> #include <osl/mutex.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <comphelper/servicehelper.hxx> #include <memory> @@ -45,7 +45,7 @@ namespace utl <code>AccessibleRelationSet</code> service. */ class UNOTOOLS_DLLPUBLIC AccessibleRelationSetHelper - : public cppu::WeakImplHelper1< css::accessibility::XAccessibleRelationSet > + : public cppu::WeakImplHelper< css::accessibility::XAccessibleRelationSet > { public: //===== internal ======================================================== diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx index b59429577f41..7916b74490d6 100644 --- a/include/unotools/accessiblestatesethelper.hxx +++ b/include/unotools/accessiblestatesethelper.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XServiceName.hpp> #include <osl/mutex.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <comphelper/servicehelper.hxx> #include <memory> @@ -44,7 +44,7 @@ namespace utl <code>AccessibleStateSet</code> service. */ class UNOTOOLS_DLLPUBLIC AccessibleStateSetHelper - : public cppu::WeakImplHelper1< css::accessibility::XAccessibleStateSet > + : public cppu::WeakImplHelper< css::accessibility::XAccessibleStateSet > { public: //===== internal ======================================================== diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx index 03ccdd4181d2..a7fa9fd854cb 100644 --- a/include/unotools/eventcfg.hxx +++ b/include/unotools/eventcfg.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <cppuhelper/weakref.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <unordered_map> #include <vector> @@ -63,7 +63,7 @@ enum class GlobalEventId class GlobalEventConfig_Impl; class UNOTOOLS_DLLPUBLIC GlobalEventConfig: - public ::cppu::WeakImplHelper2 < css::document::XEventsSupplier, css::container::XNameReplace > + public cppu::WeakImplHelper< css::document::XEventsSupplier, css::container::XNameReplace > { public: GlobalEventConfig( ); diff --git a/include/unotools/streamhelper.hxx b/include/unotools/streamhelper.hxx index c4c586fbb55e..a98a682f8580 100644 --- a/include/unotools/streamhelper.hxx +++ b/include/unotools/streamhelper.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <osl/mutex.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <tools/stream.hxx> namespace utl @@ -36,7 +36,7 @@ namespace utl * @author Dirk Grobler * @since 00/28/03 */ - typedef ::cppu::WeakImplHelper2<css::io::XInputStream, css::io::XSeekable> InputStreamHelper_Base; + typedef cppu::WeakImplHelper<css::io::XInputStream, css::io::XSeekable> InputStreamHelper_Base; // needed for some compilers class UNOTOOLS_DLLPUBLIC OInputStreamHelper : public InputStreamHelper_Base { diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx index f0b52aa060a0..037aeee7b0f5 100644 --- a/include/unotools/streamwrap.hxx +++ b/include/unotools/streamwrap.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/io/XStream.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase1.hxx> class SvStream; @@ -37,11 +37,9 @@ namespace utl //= OInputStreamWrapper -typedef ::cppu::WeakImplHelper1 < css::io::XInputStream - > InputStreamWrapper_Base; -// needed for some compilers /// helper class for wrapping an SvStream into an com.sun.star.io::XInputStream -class UNOTOOLS_DLLPUBLIC OInputStreamWrapper : public InputStreamWrapper_Base +class UNOTOOLS_DLLPUBLIC OInputStreamWrapper + : public cppu::WeakImplHelper<css::io::XInputStream> { protected: ::osl::Mutex m_aMutex; @@ -73,12 +71,11 @@ protected: //= OSeekableInputStreamWrapper -typedef ::cppu::ImplHelper1 < css::io::XSeekable - > OSeekableInputStreamWrapper_Base; /** helper class for wrapping an SvStream into an com.sun.star.io::XInputStream which is seekable (i.e. supports the com.sun.star.io::XSeekable interface). */ -class UNOTOOLS_DLLPUBLIC OSeekableInputStreamWrapper : public ::cppu::ImplInheritanceHelper1 < OInputStreamWrapper, css::io::XSeekable > +class UNOTOOLS_DLLPUBLIC OSeekableInputStreamWrapper + : public cppu::ImplInheritanceHelper< OInputStreamWrapper, css::io::XSeekable > { protected: OSeekableInputStreamWrapper() {} @@ -96,9 +93,7 @@ public: //= OOutputStreamWrapper -typedef ::cppu::WeakImplHelper1<css::io::XOutputStream> OutputStreamWrapper_Base; - // needed for some compilers -class OOutputStreamWrapper : public OutputStreamWrapper_Base +class OOutputStreamWrapper : public cppu::WeakImplHelper<css::io::XOutputStream> { public: UNOTOOLS_DLLPUBLIC OOutputStreamWrapper(SvStream& _rStream); @@ -146,7 +141,11 @@ private: virtual sal_Int64 SAL_CALL getLength( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; }; -class UNOTOOLS_DLLPUBLIC OStreamWrapper : public ::cppu::ImplInheritanceHelper3 < OSeekableInputStreamWrapper, css::io::XStream, css::io::XOutputStream, css::io::XTruncate > +class UNOTOOLS_DLLPUBLIC OStreamWrapper + : public cppu::ImplInheritanceHelper<OSeekableInputStreamWrapper, + css::io::XStream, + css::io::XOutputStream, + css::io::XTruncate> { protected: ~OStreamWrapper() override; |