From ccf475364881cebc13d50cf2cc9af2040b416bd3 Mon Sep 17 00:00:00 2001
From: Serge Krot <Serge.Krot@cib.de>
Date: Tue, 17 Oct 2017 19:03:14 +0200
Subject: [PATCH] tdf#38778 fix missing run properties export for fields in
 docx

Not all runs got their text properties written during field export -
previously only the first run had them. Adds SwTextNode param to EndRun
and EndRuby methods, implementation empty for rtf and doc though.

Change-Id: I77f39b40689feb9664044e61824ad3bb97776638
Reviewed-on: https://gerrit.libreoffice.org/43465
Reviewed-by: Serge Krot (CIB) <Serge.Krot@cib.de>
Tested-by: Serge Krot (CIB) <Serge.Krot@cib.de>
---
 .../tdf38778_properties_in_run_for_field.doc  | Bin 0 -> 25600 bytes
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx     |  67 +++++++
 sw/source/filter/ww8/attributeoutputbase.hxx  |   4 +-
 sw/source/filter/ww8/docxattributeoutput.cxx  | 181 +++++++++++++-----
 sw/source/filter/ww8/docxattributeoutput.hxx  |  12 +-
 sw/source/filter/ww8/docxexport.cxx           |   4 +-
 sw/source/filter/ww8/rtfattributeoutput.cxx   |  10 +-
 sw/source/filter/ww8/rtfattributeoutput.hxx   |   4 +-
 sw/source/filter/ww8/wrtw8nds.cxx             |  22 +--
 sw/source/filter/ww8/wrtww8.hxx               |   2 +-
 sw/source/filter/ww8/ww8attributeoutput.hxx   |   4 +-
 11 files changed, 238 insertions(+), 72 deletions(-)
 create mode 100644 sw/qa/extras/ooxmlexport/data/tdf38778_properties_in_run_for_field.doc

