[Libreoffice-commits] core.git: Branch 'libreoffice-7-1-5' - framework/source

[Caolán McNamara (via logerrit)]

 framework/source/uiconfiguration/imagemanagerimpl.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 91a292367adf8856e509bd9464c8993c3b5299c3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 8 10:55:02 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jul 12 15:17:30 2021 +0200

    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 at redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit b39292ac6c89ee20db72e2dc33a59e8d49ca449c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118722
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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();
         }
     }
 }