sfx2/source/doc/sfxbasemodel.cxx | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit dafa1bbf09e1df38cc0758b9f4c8a0ca186b31d2
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Apr 15 16:09:09 2020 +0100
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Thu Apr 16 07:20:14 2020 +0200
tdf#126828 don't crash fetching cmis properties from disposed SfxBaseModel
Change-Id: Ie064632667b40201e0d266c64e3068c4d1983c7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92283
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit db677c854a37031235b0f42b4f4f48560149754f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92289
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index a136f74f2886..9849ac86d642 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2458,8 +2458,10 @@ void SAL_CALL SfxBaseModel::notifyDocumentEvent( const
OUString&, const Referenc
throw lang::NoSupportException("SfxBaseModel controls all the sent
notifications itself!" );
}
-Sequence< document::CmisProperty > SAL_CALL SfxBaseModel::getCmisProperties()
+Sequence<document::CmisProperty> SAL_CALL SfxBaseModel::getCmisProperties()
{
+ if (impl_isDisposed())
+ return Sequence<document::CmisProperty>();
return m_pData->m_cmisProperties;
}
@@ -2597,7 +2599,9 @@ void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor,
const OUString& rMessage
uno::Sequence< document::CmisVersion > SAL_CALL SfxBaseModel::getAllVersions( )
{
- uno::Sequence< document::CmisVersion > aVersions;
+ uno::Sequence<document::CmisVersion> aVersions;
+ if (impl_isDisposed())
+ return aVersions;
SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium();
if ( pMedium )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
