summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-07-08 10:55:02 +0100
committerCaolán McNamara <caolanm@redhat.com>2021-07-08 14:43:16 +0200
commit86a8701e2eb7ac81852fab3f49372d5ab58032e4 (patch)
tree91738f264816e338ede3e1f17915585bcd8794f6 /framework
parent17811ca444676767ec72089c9fe8fb4ccd54cfc6 (diff)
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/+/118634 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'framework')
-rw-r--r--framework/source/uiconfiguration/imagemanagerimpl.cxx4
1 files changed, 2 insertions, 2 deletions
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();
}
}
}