From d3f265085997d35b917d2b35409ecdbd25cb2075 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 8 Jul 2021 10:55:02 +0100 Subject: SolarMutexGuard::clear called twice where the 2nd call site should undo the 1st MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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::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/+/118622 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- framework/source/uiconfiguration/imagemanagerimpl.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'framework') diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index 8b7733aac91e..ecd4d18b2391 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -925,7 +925,7 @@ void ImageManagerImpl::insertImages( ::sal_Int16 nImageType, const Sequence< OUS // XUIConfigurationPersistence void ImageManagerImpl::reload() { - SolarMutexClearableGuard aGuard; + SolarMutexResettableGuard aGuard; if ( m_bDisposed ) throw DisposedException(); @@ -1061,7 +1061,7 @@ void ImageManagerImpl::reload() implts_notifyContainerListener( aRemoveEvent, NotifyOp_Remove ); } - aGuard.clear(); + aGuard.reset(); } } } -- cgit