From c2b36cd6f7cf70e77dac5938f18146b0687523e6 Mon Sep 17 00:00:00 2001
From: Tamas Bunth <tamas.bunth@collabora.co.uk>
Date: Thu, 3 Oct 2019 19:49:57 +0200
Subject: [PATCH] tdf#123206 Import/Export chart custom label text
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

OOX import supports custom label texts in chart diagrams (produced by
e.g. double clicking on a data label, and write custom text), but -
since embedded objects are exported and imported to odf right after migration -
it is not displayed in case of a Writer document.

In order to make it work, we have to support custom label text in the
odf structure. This commit only allows the import/export of pure text,
it should be improved to store and load formatted string.

A new XML token is added, which currently refers to an attribute of the
chart:data-point tag. If we want to store formatted string, something
more clever has to be done.

Change-Id: I80c4a3a0dbcf59f1dc732d795fb716da318411cb
Reviewed-on: https://gerrit.libreoffice.org/80156
Tested-by: Jenkins
Reviewed-by: Tamás Bunth <btomi96@gmail.com>
---
 chart2/qa/extras/chart2export.cxx             |  16 +++++
 chart2/qa/extras/data/docx/tdf123206.docx     | Bin 0 -> 24223 bytes
 include/xmloff/xmltoken.hxx                   |   1 +
 .../OpenDocument-schema-v1.3+libreoffice.rng  |   9 +++
 xmloff/source/chart/SchXMLExport.cxx          |  63 +++++++++++++++---
 xmloff/source/chart/SchXMLPlotAreaContext.cxx |   9 +++
 xmloff/source/chart/SchXMLSeries2Context.cxx  |  15 +++++
 xmloff/source/chart/transporttypes.hxx        |   1 +
 xmloff/source/core/xmltoken.cxx               |   1 +
 xmloff/source/token/tokens.txt                |   1 +
 10 files changed, 107 insertions(+), 9 deletions(-)
 create mode 100755 chart2/qa/extras/data/docx/tdf123206.docx

diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index 8d42c8ac93ac..1645c1c1d1ae 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -149,6 +149,7 @@ public:
     void testTdf121744();
     void testTdf122031();
     void testTdf115012();
+    void testTdf123206_customLabelText();
 
     CPPUNIT_TEST_SUITE(Chart2ExportTest);
     CPPUNIT_TEST(testErrorBarXLSX);
@@ -261,6 +262,8 @@ public:
     CPPUNIT_TEST(testTdf121744);
     CPPUNIT_TEST(testTdf122031);
     CPPUNIT_TEST(testTdf115012);
+    CPPUNIT_TEST(testTdf123206_customLabelText);
+
     CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -2386,6 +2389,19 @@ void Chart2ExportTest::testTdf115012()
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs", "val", "zero");
 }
 
