summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-09-12 00:00:40 +0200
committerMichael Stahl <mstahl@redhat.com>2015-09-12 00:00:40 +0200
commit4f918cd5daed963287805da761e6983a392ae050 (patch)
treebe0b1170b201aa2dc193e8236b3506893e6ce9c3 /include
parentb3ee922299cf716a1cf785ade84196dfffb8ea19 (diff)
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
Diffstat (limited to 'include')
-rw-r--r--include/comphelper/propertysetinfo.hxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/comphelper/propertysetinfo.hxx b/include/comphelper/propertysetinfo.hxx
index e81a43e54632..5583d21197cd 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;