diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-07-08 10:55:02 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-07-08 15:16:37 +0200 |
commit | b39292ac6c89ee20db72e2dc33a59e8d49ca449c (patch) | |
tree | 9cc618dc5d6ada0c99a5b95dc47fd00430d5045c | |
parent | cid#1468696 Logically dead code (diff) | |
download | core-b39292ac6c89ee20db72e2dc33a59e8d49ca449c.tar.gz core-b39292ac6c89ee20db72e2dc33a59e8d49ca449c.zip |
SolarMutexGuard::clear called twice where the 2nd call site should undo the 1st
since
commit 94f8a0e60b7bc5c1176eafe9a36c3f3466bd1408
Date: Thu Mar 20 09:08:10 2014 +0100
Use SolarMutexGuard directly
Change-Id: I4b245dd68bf032a1d74fb16b910dc952fd761781
seen with compiler warning of:
In member function ‘sal_uInt32 comphelper::SolarMutex::release(bool)’,
inlined from ‘void osl::ClearableGuard<T>::clear() [with T = comphelper::SolarMutex]’ at include/osl/mutex.hxx:194:28,
inlined from ‘void framework::ImageManagerImpl::reload()’ at framework/source/uiconfiguration/imagemanagerimpl.cxx:1071:25:
include/comphelper/solarmutex.hxx:91:22: error: ‘this’ pointer is null [-Werror=nonnull]
Change-Id: Ibd074794e4556a6ff34b0dc94099e81e1ae3b349
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118623
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins
-rw-r--r-- | framework/source/uiconfiguration/imagemanagerimpl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index 681ce8a4a7ba..bbed5cc71243 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -929,7 +929,7 @@ void ImageManagerImpl::insertImages( ::sal_Int16 nImageType, const Sequence< OUS // XUIConfigurationPersistence void ImageManagerImpl::reload() { - SolarMutexClearableGuard aGuard; + SolarMutexResettableGuard aGuard; if ( m_bDisposed ) throw DisposedException(); @@ -1068,7 +1068,7 @@ void ImageManagerImpl::reload() implts_notifyContainerListener( aRemoveEvent, NotifyOp_Remove ); } - aGuard.clear(); + aGuard.reset(); } } } |