diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 12:51:10 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 13:29:13 +0100 |
commit | 17c17017458519e2c13c43fb362320a127c65135 (patch) | |
tree | 21740298bcbcfc0e1286328437389ac31bb35ac5 /oox | |
parent | c2fb42afb304c5ce1e5b1686df0000f87d5ae80c (diff) |
Use osl::Mutex member, not base
Change-Id: I7104a6fdd31a23750929dccb59fd89e96cadf89c
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/helper/propertymap.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index 5a153be275d5..7c26267d4678 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -98,7 +98,7 @@ typedef ::cppu::WeakImplHelper2< XPropertySet, XPropertySetInfo > GenericPropert Properties of all names and types can be set and later retrieved. TODO: move this to comphelper or better find an existing implementation */ -class GenericPropertySet : public GenericPropertySetBase, private ::osl::Mutex +class GenericPropertySet : public GenericPropertySetBase { public: explicit GenericPropertySet( const PropertyMap& rPropMap ); @@ -118,6 +118,7 @@ public: virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (RuntimeException, std::exception); private: + osl::Mutex mMutex; PropertyNameMap maPropMap; }; @@ -133,7 +134,7 @@ Reference< XPropertySetInfo > SAL_CALL GenericPropertySet::getPropertySetInfo() void SAL_CALL GenericPropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { - ::osl::MutexGuard aGuard( *this ); + ::osl::MutexGuard aGuard( mMutex ); maPropMap[ rPropertyName ] = rValue; } |