[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/qa xmloff/source

[Caolán McNamara]

 sw/qa/core/data/odt/pass/tdf112123.odt |binary
 xmloff/source/text/txtimp.cxx          |    3 +++
 2 files changed, 3 insertions(+)

New commits:
commit e09c2106c136b9cb3a32e1ffbc19aba8269f37ca
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 31 13:16:25 2017 +0100

    Resolves: tdf#112123 check m_xAutoStyles like in similar methods
    
    Change-Id: I099da789a0e64fd862d09bb462ccb699e1dc8b9f
    Reviewed-on: https://gerrit.libreoffice.org/41752
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/qa/core/data/odt/pass/tdf112123.odt b/sw/qa/core/data/odt/pass/tdf112123.odt
new file mode 100644
index 000000000000..c5d2195b9468
Binary files /dev/null and b/sw/qa/core/data/odt/pass/tdf112123.odt differ
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 234673c26461..9fd732c98f55 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -2431,6 +2431,9 @@ SvXMLImportContext *XMLTextImportHelper::CreateTableChildContext(
 sal_Int32 XMLTextImportHelper::GetDataStyleKey(const OUString& sStyleName,
                                                bool* pIsSystemLanguage )
 {
+    if (!m_xImpl->m_xAutoStyles.is())
+        return -1;
+
     const SvXMLStyleContext* pStyle =
         static_cast<SvXMLStylesContext *>(m_xImpl->m_xAutoStyles.get())->
                   FindStyleChildContext( XML_STYLE_FAMILY_DATA_STYLE,