+void Chart2ExportTest::testTdf123206_customLabelText()
+{
+    load("/chart2/qa/extras/data/docx/", "tdf123206.docx");
+
+    Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
+    CPPUNIT_ASSERT(xChartDoc.is());
+
+    xmlDocPtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
+    CPPUNIT_ASSERT(pXmlDoc);
+
+    assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[2]/c:tx/c:rich/a:p/a:r/a:t", "kiscica");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/docx/tdf123206.docx b/chart2/qa/extras/data/docx/tdf123206.docx
new file mode 100755
index 0000000000000000000000000000000000000000..f47089fe3b1bd00d37367d360e5c5c1db1576362
GIT binary patch
literal 24223
zcmeFZgMVgA7A~BQ*-6Lh*tR>i-LY-k>e#kz+qP|WjE;TZJ~Q*3nRDiT|G=G{U-sT_
z)vlFP?Zs!UdSxX*K#_sKfgpi^fbf9~QXr<|J^=x(fCB*`0YL(*3s_q@7+N`KE4tbk
z+H2CdSX$uaf&!Ce0|5h`|KIWd@Cwu?j7j&=AqYK)z6$J9i?7%6LNcHG4Ixs<ad$V6
zN(Jbv<2>9wNXD}87h8(srm56;UbgJXrT3U9otS*Wfiag~lyRd1Caj<sr!v%zYkG_k
zLJyGRR|g?i2dSO8x;LUz<?Ifg2Uke^v7N~#k|ID(SMwRR!eB9pV7e^JmUO=<`BT^B
z9ZqvSi4T-*G1s!q6>v)ODMCl3Nvqf{A7NN#S_BHEVK2L;=oga=+VE$A5Y~Wz_&c0&
zm><sdzSkK6W`;c5KGJ(9-Xj)?D2VY1H?c%e9Ps?QpAp0}=Jf-gvuPgr`Iu0-+rwf#
zo@U(!)OU9JH?~J7Tq!@rtV*0Y6(9$$;4Exnqc37!{UXQQvf>Kh^)m-uW^)!+>Ak%%
zBlk*i29IHv(qX)vip*_SVZku#(?53Hip)t;*W1%Rjii||JG}-KC**=oh&dOOWY*{`
zsc<w7=KW5}G<CzNwua3=J6Y3I$)WAdzp~cWC_kiF4T2lmw`C(ibXs@nf5M@h?Nsgh
zrjPj!V8f3O5FpwAkY$`0%%)2~k2FA3VF0qMZD(j<PfPRr{687~e^_w;ZR+K*J!XA$
zu)LT4Z~ikKa;rV)dD67{(`)D}5RmF(l1OXIW=rpHT+7SAn#Z~#W3zK{({A?Z!j9YV
znpc>KN^qeaP>WAmed;gmE<g!^?FIBMi#EHkX@~blZ=-}_<fHy!swkmTnBXyw!O0Wd
zNCy;x_XkBVrUc|u^ZG<}d6~9KOApCjjM*vl3yWr=>h2Jw--J4YzP3(cctIQS)Fd%d
zM@RK;)@t@Ep2RgXM3|A^QDIup(GsV}=#@ibUbWAhxaD;f4TJ<zLFGV&(7t#WX&|b-
z{|r6E;9<GMSFP9HvBpZ*<hub_w7<*8<}nro2%x7C1PBNl2=bG&wVeU&KZL}<THnzU
zVD^67yMGDHCxFodJpKRnQ64w(Tj>W}injYVIPd232Fhk=A;?!D;B-5(@buPDyFZPr
z>4TXl$O&P4q^q8f8%wmUczsUo$b;`-1`efy2ohdtWv%c@I=Mditb%81R#L(Di4c4_
zF$pb=bUt=h{>TkYMUtM6S7iT!9lo@WFKC>D$#zzSM>KS{X<h7&LVdrCOWU4j%I6nR
z+_~8&ukYF*Wx_u`MjEB&C_SoAEO`ZtDIOs%vSP@%Y5G-;)rmeaGKPh8Px+V2`vveI
zcTFPl#~}L(N7(y_(JoXeEGn!I=)VwkP3VQ}un-IA!ztNS8Dm43L+z3f2b|;=5q1-K
zulLDZ#hFuf0p9%InFy~E=^PxuK-^G3Kwkh){J}*3&OYTz>N0C|$X;3X9|%t!L^){u
zf_%I=0;`2)-8cIj(t6A_)N7_kUT={Z5@8fIi5JAzHB(O>G+XSQt*(?X)=~*Zell_{
zsCZF!1c-xm<Zhm>*n-1z;5VRXeskojvJqC5U0yAvdxFuW`Rgt~J&qa@3_>mR4ELT=
zc4~T_$_%*ys3q)#xwk^84E%3u#r-_+z1<c0hyiAB4;%WOgP09A`{#7^f;*Vu)Z4?P
z?8-r%j_3!SBK-27f0W1)v*4AE)7Gdd*#RXZVl^6oF=F|^kbDhK&K19I4n)7TQi*G}
z&3ki1J&AV5ic?J!a?YzV`NR!bX;1Q^7@sBN-`5VJ>W$prO2yHk7L+%4!e&lU3&z#|
z));O$<MK|ghmI}#1!hJad$;$6lT$`~{PBKQrof1_W#^I2=jNMFNZ}A)xH_b^^{A!!
zJOgLNs68=7i;#X%&bMo&D8r%gFDlgPP8j7f_J{04h-xiF*9wDyy<@;!eyi@X+*3;3
zb((&ax{x$NwKd+y3-quv`%B1RJy&)P+?@g&i{XXM6ye`Oaz`w0r`19ezJ8kmH$pA0
z1w}508zNqRaHqMTQ^nspp?FYj#zli67CgC!8E34{R!LKzpbOB1>+Dd&>RPhqgh^yD
zYS&43gPJ=W*f9F;{C48rRjaE)Ybd!Do^kDj9VIejfb0XlA~}P=U=4N(VNyU&e3&ys
zjU66=<~r(`biZcOTUH~R3CAL+g>=%9v8uI95uJ6~(#v4HFV}O;-@_7FXH-UA6LGs7
zvy15pVHN~;PthQ=?k&(_3|=jIro0h$XPW=<YDP9hd>0>%jkGD$PN|;gkZu!xT%xy9
zH#P&2c?)YfOnhDwlqx{~kaEdE;QkIGLg&_ZHOpP-nBM1x2$vT$&+y_~QS;@BKOpa_
zml<}<t_~%s7hTTkz^{<Ah<yMmuv`-~21NmXJTh5nFa+*Kj{q93O-+v<>uVF7M>?fZ
zU!AE6oj~{4PJUP&)C_f+a+9f9oc9~re-oPN5=Em%Fd!f*KriaQght;)*UrJ7_Kyqw
zZ^e72vSGc(g5Zr?{lSOy%u@VZZJ;iE-jldjVbTijIOm+2Ye9fq603;Vbo9aPCE9rA
zVmj+!LO&1B;7Szb{Lsev>v1<~EtYL57-sxv87>Q=(x1$Lz3{Zg{mE(vPE$mb*Pa($
zNZ&au;ALokNn5M?%Q_HE5{l2ToMbV2Pfc4)E#_0F50)bEb-Ge;X^r1CqUgebInU2+
zVS3sSTrj>ZR>}3CPmj>x#NG9pQ@FL6C}2S*lRBCN6x2wOkkO;Sdj6C%cK*6qBF=1y
z=yoJ3_*nwVEaPe^$aQqr&T3NeF?M)z$>25iaKp=R8rn!u+2#_w^KBYx1jfu0a+&nf
zDA*ZK#Mn|Hg6R~>7<uwy8=@-Q!@I=W-yILgZ7B=(p^>PXge{k@CRrp)w%dhp&BkNU
z+vvg{NP=<AeRQ_r-%PB1>2RQ0h=(bV!DEz1w$9B3Re<=FfwW8+9Y`(<FNPd1m(kr4
zR-{>ZsaH6upi&9_h(^;aD?%uH_u~n5=$C8N)EI<S+ukv+EC(UYznCaP_ut`8TEqJo
zaEZM75Lj0rzEV>-lqFNKLXKQD8P^%_z-S|#xq!!io48<57#<VgE68h{m5h*#BgPXw
zT3AAQtH^&^v#<GDSFkl2t&JWSDWtVfhQinJ^hr(;O`L}gF?`#@7mEHX9NVa99-faZ
z#v0@i?gY_%i(G9HUoKc@799IP?-JLofg&>GsC|y_j5tQiHspqx+MJzP<j_S?`4Sem
zDysWPyZ7M$U#e?eoz{K^T&`>UXE!n0F>YtQr<oXR=k#WtQu24%yrc*LPv|q++guyE
z+udV=+n^4jyJy|_!WlXk_pm49yyBRaH&(SrPMb)2vu$qzVHPVdz4|_rRB(G*9La@?
zxw>(fm$@gplLrV>OdcFU{S8w6`Iitmw7mVb!I+whIQmd;z4-x?E5Y!|?}GIa3aV2$
z>ezh|jgz4VYcLmBaWF0OO~7*{w?ja~w9R?e@)_#L=p!R2s0aet=j9Kqah`RP)-9Kl
zqBXj#KTRS`-k~kwI|L)zA@;8jvrRCfz5Q!jvK<a-zVL{3@oKcqetjNqK1B59(y&8(
zt@E12k`%Ds)Hcx4xJ9DPD9T|C&SeXmW5bv<`g#>7;=i@Is0Q_pHqvHW%d$#7H)Fgp
zBDfWKRp1iel<4m$`h&4##!e6nEg8o3b3i)~wh8S_V7x~jH<&Jk7#_bOyKi6t<qh5Y
zjH4A>@nGenEJ&orkM{hN(G9F1-(7O4p+nRk&LYYiUwCu$3TRGZn=&NrsC`EG78Eyp
z(Uyy6LOnUcG1vBsUCNk{aEGkSSQw%8ZYqXolmfG8fZ03wTbr1ums;eTY#K}r5`lan
z7r}Ou>T=r~{9;=@CNP^JLV8z)s|mWuLl4U>M>ql-HKg|ql$K;gtSA+W%^c3&wdAAF
zy_Jjo@;-r{0U?Wk$TD%Nx-XaOQUeU%po;p4QM%Omo8yXPQ_4W=2z;`9IWI2?#ZTz$
zzS^L(;|-k}V~te7kW=3Cion`xvqYszuB6I@r5NUh&yUO|57K!X-sr1^vhRA^&(8HP
zn=N-%ehhkiItCm{4ANObgm+@MuP>*Ahw^S3teF)}Zs(n5>oPONM={?;#huv1)~>Y0
z$AncHir(`aU315k7^XNF%EUNR&g%pR?U<gB<oZ9+&)v`KcZ{Q)RcaN+cFL3;MGCvq
zTNEu6%N_jaa0JtK1!AE^<z#i&(K?y#RM$EY7Ri}fCYB3IYqU0E5yIwP<GM>;I^&2E
zXnn&8V~uAjH2Y;3Da5Qm+MSTh0$jz{@ZGqwVDaaN`Lw6QjIBM@ktex*L+8(ggRZgB
zo#S$@*F@E)M-D^hwhukM6z+E-<(}*<s1a<@Z5t)4aLspy%M{q0EGSyaH#YZR1?LGI
zwwvK^PZ0l2(?1)|aQ*hN=>ah){$DixKV0oU_5B}?c6p4H1PDC>@1@@d{`f||I-g+b
zc@O+iPna@SVsge?wwTd~;L6*BQIEK~+SRr#;;&7tT9wb6A++J^a?`TI7?7}ur8G>K
zn~O5voAB6DWHCfOF^3OVQ_<3*(jG~UMm3+ip{5|J2&Bn-7a^~qcIb+I3-VA<xFtED
zXDMZMGRIWBSveCP@C1*CkgO?X>Q{1v)BAS+h{m$uXngH^Rx}hXP3CkT&Q#Nr&nF)E
z4pL^Stvr<x(XUuEv8OX*xk+x-A|z>N!{x)F$;P8_<jiC`^3i`#oXZwkTM=@ci9N8y
z)Y`$unPH26llpUgz`HrBo-3kD+3{-Tfc4)TOlZLU?*ku*w0LmSn*a#t_b&~g<qrqb
z&{EIPz`)eX*q&C(RNv0p-rC4PTgXM<&_esWwVk=WiJ>7NcCoN``A<Y(gECCT0`N8v
z0Jisk=-wX-{J+zGUxD&?DH#AV5OgW}`h(*8ywRQyf?5*@u1IqK<EI?kB@;`;fz9Rj
zZ&vsC0izW4T4oI)TR$tl8Z)f1IM(|546bN|*Tsl-qe^47jSmd%5_h0M#n!4VO!Ct>
z`RK89bf!`{;n3|^gtZh0zxv0kC{B}&r$dZU7QjRhc)>{=E7izLL^tKlWKg9OSI5hj
z;TOh{k}b3r?z@g<JxBx3lf@3b4JIbQ9C%tn3!N!imA?y#!3Tsh?%|Y&4`DUp8<6H`
zK4IAmyYJ0{=HaK5@m7`UV%e#W(V{75O;*(25PYT4R80l0r(A^ljwgW2Yg!IeTvCT#
zCye2K>luX0nisCiRULExk!uqLzw6~6J~c)yn1X{hTM3TcdL~yNrBMR(oB=E|xDD=Q
z_K=|AX$MBspnKFPGGp(--E_0f^$Qf@(Hkw2aMh?NGY~J@cP`rL>pfCT(Z_D1fP0t8
z^j8av%ev!#7x+IR_y#39!dt*gk^CQQ_upCbf34-Qe+uXD!@@>10>6YapJ*GtqL+`@
zI($P!9ud|?7b!M^BBnoxh<AtA>*(4BSH#IM{{1dfc^D!xCt;&=MNrbSts?{liCv<w
zZTU|B7pH~0h5Hl{aaS^@jwp(<=HeWQku5^uxog21gejWum{3Rs*g>e@Qhe10rBpZd
z9xFdB@GG2G1XVY&W}n1OrFkzU79PX#1hY$?&8DCX+v^#xRC)|s;NLxADk+$-n^x;(
z+HnxLY8zN|-w394A-#D}OQ#RZ6EGn@GE9jK5oh0dtJO1Ik7c;_vqJTi4PTA;h2a)&
z0_@e_VHaQS_@o;EBeVj91QUSWxmf%YxdWI-b3JQo^Zy}te-V>%c`1p0I)o0G_aAi5
zX-+6#Rvc&v&Xi8!AxG-T*GTXgy>7R#C|WgD7A0swtb<%HCx)CJm_P4=Al>y)7Kb8&
zx*=Iya)Mb;+)RK#>YZ2M_=$iaA)cL_mYu_VPPIpB;f@`q%0y;6d?X{r_>osgAb8s{
z8^mNbN$1F5W<ULP6u>iM_4_{00Sadoe)UaFc&X$@2Olj0Yxm$;ey+GPHyBW2TyU;H
zGe`6Il#e|^_mIEZUyY<(C(V2Eo?#EL%Or40nZJ1iIpF;m7Qyu<kF`I@O=(lQ+;QN4
z871#p`$aW&dug;kGPJM-nEKyYCdVBZVGqDeApo=v9`FQ!W&WL6%HyP>=I9W98$5`y
z2PWIpd|b2E)mZ`x{D9?Jcc(Zp{RP~Z^XWvCj|{Qg?%a+u-?>NgOxK~Rj@C8`F)ts-
z-lOzdF+r%K-gy2jyXUtn`ecP&t|j6mVF79D?W2w7x3-0W<(rvgMm`@W_KFVcMBSrM
zOk`)IIiJCdQI&yj(&yw35nx)anB9~ZgL3hKp)gVqy|bNxx~1aC)yzU=yf2^h`0S#7
zX;Ndd&MID`rtjXbv+(IE`UmGl_ink75tpi5$gHY(#V_9{6cA$ksG1f>USv~vg39gX
z+b{D{MP^{BZ`V@d@7=RG4`7`@t8Ar+MI6c4O6V0xnS(7l1pc5}Zd|G7-=&d=Wy{@p
zjzZC<CePWexP@TS?ceL63PC@Wb_)6i-Q3(Iwh^z96+kmVTx9ZbKJYk8%M&uY#2%r_
z(f6i%jufnL9`n^ubv36C?QB!Od`2YqWfO;E3xm6m=7RGnez~CAcO$8z*+!DGnW{R8
z<`$yPrKeC6j&O(X6;v;0^w={C^!vxk(;YOSX~pm{qeSkDYQ3nR39FR9L1(bPD?@}o
z{0PftLEVN^lbH9LHsiGz)zHT@R8`9z#8?>Pd#<&tWwU_&4;(qt&4pqP?7GFS|EfX|
zfV;|nW4gb?6XbvJgFOI(GBi+du>0*<|JEQHQGDhAFDUTR{~aRl<-{Uf&hH$1)M=$=
z1D-A<5nYeHA-?+cr8Q7~_}bHL)}3L(8+*YoMSuXt`UM(UKCP9vBXH~H;q()7SkYuu
z$aHTgY{Xgzx{;h=(sC~z!-ASUr_OD=43d1xYXNo#a*F$eg7DV051H-!rP5tV9z1BN
z6k|vryewnjSoqKnryzgEU1={t7Pa&lR+}G9>#3w$iQETt`dSF-tIg}*yR2s5L-R@J
z51^a@{{7ztpg8>ws2wm-V!(t6{}g~ff(843s?R?@{DHpx5sd{z^+5O1AqWDZF@$@o
zSvQ23!j9nSvLlG{<3_kfv0>qvF4k=!zAL7)&o4$rW;i!Q7sxAaMLF?ckamO4i*T5e
zMSW&4en_pKNiRkF;?PswT8bl?bVo(FR=Wulu+7mGpg9Yc!<h&raEA?x9&88WhuDgJ
z4nsjo9OWz&Uk!NQ29Pa_@EbLuc5h+XpLo_DI+*Jp4q4(PcnB1G#{@BgZL{<FMjwK<
z<VRnrid*Hi4^9A>;(wXEBX^2v9H6Kn9P@YR^M~|1m>60b(*AM&2i~Zv9=0Zo>_vOa
z1KGjZDOTIjk7cnUy?RE1f11B<YY|m363HaYxETTE8_RW9AS)`N4efa<Kn}+=J)QKP
z92mgz_T?L6Y(>f)TiRG*J+Zk;{*3dahyCOXE1G7z18w2t7io4~v9$`V;^xoNgBJX;
zs%st0*zu{AePH4w!L^`G8^nhf1shR3t-(%$0s3b?p1sbpYY_p-m+@mBuoJ=BI`-+^
zb>tHIMB6MG38ds4;9d08OB4y&*o3jo(tdh2?w%aP`e(2O63)&C?J_$oUo=?4P2KP`
z_51jBNq;DXY)jzG&a?B^pY!t|IdSzr1f0tDgK?R(q1^pUbf!(5k+u>XKvkcx%6_+N
zTi3BuQSdCRn`u>;y6MQSyRQOLwAg))@S28Sd`AX~7^0gE54)JVY;66;Gh~*1HoM!l
zbhJ<gu63imwY`3QFx5>dd$_gM4G)elI0Lv3dZ4B^o#+4E90bpD6(L^qlNq)hSSX(8
z2i8$2?tI^Z$x<|V-uLpW#7j8LhILn8KQoo@NoRVah&2_9dJahiAV8vcLViS%DwEg9
z5jmj(f+J+alQ=0tvM%=Vbe|^@)C^@y`n;cR<`Y68S9?V365D;CwoGC@u(_p2H0n2G
zddkZ9GI`vceq9}p^l8iBeB*F^wBKy9GhEi>8<A{sf9m`0?fKAh^OJU~%j4B?@y?WM
z>6+H-d3V6Nt84UIcr)a{jdf<b%k%zIllJ@do_^Sabf_?ghp66ohWX=i%ZMI&b|4Q<
zfwd8RI08MDENCZn<qH9W&r)LWs*R>a(3KN3g+7Ru);e=Dj^Hsrg2dGKyk(#ZM&UN9
z2Jr3DGl{S(o0##lj3St?&PX|g>Rb5Y;h+y__R-(<>@kFwvt9jj1+y`vt8Mlfoq}r&
z9h@QQcUxr!$@eTM(mDH&3H0DbqQk@aDZ(qG(SOy}e+f{;s#)necfe?fX#Ei-Nz{%S
ztTqf!&)n;RK@A#eN%MoO(5?F+I@p2;KJi#(=&r>_a*EDS+S`x4X+=Xuw_R<v%CC2M
zu2UwdCPWg9z5Z!kApCe3hZB|%d8#5^4Donb<`F-h%+88V*Z-371}^3y8Y138>cP@4
z!Xb+qw24>4QC!G(m^5rYc5Ey;<#I1p`in9J$f~udn`A8G-CKO^%SU+a8uK$Y)5gW4
z=6rh`;wh)&L41&P-y1|i+Yi(cI9S@T!|^-5W**3<moBsm%gbL+V~#n~c$))inicDN
z6)+FvIk&u2<ePhD=aafxsj%5{mK5`ob{#QkA~q@3NU-ZvLZgFXDUad7M|k}9D%;-|
zSR4lJml!X`F@899nJHuGd5ku#exus;WEr_HTPR&mGurKmAzP(<Z~c0YNgx0bp$FgS
zROQsb*zjHJOLU_(KmX}Ckz7->NjWAyOcg<nuoDfH8Y-&Pu~$N=66#V8klAT@ckhVr
zf%4j2#~C(Iqhj!G$hd+NQT1r0<YbGHn>t;I)~D)F6(!!7<HY?|M;AK>)shb3LO4MF
zDut+?A$%J2=Ryf?db)9?x{x@W8v}A#Q%?4bNoSOX#25AgIHs8dKaxq?HMkS*^oWR=
z_H$|7E%>BsY_lI@V6?f6Y+P7jOzt~d!m5YlXy5wtsJ6u&7?^`Yx=RGa)}0QnmKJ!C
z3h+bK8^Haps)(0>RiBz-{PWYq2It6eV7{HJg@rpf!9Zu32Hur0c)M5E8^DM@@G-GF
z2|L7W3d-tv<xzmJ;bTX7m#Q+6f=)6n@hi`7m4uKdX}<BwEyylL9&zzMh3AI3f`2Dy
zEzG-Eq@TX{MK8e1D!`UH0(GBZyir$VhQThy6vjR$i^6WcI&k|Y^$W9150P2LaJHfm
zu6??7QT#MpwxX^dqwd075)!i^m(f4fpq;!=zV1djZk3$|vR)KaeYY`_usp_PEd}>X
z`g=t>p7N=<(&I_rk9Pp~UHG}&ZX>(!fqgFtpoJ&*6Vi5yOdkPnCwLI-6b_&?j)`q_
z@7i^4uRi=yAU=1Q)ZY4?ocT?<WB&Tht>N-JWrx-ICrK)T&@!+48ABilIfoQ)H@S1H
zEbZL|)wMwSurWzbEpp1;lN*VK#<!a=0bYj-hz7p0%@gnf<qk$N*AA<?d1!yD610Gb
z&1|&iiN$T-Q*83;rIH_7)7FW8X6T9S*#yU|>IFgH%N*N<i&h>u;C~syhI7S5aiJn;
z4VXVz|5qEv1B}#{0|<D~0d@@TA2!V1!PUa>4_75WUfmp!XCB&uc=^nKS!qE!8LQJq
zB?T8~1v}fLg`zGk=m-@%%Z~MO!TF2W_IO$NMNe#KR_4QA!EHm-H#50LqYPH$JHD`F
zLhG(s(oPk;5Z%x)M=1qGy&eWPeOT4a!=?PGw4ddDI6Ek$A!EDqMKw`>qB}`R$1FtQ
zwoFAt{^vv^k+U8;HC1m>Xv7~o;i97`7myOF@9={1H!fVD1&I(RkBKlB($p}7sx+5Q
z;#jRHcnu+i^@37NjMp{-=5Dqj`vo(~OBc}Df=kS_D-snjwRrXI(LgU8^6}Ah7uZvC
zYLv!uB~hb%kG>Z|w73cHmCzq!SZ$iFX5QJP6y1oru|)-_t9TGS;M(e8xv`F%R>j-u
zeQ%Aa;xy73>{e6fB{k6vs3<arn~R6#Je2H$(^w%(i}0wt8o_n5%VEF*nf!>@jHNzc
zCqLnfKt$zbX}=b3JVb493dqQ%hkuT~@8#MsQ{eN|(ql^grC7b{E8FMn&cos9bE(V;
zVLCn+I+vlW=<=Oo*cJF9UNShMYRCGH(Mf^OF+R}2St%$7%L5^ZoNZQyQ>*FfmA*p1
z3nMJ`nH@KnaAis`t4gF3oZ)qaHN(g3<co>>ey{BvL{E2lssto|)~BCX#c-2PsKJ5*
zW^TwAJFkp=Nl&E8*LeZLr_P=`GOG>2u-b<Y+zK<}TRoW0);aAuf+Bs4uQyJ2x;35D
zyE-_PhdmCxu{ts3i+l_nsufEE1mS&Y+IiAm0=P|8(wY2q)D=EftQ~b7j}rrlJ2Sa)
zTZ?4FIOf{@byxa`fqe8(c{&_<H#*#DM0_!V*KRDD8ze#uvzhI`4j{#l;b=vWh$V)I
zku>01Fd3K{`D1mS&`5`)q3m2|Z~l8Uc5AckK@Q;MIZyyU|AUu*M`QnVM*nm}<KsuH
z0BkMv0QL+I`cOl}X^Pq7gs=p8BIKLBms*%f)tg@&dmG(#iDF0@>7RQcynW>`g+;^G
zxrH^+xZhrT7hvok&sbVOt=N%zg}a4Y#cg-!UksCDDTVYdnYksi)rECguKp5AMn^X9
z)mw&;$|crbJ`BlI4Y$xtUcpG9bE+I-jU7VpZs5QmIR_u|rSvd^|AJ<w+OULZqGBDr
zRDg6>G|cDKvjEduk?|KIJK?(9oQ9Y=rYKc{@(z2bosmJO%EDquf$+x5nc8rk(|UUh
zt2oE0B?fr3M62M|qDRs?v21E2Od#}XBcsSc0FS}bSrF-*?b(!!5T|#o5g%1o3<*YY
zcQTv#T35Z(1~`pPJpas)kFwlwcH?bGedg5)Gsz<-Lp3PgF;vkh;W_>1vymD<@tT>P
zvJFp?hEm{aRukT}AMGxgaY^Vv-Tu0g>S}OM9w~Aaanrmtm-0$N#nrtr>yJ7URegMt
zg)g*)OlW+PLz5Ti<vu1`!HX)Y+^<+@-7NQ?dPE2EAl6J-q#Ma3aW0ICoK3xxfadD5
zz1d-UzL~oWVrCj%g)%(jLi@Ro9)&Z6#-rU+igTWO-^0<c)ngELkhL>PvE~SuABEXa
zD!CVygp)KMj62eZL8w5i)h{*&zRrS=zc!a$0V4<}ewNiWwPdr3M&znI7Hi&4sZU$f
zz@RvnNf|>)zd#j2&A35~w0)SGx&0l=|2@{}A^u7u0*G@=0W9_ffDZvGa%AnSZ2;v3
z)^>)!BRfC^<o^n~081Ai%LgdvLKb`wUB~~$ZJRDHm`9WVeG)1z3hKM8dT(w1g){Ly
z_MR<0Fl>j&5;7i6!u^nE%7Z=a(h#NHzb03ioj@)eShoC--_q_@k){s|Sw#e;NT~u(
z1ftqROGC>*vZ$QpO2-Ut5USdjlst_gBd@}qV_><KTGWj2QdUc2Nm%}8l#xHPp|t}D
zTgaX{RgawX*8ys}d5|w(W76S7I~bK9wqXUp5aa8T1wp;tzoMIdU?0WDC_p<;ch1pY
zBu}W)e!l2H@vkvWElzQu_we%5R(^=mT#zkx`VK1_W1GkTGQUtrR`U8<-J@5u&eBJi
zqp2rUq5kAq1$H&Clk}kRuwE$)4}tTjW2(KE&n07ZIZ8|sn>^0X-@9K(B<98}5qE6<
z@*4HTV&aV-h5s&)PC~c~C2R0_W{<4>U%4*`FC+gA(3AEjwBVqt2QbvMe_Z~EHVtGa
z#QS&=I$=8d7@XTod1Geti)9h|{Y&7hN#cxjomtK-DqP)3#gzPpo{T!XRxUc*6|&G*
zz$tV(MtSiUa%vo?w%@9|S|A2SWc4-hsC0OPG+jL#qz?OX5Ls+LX^OuIn^$t)27S*F
ziIu|2WfdEAnO_%Sf^!ZY;mj~z$+#axBwGunCS%Z=htDgPj5yd#*>U_NYysn<VvS?X
zR}dY(*JM-KYLmE)5pSPcv@M;fvalmq;^PrQyMcTJX1;pJqe`)tU#4+Xaw7D|Up%{g
zm9m<x0(@q<&x9K;M{+js>Oa^_zKV08FK=fsnXk?Cazpvwkr-VuD1;EeQhfm+a|r(~
zthzQf|C3b!AN})4kL9yo`;A6{JmbP{V6kt=!upo$iGIJW*8LRQXe?EzpHoW|Tpn|_
z6xBF0zv6ZhvG4BkEGV{t&7pl8Ju@I1a*&G*28v~lcAwy~yrJoZ0u~F^a81uk9O<(w
ztnDG6hK*!k=L04JS}rINuPmQynZwwu!(KhxzmBoXa%pIRX}rU-n)DfXq^!0*(FPBa
zc|PeFnXIs1Nd_0LBJb<tm94WRZ23Y{e0yEcW8!mB9lM@I@uOGuc0zhs=y9Wtc5PlB
zO+tE;nR&zyW{A^47f|9Y@DrTz>iP&<jD{1_1^<F%7zb|`%kR05mI&bK;<qH6NWnGW
zYxCg^GNP(H1FzxKKsm7%$wB(;50mB(LbM_vXg>$>b%1quux)=1gS?xukj!!RkFj45
z(_Krmt@&DW*iW)*rN}&!x_@mm=#2?fxa$iv_7H7zF^AMza^+TBTQn$s0+T-FhMWIp
z&G3S6u#sB*<9Xqxi;nAk@3!ymmz$gy&6B1vBk|UI?K{lBY|STNY5-{XuU#|$nOFbU
z>-yLAzwDurmH1Br|C#gq*TCOb0O|qsZ-x7R9r&MlkbfUI3J4PZ?^%(*()lYm{wJk3
zz{a4zK;?fO{8uFP&%tnj1p^HJ8?O3S3V($r|D^DH$^ZH1|Nnr>zY_c_-1jHJ7uY`t
z{uTWDD}lepT7MGg0>FpA=k)(YUVk0>SJ(E>p<#ex$N!wnpN{Tdsr;u0^Ct};pc8<<
z{5OB*ufzXpg8n36g7uFD_^UzsD~12m%72ar0!qUEw}0TDI$Bl&48U+eK(K%xBmmDU
z<Np5ipXDbIO}wQ<fTyAW7%U2)7vS(4`~!de4-{4^42u=L6YUu{sD%?}jqzP&7jCa6
zqkct--zhFOkBe}MY%x5X=&}+3!=}5DBhStXfOOo+ii5y0-Ol3HMNb#<<i-x_M_IH;
zw0;hlWiG$FZm+`WsJa#1YjHcL8d!wNhm9#WU#etl1gnb{BnxZ1@7U8Vuv8ECrvgqk
zs5YO%ud6!uew|UO9zsgymsmEofOj|#xH;Bp80DXVT}ELDOgX|rN(H7VWvUcLPKWLy
zuU!0Eq$>4k)PfSE#Kzs7OBlaCvOvPU%Z9sqS9>tU0+Rk)Y-Ns7PW4PaN!M~ZSh5-^
zkh3Mdw4ij<4n`9-EIQg(%{4i1C&v#nN7H~O)V0_R**EGlRPdSn$}<x#HO$t^pDb?$
z-eBDxNUSDsss4wvS-?JY$cz&$@ikgibEobw7EtkMaGfs|UU`K(67N`8E?aT9a8<mn
zGaKFTKYA#Fh-I~IVd+g5K)&};%4%6yZL3FaIjdu8`67nbj)1RTr$%HapCdAmJO+K)
zyk6HW>-4FTU6?%?J!kB+tSH#V&k^_}I|7Dnh?*s{gB}2k1{5xgtO`LU-QSz$7fv^G
zHlL9*hwyPQq(qGJr5b{7gu@zoML2F>za~1D{Bku5y2=Ua*YiTz4JqwZ)~nn5?eSAw
z7Mi~G>IRUiMx*-+0DArQvHpCMbh*X-vKnq|_?nj0>2kAn`LUmAUf=0@eRvSIwB_|Q
z6g35FljSFe;T0}FT&{jK-zp(b&({ZJBe*rO%l4_*V#k;s1S6US{MLsQ^LY_lN2mKP
z8)xW6aX1jl#q(a4&?9~tLj-(#f@s0#N5D2t&LI0nynaF+-I(6ZwuAEE2H18#lT&r#
zL5~H+;x~pCSj6I)c7LH!K3K+K>J<?Z1k7<9y!?SXgur+@hQmb=gF7IGpndd+`h|Li
zR$uv;q?VBE;U?6yz8B>vowyfnu9+A;Yak0ds2bG4Q=LIRGXq$84PhLh%w$oV3DaV*
zblaF?bUi&dg5l(mLzWD42W#jQ`l2_4DTS|M?5WAo5I)fiwK61pz_TSWjH9s(_ed;X
zB#>2{Az5Sbo<GMp#y~_{N<DajHaKXvH(f$uFwi2bFy<9fe+ucu{pkXmZKtI<cZY0<
z7W$gn?tUq=85rF8e$k?8?~HeBv~AeGUNqdCwn*%OWu@5+!cTa+bLxaUUdt(KfdX>t
zz4ETz_;FL)Vaao;RsQ|CoaWbnqh^a()8@ty<Q^gS(3KClp|PIZj4V@WD1#a|g(Q-k
z25ixe9<<_0Zh&`?i(R}=33_3naPUg6<9Io_?yiOGgz#1^$keO=;z31&+O-1(ERc3X
zSY3e$8tIoQ^|Xow{pHz?(t#7(7Cb!5tw2Fjx(vZS-drUnEnfZ!3sNc$a8%1<FG`rZ
zhT+g<Z`5cW3m2<N(Q;NFU80-#HMErt*TN<+g)FBHx{k>G)-*|TBJnXPQaQCCsNik4
zn@IZ&)dIylQh^$=yag}ZmPCTuLO8ZL^Tm>7dpMb9sGfTBsDTPu<hhcop?oV~Y-3H%
z{V?7SEW;G}!51H5c1g#B8<{UZ=6lId%sbM-(<_=6PN><3;Nvxho~{UrI!DEV_UK`s
z5)+k_ZV#lxJCZ=hpi`h`MZ_G;BCf(W!3bov%1A)a@duM;!V##cFO-m%_RVTg8nh>r
z)seSNfl*1tRmbg{DQJ)54|9?$r^KshNf<*7V`)53v@D1?#dBK@fMSXYRe3hI@U`_C
zW<4X6Xf{sOmdNX^*2rz2Kym~vnUjU37+7T08&2k(T=2=@nlw_^CWAGzz)#DRaS#SN
z<QG`9WTIyTYJR=!wsQ2Plb2peauI?Kz>l>c7BBK^PBt^=6`S+eac#k!Xvx~HZf5VY
zXcW!fzX}gLv<q8qFQj`_y{mu*lA2D84dI0T#Ng6y_XI$r);hDhsh-3{rU}LFHcA*}
ztaJ^}_pEfNh%v77<?x&l(p9R*Os~2F=MSq1($i;3&lA}Txc4Ac8yMV;6-Z!CZ^GLw
z5a;4`sGulK$D+^Y(gg>Lr=4rR)<BlL+k+dDU9U9*zF)6?08H24WBur(sUiXZj5I^?
z_uT}4Sm}Rc_te&`*4Pl<Q2cOZwdIMWWzj^DkX5=@z&C(jBqib}sD;daIDGwi>P$9T
zYt?vKk)dX~)jwmxW`AhoGS@b}9$*iCPumuo&P6Pr(;a@izIt1@#JH1AI^HfO2)TN+
z+zI74J7-J9zZvF39hiC-^wv||RKsu2SgtEnq_NYcBG604qTARQBU(S(bw(^nCN9WS
z*r&t0)g|z-97m@ekicawc9$|#e8p7gxjH6T6J3kHZ#yoqHoss-C>b#8lTn>E&gVty
z>!EKac^-F~wlOU9E1QtE4fgqMT%6<`c}UBn2K7N)xw_$)@|1P=`lkrqp{pds1<0=i
z|K6Xv@3w@K(W=~Y)vZFNNg%Apga%m@wb*l~I_R>9wGNW{BUIcZ<cF)p7{rp32r<)#
zk*4IiQRv&wZtNxxcJ%{eY7p6I6u;EupYYoE7UngZj4NZxEU4CjjfrNyd?q0&(0VV?
zw9e|Z1^QweJ4V8P-7tRhHh`GnzLi*^c_d@}K9{;!CVj<`rIn@1qN_mTebL-*24Uc0
z!?%j)z&xJo_%pbznikFd_D+%66b-CkqxY95Zexr3e*TG7OpoUJxAdA~x`i2N6khco
zEcB+2ay~UkMrVW|>B$iBIx{tuzxq{v*r<rd$TKWmX(X|KOCPz0BbKlsTzhTP@tJFX
z70|V9Ylf|)A+J%@r^AdCj^}-vsDBMAL6CZ4h-ST@V*9~BHMbTxz+r0t`I*hkgNkt)
z3b#RaYiP(rNOzs0Koq?XCrs_AK}Jj4vj$t^!T)_zZ+WyIoN^J;vYSi|?LiaN7`^>G
z3p5=&GWXnQn}pZBde}im<?Nx45xR1bk-FG~R`wVhca36oF{K7r?UOvdtB#N1PnGTr
zjHg<|@s9up)@b5ovsx&1T_r-J1W9H!c(4E~TEl)u+&R3cn#V)yPh8-M4$-Xz%)2mj
zP0;a3-nw&E)+9?dr4}MP745qV&dkO!TBY#i1y|_|-kfZnM`~ByhVB*q3O}EC^>CO7
zBtpV?i_UK@WJY&OY^j0Dch$Pz2%8gY_JJ@bO<f$4t5K+IMe?U07Q_##Ak_$0*myv`
zh!Kr}y!;IBJw7@+$V~M?MT8in1+nGqT^bT>?zX2PS!p?@1+#)_4Sa-{uFxA%4Zw=o
zLb{P7Ipj$77*x8g?Ox3Lwo1I1Sl~uJsCaUr>DxTGdM%EO_K*=l$aBen4a%z7CA}`w
zqn6(J)RzCXD1TwPzUo+Q^DApy$xX>Pg|l<)Na46m6YNNaQzFZbdUx&5O_rXk5}vI&
zHg71~fW2nq@D5|6i-qygb@Q}S<`6}&a+8dnhLe(01&Q*odP)d2b!#EcwvjEJC=#^S
zyQ!!Jx}<Sk2a<8lE5*K-i%gb}%#IHLg!p%@f{k2M{JRX(3gFECE-CoKS^d`@C2I?7
zJNrM>N`9P_RUaOLaFw2|j}B*ux~eUU>UYgs&^-En(QZNB8~Yc(xq7=byaip>o9j&=
zM66rtSds@+8Z~6&JWGqmNH~0KwaIUvdwqUyhT$5i=4D9FS0r<}+|EDCTryO$$L<cC
z>E&j=8smr1)h8LjfUI$NN$Wc@A;+@fRaHj+5)`=u7AJZ4wM@KmgO}5-U%G7<vQ^)Q
z%%T{*D{UdgB4tE5#Uf)QHGY8fo1X##@(QjY@Lij0&bv6Xp+?BgoF@C>(_r}dck-(9
z=PwI9$yJ0hLsdq_i;T%dT|>0Eaue*o99}!p@_)U!Tk-&w;qMEzXSxG0>Oeq8|Gop#
z-q69}Uqv+a$`aN9&D%*^{n0b+iZT*;z+slr8?q-A>e5!cF}6t-QyY8*7F)ZA`m*IL
z8WJ-H8rUWzQ+Sy6WW+}MyzwG33C@`dm!O9VH#KX*D@aa{vZi|LS{Gh4)2%{8rzan+
z>VQY$=Kb_yeR<!4zv!2W0Tf8bPHQY@Suq;dAJ4oqoGvB=>XR^!t@=2>7C`tmUECb6
zfiD3wTKtVDk10d&Yec$G1gfjZ7kf1`Qv<^cF`BZ_#QYa1)Mw<biV^-qIMQCXs1OoZ
zz3AR~#gy*B4_YiAN4yo!OGM5|zfG^?Oq-34`Nxsn_^Wi^*;=AOUSBqtPx3RII9+&d
zzdXS^+bG>A=x__)9k5;R^+EH{K#>Hz!U;~v5bd}3=@BrT#KqN)GEp&)8+Tegt{A%3
zpiAU>@UVx+fGSz8W`vTa547|5{XHv#X>#W22uv}FKX>Qz!_{FamRBfd*9stvq&cki
z-tjF6KE6LgkdSWg$t~_0MlexO&zJ{_7tb~zD@&l>R=-NDnkOT|37t{Bj^7qJa(e6F
zBm7v-nwS^YLyz{{G;wo_&G3EThUM!#5$)}qMvjXZTUo_HSLMGle-0c6d!I&^@SWLu
zB_(*&0*d~A_4=i>ot><fXqY9sP<wy;yWU8#np{OeCldPeb`pD@k`NPH_HZmpJ=%iZ
z<&B2~LJ;#?oLAf)i(f&M6q`rvEcgObhBWETu@qK`fcyR{u-fAZbAFRpX0z+X;_enl
zx<($Xi@9xtOAa|^`TDM8x^NC|Wig}+pN`K6eXUg}(4Z|0dL+7fFA-R`4Cxd-vl$<S
zw-IH2(>Lp)9PNZ&MQ@i~J0zLgEH#!=p$E*8#!r5uHe44}CDjk{5G|&mj@5|Oc9Ge_
z+fkh7H}gftS?Xl@xcTn;SiPr<QXVfY=IDh>mCFW!@n-IY%b$(E<gKlK)=Z)H&~?#%
z6RG*?xIC<%hkAos?7#|gela~J%;%KvjAQV#!vfo2Pb(2jb#aV@kHwZ@IYf|=0%u!q
z=V(8{K=J~r^ZXhumj$X&IFxF20_L1pov$f$LMJIsWO)Wu0mfS$c>w!cYr?lwwj1fR
z9Dj>5M$I4WhIi?o2*Y}}xft)M-=(N7gviM2_ny1Mykb6Pz$c4+b-!2NRLp;JKdsR{
z#06>drSbCV^&(h6VE}bTPdxbQ6eVwd<4B)XbaR|W)hSvh#5HME`$!>CbUiTPL9dm$
zHU2a1scQo{sLLej0|3JQUBFjd9)7g|dbj{pWr+XMghqhxg;D$sA^Zkt*JG#5_UI4>
zFJS<==ZC>sq@s!vg=H4s-r64pFF>ILYq`(*OycY9o+7nz-vapUSNc}*@~wpdd4$X#
zL(X|4d~ULni%ePc;`u06MHcFFJXL9FoZ@&kZF{S#s&jdu&&|*8=eot1#vlmo);SEh
zg_@9_35IwarflOHwAA2OKjGkAZY_<Pz1JRCds8wY8kE!m^_A%w^N|L<19ww}p`OnA
zH$|~#-^L{(1dVePzNMS=eK+yHY1`z)|5R<9Cz81{no0k(3v3X7^;rYSXn9;wj(_Ja
zy&z-8`_qA=&n|E^sO#6<bOa3S2#=!v;FE%e$(ssc#74ntir8)k<~K<O#Y8Mv9@~mW
ztpeVu3Xl~2vu;Nz)gG4ee&$XXmMF>zz1*W_2n>93+YX$AAgqEYQWS77I&e1>LFZZc
z^)i)Jbl?R&9eDMibTIt^x4N9XSbay>gn{!YG4kr->z1teCskd!FClS}Ps3kA>?eDy
zjq*Uyq}wS7eP3fip3Y&Lve@LSi8<tQac5GVlp-JdJ4R!cKLQDxoDX<x4N~ELDKuz4
zI`HpmycQubSnAyU*B6cG_4I2P&@%(j=KsUt0i6DSInovQ06A%dcC;g0&`tdnzAwn&
z71=fj`_nAo<wQTJ8)AcHiTJF-o2xG6!%<o$N;oE9llpdOh^w?A6tL+8&(DO*Q6=QE
zl`3Z%*MfgM-|v=@5%^kmvxQ;V_LEhXO=a!VutoVY4f;`AtOsWfSB){0;y?t$Xf?La
zw$cI7!)YF`DpR)Go*42<930rWD(zC{SXQ@O#pMh~o`SqpneHi$qT!zA8Fz^<vblf+
zEKJqU4cj3aoI^@hK$I&}$p~I#_a)cE?#IDMl_%DY^IEw>W(TV$g&IkE-E5kG^;1`P
znV@JmP@_EPPZFFb9<&SE-G3`h%05nh{i*1+#8NcuqX2dU{P<42+P|;m+e5w8YStqd
zf6#_^i7+eZoUPCaQUPB)97u4o#Wg1(_v#m1@*T_8C%Y$h*f1r0`B5~dlo{hb^AYl=
zp?!H*el$ipTBN~v_aoPa3xB)ylhrNX@&eacGQLR0Knf{m#&y!^A{-9YLsL2e>mxh&
z<LXAf@%3V#y)DZPsnpx1|7hQnY?8Zj&5o@!QVOW+(38K|Mf;M|a=O{Ors(A{{YTEi
ziCN9QwFfV0L{`u3siHUFz5ZRz*>hW^I{~==@_#Ag{|n#$vpGCg>i2hm1pXss?1<<k
zn8zgQ)0&HjD1_%UnAsS#TythRhx4P(hCV%C49cO$YVdL*X{4_1w1UD9PK8wB8~!yJ
z!6y?f=#nI)Urbp+--&F7>ve=mborgOhaJ7#Vr}Do&G!0J!>Pn?1Ix_P92oH{2a^=c
zU!#y63UB6gG?P{69jUkF2VKKAf~E@25G(me(izl)2NjaWev`k#F<opl0rFEI<MkC5
z*^`rm*8(kDpYaub+EGMw29H$ZtZ}x^IEzqHiYTocJb8#Z9y@!ld0LP?;h_9XGzBUn
zr}xQK7`~ut{rUVWTjP-Dp1GB;uIUZCf_4^7v#PlUbD?xG;fIf=lG@JeWA+Wpr$}|v
zX>9`-Tx=KT9_-222^yl{w2i9E*M-wBFj%Tx;asNJo@wX$R?Z+_9$jWx#-&}k+d9%@
z#4-i1*~0heT2hC^+_<IljvBPA>AZnT-+(_zv;+n8AWV=jxo2MgE9S8gho(jkNR24i
z{9`l2AJNI5DT($B&F_1yC_$HP${+sUD_3Di0;1^pIL1}GVFMR*KN|yQm=7o;qO6F&
z(MP{Oi`T}nS&UsLI=A@suS6MixDi{fNPE4!F(>xWW*YGmqxsML=;P~-lNBOJ(T2^$
zvHr~c*^kOttUq7;aX@FFuIDoA<2h+dYqHLR*cH`;H#TEvXFw<B=h)2-9Sj<m(F#Pv
zeh4?4g6X*38$$-Xej+#8n7{0RL}FM;G=Vl;)Mxl1f9N=;oZ=P9fY&hSuw>Gf2;4#q
zvt04oKoukNRSC4!F!4OYQvOWC=X`zDUwS05a7GTmyfu&t2_>rUd|8r8gkiHgc>*um
zR82k#*xQgmgBU~j(v<yl>I1Ki2>m-x8(ebaY2s3|MaV~LV5nS=<qP48kAYJv_&4M2
zlDM-chIgayEplR+V6;D}U;<s{8>Wj@Ois=XV?%todsP#)jr^E#G?KkBqXJa5++V~6
z_2`(0jXoA2yy;!(**Mg?>@CfzZ!!%=Jl-~Q*_u5|m-h9#<NS+4T+K^c&_EJ#Bx$6!
zt2t_ZS)V&3S!=KOB~c+aVzZ33TomVB=lF{2de}NVo4)Oe=&B{7w3I^E`24yA=L7}R
z4_94G#LX%`lVy1->@Y@=v~b(dR~sI)W?kUO=g3>8hxL%E7kb(E>f2K029q|xlfZnr
z&VtG0GUQtA{P-Dh{<?sbLxK4AalJBp51b;Ttu4^Wq&zEvWW@Aj1)TrnfZrIncJ)!N
zn<pMp_y}ff#04d6{iX4ltUo4X*vxosoN6<@?G3p!d+&kbXukuR!?Vh7@KR}d#U17L
zx&yj4`NNoxAmq{9R8R#r`(lr6J@}AqJm`?EJ>Zb7-0zSr-RF>vgClkCXvicoFO7h$
z1zNMCdT}M{Yez>$n|I{Z-bEJTYx9dS5YNT?r>&?qZ;yw)3*5=K<`)rbKvNIq6m^nX
zPe!9^?1R&aWC@oXJG|ZdYStj)M6DPg9F%n9B4!r@mSnG0LbA118$LUI`_`X2@6A0W
z#er6=N{4hqu+ZYV6?(Iemc$|PSq0e?2cPc1HHJg2zeuLYV^AS8AiY+9j!%jNok)m_
z_$W<+g;f8Vh`_3oImSSC*})`(hc;Xcl&>gKHM#U%Ng>?A<B_EH-O>=RM+u*pRL`^M
zSTAvbhqXHSy~KCmb_$lN&|6P-F1$2^0#i;xi76Mn%tY{9`Cg{f>5rS4;MI!UJL@Kq
z7zxh)rSD(!F5I1$<WnrKH}8^zU3+hVvp*aZ&QrkQsSI!8snL8_608Onr!dqf6GD}H
z2nW&|@#QK`Ezw#Qjj3aEz5Oqyi^m&wzO0z{5i%?XEp6#NxTRR2nlv#zjprvHMie&W
zOBZI)sm8;szFX<Le&94RcSndaGGH<3L%Cf!*QGPt$%lKasohsCCoXI$TZ<6So+yd>
zsfnX-&%yRJl@ZH0s@<=rIppOl(sJbzO8-(!@T{<UBBT@}9rKPzf=Pr*qddoJmAN~G
zIqCVPe$Sl)F(SyHx3=V;423aWfoFw#*##D5W;!c5N5|AnnedZ>L|>WH*ZXCp$h)Xy
zyFl764rOLV3(*o@b-4jA*+4utG+5Lvg&dKO;fLBL&y!iH3g*l-j=a`pU#vaBZot5p
z-3;G0^*5T%qw60!%m%I>dL?u({ECHcM7|4+aCLgm);RaLC!J+J2F6EG1WhkdP9^4f
z$2M<CP@K*05};*;nK+Uk#B3{HH9q1tdgL<B8VpoP(vxI6TosGj4&}0}KlZD3$xCKc
z@sBZW;E2q7n4`;~5~y~G^0@TJ2)T5}^0>8oY4lw|)$I}=q7(%U^i<Fj5K)DR{R8Dp
zb#(KAZ@UDFz)!u?q~R7nv@#Hd>p_cqik~r#Z)F@3ioo+uj8TObrl`V8vsBTQcsSn?
zuT~^!{f-NhF=I=o7NQ-Hq+)MeO5_tOgQK;Hvl#v0W@GQ8OH*8%`G^ms)<H$<M5v+A
z)`%m;_p?02m6`i;%h7rw$>QY6b2}Q&1M~@<FE!WDjI#ERGy@?<_&a48c1!ls*K0Vm
zGvlKS+bcRNgo`Yvto1sF{YUib*0hJh;U9!6k?u39-@sTJo?PCzBovmvMG1bXqJ+jR
zM8|c8Z~W#)`e@*N<wRVA<hn|an8?0~+oDN)DVXUP9$@HohHmQFinMb0gO<wE>I~A@
z^36DIkDX&nRh@PflofStF@_~ZO7p6`0_|LdxEWT!z5%FoZi4aR(dy84NMB>WQ0HvF
z(BVD-YsRP=_ce)*k<)0p{=o7g6KJnfQ_vZc{ew!e#k$MBr{qOI)7fn&-hj(wAKSUh
zrh##^d9CKgW>44w$9X+?5+oXH#+1k|C@+YJwcuuXAJCk?4tZ+=W(>M+0=8$HhZ6pP
zQGqvLTz^snZ9~XG3$YGaFNY6oIgdjL#tLkxh;U)3D9VS0LNF~H2<X`XhBa11k7A?<
zf1szxe?&)-|3^Dugkmu7ACKK>ta0{rghP{?<ne>979;qwlxou6(@}&EVW14Y07m?u
z)ga4hxh&}A5(FtdwL;;}=@k>2%wR&(`lWtJiynL2!}YipsKw5$RRrubm_;D>C}KMC
z?a@PWZml0J79XmRU+mP?AE?L*cN;_th$|`DQY{I0{i3z?Vbe8Yx8LmluzTJ)>u<Z`
zcdgR;y7-?)xoqhj*{$oQ&c6CLvPFC8yyj!<{QbH6F7hfZ3)0x_`gX^fxaYT`l>)@=
z{_n`EKeXKM{m-S|S2qiMo2A(>zoeI?T1!1QcAp&Qq&<_j&5P@2S$%Huwu{^4IF}uq
zyv_0YucF%Eu6cb91-A`?x#cVm-FAB&Ws&n}o8c}oj_4h^DeG7dvE@nkXE!cyl$>+l
zZGKtK@{iB{1vzBA?lV0!bM}R6x(mZzKa`MKygDP#Dg5i5mUTwEI5lkNO6=K?ClZxt
ze#$>9!+6b=e{QA18-kphre9%rtZ(X4>CGEh7j(E$P}@``Vd*#dId@s~S27-p&+7Oz
zO={7fC2hfyVObsrym&byR#y9+@ax%sMc}Efsmo7KUh(pXm5PjDeQl_k*dmRhV44&U
zdS^9!oG!I!&(gLPW-H(7o$9-y(VG2mhiincfVtvzro!f8-3!Xmt6ZzoyiJ?Zx3O%E
z%I-To?bV{4oUvDng?F8Lp|;>lNz#Wyy8<&>?`qhuEW8;s8S0J4n^c!y*^#p{G%IG?
z6)jV}=pygl)6-@xIhN|}8}yt1TprMyxTGI%TB-)~5>(BTX;Ra5O+67t;58p?K;g|v
z!7$6Srrw&U%Nt)-*Kl&f+xN3y@;_g#YJUG<Y;}T~*8b)#yEroJE5vi_G)}V2p2c$2
zKPWW+HdnYf&uO7t1s$!J7n=^fx;<IOHS~VduF9U{b?mQhH_66N&C=eK+w^t$YPGv@
zT)Ot#i*Ih;dT(dur)gHvo>8|~gq#gM=pSl+C)_!9{z{$tE#Ci&r@Kgf2>P248hQD}
z)TtV^e`a}Co<HTkdg<@Qlg@wo^y0+@JCpy<er);k&pf>*i=9h7VMp}LPpMxIC-!~Q
z+b_6pSJT@!laBH7p3Ti){^Itf+q>5OKW&G7?0<6EHBSj(SI`026$EV!1-GutQ<H*`
zMzyD0Jm>{HsD|yq?g!Q_cW&o&>uxHE7Fby!=vdoeGB>w*rq78bd9N>9uL~8_f2%t=
z#qL>pTDL9RSGJk9N8S3{riKZ~uC2Xe^6P1(<&JAz-M!h;8cvJ(4^$cM-!r4Mlzp|j
zhHKp>A=RSZbr)|31?BSW)?M&aQMKdKjUcz^C1<3Y&Gx^$bU;uo`p+r$c)qll(BRsX
zPnuj?*OnJ}=d}xX-_JK<5!C#2P5s}sUBO%WK3Sy}9nh&XsHx1T{gdbx{$JsXo^Wt<
zo6s|hK!4BQD_;3a)HR;0Jn%!_Al0IOh79Ln_LjY2FJArjU6K>-sM5J4MeFL}Dn0F`
zAvV9tBZBswykeO0xiZ&z!Ml$S{kT4-zyFL_hmE?l4fRB6^qwUVYvWLlu|+oE3~-zZ
z&)PWD^F5I@z5y;m0>>#tH}Y|f;BBwyOQFyYc|@3H2%Pi)n}lozx_0#A?hxA3fQ!+<
z+F=t*pfm8m^GfJupdX}!Fe3msCW~wa#7}6)DnX3HeX0<`xJkg}ZD8X_IAaJk#?hB~
zA<T|7gPKif^&R?@KEjACHmJTuOz@+J82SVr!VE4)R5Owh(|PEIpigcg3^8_s8iG94
zg{~ca=p3P4#0{z)Wgs10KkA4qLN^1$Uw3S4@K7THbwmqU_iryG-LNeY=$508F(3?B
m;S2LS&P9;uMJPfuTO?F7T7e2%K_~zmd$t5F=Lm=b=>Y(X?pU4x

literal 0
HcmV?d00001

diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 751cd423556d..4418f9ba54a0 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -536,6 +536,7 @@ namespace xmloff { namespace token {
         XML_CUSTOM_ICONSET,
         XML_CUSTOM_ICONSET_INDEX,
         XML_CUSTOM_ICONSET_NAME,
+        XML_CUSTOM_LABEL_FIELD,
         XML_CUT,
         XML_CUT_OFFS,
         XML_CX,
diff --git a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
index 5da3958ef15e..766added79c3 100644
--- a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
+++ b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
@@ -2400,4 +2400,13 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
     </rng:optional>
   </rng:define>
 
+  <!-- TODO no proposal -->
+  <rng:define name="chart-data-point-attlist" combine="interleave">
+    <rng:optional>
+      <rng:attribute name="loext:custom-label-field">
+        <rng:ref name="string"/>
+      </rng:attribute>
+    </rng:optional>
+  </rng:define>
+
 </rng:grammar>
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 337a322fc469..4dd2bc43b6c8 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -81,6 +81,7 @@
 #include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
 #include <com/sun/star/chart2/XChartTypeContainer.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
+#include <com/sun/star/chart2/XDataPointCustomLabelField.hpp>
 #include <com/sun/star/chart2/data/XDataSource.hpp>
 #include <com/sun/star/chart2/data/XDataSink.hpp>
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
@@ -109,6 +110,19 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
 using ::std::vector;
 
+
+namespace
+{
+    struct SchXMLDataPointStruct
+    {
+        OUString   maStyleName;
+        sal_Int32  mnRepeat;
+        OUString   msCustomLabelText;
+
+        SchXMLDataPointStruct() : mnRepeat( 1 ) {}
+    };
+}
+
 // class SchXMLExportHelper_Impl
 
 class SchXMLExportHelper_Impl
@@ -263,6 +277,33 @@ public:
 namespace
 {
 
+OUString lcl_getCustomLabelField(sal_Int32 nDataPointIndex,
+        const uno::Reference< chart2::XDataSeries >& rSeries)
+{
+    if( !rSeries.is() )
+        return OUString{};
+
+    const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion( SvtSaveOptions().GetODFDefaultVersion() );
+    if( nCurrentODFVersion <= SvtSaveOptions::ODFVER_012 )//do not export to ODF 1.2 or older
+        return OUString{};
+
+    // export custom label text
+    if(Reference<beans::XPropertySet> xLabels = rSeries->getDataPointByIndex(nDataPointIndex); xLabels.is())
+    {
+        if(Any aAny = xLabels->getPropertyValue("CustomLabelFields"); aAny.hasValue())
+        {
+            Sequence<uno::Reference<chart2::XDataPointCustomLabelField>> aCustomLabels;
+            aAny >>= aCustomLabels;
+            OUString sLabel;
+            // TODO export formatted string instead of simple characters
+            for(auto& aLabel : aCustomLabels)
+                sLabel += aLabel->getString();
+            return sLabel;
+        }
+    }
+    return OUString{};
+}
+
 class lcl_MatchesRole
 {
 public:
@@ -919,14 +960,6 @@ bool lcl_exportDomainForThisSequence( const Reference< chart2::data::XDataSequen
     return bDomainExported;
 }
 
-struct SchXMLDataPointStruct
-{
-    OUString   maStyleName;
-    sal_Int32  mnRepeat;
-
-    SchXMLDataPointStruct() : mnRepeat( 1 ) {}
-};
-
 } // anonymous namespace
 
 // class SchXMLExportHelper
@@ -3232,6 +3265,8 @@ void SchXMLExportHelper_Impl::exportDataPoints(
 
                         SchXMLDataPointStruct aPoint;
                         aPoint.maStyleName = maAutoStyleNameQueue.front();
+                        if(bExportNumFmt)
+                            aPoint.msCustomLabelText = lcl_getCustomLabelField(nElement, xSeries);
                         maAutoStyleNameQueue.pop();
                         aDataPointVector.push_back( aPoint );
                     }
@@ -3259,6 +3294,7 @@ void SchXMLExportHelper_Impl::exportDataPoints(
             {
                 SchXMLDataPointStruct aPoint;
                 aPoint.mnRepeat = nCurrIndex - nLastIndex - 1;
+                aPoint.msCustomLabelText = lcl_getCustomLabelField(nCurrIndex, xSeries);
                 aDataPointVector.push_back( aPoint );
             }
 
@@ -3291,6 +3327,7 @@ void SchXMLExportHelper_Impl::exportDataPoints(
                         SAL_WARN_IF( maAutoStyleNameQueue.empty(), "xmloff.chart", "Autostyle queue empty!" );
                         SchXMLDataPointStruct aPoint;
                         aPoint.maStyleName = maAutoStyleNameQueue.front();
+                        aPoint.msCustomLabelText = lcl_getCustomLabelField(nCurrIndex, xSeries);
                         maAutoStyleNameQueue.pop();
 
                         aDataPointVector.push_back( aPoint );
@@ -3306,6 +3343,7 @@ void SchXMLExportHelper_Impl::exportDataPoints(
 
             // if we get here the property states are empty
             SchXMLDataPointStruct aPoint;
+            aPoint.msCustomLabelText = lcl_getCustomLabelField(nCurrIndex, xSeries);
             aDataPointVector.push_back( aPoint );
 
             nLastIndex = nCurrIndex;
@@ -3335,10 +3373,13 @@ void SchXMLExportHelper_Impl::exportDataPoints(
     {
         aPoint = rPoint;
 
-        if( aPoint.maStyleName == aLastPoint.maStyleName )
+        if( aPoint.maStyleName == aLastPoint.maStyleName && aPoint.msCustomLabelText.isEmpty() )
             aPoint.mnRepeat += aLastPoint.mnRepeat;
         else if( aLastPoint.mnRepeat > 0 )
         {
+            // export custom label text
+            if(!aLastPoint.msCustomLabelText.isEmpty())
+                mrExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_CUSTOM_LABEL_FIELD, aLastPoint.msCustomLabelText);
             // write last element
             if( !aLastPoint.maStyleName.isEmpty() )
                 mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_STYLE_NAME, aLastPoint.maStyleName );
@@ -3354,6 +3395,10 @@ void SchXMLExportHelper_Impl::exportDataPoints(
     // write last element if it hasn't been written in last iteration
     if( aPoint.maStyleName == aLastPoint.maStyleName )
     {
+        // export custom label text
+        if(!aLastPoint.msCustomLabelText.isEmpty())
+            mrExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_CUSTOM_LABEL_FIELD, aLastPoint.msCustomLabelText);
+
         if( !aLastPoint.maStyleName.isEmpty() )
             mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_STYLE_NAME, aLastPoint.maStyleName );
 
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 27def14f6ece..33bb1e043893 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -609,6 +609,7 @@ void SchXMLDataPointContext::StartElement( const uno::Reference< xml::sax::XAttr
     sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
     OUString sAutoStyleName;
     sal_Int32 nRepeat = 1;
+    OUString sCustomLabelField;
 
     for( sal_Int16 i = 0; i < nAttrCount; i++ )
     {
@@ -623,6 +624,13 @@ void SchXMLDataPointContext::StartElement( const uno::Reference< xml::sax::XAttr
             else if( IsXMLToken( aLocalName, XML_REPEATED ) )
                 nRepeat = xAttrList->getValueByIndex( i ).toInt32();
         }
+        else if( nPrefix == XML_NAMESPACE_LO_EXT)
+        {
+            if( IsXMLToken( aLocalName, XML_CUSTOM_LABEL_FIELD))
+            {
+                sCustomLabelField = xAttrList->getValueByIndex( i );
+            }
+        }
     }
 
     if( !sAutoStyleName.isEmpty())
@@ -631,6 +639,7 @@ void SchXMLDataPointContext::StartElement( const uno::Reference< xml::sax::XAttr
             DataRowPointStyle::DATA_POINT,
             m_xSeries, mrIndex, nRepeat, sAutoStyleName );
         aStyle.mbSymbolSizeForSeriesIsMissingInFile = mbSymbolSizeForSeriesIsMissingInFile;
+        aStyle.msCustomLabelField = sCustomLabelField;
         mrStyleVector.push_back( aStyle );
     }
     mrIndex += nRepeat;
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 32f84b0feae1..66c473dfe47b 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -30,6 +30,10 @@
 #include <com/sun/star/chart2/data/XDataSink.hpp>
 #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp>
 
+#include <com/sun/star/chart2/XDataPointCustomLabelField.hpp>
+#include <com/sun/star/chart2/DataPointCustomLabelFieldType.hpp>
+#include <com/sun/star/chart2/DataPointCustomLabelField.hpp>
+
 #include <com/sun/star/chart/ChartAxisAssign.hpp>
 #include <com/sun/star/chart/ChartSymbolType.hpp>
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
@@ -1085,6 +1089,17 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri
                     if( seriesStyle.mbSymbolSizeForSeriesIsMissingInFile )
                         lcl_resetSymbolSizeForPointsIfNecessary( xPointProp, rImport, pPropStyleContext, pStylesCtxt );
                 }
+
+                if(!seriesStyle.msCustomLabelField.isEmpty())
+                {
+                    Sequence< Reference<chart2::XDataPointCustomLabelField>> xLabels(1);
+                    Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() );
+                    Reference< chart2::XDataPointCustomLabelField > xCustomLabel = chart2::DataPointCustomLabelField::create(xContext);
+                    xLabels[0] = xCustomLabel;
+                    xCustomLabel->setString(seriesStyle.msCustomLabelField);
+                    xCustomLabel->setFieldType(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_TEXT);
+                    xPointProp->setPropertyValue("CustomLabelFields", uno::Any(xLabels));
+                }
             }
             catch( const uno::Exception & )
             {
diff --git a/xmloff/source/chart/transporttypes.hxx b/xmloff/source/chart/transporttypes.hxx
index 44d3bc3a7b22..6481cfb1c004 100644
--- a/xmloff/source/chart/transporttypes.hxx
+++ b/xmloff/source/chart/transporttypes.hxx
@@ -168,6 +168,7 @@ struct DataRowPointStyle
     sal_Int32 m_nPointRepeat;
     OUString msStyleName;
     OUString msSeriesStyleNameForDonuts;
+    OUString msCustomLabelField;
     sal_Int32 mnAttachedAxis;
     bool mbSymbolSizeForSeriesIsMissingInFile;
 
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 9da33e32e6e1..19c7692be7cd 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -537,6 +537,7 @@ namespace xmloff { namespace token {
         TOKEN( "custom-iconset",                  XML_CUSTOM_ICONSET ),
         TOKEN( "custom-iconset-index",            XML_CUSTOM_ICONSET_INDEX ),
         TOKEN( "custom-iconset-name",             XML_CUSTOM_ICONSET_NAME ),
+        TOKEN( "custom-label-field",             XML_CUSTOM_LABEL_FIELD ),
         TOKEN( "cut",                             XML_CUT ),
         TOKEN( "cut-offs",                        XML_CUT_OFFS ),
         TOKEN( "cx",                              XML_CX ),
diff --git a/xmloff/source/token/tokens.txt b/xmloff/source/token/tokens.txt
index 859cbbc08768..beb4adb8360e 100644
--- a/xmloff/source/token/tokens.txt
+++ b/xmloff/source/token/tokens.txt
@@ -460,6 +460,7 @@ custom5
 custom-iconset
 custom-iconset-index
 custom-iconset-name
+custom-label-field
 cut
 cut-offs
 cx