From a3d74764d89e396dd7e8e7812ea64a062d6aed85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Sat, 27 Aug 2016 13:31:14 +0100
Subject: [PATCH] fftester: topcontext check

Change-Id: I2045ce82a1d536ab566e6a1218bea9c6a6696024
---
 .../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 0000000000000000000000000000000000000000..c0bd2691cddedcf097628aa99882a213200f7262
GIT binary patch
literal 1300
zcmZ`&U1%It6#izi+3J+&MiWyofs0bqA{tSG+9+K!DP7aLP1!Bl9)s*=yBQL6-JfoB
zcC$mJ;u>gF5JoDrioUG+kO%ca6zPNS5(Gusp!C|+RBVgJWn*(avy)XC@q4)E&d)vH
zchC8bO@$fUr*+TF(2>UtA?&Ae`4?tVxv5ktzti4XE*o}YGwdiFP(Def31ymJn7d5V
z{4){D_5(XCQfoeXHsYEhgXr^>Qt2)`mbeNa)2YIpI&b>30=>Yt&kV{HGO4V1<)v`=
zfv~RsB}e2RQYuGExfC6K><}4S$b|8W2J|4Pt3>SNaRlsa;)%`R6FwqgC~FTfd5mc5
z1^gPilioO&qf6pgEpT%!ARfWN0ZoW*@$3cAKq{FBG%PMI_O?-+DAodn0uW;MNkI46
z!R-C<`1ry2vg^iS?p|HJ|Mu>;0QW=J1;p%|soeQbmk3VLQ95p_1tt}CV4%J*KR>_k
znFy|jqtj8U#K~$jK5)OK*D1&Jbje35$uT76b@2buXmnpBa^_6v;(BpQtMZe>`2%Gl
zYwxc20tLIH9@ZhN8wijcefjD5(MV*N5Bdmkf`>T)*IUQM%k3<b|G1TfDyU8iwahr{
zEf6QHQ6X>WqvxCUehr})vsTZ$IC~vxfs`E#215vb*~zg5?!39+c>o=CsvKciq<&T>
zla~+EgQ%?7ZrAdZB5?nIC@~IsOX;1fZVL;yyyo)l^T~3t2;GZ(ew_u~J1xH90xDH5
zKDpBVu$NAGA6C`68dYk&J~oB`R~tWBmi_(P&T+$G#Xz$m#kmuu3Bz;2h`0DIl3l)w
z@-U=Q7K}a;%||iRycJk!$bJt(XxN5saxt4v<ygW*esFLw$#nxdG8uLPGln3)mJYvR
zraLyz#<kDwNqOIE7vD=>VL49S)70|N=y<&6zu?rkkqJKX#E*EU^fppP1jyd6tTcQ2
zUn{V?H@r(*?+K6n*2Ndw?I<2OCL!xKXcblb{mOTJV2|Xg)#>W1R(hPKe1r*lcoM2&
zarPiDY;!zRQG0%DaA~~qwugb^=22@s<CCU5%tOW_I)tI60S%7qW#aVO+^OdbuMOw@
zHf&ttnyDQ1xXI(Lvq#A2rvo%Q_J2?sQA0I#9P_N4WvQV|Cd21RRn%z~zJ0_{3gxtz
mb2{N@v;Uw~GotOj2Kkkg++Tl2%TnGQOUFsa99It75dH@BME=|W

literal 0
HcmV?d00001

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())