From ac18fc6dde31fd5a6663594df2ecb07132ae1f65 Mon Sep 17 00:00:00 2001
From: Adam Hooper <adam@adamhooper.com>
Date: Tue, 25 Feb 2020 14:32:14 -0500
Subject: [PATCH] Parse inlineStr values

inlineStr XML structure is <c><is><t>. This was being parsed incorrectly
when streaming (because has_value wasn't being set to true) and when
reading the whole file (because the <t> was ignored).

[closes #445]
---
 source/detail/serialization/xlsx_consumer.cpp |  13 ++++++++++--
 tests/data/Issue445_inline_str.xlsx           | Bin 0 -> 4593 bytes
 tests/workbook/serialization_test_suite.cpp   |  20 ++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 tests/data/Issue445_inline_str.xlsx

diff --git a/source/detail/serialization/xlsx_consumer.cpp b/source/detail/serialization/xlsx_consumer.cpp
index d23d35db..ea64b131 100644
--- a/source/detail/serialization/xlsx_consumer.cpp
+++ b/source/detail/serialization/xlsx_consumer.cpp
@@ -272,8 +272,8 @@ Cell parse_cell(xlnt::row_t row_arg, xml::parser *parser)
             if (level == 2)
             {
                 // <v> -> numeric values
-                // <is> -> inline string
-                if (string_equal(parser->name(), "v") || string_equal(parser->name(), "is"))
+                // <is><t> -> inline string
+                if (string_equal(parser->name(), "v"))
                 {
                     c.value += std::move(parser->value());
                 }
@@ -283,6 +283,14 @@ Cell parse_cell(xlnt::row_t row_arg, xml::parser *parser)
                     c.formula_string += std::move(parser->value());
                 }
             }
+            else if (level == 3)
+            {
+                // <is><t> -> inline string
+                if (string_equal(parser->name(), "t"))
+                {
+                    c.value += std::move(parser->value());
+                }
+            }
             break;
         }
         case xml::parser::start_namespace_decl:
@@ -561,6 +569,7 @@ cell xlsx_consumer::read_cell()
         else if (current_element == qn("spreadsheetml", "is")) // CT_Rst
         {
             expect_start_element(qn("spreadsheetml", "t"), xml::content::simple);
+            has_value = true;
             value_string = read_text();
             expect_end_element(qn("spreadsheetml", "t"));
         }
