diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-09-01 17:51:02 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-09-01 18:25:47 +0200 |
| commit | a01a0785e61d230cc8e2fb15cc1936f1fd29458a (patch) | |
| tree | 53ce1848acd518c5516c27f037f2807fff859cc2 | |
| parent | 8a7be690ced76c5bd790858226a2ff0747354676 (diff) | |
comphelper: fix MSVC --enable-mergedlibs build
Try not to export the WeakImplHelper symbols as that causes duplicate
definition errors with the class OSelfTerminateFileStream that
has the same WeakImplHelper base.
Change-Id: Id41bfed24617113de48c76ab6802b21a8892e66f
| -rw-r--r-- | include/comphelper/seekableinput.hxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/comphelper/seekableinput.hxx b/include/comphelper/seekableinput.hxx index bec6ac73c470..e83c6f1f3137 100644 --- a/include/comphelper/seekableinput.hxx +++ b/include/comphelper/seekableinput.hxx @@ -30,8 +30,13 @@ namespace comphelper { -class COMPHELPER_DLLPUBLIC OSeekableInputWrapper : public ::cppu::WeakImplHelper< ::com::sun::star::io::XInputStream, - ::com::sun::star::io::XSeekable > +class SAL_DLLPUBLIC_TEMPLATE OSeekableInputWrapper_BASE + : public ::cppu::WeakImplHelper< ::com::sun::star::io::XInputStream, + ::com::sun::star::io::XSeekable > +{}; + +class COMPHELPER_DLLPUBLIC OSeekableInputWrapper + : public OSeekableInputWrapper_BASE { ::osl::Mutex m_aMutex; |