[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - writerfilter/qa writerfilter/source

[Caolán McNamara]

 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 8cba5e9bd27c0ac92c9ea68522352551505187c6
Author: Caolán McNamara <caolanm at redhat.com>
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/28421
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

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 8a6cf50..af0ae0a 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())