[Libreoffice-commits] core.git: sfx2/source
Samuel Mehrbrodt (via logerrit)
logerrit at kemper.freedesktop.org
Wed Nov 20 08:12:39 UTC 2019
sfx2/source/view/sfxbasecontroller.cxx | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 9c9c047f42637c274b246fb4020ed0df4ee39ded
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Wed Nov 20 07:49:23 2019 +0100
Commit: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Wed Nov 20 09:11:33 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.Mehrbrodt at 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.");
More information about the Libreoffice-commits
mailing list