diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-12-07 17:15:52 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-12-08 07:50:50 +0000 |
| commit | 288386f6986622461f28276ff7ff3e7172143159 (patch) | |
| tree | 4d945af0383686f9bf68bc846f833822e13ccbb2 /include/comphelper | |
| parent | ImplWallpaper to use std::unique_ptr (diff) | |
| download | core-288386f6986622461f28276ff7ff3e7172143159.tar.gz core-288386f6986622461f28276ff7ff3e7172143159.zip | |
Another "Do not export whole class to avoid MS C++ implicitly exporting...
...base template" (like a90d4d5f036ab7785ba72038936c6c8427b74ba8 did for
OSLOutputStreamWrapper), in preparation for
<https://gerrit.libreoffice.org/#/c/31679> "tdf#88206 replace
cppu::WeakImplHelper* in unotools".
Beats me why a solution like 4f918cd5daed963287805da761e6983a392ae050
"comphelper: give up on the XPropertySetInfos for now" apparently doesn't work
there---almost feels like MSVC recursively treats as dllexport'ed all the (non-
llim-/export'ed) base classes all the way down until reaching a template.
Change-Id: Id42610e7fd5c5762dffdeb15623bfe3a37ec0aa6
Reviewed-on: https://gerrit.libreoffice.org/31732
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/comphelper')
| -rw-r--r-- | include/comphelper/oslfile2streamwrap.hxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/comphelper/oslfile2streamwrap.hxx b/include/comphelper/oslfile2streamwrap.hxx index 842da52ea174..76223722ecbb 100644 --- a/include/comphelper/oslfile2streamwrap.hxx +++ b/include/comphelper/oslfile2streamwrap.hxx @@ -32,13 +32,12 @@ namespace comphelper // FmUnoIOStream, // Stream to read and write data, based on File -class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public ::cppu::WeakImplHelper<css::io::XInputStream> +class OSLInputStreamWrapper : public ::cppu::WeakImplHelper<css::io::XInputStream> { - ::osl::Mutex m_aMutex; - ::osl::File* m_pFile; - public: - OSLInputStreamWrapper(::osl::File& _rStream); + COMPHELPER_DLLPUBLIC OSLInputStreamWrapper(::osl::File& _rStream); + +private: virtual ~OSLInputStreamWrapper() override; // css::io::XInputStream @@ -47,6 +46,9 @@ public: virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL available() throw(css::io::NotConnectedException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL closeInput() throw(css::io::NotConnectedException, css::uno::RuntimeException, std::exception) override; + + ::osl::Mutex m_aMutex; + ::osl::File* m_pFile; }; |