diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-08-27 13:31:14 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-08-27 13:35:53 +0100 |
| commit | a3d74764d89e396dd7e8e7812ea64a062d6aed85 (patch) | |
| tree | 594bce21383663baddcfa63580e5fa3748bba6fd /writerfilter | |
| parent | 50bec3daab04d2c2d041fdb100d97c30ad441491 (diff) | |
fftester: topcontext check
Change-Id: I2045ce82a1d536ab566e6a1218bea9c6a6696024
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-2.rtf | bin | 0 -> 1300 bytes | |||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-2.rtf b/writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-2.rtf Binary files differnew file mode 100644 index 000000000000..c0bd2691cdde --- /dev/null +++ b/writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-2.rtf diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 26eaee92e171..1933b42d892d 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()) |