diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-08-27 13:31:14 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-09-01 12:13:34 +0200 |
| commit | 40819ed68d6cd9381fbcf65d80162ba0a3ac13b6 (patch) | |
| tree | 6b0425c2e501a7fcc43e5d1c533629939c3585e5 /writerfilter | |
| parent | 712f7e0c22c5049ad2a971a3afef16821a5477ea (diff) | |
fftester: topcontext check
Change-Id: I2045ce82a1d536ab566e6a1218bea9c6a6696024
(cherry picked from commit a3d74764d89e396dd7e8e7812ea64a062d6aed85)
Reviewed-on: https://gerrit.libreoffice.org/28422
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit b85ce724410ef0a54f63cf68445e0f59641d5ab4)
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 268017e0b74b..0dc8a651792f 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()) |