diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-24 14:57:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-27 12:42:37 +0000 |
| commit | ce0cf8301f1452f3bdc00992b7fde5e97a007337 (patch) | |
| tree | 487e1eac40db93e5990df6fb6be8102e459d1c5e /reportdesign/source | |
| parent | 93f9ce7b644c0887423891e0d645b88eb39bc457 (diff) | |
osl::Mutex->std::mutex in DefaultComponentInspectorModel
Change-Id: I1f76a062f75d1779ae86ae931ff3e2ac4f1ba831
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147859
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign/source')
| -rw-r--r-- | reportdesign/source/ui/inc/DefaultInspection.hxx | 3 | ||||
| -rw-r--r-- | reportdesign/source/ui/inspection/DefaultInspection.cxx | 16 |
2 files changed, 10 insertions, 9 deletions
diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx index 3f32725c584f..1d82d32455c0 100644 --- a/reportdesign/source/ui/inc/DefaultInspection.hxx +++ b/reportdesign/source/ui/inc/DefaultInspection.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <cppuhelper/implbase3.hxx> +#include <mutex> namespace rptui @@ -40,7 +41,7 @@ namespace rptui class DefaultComponentInspectorModel final : public DefaultComponentInspectorModel_Base { private: - ::osl::Mutex m_aMutex; + std::mutex m_aMutex; css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::inspection::XObjectInspectorModel > m_xComponent; /// delegatee bool m_bConstructed; diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index 80269f433346..51edab1410ea 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -87,39 +87,39 @@ namespace rptui sal_Bool SAL_CALL DefaultComponentInspectorModel::getHasHelpSection() { - ::osl::MutexGuard aGuard(m_aMutex); + std::unique_lock aGuard(m_aMutex); return m_bHasHelpSection; } ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getMinHelpTextLines() { - ::osl::MutexGuard aGuard(m_aMutex); + std::unique_lock aGuard(m_aMutex); return m_nMinHelpTextLines; } sal_Bool SAL_CALL DefaultComponentInspectorModel::getIsReadOnly() { - ::osl::MutexGuard aGuard(m_aMutex); + std::unique_lock aGuard(m_aMutex); return m_bIsReadOnly; } void SAL_CALL DefaultComponentInspectorModel::setIsReadOnly( sal_Bool _isreadonly ) { - ::osl::MutexGuard aGuard(m_aMutex); + std::unique_lock aGuard(m_aMutex); m_bIsReadOnly = _isreadonly; } ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getMaxHelpTextLines() { - ::osl::MutexGuard aGuard(m_aMutex); + std::unique_lock aGuard(m_aMutex); return m_nMaxHelpTextLines; } void SAL_CALL DefaultComponentInspectorModel::initialize( const Sequence< Any >& _arguments ) { - ::osl::MutexGuard aGuard(m_aMutex); + std::unique_lock aGuard(m_aMutex); if ( m_bConstructed ) throw ucb::AlreadyInitializedException(); @@ -155,7 +155,7 @@ namespace rptui Sequence< PropertyCategoryDescriptor > SAL_CALL DefaultComponentInspectorModel::describeCategories( ) { - ::osl::MutexGuard aGuard( m_aMutex ); + std::unique_lock aGuard( m_aMutex ); const struct { @@ -183,7 +183,7 @@ namespace rptui ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getPropertyOrderIndex( const OUString& _rPropertyName ) { - ::osl::MutexGuard aGuard(m_aMutex); + std::unique_lock aGuard(m_aMutex); const sal_Int32 nPropertyId( OPropertyInfoService::getPropertyId( _rPropertyName ) ); if ( nPropertyId != -1 ) return nPropertyId; |