diff --git a/tests/data/Issue445_inline_str.xlsx b/tests/data/Issue445_inline_str.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..4085593b67b33337710668b8f08a48fed77fadf3
GIT binary patch
literal 4593
zcmZ`+2Q(aO8(u9~L|G+PkD6GKMf5JZ=rw}9*sHU8N%T(i-g`t{5?M7mQNl(ELX;pu
z^cqqB&CU65Zv6M3IWu$SoO#}P=b7hy-tW~^#lfWn000DlO$Q@Qe3=L4ftb5m%t3}Z
zES)SgU7QfEyni4Ncf1_zAH+%!VMEF8Uk*6Gu9xYMHJ5&;UGswUF&%HbrQ8cyzgCfs
zI7ddO8w&G4tJ{lZ*LlKp<CbnFk^-n`qEPB4rH=Gz)+H9+0I`*X;iqUNWmv^H<8#82
zj4ux^uE#3mxm;(g@>2iuwH5*A>?&cwBe`^Om@6B<x6N^w$~3VfW@D=PTe<)&!SroR
zn%vj`0Qo=DwQzEQ|HyYJQA@S!F4>#5sO8tM1&s0J(r9{034?HY>f=A6U}GW6#k2MG
zRmS0~_&ZR~%d;&{L`>vpNC^7YeYNGg^Te&2F9e*sV()8VTe{vyx{7c#)i#p$+kx}e
z09sk3zS3mb^FfNE`blAghTWlkx)w14g!e+-dW~N$ELquFrQZwS@!8;#)6;Js7l7u5
zp#r&KLF62HZA8{Ii;vDhVx9pxNpc>l<=dw(%!V4B!+~?TDBk_1&~?7G;e}&vG3C+-
zI**LArY8R>2|o6Q1w5M2=blt)hdGs#+ez!BZ51`76PvSAf~^GQ*ZgKfPq2SyC*x5z
zE7>&wAe$2a0AbkivgdWPhC9H2o}oYZ*?eg1IxS4;w~c(~Wp(60)GHW>ssp*&c+Avg
zglwuag_0Y_*n3+hg!s293X%<`l58eEXvz}Dg{++p%PX#|3VZKw-7#Mci%8z{f_>nf
znP{%(om(*AV<VTjOIwQEX$O|5nZ9~x1LzX=?FUhGeGG~wQ1zl5oOrZg4CZB>_*yqJ
zs~=)xUvNXw66R|Pv6g<PtM$;yjJfVJ6aO*Qpl%Gj2n%E&!_gQ~xA)z?=WKdT5{_OI
zW#9{Ryh~@u>_6;Ox~%>%;*)M?ce|~Xl)l}Ykx`|9pnl(Eye8$NqA@B0J`yp}9K&Ic
zCr90zc~1wX-2@!K3ro9R!l=Q~Xaqg(f>v{GXU>6rTd@pbU6IW@%c-O3>V#+IF*+J!
z-+brSv#hg$F~%BWcAm3iv5~!1@4QG_cQwMhsv~<V-np&YaB!Yi+ZC@-Tgxget@}_=
zz4|OY#tbk-cuc$<#Yr{2b>f~3{=m>YEAwc_a7!eT{Gzu9cfw|rHdR2uB_|&5IzXs<
zL{0MvQU(>Z(3v>;D1HKc>y;*$AhR#<P%((5=Ogm`Fs-@2nBOPIS9I7e+25uDt8}wD
z3!QZ4y1JZKnl$-9b{NqDA>2J>HU1-<(@_lMB1&&1`viS-lu*LXhu;1UTvr#jV$x5o
zF+ro3bDz4fHqRaz`W|U0I<iidwZFVMnXJGjpV!CJv`jAiN|}TYBt?)DmTs#_k6la%
zO)UsJuIsHNUjX^mw-WTt$3%RqaLSZ0C@@r>4ml=M054{{esLYKKgBOm7&+2w`B;=@
zNQISlV_u;A9;9c&E2Vw6DqEZZL@|_1bWJ8Kjg5n%OvLYj66k`vWcng|OnN7om+eF)
zA<pI{YpEN@&?-N;Ljg(W9&SA<?sI|nJ^LPzK7oz_+lua`0!xTZ^A01DEjF{Nlbl;t
z(wtTh?DC2_5anDJ0((f&JL082T1S3nRCzB+64tjdl;A!*k#L<n(NqZY>~M5Ec^hMx
zuuA4;p|c_Gd9G=fa>r`W;GgFWeqrzV?IE$>6vt^)mPt8ErPlZa@QX5y2w#Wj+vb&r
z3rId^<OAaEHZn?n_VEG=rS`UHRtG)Cx*VAn>Z~{pY8Uap<BKlYZak1E7_Ap#^|k64
zi#DE9a5U~dt%god3f$qcFmM^_d!vg?x-}(|*S>LXEt$K!dGdiR1es~X!%7{m8u(I%
zt>G+sVCQx>;i{!EJK>=27+ffdB3G8qaZTq?C1vt6vXQGn+<18nS>PrKL4OxFTd5l&
z;+Ly;QT>WaZhgfeta4EM7NO2KNGxV0p2&dm%xAcFdSv3U%vy3+Crz#aEZd6X(3JC0
zR5&+1p%FNy9q-ijeXYj}yeRSkx6wD<z+q)-WaM<EL#w7}TRfHFO~hUy%T_^HI=V|P
z-21Uvx>ZWArU0dbeI*-2p&r&SxeK9Ou!QmC;|C+Pu=lj}U{K>;9PaqSCu&dSR}m{|
zkIa@v5|?J4!CyHdZ+X%>+|(B7v`Gh9RSe9*YdiE9(0ayuHLbQ1byVu;3!|#OJYsTn
zY9b0Hi)5N-Duw&BI;|_*%H4XxZSwpminJRoOJCkNtLrpSc%VqJ`5K!=%6#BZt7m)j
zJj8?$;|L>)#Rn#v?^m+2t9@>IoTPbn!1m4&{feZY#a7G?OysKlj%Jrm9FxS9)Uv&M
z$g$kyu~}2-uTj(REo*Ki#$N+r4JG&A-@y*Dd`2ITenRwmkGSy`)o_)hh`&4}I85Di
zl%0Yys)iVkg~nxRdppV2^XcRXB+wy5m(TJ&&465FhXlWi+>|c+e)Tj5QRvK~?oczh
zl>?^Q<>Q#c!+AMlIxbO1BcZTgl(E40GTb%Gr=e56^3rgE@jKtV2x3Nb4#)Hh2qIVP
z*Wnu#6+m8L-r9uJ_|Bd!R`+-}kU8sYVy5_Lc7gcGc*VmKOKx&0Rs1JRiPtQi8XpLl
z#Zj79J*%ziorV&72N>=X7yKzaA1<E>=6@euDG~#8l6f!vS!!mS#QKOtfIb1w6q<n&
zELv6vihsP=CaLM{j{US5-G=ph0}(CnnUTc;0F*H8^~TQz;_2jK=V}dyySeiIb@{7{
zxNCQ)cikmEPvK&!aZ9;oZOa|Qf{R~l145`9*T<xGv+r`9Nhk{yGAxk2M;|^uiq=tE
zjr9XCAHnMm*_k4GUy-%awkx%@liMGU74RowyS?5i!uc@FRwSPb7wS}kd+WVz%&7p1
zC+Jgq#C}hLj{43A_m(ZIUSv&G_~oaQ=|Kk=uS+ABhVj@ERVs)Lk?;8MP5Olf4>{rv
zT|2UZ`ptSEqGjZ9<l^=0=tb%Lf`aGFT`M3|zB?t*;>jZcZ(G{P$z9~h(uRarSxGq0
zSI_sOntNiy4_B9!#~4dF8;*@iu$b8T%Mrp*8ee^RQ1F!4_$|8a73n+6de-+-Ah@Ah
z<PjX%(rO#xwfp{4hi3N9_Y_-}Xx4n-5)}yqLoG4a6PO9CqN%Lp4DGPNqEVk5B4$5)
zq$P_@dmVY;RnGJ~?{){k2~P~~3OE1&$xq&0-MsDLu0L9KiO!%cW=V5KRY3ZDNg9U-
zMaqK<bRc94H%;+kAUZ&lxJR5GnkdJbBw1)o=gj8Nz6Qnx2l)~OY?P<$vOAGCuR!)o
zsq1z~Q8;oby`ntv+MdHtR;0%ziEUD<3@RQx3l(U&t%j@zONf1#gY_GTS48z@()N2}
zKi9K{(G;j$+)fr3rF|TlYOAy(3gE1$v{2G#CI&6~Yl~<YAw>49Z7PXisg#S0k-E3<
z(HidK>dJGHb!70cJ97kivJ3Wx7qH@6afUrP?^_9Mi0>O|0)I5mBP<8vk&Ff;tq4|H
zH$y1NtDfbjF51ULFgk)Pr0X~}ZJDZ9D~u3kbg4dbUlDI14Gp1n>rl1Hgv9pCG#=;6
ztW@_s^WBot+4OY(Z`6OR<R?s~n`M<;urb6y#yOK29+zomY89rqlSE3iWG4EDy?MUX
z2x4cb6&@`z-5IkdiCLxE3i@OS`A**!KGQFxGx<j$*LQk<X`aXDlz1z7I_FoGR!ppD
zoOaBg0bweG2y-=af!n+C-uZE^O4Nw%lqT+JQ^`058+3G;OL(t27@c7|bDYbGC9!~N
z{T_$Ewy)RK+__=8Hy5XPBqfmVL9ad2qx;m4piH33_6%DI#U5wVlOU^aOC6V~Xv18%
zS<5n2IVl!j7A~?;nk)ZVg*D|=pog%8g=a{(J*7m7|67H9R;Y2Ym26|Rn5rU*Mni_?
zg%#bkR3kxuNbF`kqO}fk03KQbwkH+J^_We@rQ;~o6&(;*Hv>YTt<4PJlpt0i)*yc=
zL<7$6Qmjq`-MNR6;!VtllKzz94+}7Na<cm&#u%+Z^)6}RvlMHofMP1$LfZyStQ0a`
z%EMOW?B1`EH<4qqZH(Lc1)qES*J~vh(RX5Vk5ay!ZVZBHRNh0s?TeGT<Ligh%?Br`
ztoPfdCVP0V61ssz0Vs|<>K;fvILF8E=_9)VBnYj^@52ehMG?F~l)Vuc8$|?Yn52|z
zW-v}k75tH3@~0Pv)WNDpN#^rPd0<OqvregeIJL&RVu;(t@gkwdT&-YMW((BjHuY${
zJwaO^bwusOSYOl0yTVtxFJ%cxZ`8;JpP7^&2<9(Goqc_}+;s!ZF}x-vc!KHyr?xUe
zge6avV2d6!q8q^j*(l9&Hu2l3HMYZFjh-|r4Oqu&=j-t+?<qVWsawtW24ylgWIsgS
zie}kWbK2(kX1)e{TLjzQdcWSyB+|R>eSF1a8KSxmt1-+TV^{|NWca6={>k%CWhHa~
zgYOcDnaQ636c{${j*s0jePfzGZrx+6ngsPdb>GUz!58zgAt1c`mheSLAW=*#af@Dl
z45n~9<WCP8fHoLkxz=4cOxfa`S){HNk5iA=I0T|RyiiYD__jVnOOK}0!2Nb%^8t?w
z3yg24u9Y*U4_8%r2|&R8vde!5Wg{ADP{D{3+hS3Rjk`evuOQpCkB=2RF23l@(-+4l
z=-gxU3u8ar1eh_Iv;uzD(e(`IB?$9{XpE)(m_>}`oE+WYj&5eU-Uzs>$qy}6>0q>k
zF}4&g1IlK^LO`Y|m%(Zv)7_(IwO`X(W)d$XvWn#kfzO{ePMM;&-b!wKK80dY=XheR
zzhGC<&@OcB;HHGiz=|V3aGUcx!L@x#QOr!#(TZgj%mlhxXszm0JL~Z|tzGfCZ{zM|
z+AjLsFQ9#LcWH{>M`~Ikf=N+=pBTiFdsN>*`aIqHxl;Flp@Z#nUmEIhmhDN-xL-{P
z=m$soY>V874dfG}0LwYjqN2j=O<EbIDOL&}L_}_yE5H|>+mpuuPuI^M1g+d!O)pT%
z7*X>m6j!(D;u@H99;PT@%D{3>5!OMMox9fLLAS&9b-UVRlDj;NColbA=XY9Oe5$`M
zY5p<i@bgZbftjW%7B(f${~ymWME<n}V3_^iVf`xl>a_e53jhRQA^(Z~@9caPes!Gu
z1s}q^{$Ga6s{yVqC;ko)c%9&{0ROtUxEkeZbNo9BRv6)5QGT_`tI(^i{R_&4G4X$R
z_*LLl7yJbzC;mJ0|9aw8@YMqU1$M<WcMNa;r`)f`xmrTM;uu~3*Mibi#luYh001Fo
Nm&EvY&JP0z{0E$@$i)Bv

literal 0
HcmV?d00001

diff --git a/tests/workbook/serialization_test_suite.cpp b/tests/workbook/serialization_test_suite.cpp
index 56660f89..289e08ca 100644
--- a/tests/workbook/serialization_test_suite.cpp
+++ b/tests/workbook/serialization_test_suite.cpp
@@ -91,6 +91,8 @@ public:
         register_test(test_streaming_read);
         register_test(test_streaming_write);
         register_test(test_load_save_german_locale);
+        register_test(test_Issue445_inline_str_load);
+        register_test(test_Issue445_inline_str_streaming_read);
     }
 
     bool workbook_matches_file(xlnt::workbook &wb, const xlnt::path &file)
@@ -716,5 +718,23 @@ public:
         test_round_trip_rw_custom_heights_widths();
         std::locale::global(current);*/
     }
+
+    void test_Issue445_inline_str_load()
+    {
+        xlnt::workbook wb;
+        wb.load(path_helper::test_file("Issue445_inline_str.xlsx"));
+        auto ws = wb.active_sheet();
+        auto cell = ws.cell("A1");
+        xlnt_assert_equals(cell.value<std::string>(), std::string("a"));
+    }
+
+    void test_Issue445_inline_str_streaming_read()
+    {
+        xlnt::streaming_workbook_reader wbr;
+        wbr.open(path_helper::test_file("Issue445_inline_str.xlsx"));
+        wbr.begin_worksheet("Sheet");
+        auto cell = wbr.read_cell();
+        xlnt_assert_equals(cell.value<std::string>(), std::string("a"));
+    }
 };
 static serialization_test_suite x;