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>

2 files changed, 8 insertions, 2 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;