include/comphelper/propertysetinfo.hxx | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 4f918cd5daed963287805da761e6983a392ae050
Author: Michael Stahl <mst...@redhat.com>
Date: Sat Sep 12 00:00:40 2015 +0200
comphelper: give up on the XPropertySetInfos for now
PropertySetInfo_Impl in ucb/source/core/ucbstore.cxx is sheer insanity,
persisting a PropertySetInfo into the configuration => throw up
hands in despair.
Change-Id: Ic341e453571072a9ed66c6bf51e96dbe39806566
diff --git a/include/comphelper/propertysetinfo.hxx
b/include/comphelper/propertysetinfo.hxx
index e81a43e..5583d21 100644
--- a/include/comphelper/propertysetinfo.hxx
+++ b/include/comphelper/propertysetinfo.hxx
@@ -44,10 +44,16 @@ typedef std::map<OUString, PropertyMapEntry const *>
PropertyMap;
class PropertyMapImpl;
+// don't export to avoid duplicate WeakImplHelper definitions with MSVC
+class SAL_DLLPUBLIC_TEMPLATE PropertySetInfo_BASE
+ : public ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertySetInfo
>
+{};
+
/** this class implements a XPropertySetInfo that is initialized with arrays
of PropertyMapEntry.
It is used by the class PropertySetHelper.
*/
-class COMPHELPER_DLLPUBLIC PropertySetInfo : public ::cppu::WeakImplHelper<
::com::sun::star::beans::XPropertySetInfo >
+class COMPHELPER_DLLPUBLIC PropertySetInfo
+ : public PropertySetInfo_BASE
{
private:
PropertyMapImpl* mpMap;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
