| commit | 71c7c3dddb1291e262b1f8132b75e95fc6f9fa02 | [log] |
|---|---|---|
| author | Caolán McNamara <caolanm@redhat.com> | Thu Apr 13 15:50:25 2023 +0100 |
| committer | Michael Stahl <michael.stahl@allotropia.de> | Fri Apr 14 14:02:55 2023 +0200 |
| tree | 299b8bb3097ff2cd174c90725881b01a399c81ab | |
| parent | 9d4cb8c356c0f83c81dc8e96b3e96e3c009a19f6 [diff] |
Resolves: tdf#152619 crash inspecting uninserted XFieldMaster Change-Id: I765dd5d7e1ed2c1749841491a50216a6afe903c1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150351 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 5464a1dad69c52d011b194baf7d543ce8dd27748) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150321 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 84ae8fe..c6d899d 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx
@@ -1325,6 +1325,8 @@ SwXTextField::getTextFieldMaster() SolarMutexGuard aGuard; SwFieldType* pType = m_pImpl->GetFieldType(); if (!pType && !m_pImpl->m_pDoc) // tdf#152619 return nullptr; uno::Reference<beans::XPropertySet> const xRet( SwXFieldMaster::CreateXFieldMaster(m_pImpl->m_pDoc, pType)); return xRet;