[Libreoffice-commits] core.git: framework/source svtools/source

[Caolán McNamara (via logerrit)]

 framework/source/uielement/popuptoolbarcontroller.cxx |    1 +
 svtools/source/uno/popupwindowcontroller.cxx          |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit 7d514150ef7c9a82aa72213ee2973cc8b9b2dbfa
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 15 14:37:10 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jan 15 20:28:34 2020 +0100

    hold SolarMutex on calling vcl toolbox enable item
    
    Change-Id: I35bbe90fbda6c46c1ad173746171b3ede1b2105c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86850
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index f232abfcb30c..f5b6d5f31695 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -162,6 +162,7 @@ void SAL_CALL PopupMenuToolbarController::statusChanged( const css::frame::Featu
     sal_uInt16 nItemId = 0;
     if ( getToolboxId( nItemId, &pToolBox ) )
     {
+        SolarMutexGuard aSolarLock;
         pToolBox->EnableItem( nItemId, rEvent.IsEnabled );
         bool bValue;
         if ( rEvent.State >>= bValue )
diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx
index a2eb9efc7cfb..a60f06daf5ee 100644
--- a/svtools/source/uno/popupwindowcontroller.cxx
+++ b/svtools/source/uno/popupwindowcontroller.cxx
@@ -202,6 +202,7 @@ void SAL_CALL PopupWindowController::statusChanged( const frame::FeatureStateEve
     sal_uInt16 nItemId = 0;
     if ( getToolboxId( nItemId, &pToolBox ) )
     {
+        SolarMutexGuard aSolarLock;
         pToolBox->CheckItem( nItemId, bValue );
         pToolBox->EnableItem( nItemId, rEvent.IsEnabled );
     }