[Libreoffice-commits] core.git: Branch 'feature/cib_contract3756' - sfx2/source

[Samuel Mehrbrodt (via logerrit)]

 sfx2/source/view/sfxbasecontroller.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 827c61c5a80102877dafd7290fd3157ad16e4f9b
Author:     Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Wed Nov 20 07:49:23 2019 +0100
Commit:     Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Wed Nov 20 09:21:58 2019 +0100

    Add SolarMutexGuard to infobar api methods
    
    Change-Id: If7fab7df7566b1db770437090115b064b98257c6
    Reviewed-on: https://gerrit.libreoffice.org/83255
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
    (cherry picked from commit 9c9c047f42637c274b246fb4020ed0df4ee39ded)
    Reviewed-on: https://gerrit.libreoffice.org/83261
    Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>

diff --git a/sfx2/source/view/sfxbasecontroller.cxx 
b/sfx2/source/view/sfxbasecontroller.cxx
index f4cf6768a8b3..22ec268c9518 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -1477,6 +1477,8 @@ void SAL_CALL SfxBaseController::appendInfobar(const 
OUString& sId, const OUStri
                                                const Sequence<StringPair>& 
actionButtons,
                                                sal_Bool bShowCloseButton)
 {
+    SolarMutexGuard aGuard;
+
     if (aInfobarType < static_cast<sal_Int32>(InfobarType::INFO)
         || aInfobarType > static_cast<sal_Int32>(InfobarType::DANGER))
         throw lang::IllegalArgumentException("Undefined InfobarType: "
@@ -1510,6 +1512,8 @@ void SAL_CALL SfxBaseController::updateInfobar(const 
OUString& sId, const OUStri
                                                const OUString& 
sSecondaryMessage,
                                                sal_Int32 aInfobarType)
 {
+    SolarMutexGuard aGuard;
+
     if (aInfobarType < static_cast<sal_Int32>(InfobarType::INFO)
         || aInfobarType > static_cast<sal_Int32>(InfobarType::DANGER))
         throw lang::IllegalArgumentException("Undefined InfobarType: "
@@ -1525,6 +1529,8 @@ void SAL_CALL SfxBaseController::updateInfobar(const 
OUString& sId, const OUStri
 
 void SAL_CALL SfxBaseController::removeInfobar(const OUString& sId)
 {
+    SolarMutexGuard aGuard;
+
     SfxViewFrame* pViewFrame = m_pData->m_pViewShell->GetFrame();
     if (!pViewFrame->HasInfoBarWithID(sId))
         throw css::container::NoSuchElementException("Infobar with ID '" + sId 
+ "' not found.");
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits