sw/qa/core/data/odt/pass/tdf112123.odt |binary
xmloff/source/text/txtimp.cxx | 3 +++
2 files changed, 3 insertions(+)
New commits:
commit 1b7d983684790331eacdf027c26d1cf61ae53468
Author: Caolán McNamara <caol...@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/41751
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@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 a49e9f621f30..2e8837c88da7 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -2427,6 +2427,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,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
