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

[Maxim Monastirsky]

 framework/source/uielement/popuptoolbarcontroller.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit d6c4c28f75c755df1e1fa7df67eeadba78d66785
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Thu Jan 28 21:30:06 2016 +0200

    tdf#97419 Need to take SolarMutex here
    
    Change-Id: I97886c8dbd7b56d155ad9598ca127df0c7420d2c
    (cherry picked from commit 49e1a1a4f5591faaca61559e6492909faf1bc94d)
    Reviewed-on: https://gerrit.libreoffice.org/22034
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 6b9c552..ace6884 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -402,6 +402,7 @@ void SaveToolbarController::functionSelected( const OUString& /*aCommand*/ )
 void SaveToolbarController::updateImage()
     throw ( css::uno::RuntimeException, std::exception )
 {
+    SolarMutexGuard aGuard;
     ToolBox* pToolBox = nullptr;
     sal_uInt16 nId = 0;
     if ( !getToolboxId( nId, &pToolBox ) )