summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2019-11-20 07:49:23 +0100
committerXisco FaulĂ­ <xiscofauli@libreoffice.org>2019-11-23 08:51:13 +0100
commit5d7be7fdbd1f94b2056f8b4adc7722addb9e7fc9 (patch)
tree7e0832b89d254d226dcd37ce51886e6d50484681 /sfx2
parenta297c6a8c71a8cb07ede3b2305760a1d41b9fb6a (diff)
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@cib.de> (cherry picked from commit 9c9c047f42637c274b246fb4020ed0df4ee39ded) Reviewed-on: https://gerrit.libreoffice.org/83506 Reviewed-by: Xisco FaulĂ­ <xiscofauli@libreoffice.org>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/view/sfxbasecontroller.cxx6
1 files changed, 6 insertions, 0 deletions
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.");