diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-18 10:01:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-18 20:50:58 +0100 |
| commit | 3cdab0587977927b781a631dd8e2d43a3faa3c07 (patch) | |
| tree | ac58af52e2d5c536d43e5f3afbe520de8365973f | |
| parent | 9366a40b7ee4d422b283467caf7c130fee611140 (diff) | |
use more cppu::BaseMutex
Change-Id: I00b63f8ce201d2f83b89b493b4ae086368ed54d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127082
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | include/svx/unoshape.hxx | 14 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshape.cxx | 8 |
2 files changed, 9 insertions, 13 deletions
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 3d3d5bea3a9b..381a2a723b90 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -56,6 +56,7 @@ #include <comphelper/servicehelper.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase12.hxx> class SfxItemSet; @@ -70,12 +71,6 @@ namespace basegfx class B2DPolyPolygon; } // end of namespace basegfx -class SvxShapeMutex -{ -protected: - ::osl::Mutex maMutex; -}; - struct SvxShapeImpl; class SvxShapeMaster; class SvxItemPropertySet; @@ -103,9 +98,10 @@ typedef ::cppu::WeakAggImplHelper12< css::document::XActionLockable, css::beans::XMultiPropertyStates> SvxShape_UnoImplHelper; -class SVXCORE_DLLPUBLIC SvxShape : public SvxShape_UnoImplHelper, - public SfxListener, - public SvxShapeMutex +class SVXCORE_DLLPUBLIC SvxShape : + public cppu::BaseMutex, + public SvxShape_UnoImplHelper, + public SfxListener { private: css::awt::Size maSize; diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index eed9f89f2116..86b3d875d64a 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -194,7 +194,7 @@ sal_Int16 GetTextFitToSizeScale(SdrObject* pObject) SvxShape::SvxShape( SdrObject* pObject ) : maSize(100,100) -, mpImpl( new SvxShapeImpl( *this, maMutex ) ) +, mpImpl( new SvxShapeImpl( *this, m_aMutex ) ) , mbIsMultiPropertyCall(false) , mpPropSet(getSvxMapProvider().GetPropertySet(SVXMAP_SHAPE, SdrObject::GetGlobalDrawObjectItemPool())) , maPropMapEntries(getSvxMapProvider().GetMap(SVXMAP_SHAPE)) @@ -207,7 +207,7 @@ SvxShape::SvxShape( SdrObject* pObject ) SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet ) : maSize(100,100) -, mpImpl( new SvxShapeImpl( *this, maMutex ) ) +, mpImpl( new SvxShapeImpl( *this, m_aMutex ) ) , mbIsMultiPropertyCall(false) , mpPropSet(pPropertySet) , maPropMapEntries(pEntries) @@ -1353,14 +1353,14 @@ Reference< beans::XPropertySetInfo > const & void SAL_CALL SvxShape::addPropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener ) { - ::osl::MutexGuard aGuard( maMutex ); + ::osl::MutexGuard aGuard( m_aMutex ); mpImpl->maPropertyNotifier.addPropertyChangeListener( _propertyName, _listener ); } void SAL_CALL SvxShape::removePropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener ) { - ::osl::MutexGuard aGuard( maMutex ); + ::osl::MutexGuard aGuard( m_aMutex ); mpImpl->maPropertyNotifier.removePropertyChangeListener( _propertyName, _listener ); } |