diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-08-31 13:16:25 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-08-31 15:49:42 +0200 |
| commit | 3576aa7a7328b04faf222451d73681db7c1d9c54 (patch) | |
| tree | 328fb02917c41c4b8c8bb4ecc8a9dc5b78b99a6b | |
| parent | fb8fba4a99e71ba9faa9d93dc126bae80baffdde (diff) | |
Resolves: tdf#112123 check m_xAutoStyles like in similar methods
Change-Id: I099da789a0e64fd862d09bb462ccb699e1dc8b9f
Reviewed-on: https://gerrit.libreoffice.org/41753
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | sw/qa/core/data/odt/pass/tdf112123.odt | bin | 0 -> 1673 bytes | |||
| -rw-r--r-- | xmloff/source/text/txtimp.cxx | 3 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sw/qa/core/data/odt/pass/tdf112123.odt b/sw/qa/core/data/odt/pass/tdf112123.odt Binary files differnew file mode 100644 index 000000000000..c5d2195b9468 --- /dev/null +++ b/sw/qa/core/data/odt/pass/tdf112123.odt diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 4d1b1333d9d2..ddb51718bf9f 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -2430,6 +2430,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, |