diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-18 09:20:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-18 19:08:05 +0100 |
| commit | 6b16793cd13e540c1dfc1686df948c0dbcbe8068 (patch) | |
| tree | 2faa8db40660195054459b338a5b72c5bc790c0b /svx/source | |
| parent | a22772c4393f4b0a3d1a838f074c4d51be762388 (diff) | |
use more cppu::BaseMutex
Change-Id: I1ee9aff2774a673666c332c116aa5b0ba0d8b585
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127077
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/inc/gridcell.hxx | 10 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshcol.cxx | 13 |
2 files changed, 6 insertions, 17 deletions
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 8a2c40dcf340..ed9e5eb2722e 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -44,6 +44,7 @@ #include <comphelper/interfacecontainer3.hxx> #include <comphelper/uno3.hxx> #include <connectivity/formattedcolumnvalue.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/component.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> @@ -57,13 +58,6 @@ namespace dbtools { class FormattedColumnValue; } -class FmMutexHelper -{ -protected: - ::osl::Mutex m_aMutex; -}; - - // DbGridColumn, column description class DbGridColumn @@ -191,7 +185,7 @@ private: // Is usually only required for complex controls such as combo boxes. class DbCellControl - :public FmMutexHelper // _before_ the listener, so the listener is to be destroyed first! + :public cppu::BaseMutex // _before_ the listener, so the listener is to be destroyed first! ,public ::comphelper::OPropertyChangeListener { private: diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 80ad53cc1f88..d4cbce783af7 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase3.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <comphelper/interfacecontainer3.hxx> @@ -36,15 +37,9 @@ using namespace ::com::sun::star::uno; namespace { -class SvxShapeCollectionMutex -{ -public: - ::osl::Mutex maMutex; -}; - class SvxShapeCollection : - public cppu::WeakAggImplHelper3<drawing::XShapes, lang::XServiceInfo, lang::XComponent>, - public SvxShapeCollectionMutex + public cppu::BaseMutex, + public cppu::WeakAggImplHelper3<drawing::XShapes, lang::XServiceInfo, lang::XComponent> { private: comphelper::OInterfaceContainerHelper3<drawing::XShape> maShapeContainer; @@ -81,7 +76,7 @@ public: }; SvxShapeCollection::SvxShapeCollection() noexcept -: maShapeContainer( maMutex ), mrBHelper( maMutex ) +: maShapeContainer( m_aMutex ), mrBHelper( m_aMutex ) { } |