commit 36defda96fc62cef1e1ffb725f6768d54b0d9cd0
author Xisco Fauli <xiscofauli@libreoffice.org> Fri Jun 21 19:03:36 2019 +0200
committer Michael Stahl <Michael.Stahl@cib.de> Wed Jun 26 11:05:56 2019 +0200
tree 15839778a89d0ee1d270cf9b58b4dfed9fb95819
parent 100f43ab871bedda6b427645cbfc2c8083da98b5

tdf#125382: Check if pDoc is not null

regression from e18359445fabad9ba1a704600e9ee327112cc6ae

Change-Id: Icd8db6a403b7736d6c8c9d40c8f2c7476c1eee87
Reviewed-on: https://gerrit.libreoffice.org/74533
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

sw/source/core/unocore/unofield.cxx

diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 3c31a11..7759844 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -1182,6 +1182,9 @@

    SwFieldType* GetFieldType() const
    {
        if(!m_pDoc)
            throw uno::RuntimeException();

        if (IsDescriptor())
            return m_pFieldType;
        return m_pFormatField->GetField()->GetTyp();
@@ -1363,6 +1366,7 @@
SwXTextField::getTextFieldMaster()
{
    SolarMutexGuard aGuard;

    SwFieldType* pType = m_pImpl->GetFieldType();
    uno::Reference<beans::XPropertySet> const xRet(
            SwXFieldMaster::CreateXFieldMaster(m_pImpl->m_pDoc, pType));