writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-2.rtf |binary writerfilter/source/dmapper/DomainMapper.cxx | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-)
New commits: commit b85ce724410ef0a54f63cf68445e0f59641d5ab4 Author: Caolán McNamara <[email protected]> Date: Sat Aug 27 13:31:14 2016 +0100 fftester: topcontext check Change-Id: I2045ce82a1d536ab566e6a1218bea9c6a6696024 (cherry picked from commit a3d74764d89e396dd7e8e7812ea64a062d6aed85) Reviewed-on: https://gerrit.libreoffice.org/28422 Tested-by: Jenkins <[email protected]> Reviewed-by: David Tardon <[email protected]> diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-2.rtf b/writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-2.rtf new file mode 100644 index 0000000..c0bd269 Binary files /dev/null and b/writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-2.rtf differ diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 26fcb1f..ecef996b 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -258,7 +258,8 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) m_pImpl->SetSymbolFont(sStringValue); break; case NS_ooxml::LN_CT_Underline_val: - handleUnderlineType(nIntValue, m_pImpl->GetTopContext()); + if (m_pImpl->GetTopContext()) + handleUnderlineType(nIntValue, m_pImpl->GetTopContext()); break; case NS_ooxml::LN_CT_Color_val: if (m_pImpl->GetTopContext())
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
