diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-04-07 11:48:47 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-04-07 17:53:04 +0200 |
| commit | 5a824268dfdd48c00f656b767b48cd12ccbdaabb (patch) | |
| tree | a25f4afd3ca49cff41fc44559aedea70c82e6c7e /accessibility | |
| parent | a6186a678cd9f67359da885606b3c3983f6bdc74 (diff) | |
Don't use resettable/clearable guard where plain guard is enough
Also use scope where possible. This allows to limit guard scope at
language level; visualises the scope clearly; and helps avoiding
errors like fixed in commit 61e4437c857854b331fa01da6f39b2b3b58a800b.
Change-Id: Ifeca96e2df8e8a0897770d9546b2536806275f41
Reviewed-on: https://gerrit.libreoffice.org/70376
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 2 | ||||
| -rw-r--r-- | accessibility/source/extended/textwindowaccessibility.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index 488d42f7c68c..f8d733c3e30b 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -414,7 +414,7 @@ tools::Rectangle AccessibleBrowseBoxBase::getBoundingBoxOnScreen() void AccessibleBrowseBoxBase::commitEvent( sal_Int16 _nEventId, const Any& _rNewValue, const Any& _rOldValue ) { - ::osl::ClearableMutexGuard aGuard( getMutex() ); + osl::MutexGuard aGuard( getMutex() ); if ( !getClientId( ) ) // if we don't have a client id for the notifier, then we don't have listeners, then // we don't need to notify anything diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 927895339a7e..3cebc2ba295e 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -589,7 +589,7 @@ void SAL_CALL Paragraph::removeAccessibleEventListener( { comphelper::AccessibleEventNotifier::TClientId nId = 0; { - ::osl::ClearableMutexGuard aGuard(rBHelper.rMutex); + osl::MutexGuard aGuard(rBHelper.rMutex); if (rListener.is() && m_nClientId != 0 && comphelper::AccessibleEventNotifier::removeEventListener( m_nClientId, rListener ) == 0) { @@ -612,7 +612,7 @@ void SAL_CALL Paragraph::disposing() { comphelper::AccessibleEventNotifier::TClientId nId = 0; { - ::osl::ClearableMutexGuard aGuard(rBHelper.rMutex); + osl::MutexGuard aGuard(rBHelper.rMutex); nId = m_nClientId; m_nClientId = 0; } |