From 8cba5e9bd27c0ac92c9ea68522352551505187c6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 27 Aug 2016 13:31:14 +0100 Subject: fftester: topcontext check Change-Id: I2045ce82a1d536ab566e6a1218bea9c6a6696024 (cherry picked from commit a3d74764d89e396dd7e8e7812ea64a062d6aed85) Reviewed-on: https://gerrit.libreoffice.org/28421 Tested-by: Jenkins Reviewed-by: David Tardon --- .../qa/cppunittests/rtftok/data/fail/topcontext-2.rtf | Bin 0 -> 1300 bytes writerfilter/source/dmapper/DomainMapper.cxx | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-2.rtf 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 000000000000..c0bd2691cdde 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 8a6cf50c2895..af0ae0af3235 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -276,7 +276,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()) -- cgit