diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-01-13 15:46:11 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-01-14 12:52:41 +0000 |
| commit | d99fc6f2ad8b9078e9adc56796728d7e38b3ca80 (patch) | |
| tree | 3d80348d86a63d3aa36a570586d0e2c7bf7237ae /include | |
| parent | 1b0166e1879d3edbbffbcc23cbf4c8c27c23b327 (diff) | |
fix the MSVC 2013 --enable-lto build
... by sacrificing the appropriate number of chickens to the template
dllexport gods.
Change-Id: I27fb6a1f0a8a32c9bdc67574b3a2f3ec9f27b00f
Reviewed-on: https://gerrit.libreoffice.org/21442
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/comphelper/containermultiplexer.hxx | 4 | ||||
| -rw-r--r-- | include/comphelper/enumhelper.hxx | 6 | ||||
| -rw-r--r-- | include/oox/core/filterdetect.hxx | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/include/comphelper/containermultiplexer.hxx b/include/comphelper/containermultiplexer.hxx index f66024882e68..c3e77c62093b 100644 --- a/include/comphelper/containermultiplexer.hxx +++ b/include/comphelper/containermultiplexer.hxx @@ -69,9 +69,11 @@ namespace comphelper //= OContainerListenerAdapter + class SAL_DLLPUBLIC_TEMPLATE OContainerListenerAdapter_BASE + : public cppu::WeakImplHelper<css::container::XContainerListener> {}; class COMPHELPER_DLLPUBLIC OContainerListenerAdapter - :public cppu::WeakImplHelper< css::container::XContainerListener > + : public OContainerListenerAdapter_BASE { friend class OContainerListener; diff --git a/include/comphelper/enumhelper.hxx b/include/comphelper/enumhelper.hxx index 07edda974e1d..e6d115eac9a5 100644 --- a/include/comphelper/enumhelper.hxx +++ b/include/comphelper/enumhelper.hxx @@ -93,12 +93,16 @@ private: COMPHELPER_DLLPRIVATE void impl_stopDisposeListening(); }; +// this is the way that works for ENABLE_LTO with MSVC 2013 +class SAL_DLLPUBLIC_TEMPLATE OAnyEnumeration_BASE + : public ::cppu::WeakImplHelper<css::container::XEnumeration> {}; + /** provides an com.sun.star.container::XEnumeration for an outside set vector of Any's. */ class COMPHELPER_DLLPUBLIC OAnyEnumeration : private OEnumerationLock - , public ::cppu::WeakImplHelper< css::container::XEnumeration > + , public OAnyEnumeration_BASE { sal_Int32 m_nPos; css::uno::Sequence< css::uno::Any > m_lItems; diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx index 679a4eb73869..9ecd9fea1679 100644 --- a/include/oox/core/filterdetect.hxx +++ b/include/oox/core/filterdetect.hxx @@ -83,8 +83,9 @@ private: }; +class SAL_DLLPUBLIC_TEMPLATE FilterDetect_BASE : public ::cppu::WeakImplHelper<css::document::XExtendedFilterDetection, css::lang::XServiceInfo> {}; -class OOX_DLLPUBLIC FilterDetect : public ::cppu::WeakImplHelper< css::document::XExtendedFilterDetection, css::lang::XServiceInfo > +class OOX_DLLPUBLIC FilterDetect : public FilterDetect_BASE { public: explicit FilterDetect( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) |