diff --git a/sw/qa/extras/ooxmlexport/data/tdf38778_properties_in_run_for_field.doc b/sw/qa/extras/ooxmlexport/data/tdf38778_properties_in_run_for_field.doc
new file mode 100644
index 0000000000000000000000000000000000000000..5f0f7238a153dfb54d33cad9cd241368260ecc59
GIT binary patch
literal 25600
zcmeG^2Ut|s(&uht=?em)pe$7^G*LvO0s@gDf`Hi2u)tE3CZM7bMa72kiLnF?QG+E!
zMTm;MVL^=zH44V4h$U(?!4i<D>_2nwURd^tX!73wzyD<q-`qKEX3m*&&YZebT+plj
z`n!&|iIN*gxTI00P6P_^6!`7fu!s-`@MBz~OeVwV9suA~x&KERc)YQUsAYBF5mKvv
z7#oogXjyPVLaYIFNaXm)@n##%Hqx;zKI%Lp(o2Vs%nJ;(m#1pC$kiN>$#k0nt@+su
zyJ=5}786GNyaVHZ7dBwY0b?UzP^}{qsfb-6$_?U?y}ul@>7M3<7;p#~0r5tVo+zhp
z4f~id{FU)hF(JT)90!c<eXtee8(~RE0T4D=6VeO955$BR0#<gc9$2}`>1=#!82KtX
zmLH4R`m%X2d>sOB#Ef2aOqmpAjPl$eNtusw81<v*SU!qz@8f6d*BU?M+YcDIiWv*_
zK0Mzi&phCVj@1*}-y*)NDf9NcjE0eRY`<C{*GsgR5My~7qHPeye%lWEog-lEf9R%*
z3DE#-XM-U^P67SLfH92uS^1duuW+m!mKWPzD94tKRKS0=z1VhRG20(mtRU*G-uIQy
z@>j;Jo|WU3!>n+&eU))r>B{;4RbjThl*`*zm@V&z;@0@0ZB_@^3!S<j^m;zghcC`3
zD)*nSfgnk&G-*;|q%>9BP8{Sh*jsGiWT>sp)z;>*U+vcB^Z)$XsY=+U24Ib+0iX$>
z1)vYm4!{7w5WonaJ%BMlM*tImP5_+&!~o_1RsgtGtb26x>dn(PPaN8{o%uV|ru4r>
z27yuBkUlPi=yJzneVNd3A*E#)SCx7W!i9rw5(2p}L^?3o)6alN01|x&F9~3hkkV<H
zLfW(ZkPh<$Pb4vF&KKlI$T$FuCi>0sY@9x>^Vv4;0Df#^QvhsZGXQL33jj+1ww>!0
zTkV-*p!WYF(4qv21yK1x127j8n2Teh>CUAlCR{5@VnxZrT0Mzl3fXy9%PH5DGApTY
z5SLUBFfUohw<xLLSmp}3R=F~sbqUx22pa=v<yPRPM&<rXG%${5LG+=MXi~aFt*K5t
zGz%n83D!VZ8C(Q}v;~u)$Fv2l@o)v&*3$kR@r6)FmM`x9S$}JI&wJ!irj3I!=>wn~
z|91?Ra2Y-Hgnop(;v*2Q0H_A21wh*+0uTc@0=NSN0Ym_#0AvB=0<=bld~Kl*Re`=A
z0Ei*)pW*X&r*j3}jRbfJAOw9H1B3z00Kn6TPkbm|qE81{s&wF`0i**!Gzo*IdMe`p
z)?&^TAx=Psl4O!f5{ZN)Kp1UJH!I4?3eFik{fvn}42~c_E-YMlz_%|?0&$5x>cE>P
zOaq(_I2~-(QmTMTSKzBoe25fyMw57wL}H1UI00un$mwoFG;E0G#}td0NpM^?A!7j|
z0NQPUifqV*6%YyZ<C9?ko_<!Ow-AcKhxL;c2^Rua4lOn5ol<*(RCCDbZbNC<P>fU>
zF;W>xY0wuz5&=nY=Hn+OE<&oekYW~QVlq}pg$t=9!hH{U&LFP~<aD>;XxMNVc{CcA
zo!8j1ejpX=$4WJZ`pHEaL;a{Y!lUKIy|aG3K%NQYbhqJZ*l-znG<s{zj9b*qSY9(=
zA$MNHL;OtkHSwZPW0^=J2uVo{wB;n|A?cv0An>OG#M0js5(jY~LoZ5#RCHm`=Feq2
zu%F4dtBwLK5(*TNz(ESRTlP6I=@+I++Sh@J>2*~=C_d}a;3g0WMstWJ@U<lq#4luJ
zcmmeMSB>T+CPP4G8ZDnAFS{RUba*CvO8gY+(t&tD8PcF6>0}!8#t^^~D0eh`Q{kIN
zqM$aZz$=DMNu@c0m7{r4RFDEMQ!)bn?EWOjV49;I6|BIq)1T&uV~c=>vBu_9r~=Q<
ze}N~%HH_x!L_urPQt)H;m$))~N78&fsF4bM#eb16!+A8#c^EZXfwTEv=FIR8r+G`L
za0T8L{{r3&cNd!bM9M{hyBZlpk31YX>Ci**QYg?*09IK5_DTRIQ2=M^*z&WeehPGY
zFft~AU5^Ah?9q%B4k1(NxMUcK$csR(MqP>&P(u}H)s(C^4!90rmTSQ*XAprE1?z)m
z%M2DlK0`?SOo<B_<c|Cl>!1#GNQUt>6~=xjlqZ88R~lgd7&Dat<#2>M%&)2Kl%qm9
zcrC`Y38b+066d2JVgd8XQ5=;`^O+j)gt43g{Nrhhge5lxDH(LhwV>oJZ7x`PWQEfj
zn0e4Y=;Bg~vh#^AZ6UDKc%s^gAeWXU=}*(uQ2iCkuG7NedCKjh6nHVM$S0j?PI!~h
zsC%1wMt!V6t=)pU<y;CUL@)xG2@K03z?lPP3>P8>&2u=4nitTPIT>VPFTlPdCfemf
z!YOGN(S_n5IkcD==uuyZj+M#MnKN{k^*33|>4N;ZJOhx9YX);NJLf>VKfq@StB`hp
z$9N_urAw32KM9?hB261>pOKibb?KS$#~el8^>Z8NRP3rs-DkV8>U@Fkl*}HNbdB$R
zXE%OHb}#kQx28Pa6SPlgmu@MFJiqGG;oFwnS*K&X?0M+J;p5`wMrYnB-16epuU+?7
zc5@2i&gruCh5E8_m6apz{c7OYb=9WOhim%wH(r*o#B#$=YF1O@GfijR>-bT-BQxCR
z-`{2X>u0|o_sM^Hykb&AH%+g~b<^gYa&XK!S+cJ7RfCpQR-Wd_Ehn8NqYEyHj#l?5
z@p4ofKjVS(tzG9M?>w1d5I=BE`>Jz1=fmL<zq>th_*pQfN_Xq7!4GS~XC60yV|P7x
zg8j0z#vk_Q+8f({v3sZF{^24wP_InJB`sC8@#;4}9|0A)Kq^jbpQK6?(j4sZo4w=$
zs7P!6Z*vdMxtKZZ(lKM}$qpNHJss9(lH0a3<19?BoBVP;@T5Rvzc72lZ}r~}Xxz4_
z;r8;M#YU?)3y#%zx}Ax;J$b<4nX^yN-SCaIa7;$Zy!D@6Fa6{|(8cxr&pDZF^x5UO
zLSJ{mwZH?x+Xh8nJT1E9=Y73bq}9xCmQMVn(kyRHhiaE0mwz`3uIv-BZAsy2*^Xn5
zXV(Ol%`EP5&zqOjXZeu$yOCcPI@}34m|G~_{6pu8(mf4V-@LV=6Q-^-ngbQg0l+KD
z^f+mv)Is4JAW4El?^Ns@T4w_^j)_I?w==(<l6$RB)P7s<$n9sg?XM%A`5iq@uDi7M
zdgZ-4bNZaWWpL$7f9+8{^3}9+r047x?5>^O;~SI0AAL+u^hmgU((wMn4CB)~7q`3R
zdn#>Mrsb8~xkaTn#8*qZUoro!$Bl7&t;P>nG<d{=%k^DrynpF#qrq`~d*N4>7S*hT
zElUtw_TlzZq1a3noUquBM+GKdcQH7uTQx<To*dO>a!0jEIaS|%X%}E}JZXOC_=PL0
zf(qO(`DU8@cqfZGwofwOuqtuBWXvq1s*SIDUF(<7siL@KaPa3RMvnX3r7EXrpp|~Z
zomaBXX5Vh9{Pm<(Cw=p-fj^FWlX}k6>giPXWhGB;bgpwKn(EUnpO^PEd*{KfOK+Ag
zuD`WEr*gPg<m`w{i^_@D7cKXz{9@$>-D4xi-S6rfk#yGkGs6QpDP2V`g%8RT;`fG)
z8Jpu2(0_Tg@u`~~mwX#o5wz@uOKQykLGi-RryYrnT<6;^c5azKZPMc0kZV#-r^u^y
zS%F8E%)5K&ndn$>nb-9#tJdz`IdPJDaqObJ(IvZfZcCnVZC`>%N=ZUSPD-d_QN2k~
z_c8oTZp8S`mB0MH@8C3#3#8<?Ih(>(_B{9T%%Yp8<5#-ZO<Xg1_tmYv!>2E7{67C|
z(a>)$CrG!CED%JSnWVie{c(I$+O;y1+!K9%u3daSX7~O_)!L_OM*Lj+rhCzqd5ik2
zTX6AigicYXAAgJeLGx7JjwgOEJ07VV-(mW^*>Sc7{yU7Hd)eib8sEB8pi8u)M_%N8
z8}C<MHQ)BvnhY!3t6H`F$~JcR=<b=l=I1nhKdA^UJ*XR^)xl|f{iBBZ;x%sGCw13!
za(nsk<?Um4)Z9i7I=?wFKl|Qrhr@3kUpQ&D-fhi{=g%&-zmhSkT=vJYE{9*gp4wY<
zDc0uvB8RoF>mHw8R6Ov_oBe|gYXfEtmcGm__bT}EuJFloV*}@~iPl{#Cmu39CcOMC
z=bY7Y*Rs|A{5NZIOkbSq8nbGOY2SXwORGCk_ttA<WTsxw%MdMGSYVhxrJ#!XHT8VI
z@X*nc!Oy#`n(FF%bo~9u;PNL?(?_1zzo^~G!v}peCOPZ+4}O~DW$ILKJk&tPcaXuQ
zwAWd=8c%)=epEH-i$7-j4-9)?@7-xg_kf-oEW50ZS+px&YsRXuhgyx36Lx&6Hpz9%
zrD=;y_xYUCINL4TO#gn~(|&7gO-C#>t;t)VJ%hWY(C<`P=u2sMV7J<IALGFXvwTLC
z-d{;F{fFKv3;M3xjYDTPeYeOUr*r7V1GD-%Snhu5(dX#I(Q`XhSapkX%T*H<7(baf
zoPX<H(!2*#YPmy=_Px@v{>T2nV!`hC2Mc;>iUv6A{rE-D=C3qNFW>#`d#Ck5OA@uh
z!~4$TysY`<q~X%vcNx_LR4v=wQ}W8IVQltCqtf?>^IkkD-a97a^T&F^=M9U09(y`-
zMCw7=^wVRPUx>Bax#LF->4<vmU0q%5QV*1Pb`B{QjQ{?WcKqsS^;cdM^F0op&)4yt
z80lx3arV)^IhuTz3AxpeEH@W;WQW9+{IbSI|NGC<ZHIktZTk3Zign`R`8H#(MM*-;
zj1varj(qa$h)(f?+poiea-H@E#ObW<yWTLMdh6M+ZP8vHPbwv0m4m)oHRi^G7{9NM
z6$N#e?poYY%jjyhfah_Y6E<${^Sv?JYVFSYtb3AFfAc51a?SP+EjrxJiXM1r+J#qz
zN%_l9=Im9^s`|Ee>A<^RMV9LCUTO16@YDI44L$dlb0+Vtzj@q$D(}L94bSVm`fcBk
zpWnk{aANV5@T6&{PR3t1Ikw8E^Bsc&_LDBmA0=$>c}U;oabQ5qvU|?SyHZd5WL0>q
z_uSG~`A3I#@|hbtX5_~%z0QUjae7?L-}?GYfa5RTT_Y^t^xiOX)SQTyl^e)M`?gu%
zae6xZ+O>^(i66aMy&`zvFfXlwYT@E4ug6g-hjoTmbXljr&1Q&qg+t1cO+|^DeyYj0
z9@|j&ef4A4nE31+saryNU5M7~Gd28F#7)1NSxGClo7_8Joa5V|8NAW7T;@Fd#SBg#
ze)m~*S-O>bIF?@(Coa)6oLD$0-s{bwtn#uSbQT!xSu{6Z*lo`c7a70r53<DbqdM9Y
z-9GY7UHk&x+&4bnvvUX7`rG_5)I97$oxT6(((EB#D~_-D*6>p=9d(mO9rtXmpRDUG
zdbDYEwDd^z(DJpf)<`RCe+U@b_f~$#;Kv7D)EXb2KWXD^d+(~`a>d;`2d}MF!=Fss
z(f`(`XL24a9QEauQ#&|$D|XEeTUl4!^=RMSqsM%Azt^~=`$uQB|GD?PvI29z+lSO1
zx|PU=-FAK@9h6+?c}Ta^ux!2{K<lWW;E&G}`{&x{PEO%1Ue;-6*#_THmt%^S?HYY(
z)F&z5jHw+UNwB*%>UHMOsP^YpojHH{#G+o4V<ac9PEPpx+p-;9LJa1WH+Yo0mQTOb
zZRVt!^`BNhu-kKMt)q2-V_6^TSzrHdn%6(;?rzg_mlor*v437~XkW}-y9-iGV3O{l
zG?OuF4|;A>n2hCXkpPXOjt1HFv!@7?lP~WREw#C^prYspZuZ^Y+AeNZ!yZ4;-qu5C
zKVNcaRs8-hzB=75s^?9oxXm4f{T{BExVkKH&*Oi%2OAAtc<rO;l8D*=Nbd8*Fm|cG
zZGeqcu&upQUaC$Pzh(IqIiU?%+g#T#3A<~tev`+k{S`j-lQP#m{gRq~!s=k8=+i5t
z!^)u5vK?<+J1&fMFf$t4ILssM+FZVELHXHg%P%(%;e9`5-@fCwnyOB5?BE=%wRI_E
zQ*dutr3U%8WT3oSYo_iF`czoEDHAHMewqpKP1`>$Clu7L%t?7E(#+}N+c?n+6J;LC
zouHY=m+CD`^NubN<j;o{5pIL{WGvKvr3QxjyTL+8JXxBW7N49nz{1Ji(LyXuib{@-
zPl_F2F+B8RJ68*FTDl}DT9S~QBpqNeRhnkuHc(rmzocJOLTZ2{MGOp*()vjTSj45L
zr}T4hNQ;7{q9n~eIYpWTX)(#EiIQ{(rp7u%r%I*(<HQ7qo{o+#4vCWZBnxq5tkVFC
zgmfnhae4;$q9=eaGPWni^~5;vMNa^qBq|E_B#=YyVPhbjiD}B?%*Hsgd3v!iz1W!E
zY)o%9#)XY>u@J{4#3xOF8X>X}$0R5CFcGZJ!eJn458f8yE&v{HHb0bvGcV}C3_$D9
z8$&#PX$|PdoUjkWtA9S^!#x@Lkq7QD^a1c_7-h9HH;@@-14XSXgdk5X9`<t}H}oag
z2sQ(T-AU)CxVvT^aLPzlRu+LvXA#jQoZ8PJK}3YLK+6#F;AWk0YaJo1OL(=mbi8_P
z)Ak&~tm6<3nhp*x=^|tPL6E2~kEb9Wl@dZUYdeGYFqBM0&S3e748B6b<DzQZxD+j0
zuNDdDWWd-j@eM3KRK-W5xcle?U<M!tumG?D;K5Cs8dO{nAew&V`B&+2)9`*g_-`o%
zhtVkTkm)M_F-?Wdqnv`zdQk`Tb6ddRFdO5boprNID81~UM#FMG<`ayAa0G<gqH^cx
zWgmIdOy$mrfN)z>6+q>vKve-$j%`v!aP_j+y>6Bj!Hs}$Te50_N~Azl3sj;usj_%_
z*;%ieWo7XqAl#NL5nnI6_K#*N5kCULZBeZQst5(DbwCx-CY7T=FT0|lS(c+90>X?e
z_RBUfjp<fK&F3+#T)}}>M$P9nVpp)I`$y}PuAmV)r7I68T|pyANwrCd^^;Ss;{zqu
z4=FiqQVP|YD1~Z3DO6)9xouLW2%9KVgg}`hWGH!UQdX%qQC6t~WtBQZ$#0X=U9*YO
zT@xtXH5p1lo0NrGO_YUNKv}58P^z^_Dbi`86zKq^NQa>m0wuO8Yxmfm&^+jw7<}o<
zI3`7nKC^a}pAq*2^UhMB6-7XsevcuB`z$aO{%QoDPT|`X`jHgGvDOW<(N@Qu%7S}6
z2+`|;j2k?(&9tA51I%Hk1DuUUqE&YXgM~I7%;0c1Ae{h^Os2pWW3eEtV{&0`v}^J?
zNx_eK2Y1e;&cZRMfXnCcIb5Es8>#llAV+YrKt~G#912IoiEu2MM({#P3i8Ax806wr
zXcDCN20k3Z=TjU?O~B!^FEZG|BdaX@C?2U3;%rY#*A(zL=xFJlZ;|dnAIdYAt{>^-
zQuEX}lz?z4bf|7Zme}G1f{vma1SMgKL*Q5+%eQDuNFX7;ATNt>n&lPC>SeN958Y@=
ztS#efmM5ll91mArcqEV4aRI;+e(V68K&v`xe9#?-$74z%X9EZlX@^JIDe#8}!zpl$
zfR|~=WiZ62!}S?*7Sjj*3BaF_0RrU9XUR!1=<U&Cs!5M*LLkjENlBj`Ol$J^(3%1+
z=#xXLWmdpm?$*l5J)s<U*@0Ib5`uNYa>YR|3(y`V%r+)sd@dD7=g+@UXJZ*PdVb=g
zx)?6qy|K2qLShyZJTeChO{X-+%0&@#E(kz}<3#2Dv<CDYTasdbXZw81l=ly@W(+8L
z&e6km;t?4h@V?y%g<ycd)k4cR85%H@Gg|{RgV^rd-^$PYEj>a6YfsjA5c(1+LxFZ3
zAFUa#&s#b^i~}5DvG9GH!(NH2d#1ix&~KZsXWy1z755*nfkv3f1Tf_&JM6sGbJsp=
z2#gbLSt=ymyX?4zBPSXX^Z;XeE&x*I0iY?{0Dyh51OR#%IRJp2@Du>{^C|$G5FY?w
z=X(Kw^Rxjl!wsVtFm|XOfbp>fzB$4jsuy6`Vvr$#MSw#A<85C!V3dCcgyL?E9S860
z$1)AYO@0DHkKqt$YAkksmWQ+4ZwxpfJ}NaiEjcD#92gT5A0-u!NKTE0cy|DD$#()G
zcl_8?r8>HtrD(s8pj6mf?vIS1e;J0lf}%G~0qit@Smjh2P-#G=0hI<+8c=CKr2&-&
zR2ooeK&1hd22>jOcWB^U`+v@rb64{1O+?GSfc<}uhHbe2$Gto5(Q*G82Y~zX6ad`s
zPY1x`p=<y=BlrvePwSTh;Ql@z0Qc`30C4}l6#$Rkb^_pjAI}Sr_i2E)?duiy&Fuae
z>6v}A7A*sUt>Vrg9O)3~=i4X*H~LuU(D?KODb0#bh8UGoX+Wg`l?GHAP-#G=0hI<+
z8c=CKr2&-&R2ooe;J-!#xY@;RFz%u8{v7x5xE;oOd;Gu7cwdiq^tgY=y*cjF@lGE1
z{kWIMeLmjh<9;5Whv0vz#XULh`|-}4eG3i0XQcVzduZHpn*oRc%mFL_ECEoSHDDWn
zE&#RwT>-iQbO*rnHvsl>KZX%h?$2ugA0OfqIx+Ev2Y%`B_-86;_x+s_JhEe@V;>Tz
zV{anl2>qr1VJ+i>Z>{Jq{r<rb{8{o?Cxzdf%cDLB=@1SrANwtq<9&$norec@GH@fH
z_V`~oyZ}eh|GR+swLFvB_O~O*$1%j}plu3y4jeq-@W~ba#{_%;in_<&{m0N{!kFg&
zD8S_Y=dUfuM~&myec$?<BAX`p$~FJ6^0><N{~`6aQjkx<|4zW?uPG!D9#W3Sln-+H
zV7*w`?^}Nq@L|3D-9`E{^54zz!&3i>eC)d_8>*<mzn7na*5|?mkF{2|-8cuo_05~O
zZy!7O9h|e+D>-UXBK)?EULpj9;CncTqHPQM?b&pDSMs9o_K6?XtyQ`I7c}rc<o&rV

literal 0
HcmV?d00001

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index 8858ffd5ade6..52fed19b7dc8 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -675,6 +675,73 @@ DECLARE_OOXMLEXPORT_TEST(test_OpeningBrace, "2120112713_OpenBrace.docx")
     assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/m:oMath[1]/m:d[1]/m:dPr[1]/m:begChr[1]","val","");
 }
 
+// Checks that all runs of the field have text properties.
+// Old behaviour: only first run has text properties of the field
+//
+// There are several runs are used in fields:
+//     <w:r>
+//         <w:rPr>
+//             <!-- properties written with DocxAttributeOutput::StartRunProperties() / DocxAttributeOutput::EndRunProperties().
+//         </w:rPr>
+//         <w:fldChar w:fldCharType="begin" />
+//     </w:r>
+//         <w:r>
+//         <w:rPr>
+//             <!-- properties written with DocxAttributeOutput::DoWriteFieldRunProperties()
+//         </w:rPr>
+//         <w:instrText>TIME \@"HH:mm:ss"</w:instrText>
+//     </w:r>
+//     <w:r>
+//         <w:rPr>
+//             <!-- properties written with DocxAttributeOutput::DoWriteFieldRunProperties()
+//         </w:rPr>
+//         <w:fldChar w:fldCharType="separate" />
+//     </w:r>
+//     <w:r>
+//         <w:rPr>
+//             <!-- properties written with DocxAttributeOutput::DoWriteFieldRunProperties()
+//         </w:rPr>
+//         <w:t>14:01:13</w:t>
+//         </w:r>
+//     <w:r>
+//         <w:rPr>
+//             <!-- properties written with DocxAttributeOutput::DoWriteFieldRunProperties()
+//         </w:rPr>
+//         <w:fldChar w:fldCharType="end" />
+//     </w:r>
+// See, tdf#38778
+DECLARE_OOXMLEXPORT_TEST(testTdf38778, "tdf38778_properties_in_run_for_field.doc")
+{
+    xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+    if (!pXmlDoc)
+        return;
+
+    const OUString psz("20");
+    const OUString pszCs("20");
+
+    // w:fldCharType="begin"
+    assertXPath(pXmlDoc,        "/w:document/w:body/w:p[1]/w:r[3]/w:rPr/w:sz",   "val", psz);
+    assertXPath(pXmlDoc,        "/w:document/w:body/w:p[1]/w:r[3]/w:rPr/w:szCs", "val", pszCs);
+
+    // PAGE
+    assertXPath(pXmlDoc,        "/w:document/w:body/w:p[1]/w:r[4]/w:rPr/w:sz",   "val", psz);
+    assertXPath(pXmlDoc,        "/w:document/w:body/w:p[1]/w:r[4]/w:rPr/w:szCs", "val", pszCs);
+    assertXPathContent(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[4]/w:instrText",  " PAGE ");
+
+    // w:fldCharType="separate"
+    assertXPath(pXmlDoc,        "/w:document/w:body/w:p[1]/w:r[5]/w:rPr/w:sz",   "val", psz);
+    assertXPath(pXmlDoc,        "/w:document/w:body/w:p[1]/w:r[5]/w:rPr/w:szCs", "val", pszCs);
+
+    // field result: 1
+    assertXPath(pXmlDoc,        "/w:document/w:body/w:p[1]/w:r[6]/w:rPr/w:sz",   "val", psz);
+    assertXPath(pXmlDoc,        "/w:document/w:body/w:p[1]/w:r[6]/w:rPr/w:szCs", "val", pszCs);
+    assertXPathContent(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[6]/w:t",          "1"); // field result
+
+    // w:fldCharType="end"
+    assertXPath(pXmlDoc,        "/w:document/w:body/w:p[1]/w:r[7]/w:rPr/w:sz",   "val", psz);
+    assertXPath(pXmlDoc,        "/w:document/w:body/w:p[1]/w:r[7]/w:rPr/w:szCs", "val", pszCs);
+}
+
 DECLARE_OOXMLEXPORT_TEST(testFDO76312, "FDO76312.docx")
 {
     xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx
index 00ab40dcb88a..1cbe3a1a5376 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -172,7 +172,7 @@ public:
     virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false ) = 0;
 
     /// End of the text run.
-    virtual void EndRun() = 0;
+    virtual void EndRun( const SwTextNode* pNode, sal_Int32 nPos ) = 0;
 
     /// Called before we start outputting the attributes.
     virtual void StartRunProperties() = 0;
@@ -199,7 +199,7 @@ public:
     virtual void StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby ) = 0;
 
     /// Output ruby end.
-    virtual void EndRuby() = 0;
+    virtual void EndRuby( const SwTextNode& rNode, sal_Int32 nPos ) = 0;
 
     /// Output URL start.
     virtual bool StartURL( const OUString& rUrl, const OUString& rTarget ) = 0;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 9f2e11da3a61..0461408b0a67 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1104,7 +1104,7 @@ void DocxAttributeOutput::StartRun( const SwRedlineData* pRedlineData, bool /*bS
     m_pSerializer->mark(Tag_StartRun_3); // let's call it "postponed text"
 }
 
-void DocxAttributeOutput::EndRun()
+void DocxAttributeOutput::EndRun(const SwTextNode* pNode, sal_Int32 nPos)
 {
     int nFieldsInPrevHyperlink = m_nFieldsInHyperlink;
     // Reset m_nFieldsInHyperlink if a new hyperlink is about to start
@@ -1119,7 +1119,7 @@ void DocxAttributeOutput::EndRun()
         // Add the fields starts for all but hyperlinks and TOCs
         if ( pIt->bOpen && pIt->pField )
         {
-            StartField_Impl( *pIt );
+            StartField_Impl( pNode, nPos, *pIt );
 
             // Remove the field from the stack if only the start has to be written
             // Unknown fields should be removed too
@@ -1167,7 +1167,7 @@ void DocxAttributeOutput::EndRun()
             {
                 // If fields begin before hyperlink then
                 // it should end before hyperlink close
-                EndField_Impl( m_Fields.back( ) );
+                EndField_Impl( pNode, nPos, m_Fields.back( ) );
                 m_Fields.pop_back();
             }
             m_pSerializer->endElementNS( XML_w, XML_hyperlink );
@@ -1184,7 +1184,7 @@ void DocxAttributeOutput::EndRun()
         // Add the fields starts for hyperlinks, TOCs and index marks
         if ( pIt->bOpen && !pIt->pField )
         {
-            StartField_Impl( *pIt, true );
+            StartField_Impl( pNode, nPos, *pIt, true );
 
             if (m_startedHyperlink)
                 ++m_nFieldsInHyperlink;
@@ -1213,7 +1213,7 @@ void DocxAttributeOutput::EndRun()
             {
                 if (it->bClose && !it->pField)
                 {
-                    EndField_Impl(*it);
+                    EndField_Impl( pNode, nPos, *it );
                     it = decltype(m_Fields)::reverse_iterator(m_Fields.erase(it.base() - 1));
                 }
                 else
@@ -1356,7 +1356,7 @@ void DocxAttributeOutput::EndRun()
             {
                 // If fields begin after hyperlink start then
                 // it should end before hyperlink close
-                EndField_Impl( m_Fields.back( ) );
+                EndField_Impl( pNode, nPos, m_Fields.back( ) );
                 m_Fields.pop_back();
             }
             m_nFieldsInHyperlink = 0;
@@ -1372,7 +1372,7 @@ void DocxAttributeOutput::EndRun()
     {
         while ( m_Fields.begin() != m_Fields.end() )
         {
-            EndField_Impl( m_Fields.front( ) );
+            EndField_Impl( pNode, nPos, m_Fields.front( ) );
             m_Fields.erase( m_Fields.begin( ) );
         }
         m_nFieldsInHyperlink = 0;
@@ -1622,7 +1622,7 @@ void DocxAttributeOutput::WriteFFData(  const FieldInfos& rInfos )
     }
 }
 
-void DocxAttributeOutput::StartField_Impl( FieldInfos const & rInfos, bool bWriteRun )
+void DocxAttributeOutput::StartField_Impl( const SwTextNode* pNode, sal_Int32 nPos, FieldInfos const & rInfos, bool bWriteRun )
 {
     if ( rInfos.pField && rInfos.eType == ww::eUNKNOWN )
     {
@@ -1655,9 +1655,9 @@ void DocxAttributeOutput::StartField_Impl( FieldInfos const & rInfos, bool bWrit
 
                 if ( bWriteRun )
                     m_pSerializer->endElementNS( XML_w, XML_r );
-                if ( !rInfos.pField )
-                    CmdField_Impl( rInfos );
 
+                if ( !rInfos.pField )
+                    CmdField_Impl( pNode, nPos, rInfos, bWriteRun );
         }
         else
         {
@@ -1687,7 +1687,7 @@ void DocxAttributeOutput::StartField_Impl( FieldInfos const & rInfos, bool bWrit
             // The hyperlinks fields can't be expanded: the value is
             // normally in the text run
             if ( !rInfos.pField )
-                CmdField_Impl( rInfos );
+                CmdField_Impl( pNode, nPos, rInfos, bWriteRun );
         }
     }
 }
@@ -1707,48 +1707,130 @@ void DocxAttributeOutput::DoWriteCmd( const OUString& rCmd )
 
 }
 
-void DocxAttributeOutput::CmdField_Impl( FieldInfos const & rInfos )
+void DocxAttributeOutput::CmdField_Impl( const SwTextNode* pNode, sal_Int32 nPos, FieldInfos const & rInfos, bool bWriteRun )
 {
-    m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
-    sal_Int32 nNbToken = comphelper::string::getTokenCount(rInfos.sCmd, '\t');
-
-    for ( sal_Int32 i = 0; i < nNbToken; i++ )
+    // Write the Field instruction
     {
-        OUString sToken = rInfos.sCmd.getToken( i, '\t' );
-        if ( rInfos.eType ==  ww::eCREATEDATE
-          || rInfos.eType ==  ww::eSAVEDATE
-          || rInfos.eType ==  ww::ePRINTDATE
-          || rInfos.eType ==  ww::eDATE
-          || rInfos.eType ==  ww::eTIME )
+        if ( bWriteRun )
         {
-           sToken = sToken.replaceAll("NNNN", "dddd");
-           sToken = sToken.replaceAll("NN", "ddd");
+            m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
+            DoWriteFieldRunProperties( pNode, nPos );
         }
 
-        // Write the Field command
-        DoWriteCmd( sToken );
+        sal_Int32 nNbToken = comphelper::string::getTokenCount(rInfos.sCmd, '\t');
 
-        // Replace tabs by </instrText><tab/><instrText>
-        if ( i < ( nNbToken - 1 ) )
-            RunText( "\t" );
+        for ( sal_Int32 i = 0; i < nNbToken; i++ )
+        {
+            OUString sToken = rInfos.sCmd.getToken( i, '\t' );
+            if ( rInfos.eType ==  ww::eCREATEDATE
+              || rInfos.eType ==  ww::eSAVEDATE
+              || rInfos.eType ==  ww::ePRINTDATE
+              || rInfos.eType ==  ww::eDATE
+              || rInfos.eType ==  ww::eTIME )
+            {
+               sToken = sToken.replaceAll("NNNN", "dddd");
+               sToken = sToken.replaceAll("NN", "ddd");
+            }
+
+            // Write the Field command
+            DoWriteCmd( sToken );
+
+            // Replace tabs by </instrText><tab/><instrText>
+            if ( i < ( nNbToken - 1 ) )
+                RunText( "\t" );
+        }
+
+        if ( bWriteRun )
+        {
+            m_pSerializer->endElementNS( XML_w, XML_r );
+        }
     }
 
-    m_pSerializer->endElementNS( XML_w, XML_r );
-
     // Write the Field separator
-    m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
-    m_pSerializer->singleElementNS( XML_w, XML_fldChar,
-          FSNS( XML_w, XML_fldCharType ), "separate",
-          FSEND );
-    m_pSerializer->endElementNS( XML_w, XML_r );
+    {
+        if ( bWriteRun )
+        {
+            m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
+            DoWriteFieldRunProperties( pNode, nPos );
+        }
+
+        m_pSerializer->singleElementNS( XML_w, XML_fldChar,
+              FSNS( XML_w, XML_fldCharType ), "separate",
+              FSEND );
+
+        if ( bWriteRun )
+        {
+            m_pSerializer->endElementNS( XML_w, XML_r );
+        }
+    }
 }
 
-void DocxAttributeOutput::EndField_Impl( FieldInfos& rInfos )
+/// Writes properties for run that is used to separate field implementation.
+/// There are several runs are used:
+///     <w:r>
+///         <w:rPr>
+///             <!-- properties written with StartRunProperties() / EndRunProperties().
+///         </w:rPr>
+///         <w:fldChar w:fldCharType="begin" />
+///     </w:r>
+///         <w:r>
+///         <w:rPr>
+///             <!-- properties written with DoWriteFieldRunProperties()
+///         </w:rPr>
+///         <w:instrText>TIME \@"HH:mm:ss"</w:instrText>
+///     </w:r>
+///     <w:r>
+///         <w:rPr>
+///             <!-- properties written with DoWriteFieldRunProperties()
+///         </w:rPr>
+///         <w:fldChar w:fldCharType="separate" />
+///     </w:r>
+///     <w:r>
+///         <w:rPr>
+///             <!-- properties written with DoWriteFieldRunProperties()
+///         </w:rPr>
+///         <w:t>14:01:13</w:t>
+///         </w:r>
+///     <w:r>
+///         <w:rPr>
+///             <!-- properties written with DoWriteFieldRunProperties()
+///         </w:rPr>
+///         <w:fldChar w:fldCharType="end" />
+///     </w:r>
+/// See, tdf#38778
+void DocxAttributeOutput::DoWriteFieldRunProperties( const SwTextNode * pNode, sal_Int32 nPos )
+{
+    if (! pNode)
+    {
+        // nothing to do
+        return;
+    }
+
+    m_bPreventDoubleFieldsHandling = true;
+
+    {
+        m_pSerializer->startElementNS( XML_w, XML_rPr, FSEND );
+
+        if(GetExport().m_bHideTabLeaderAndPageNumbers && m_pHyperlinkAttrList.is() )
+        {
+            m_pSerializer->singleElementNS( XML_w, XML_webHidden, FSEND );
+        }
+
+        SwWW8AttrIter aAttrIt( m_rExport, *pNode );
+        aAttrIt.OutAttr( nPos, false );
+
+        m_pSerializer->endElementNS( XML_w, XML_rPr );
+    }
+
+    m_bPreventDoubleFieldsHandling = false;
+}
+
+void DocxAttributeOutput::EndField_Impl( const SwTextNode* pNode, sal_Int32 nPos, FieldInfos& rInfos )
 {
     // The command has to be written before for the hyperlinks
     if ( rInfos.pField )
     {
-        CmdField_Impl( rInfos );
+        CmdField_Impl( pNode, nPos, rInfos, true );
     }
 
     // Write the bookmark start if any
@@ -1761,6 +1843,8 @@ void DocxAttributeOutput::EndField_Impl( FieldInfos& rInfos )
     {
         // Write the Field latest value
         m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
+        DoWriteFieldRunProperties( pNode, nPos );
+
         OUString sExpand;
         if(rInfos.eType == ww::eCITATION)
         {
@@ -1789,6 +1873,7 @@ void DocxAttributeOutput::EndField_Impl( FieldInfos& rInfos )
     if ( rInfos.bClose  )
     {
         m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
+        DoWriteFieldRunProperties( pNode, nPos );
         m_pSerializer->singleElementNS( XML_w, XML_fldChar,
               FSNS( XML_w, XML_fldCharType ), "end",
               FSEND );
@@ -1820,7 +1905,7 @@ void DocxAttributeOutput::EndField_Impl( FieldInfos& rInfos )
             m_sFieldBkm = OUString( );
 
             // Write the end of the field
-            EndField_Impl( rInfos );
+            EndField_Impl( pNode, nPos, rInfos );
         }
     }
 }
@@ -2339,7 +2424,7 @@ void DocxAttributeOutput::RawText(const OUString& /*rText*/, rtl_TextEncoding /*
 void DocxAttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby )
 {
     SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::StartRuby( const SwTextNode& rNode, const SwFormatRuby& rRuby )" );
-    EndRun(); // end run before starting ruby to avoid nested runs, and overlap
+    EndRun( &rNode, nPos ); // end run before starting ruby to avoid nested runs, and overlap
     assert(!m_closeHyperlinkInThisRun); // check that no hyperlink overlaps ruby
     assert(!m_closeHyperlinkInPreviousRun);
     m_pSerializer->startElementNS( XML_w, XML_ruby, FSEND );
@@ -2393,17 +2478,17 @@ void DocxAttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 nPos, co
 
     EndRunProperties( nullptr );
     RunText( rRuby.GetText( ) );
-    EndRun( );
+    EndRun( &rNode, nPos );
     m_pSerializer->endElementNS( XML_w, XML_rt );
 
     m_pSerializer->startElementNS( XML_w, XML_rubyBase, FSEND );
     StartRun( nullptr );
 }
 
-void DocxAttributeOutput::EndRuby()
+void DocxAttributeOutput::EndRuby(const SwTextNode& rNode, sal_Int32 nPos)
 {
     SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::EndRuby()" );
-    EndRun( );
+    EndRun( &rNode, nPos );
     m_pSerializer->endElementNS( XML_w, XML_rubyBase );
     m_pSerializer->endElementNS( XML_w, XML_ruby );
     StartRun(nullptr); // open Run again so OutputTextNode loop can close it
@@ -6515,6 +6600,9 @@ void DocxAttributeOutput::CharCaseMap( const SvxCaseMapItem& rCaseMap )
 
 void DocxAttributeOutput::CharColor( const SvxColorItem& rColor )
 {
+    if (m_bPreventDoubleFieldsHandling)
+        return;
+
     const Color aColor( rColor.GetValue() );
     OString aColorString;
 
@@ -7066,6 +7154,9 @@ void DocxAttributeOutput::WriteExpand( const SwField* pField )
 
 void DocxAttributeOutput::WriteField_Impl( const SwField* pField, ww::eField eType, const OUString& rFieldCmd, FieldFlags nMode )
 {
+    if (m_bPreventDoubleFieldsHandling)
+        return;
+
     struct FieldInfos infos;
     if (pField)
         infos.pField.reset(pField->CopyField());
@@ -8620,6 +8711,9 @@ void DocxAttributeOutput::ParaGrabBag(const SfxGrabBagItem& rItem)
 
 void DocxAttributeOutput::CharGrabBag( const SfxGrabBagItem& rItem )
 {
+    if (m_bPreventDoubleFieldsHandling)
+        return;
+
     const std::map< OUString, css::uno::Any >& rMap = rItem.GetGrabBag();
 
     // get original values of theme-derived properties to check if they have changed during the edition
@@ -8821,6 +8915,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, const FSHelperPtr
       m_bRunTextIsOn( false ),
       m_bWritingHeaderFooter( false ),
       m_bAnchorLinkedToNode(false),
+      m_bPreventDoubleFieldsHandling( false ),
       m_sFieldBkm( ),
       m_nNextBookmarkId( 0 ),
       m_nNextAnnotationMarkId( 0 ),
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 3fdfd95cd312..2515210fcfb5 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -166,7 +166,7 @@ public:
     virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false ) override;
 
     /// End of the text run.
-    virtual void EndRun() override;
+    virtual void EndRun(const SwTextNode* pNode, sal_Int32 nPos) override;
 
     /// Called before we start outputting the attributes.
     virtual void StartRunProperties() override;
@@ -190,7 +190,7 @@ public:
     virtual void StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby ) override;
 
     /// Output ruby end.
-    virtual void EndRuby() override;
+    virtual void EndRuby(const SwTextNode& rNode, sal_Int32 nPos) override;
 
     /// Output URL start.
     virtual bool StartURL( const OUString& rUrl, const OUString& rTarget ) override;
@@ -725,10 +725,11 @@ private:
     /// Closes a currently open SDT block.
     void EndSdtBlock();
 
-    void StartField_Impl( FieldInfos const & rInfos, bool bWriteRun = false );
+    void StartField_Impl( const SwTextNode* pNode, sal_Int32 nPos, FieldInfos const & rInfos, bool bWriteRun = false );
     void DoWriteCmd( const OUString& rCmd );
-    void CmdField_Impl( FieldInfos const & rInfos );
-    void EndField_Impl( FieldInfos& rInfos );
+    void CmdField_Impl( const SwTextNode* pNode, sal_Int32 nPos, FieldInfos const & rInfos, bool bWriteRun );
+    void EndField_Impl( const SwTextNode* pNode, sal_Int32 nPos, FieldInfos& rInfos );
+    void DoWriteFieldRunProperties( const SwTextNode* pNode, sal_Int32 nPos );
 
     static void AddToAttrList( rtl::Reference<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nAttrName, const sal_Char* sAttrValue );
     static void AddToAttrList( rtl::Reference<sax_fastparser::FastAttributeList>& pAttrList, sal_Int32 nArgs, ... );
@@ -776,6 +777,7 @@ private:
     bool m_bAnchorLinkedToNode;
 
     /// Field data to remember in the text run
+    bool m_bPreventDoubleFieldsHandling;
     std::vector< FieldInfos > m_Fields;
     OUString m_sFieldBkm;
     sal_Int32 m_nNextBookmarkId;
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index b57d24acbdb1..fddce24b159d 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -1512,7 +1512,9 @@ void DocxExport::WriteOutliner(const OutlinerParaObject& rParaObj, sal_uInt8 nTy
             nAktPos = nNextAttr;
             eChrSet = eNextChrSet;
             aAttrIter.NextPos();
-            AttrOutput().EndRun();
+
+            AttrOutput().EndRun( nullptr, 0 );
+
         } while( nAktPos < nEnd );
 //        aAttrIter.OutParaAttr(false);
         AttrOutput().EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t());
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 21406ab98fb9..48e004bb7102 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -395,7 +395,7 @@ void RtfAttributeOutput::StartRun(const SwRedlineData* pRedlineData, bool bSingl
     OSL_ENSURE(m_aRunText.getLength() == 0, "m_aRunText is not empty");
 }
 
-void RtfAttributeOutput::EndRun()
+void RtfAttributeOutput::EndRun(const SwTextNode* /*pNode*/, sal_Int32 /*nPos*/)
 {
     m_aRun->append(SAL_NEWLINE_STRING);
     m_aRun.appendAndClear(m_aRunText);
@@ -436,7 +436,7 @@ void RtfAttributeOutput::RawText(const OUString& rText, rtl_TextEncoding eCharSe
     m_aRunText->append(msfilter::rtfutil::OutString(rText, eCharSet));
 }
 
-void RtfAttributeOutput::StartRuby(const SwTextNode& rNode, sal_Int32 /*nPos*/, const SwFormatRuby& rRuby)
+void RtfAttributeOutput::StartRuby(const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby)
 {
     OUString aStr(FieldString(ww::eEQ));
     aStr += "\\* jc";
@@ -528,7 +528,7 @@ void RtfAttributeOutput::StartRuby(const SwTextNode& rNode, sal_Int32 /*nPos*/,
     nHeight = (rHeightItem.GetHeight() + 10)/20-1;
     aStr += OUString::number(nHeight);
     aStr += "(";
-    EndRun();
+    EndRun(&rNode, nPos);
     m_rExport.OutputField(nullptr, ww::eEQ, aStr, FieldFlags::Start | FieldFlags::CmdStart);
     aStr  = rRuby.GetText();
     aStr += ")";
@@ -536,10 +536,10 @@ void RtfAttributeOutput::StartRuby(const SwTextNode& rNode, sal_Int32 /*nPos*/,
     m_rExport.OutputField(nullptr, ww::eEQ, aStr, FieldFlags::NONE);
 }
 
-void RtfAttributeOutput::EndRuby()
+void RtfAttributeOutput::EndRuby(const SwTextNode& rNode, sal_Int32 nPos)
 {
     m_rExport.OutputField(nullptr, ww::eEQ, ")", FieldFlags::End | FieldFlags::Close);
-    EndRun();
+    EndRun(&rNode, nPos);
 }
 
 bool RtfAttributeOutput::StartURL(const OUString& rUrl, const OUString& rTarget)
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index f0fbe732ee3c..1520569a7dd3 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -66,7 +66,7 @@ public:
     void StartRun(const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false) override;
 
     /// End of the text run.
-    void EndRun() override;
+    void EndRun(const SwTextNode* pNode, sal_Int32 nPos) override;
 
     /// Called before we start outputting the attributes.
     void StartRunProperties() override;
@@ -92,7 +92,7 @@ public:
     void StartRuby(const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby) override;
 
     /// Output ruby end.
-    void EndRuby() override;
+    void EndRuby(const SwTextNode& rNode, sal_Int32 nPos) override;
 
     /// Output URL start.
     bool StartURL(const OUString& rUrl, const OUString& rTarget) override;
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 3b91af45d4d4..a43db5d01869 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -871,7 +871,7 @@ void WW8AttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 /*nPos*/,
             FieldFlags::Start | FieldFlags::CmdStart );
 }
 
-void WW8AttributeOutput::EndRuby()
+void WW8AttributeOutput::EndRuby(const SwTextNode& /*rNode*/, sal_Int32 /*nPos*/)
 {
     m_rWW8Export.WriteChar( ')' );
     m_rWW8Export.OutputField( nullptr, ww::eEQ, OUString(), FieldFlags::End | FieldFlags::Close );
@@ -1219,7 +1219,7 @@ void AttributeOutputBase::TOXMark( const SwTextNode& rNode, const SwTOXMark& rAt
         FieldVanish( sText, eType );
 }
 
-int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos)
+int SwWW8AttrIter::OutAttrWithRange(const SwTextNode& rNode, sal_Int32 nPos)
 {
     int nRet = 0;
     if ( const SwpHints* pTextAttrs = rNd.GetpSwpHints() )
@@ -1253,7 +1253,7 @@ int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos)
                     pEnd = pHt->End();
                     if (nPos == *pEnd && nPos != pHt->GetStart())
                     {
-                        m_rExport.AttrOutput().EndRuby();
+                        m_rExport.AttrOutput().EndRuby(rNode, nPos);
                         --nRet;
                     }
                     break;
@@ -1307,7 +1307,7 @@ int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos)
                     pEnd = pHt->End();
                     if (nPos == *pEnd && nPos == pHt->GetStart())
                     {   // special case: empty must be handled here
-                        m_rExport.AttrOutput().EndRuby();
+                        m_rExport.AttrOutput().EndRuby( rNd, nPos );
                         --nRet;
                     }
                     break;
@@ -2156,7 +2156,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
         {
             if( AttrOutput().FootnoteEndnoteRefTag() )
             {
-                AttrOutput().EndRun();
+                AttrOutput().EndRun( &rNode, nAktPos );
                 AttrOutput().StartRun( pRedlineData, bSingleEmptyRun );
             }
         }
@@ -2193,7 +2193,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
             AppendSmartTags(rNode);
 
         bool bTextAtr = aAttrIter.IsTextAttr( nAktPos );
-        nOpenAttrWithRange += aAttrIter.OutAttrWithRange(nAktPos);
+        nOpenAttrWithRange += aAttrIter.OutAttrWithRange( rNode, nAktPos );
 
         sal_Int32 nLen = nNextAttr - nAktPos;
         if ( !bTextAtr && nLen )
@@ -2381,7 +2381,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
             bool bAttrWithRange = (nOpenAttrWithRange > 0);
             if ( nAktPos != nEnd )
             {
-                nOpenAttrWithRange += aAttrIter.OutAttrWithRange(nEnd);
+                nOpenAttrWithRange += aAttrIter.OutAttrWithRange( rNode, nEnd );
                 OSL_ENSURE(nOpenAttrWithRange == 0,
                     "odd to see this happening, expected 0");
             }
@@ -2430,7 +2430,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
 
         if( bPostponeWritingText && FLY_PROCESSED == nStateOfFlyFrame )
         {
-            AttrOutput().EndRun();
+            AttrOutput().EndRun(&rNode, nAktPos);
             //write the postponed text run
             AttrOutput().StartRun( pRedlineData, bSingleEmptyRun );
             AttrOutput().SetAnchorIsLinkedToNode( false );
@@ -2442,16 +2442,16 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
                 AttrOutput().EndRunProperties( pRedlineData );
             }
             AttrOutput().RunText( aSavedSnippet, eChrSet );
-            AttrOutput().EndRun();
+            AttrOutput().EndRun(&rNode, nAktPos);
         }
         else if( bPostponeWritingText && !aSavedSnippet.isEmpty() )
         {
             //write the postponed text run
             AttrOutput().RunText( aSavedSnippet, eChrSet );
-            AttrOutput().EndRun();
+            AttrOutput().EndRun(&rNode, nAktPos);
         }
         else
-            AttrOutput().EndRun();
+            AttrOutput().EndRun(&rNode, nAktPos);
 
         nAktPos = nNextAttr;
         UpdatePosition( &aAttrIter, nAktPos );
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index cce3de273005..a835bfca6099 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -1492,7 +1492,7 @@ public:
     void OutAttr( sal_Int32 nSwPos, bool bRuby = false );
     virtual const SfxPoolItem* HasTextItem( sal_uInt16 nWhich ) const override;
     virtual const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const override;
-    int OutAttrWithRange(sal_Int32 nPos);
+    int OutAttrWithRange(const SwTextNode& rNode, sal_Int32 nPos);
     const SwRedlineData* GetParagraphLevelRedline( );
     const SwRedlineData* GetRunLevelRedline( sal_Int32 nPos );
     FlyProcessingState OutFlys(sal_Int32 nSwPos);
diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx
index 4136de0ab9f2..84525b6a165d 100644
--- a/sw/source/filter/ww8/ww8attributeoutput.hxx
+++ b/sw/source/filter/ww8/ww8attributeoutput.hxx
@@ -56,7 +56,7 @@ public:
     /// End of the text run.
     ///
     /// No-op for binary filters.
-    virtual void EndRun() override {}
+    virtual void EndRun(const SwTextNode* , sal_Int32 ) override {}
 
     /// Before we start outputting the attributes.
     virtual void StartRunProperties() override;
@@ -74,7 +74,7 @@ public:
     virtual void StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby ) override;
 
     /// Output ruby end.
-    virtual void EndRuby() override;
+    virtual void EndRuby(const SwTextNode& rNode, sal_Int32 nPos) override;
 
     /// Output URL start.
     virtual bool StartURL( const OUString &rUrl, const OUString &rTarget ) override;