From 53564cbe57522467a7e0febd0c9ae4374fa90808 Mon Sep 17 00:00:00 2001 From: Ri Xu Date: Tue, 7 Feb 2017 14:03:03 +0800 Subject: [PATCH] Fix issue #19. --- rows.go | 7 +++++++ test/Workbook1.xlsx | Bin 22958 -> 23055 bytes xmlSharedStrings.go | 8 ++++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/rows.go b/rows.go index 4e655b1..89365a2 100644 --- a/rows.go +++ b/rows.go @@ -82,6 +82,13 @@ func (xlsx *xlsxC) getValueFrom(f *File) (string, error) { if err != nil { return "", err } + if len(d.SI[xlsxSI].R) > 0 { + value := "" + for _, v := range d.SI[xlsxSI].R { + value += v.T + } + return value, nil + } return d.SI[xlsxSI].T, nil case "str": return xlsx.V, nil diff --git a/test/Workbook1.xlsx b/test/Workbook1.xlsx index d287361c740d9c6130f0e2cba24533221f708aca..ee52187124e68a3a95cee012b591cf9f1a574ad5 100644 GIT binary patch delta 1272 zcmZ3tnX!Kh;|4Y+=A(J;n>m?G8Nm!kW)Ef%V{#9h99Up2TP#>+GB1ZJSiqFyi40hU zjH)_Vz)f`>E12X}6dsnTfrnJevN3S)I2xH*_oWf8Xw3KE2;O z{CxTI^Vh}KT1}j4_PKS=9;qppD!+yatk2)#vxhD5o;T~Z-TIvO|DO7Axc>WxT}$#7 z>#_Cup4ex8&SERabJL|wZ=))zjpl59n!7k-8=sg-)bTiOrtH_2{a_&jU^W^8PUecr&w1_6?QT zTwv+~j_u9cEfOH{FJ-lh101{8oixFb%ItiI9V~Fd%TV~DefLbZ#!HMantji|$@c?9 zCo6hKg4O7UNKc;OEy)LyhtQMvd*232&-KycQ(4ptHUdIVE({T2Wncg$IFMdmUr7u* zEFMGb@bk?88?w{aR2|j)ON>A2{(t`*eTgx^n~}+$L4*MWKxT^iS);qfK3HmVh2Jtr zB3BGD$1qFd3wE>WgKV*wHMv}sZ}X=hD@Y#E4>956t8N2(5JCezSfhZNCm4VZQ~^7Y zfk6RCe>I*gXd))e1?Dg?FfvFmY`*v76EK`7n}u5QZZ&0KsL0VTE~(5(EuNehZUPMj zX&r7$uuMr}5>Q4TSwCtZUt;XMH`y^%Y_d?86qB*#WW6vqSZt~1SwYOmNX<>fW5ncJ z0aBAM1GP`JnjByyI$14HWU@rK6=UDz;BY4|U{HHOJp`us;QkW;^0l48R+Q%#Wfy0p zrk3Dy>g4<3VhZTSA%Y8JT)6XO(Fi3WbT9IqoqR7qY;t^r6l3S)s)!QCUz6WQWHQZj RpZp<0baH;ACEHf88v*j#=#T&a delta 1121 zcmeC*!nkfT;|4Y+=9+b;n>m?G8Nm!kW)Ef%V{#9h99Up2TP#>+GB1ZJSiqFyi40hU zjH)_Vz)f`>E12~ZME`18h2a?*=k z*t=^lZVbBNcmC`z-7UP=?sgk@e*R{AWv<)0wuOFMv!pxpi$5JdQ@{KVcYrrD%j9*T z5}PlYx`5+ivxH>=BzCH;c5#5i-ojZE9ONm^huFaan%;(d_Pe&Xy)C}P2%#qnc#BN- z4`iF%h^$5fYI4*|Gs~YzQh>d&B$cWAi@9w zpu_<(D$iF^7}ds0j24goO?C(roxI*R18k<0pQ*Z|%r3B*F#1Q`f2?Mf`B|eoZ9%Zq z=9_-YAPKT5$ea&m285oxAXtPI;-CjXwwRJqlgm~4HU|e=K@#wU5EH&T;akCufzXpL zh15(|2w{;yBv=NZFIB+)WMF6j(qD}y3z~>cUK%DcnI%MF@{Uj`-Vjp;hKd~h;*!do z)Z)nt!z3o(3WwwfDL-kQRTf~`lEfsStUecm0@yG{1_=gOpu*_Rdy@+T#3mPqNikir znA{)c28$(iUMq+h8L7Fcc#N2A9Vj)~BwUKg#A@t%~CvORN0vq-- zTw3Rp6WFlw{G#mQjMUT;e2$vz5FrNE7#ShW^v!8