commit 72f598e4b6f5250f250a3f3cce82e059f4fae34f
author Caolán McNamara <caolanm@redhat.com> Thu Apr 13 15:50:25 2023 +0100
committer Xisco Fauli <xiscofauli@libreoffice.org> Wed Apr 26 13:27:34 2023 +0200
tree bd50e0281a80454284aad7659ad1890dbed4bf12
parent 646ac8d55ec742da4ba1d34e9c4bc3217a279f60

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/+/150503
Reviewed-by: Stéphane Guillou <stephane.guillou@libreoffice.org>
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

sw/source/core/unocore/unofield.cxx

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;