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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Dec 18 09:33:24 UTC 2018


 sfx2/source/doc/sfxbasemodel.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 1b7147f471085579bfca76ea21ee0e6519de54a5
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Tue Dec 18 08:52:00 2018 +0100
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Tue Dec 18 10:32:54 2018 +0100

    Add SfxModelGuard to setArgs
    
    Follow-up to 43a63b725208bfa378355011ea56cb936afa4411
    
    Change-Id: I39d80abdb541909b3cfa4651317c9c9f478e42ca
    Reviewed-on: https://gerrit.libreoffice.org/65312
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit 7f2d0dc559e24d861d72cf03a451b0aa4d275d91)

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 979c34f549ce..9b96c5eab55d 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1053,6 +1053,8 @@ Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(RuntimeE
 
 void SAL_CALL SfxBaseModel::setArgs(const Sequence<beans::PropertyValue>& aArgs)
 {
+    SfxModelGuard aGuard( *this );
+
     SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium();
     if (!pMedium)
     {


More information about the Libreoffice-commits mailing list