|
 |
8bbdeac |
From b8e0c4739524504385955180df09f67887b3cb10 Mon Sep 17 00:00:00 2001
|
|
|
8bbdeac |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
8bbdeac |
Date: Thu, 3 Sep 2015 15:07:49 +0100
|
|
|
8bbdeac |
Subject: [PATCH] Fix export of tdf#93675 to .docx as much as is possible
|
|
|
8bbdeac |
|
|
|
8bbdeac |
convert Axis constants to an enum and hilight suspicious absence
|
|
|
8bbdeac |
|
|
|
8bbdeac |
that compiler warnings then shows (which I saw manually in the first place)
|
|
|
8bbdeac |
of AXIS_SECONDARY_X
|
|
|
8bbdeac |
|
|
|
8bbdeac |
Change-Id: I873623141020633ea73f14f5c93322c2346b8efb
|
|
|
8bbdeac |
(cherry picked from commit 90ea1221856340860c406357e274000771b5b127)
|
|
|
8bbdeac |
|
|
|
8bbdeac |
Related: tdf#93676 'new' ms-alike numbering has same problem as old numbering
|
|
|
8bbdeac |
|
|
|
8bbdeac |
when it comes to nodes which were numbered, but have their number deleted,
|
|
|
8bbdeac |
where the indent from the numbering is still in effect in writer, but not
|
|
|
8bbdeac |
in msoffice.
|
|
|
8bbdeac |
|
|
|
8bbdeac |
(cherry picked from commit 54f9576aa43e3d6d687469aa0b2ea56ce0bbaca3)
|
|
|
8bbdeac |
|
|
|
8bbdeac |
Change-Id: I700f34171d8c9e9f6fb725d115ff1fe704ceb4bb
|
|
|
8bbdeac |
|
|
|
8bbdeac |
Related: tdf#93676 unwanted duplicate axis title exported
|
|
|
8bbdeac |
|
|
|
8bbdeac |
translateFromChart2AxisIndexToOox toggles between just two
|
|
|
8bbdeac |
states, so convert consumers/suppliers of that to bool
|
|
|
8bbdeac |
|
|
|
8bbdeac |
Then in exportAxesId toggle between primary/seconday pairs based on that, vs
|
|
|
8bbdeac |
always exporting AXIS_PRIMARY_X + primary/secondary y
|
|
|
8bbdeac |
|
|
|
8bbdeac |
Change-Id: I2649f5fc07323a73a3a215fdc52d5f1a5c31c349
|
|
|
8bbdeac |
(cherry picked from commit 24560df316de86cea93a37edd38e02a2f2d9c0c2)
|
|
|
8bbdeac |
|
|
|
8bbdeac |
use correct axis type in secondary x axis export
|
|
|
8bbdeac |
|
|
|
8bbdeac |
Change-Id: Ic21d88b55b22c650de4fd69479b51d0f640fec6f
|
|
|
8bbdeac |
(cherry picked from commit befef6a79feae0490bd3a1cf72b1134e5ff86111)
|
|
|
8bbdeac |
|
|
|
8bbdeac |
that change looked wrong
|
|
|
8bbdeac |
|
|
|
8bbdeac |
Change-Id: Id40a6802536120501133968d003267f21aaf5c27
|
|
|
8bbdeac |
(cherry picked from commit cfb717133c7276a7b154379d049e6fac0e5a49da)
|
|
|
8bbdeac |
|
|
|
8bbdeac |
related tdf#93676: make the bold property explicit for run export
|
|
|
8bbdeac |
|
|
|
8bbdeac |
Change-Id: I5f7f993f2cf0604ec62cea3460b651c07a7b4383
|
|
|
8bbdeac |
(cherry picked from commit a052479f3c85bdedddfa38cb03b0858003c965c3)
|
|
|
8bbdeac |
|
|
|
8bbdeac |
foo
|
|
|
8bbdeac |
|
|
|
8bbdeac |
Change-Id: I6e175b3f3b031535488660d45dbb62b998d47e66
|
|
|
8bbdeac |
|
|
|
8bbdeac |
related tdf#93676, we want to export all significant digits
|
|
|
8bbdeac |
|
|
|
8bbdeac |
The code comment mentions correctly that we want to show all significant
|
|
|
8bbdeac |
digits but a value of -1 means that the last digit before the decimal
|
|
|
8bbdeac |
point is rounded away.
|
|
|
8bbdeac |
|
|
|
8bbdeac |
Change-Id: Id91a6076e37629502281c5dda426018f93d1e465
|
|
|
8bbdeac |
(cherry picked from commit 442eb1ab9d8c1ad970993ef6c8a49e89601b7432)
|
|
|
8bbdeac |
|
|
|
8bbdeac |
related tdf#93676, also fix chart::CommonFunctors::DoubleToOUString
|
|
|
8bbdeac |
|
|
|
8bbdeac |
Change-Id: I8d63d942c7cb7876b864a9720e9a8adbc7345172
|
|
|
8bbdeac |
(cherry picked from commit bb5d638065590cba700ff46f5a0a1ffbe03b6f1a)
|
|
|
8bbdeac |
|
|
|
8bbdeac |
Related: tdf#93676 in msword chart appears with axis positioned between ticks
|
|
|
8bbdeac |
|
|
|
8bbdeac |
(cherry picked from commit 694419d813c14f6135aa4463d77f72c3a24a5cc5)
|
|
|
8bbdeac |
|
|
|
8bbdeac |
Change-Id: Ibd16d255a45a220faf7681a74785549c32969f78
|
|
|
8bbdeac |
---
|
|
|
8bbdeac |
chart2/qa/extras/chart2export.cxx | 9 ++
|
|
|
8bbdeac |
chart2/qa/extras/data/odt/axis-position.odt | Bin 0 -> 21224 bytes
|
|
|
8bbdeac |
chart2/source/inc/CommonFunctors.hxx | 8 +-
|
|
|
8bbdeac |
include/oox/export/chartexport.hxx | 29 +++--
|
|
|
8bbdeac |
oox/source/export/chartexport.cxx | 136 +++++++++++++--------
|
|
|
8bbdeac |
oox/source/export/drawingml.cxx | 2 +-
|
|
|
8bbdeac |
.../ooxmlexport/data/no-numlevel-but-indented.odt | Bin 0 -> 19535 bytes
|
|
|
8bbdeac |
sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 9 ++
|
|
|
8bbdeac |
sw/source/filter/ww8/wrtw8nds.cxx | 18 +--
|
|
|
8bbdeac |
9 files changed, 140 insertions(+), 71 deletions(-)
|
|
|
8bbdeac |
create mode 100644 chart2/qa/extras/data/odt/axis-position.odt
|
|
|
8bbdeac |
create mode 100644 sw/qa/extras/ooxmlexport/data/no-numlevel-but-indented.odt
|
|
|
8bbdeac |
|
|
|
8bbdeac |
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
|
|
|
8bbdeac |
index 5b40560..c30ee91 100644
|
|
|
8bbdeac |
--- a/chart2/qa/extras/chart2export.cxx
|
|
|
8bbdeac |
+++ b/chart2/qa/extras/chart2export.cxx
|
|
|
8bbdeac |
@@ -98,6 +98,7 @@ public:
|
|
|
8bbdeac |
void testPlotVisOnlyXLSX();
|
|
|
8bbdeac |
void testBarChartVaryColorsXLSX();
|
|
|
8bbdeac |
void testMultipleAxisXLSX();
|
|
|
8bbdeac |
+ void testAxisCrossBetweenXSLX();
|
|
|
8bbdeac |
|
|
|
8bbdeac |
CPPUNIT_TEST_SUITE(Chart2ExportTest);
|
|
|
8bbdeac |
CPPUNIT_TEST(testErrorBarXLSX);
|
|
|
8bbdeac |
@@ -160,6 +161,7 @@ public:
|
|
|
8bbdeac |
CPPUNIT_TEST(testPlotVisOnlyXLSX);
|
|
|
8bbdeac |
CPPUNIT_TEST(testBarChartVaryColorsXLSX);
|
|
|
8bbdeac |
CPPUNIT_TEST(testMultipleAxisXLSX);
|
|
|
8bbdeac |
+ CPPUNIT_TEST(testAxisCrossBetweenXSLX);
|
|
|
8bbdeac |
CPPUNIT_TEST_SUITE_END();
|
|
|
8bbdeac |
|
|
|
8bbdeac |
protected:
|
|
|
8bbdeac |
@@ -1462,6 +1464,13 @@ void Chart2ExportTest::testMultipleAxisXLSX()
|
|
|
8bbdeac |
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:axPos[@val='r']", 1);
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
|
|
|
8bbdeac |
+void Chart2ExportTest::testAxisCrossBetweenXSLX()
|
|
|
8bbdeac |
+{
|
|
|
8bbdeac |
+ load("/chart2/qa/extras/data/odt/", "axis-position.odt");
|
|
|
8bbdeac |
+ xmlDocPtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
|
|
|
8bbdeac |
+ assertXPath(pXmlDoc, "(//c:crossBetween)[1]", "val", "midCat");
|
|
|
8bbdeac |
+}
|
|
|
8bbdeac |
+
|
|
|
8bbdeac |
CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
|
|
|
8bbdeac |
|
|
|
8bbdeac |
CPPUNIT_PLUGIN_IMPLEMENT();
|
|
|
8bbdeac |
diff --git a/chart2/qa/extras/data/odt/axis-position.odt b/chart2/qa/extras/data/odt/axis-position.odt
|
|
|
8bbdeac |
new file mode 100644
|
|
|
8bbdeac |
index 0000000000000000000000000000000000000000..35ea152aa0d9cd16783e5b021b05a68da0cbdf96
|
|
|
8bbdeac |
GIT binary patch
|
|
|
8bbdeac |
literal 21224
|
|
|
8bbdeac |
zcmb5W1C%Apwl=!Twr$(CjjpOL+qTtZciFaWqs!{DZQFXi_j&j2^Zs$q8RO3}GBYA`
|
|
|
8bbdeac |
zB4TDnu9#oUxfEqUKv4kzNC4nnl0rgvh#8gw008{8|G5OPv9K|5_OLfGu(!9iFfwqq
|
|
|
8bbdeac |
zu(M@wwKb-
|
|
|
8bbdeac |
zTLTMgCkE&LDbm~9nuROMOTa;6L;oRxladrw1^|Hm6ah_;Ab*ab>oep400=-)Rz(b6
|
|
|
8bbdeac |
z)R#!gTUf+IOwC(G#_YSYosO5Ip@^EZf{u-ijhB}fkXQ(~R2YnGB!XfTvT_W%YAmK&
|
|
|
8bbdeac |
z9G+$Zok|dqP7;G|9GQL!xj`z8aXPbEETdTli)9wKZ5F$AE|*O%pF_TwL!^*%p}2dA
|
|
|
8bbdeac |
zq(_O2SDCVJsZF4sUxKS@V3kf#u0~L$W=O40c%4yHqvg*Av)C4k*k-GQR>!1fhm;QI
|
|
|
8bbdeac |
zv`){gF0brfpWNPD5$;$q(NtB{P-~Ak3x_5(sbWjZW*gHj5xg;B@&RT3Sz+Q8MW!QR
|
|
|
8bbdeac |
ztS@2scWJCM4c2RUl20|tFCE4&Q|d1h?k^{%X
|
|
|
8bbdeac |
z
|
|
|
8bbdeac |
zx~;xC9N&it4t`PX4e`8<6W>j-ea;bo&eJ~3a6Ha(eJ-$kE^>V>^DT|qe~qf#%}T#7
|
|
|
8bbdeac |
z3VyDLe6GrTuB#o**`3cj-mTbv&D(x%8a{72e{Gw5?O1;9I(_bY1qB5~Mn)!tBqt^&
|
|
|
8bbdeac |
zW@Kdi$Y?7~&MmEtC@3hXsHkYGXl!U`=;-JOD*P2%Iuubl7*#P6Up1UmKapBHoYpvz
|
|
|
8bbdeac |
z)$%*5^><<GL_x<~Y0pA!>qt%SKzZL{)xdIn|7_jhO7rM?$H+qa#75WjcK7e?>70!I
|
|
|
8bbdeac |
zx|XjD|Lxqwui~hWip2N&tjnH;&$gnW$+m;#)cehl=gs7c&HT^7rmwZ4&zaVzotV#q
|
|
|
8bbdeac |
zz|X_Tuj8ouorJrc%;$r+uaktY)69$A=9`_OyZy44qr9*4g0IWUkIROy>*lYUj)8%J
|
|
|
8bbdeac |
z@$vEAvE}KxjoI1RxwVb8wY7n{-I1mJiPgiYwd1+9-MP(^wXMCyowK$5i=(Nr%lXOk
|
|
|
8bbdeac |
z<%O@Q-p{#_&-J<8ozb(S<-60Nx5Krs+y2k{@z2Mly}iA|qvPZK?TfSh^Yin))0^YV
|
|
|
8bbdeac |
zyNlb$kF&$a+x>^T)32M0ujjq5*Yo@P``d@-$LH72`<t)#`_Io$l&w{9005~(N>oV2
|
|
|
8bbdeac |
zef1&}#u?|kra#QM5fQ>#KkH$k+{mu~sF72ri?Y6lfHgG|`g!88hC1Z3mAOTcj##ba
|
|
|
8bbdeac |
zYC~&sqJEZG1B*dcto6o5F`O=E9=mA=PU!`h#~R6SHdhwjQ
|
|
|
8bbdeac |
zmz#J!DNS{iNF`Gn$=m5>MOsDL)#sDndRxKU2w(TcFn|#N3jpc;Pp7mD-SvjK8-
|
|
|
8bbdeac |
zvpQygJSDw<m~X&d>z?)u;JUNAOf!yMl_Yb1$f4h%+Z^DG*pnX(9E~Wp#HJJ6K$(wB
|
|
|
8bbdeac |
zOAU}w|KWw#yAkg{V|L{LFtd5$^#8~Zzl6g>%$U~enQngCj0H>!e!kk^k-=aMmX*VS
|
|
|
8bbdeac |
z>KnjaO!H{n`6=?ZU%W)^4rtlgVge{CZZDn`UJ!EZJ8l;hRz~tBnDlAh%G1^?8dTRC
|
|
|
8bbdeac |
z>*3WY>11e=ls_IHiyP7g?-#eO(nhSn#z%3qN>Z+q7J04XsR*(>uN$HKzxAOU_IDPM
|
|
|
8bbdeac |
z=6(pReV+@4*D8tgD9uN8Jzsy-oZ6%t===1ZbQOHM;!U8xtioEc*w@|4j%Si138245
|
|
|
8bbdeac |
zI%!p81?1P``d_?@EXa^}=#8da^BJ5~uFHtqsG5`#iYJTy!XdanvTExJiJe
|
|
|
8bbdeac |
z9g@o+;w#C!;gCiS0fnrmtcWMZfb;)#W+~44eCU+!S}g0+&Z~M8cX8@u@
|
|
|
8bbdeac |
zr?6((sH3Xb(Z<&_z?R}V=|QJZ+5+L4=BfWv!*Z+I0)bbeq2miE{;dag)CA@jpfNTJ
|
|
|
8bbdeac |
z#FkMmK{FK_Tvc%BP6xEWp#v;`QOzJ+VhcXnRaaC{-^pD?PLccOGY~|&SJ$g=I-WEw
|
|
|
8bbdeac |
z#H{m3R?t|1ckZ7DO1&AdFWAIZ<$s~FkbDca=Uv7k^58Df#@~e%=bXEpy{1ys)5YZ?
|
|
|
8bbdeac |
z$|@~cnnL=Kt=Pjc4wnndBXjLIszvsV(Y6#>GI3Y(xRI<9QXe$r5R$vLgc@$LXD~J>
|
|
|
8bbdeac |
zYk`7>1s3-`CA!dsP_mB+8B|EJoq|PH>Lt
|
|
|
8bbdeac |
zd99_a6v0OQh4rJ57edi{FITJM_X>oM9ev7iIKq%yQ9E-l2s{XL#VO1!C70O
|
|
|
8bbdeac |
zKCGMqa>9c#JnG51uW4J34?&J%-|x6vyVXUt+Yc8QIME_cyO6n|Iih5WKBxV(F~tyc
|
|
|
8bbdeac |
zlt3g!76h%P9Hd7!
|
|
|
8bbdeac |
zt1v2E@>&RjmY~`v
|
|
|
8bbdeac |
zGL#)Dup~F~wD>r0kWq6rO9#=53Dh9x@+j`;$a8!aw{qz@Y`9qfe?hVECM}@^VG1f<
|
|
|
8bbdeac |
z?N0r+qj#EKRY3e(X+|TRkZ)Q3O@X85E|PCwk_9bVCxxyUM0fDorE}cD*!$6bz{>
|
|
|
8bbdeac |
zYimyZ`_{$rl-KVO1U@Yh{OackV>KH>K5%|ZJyHxo&}!D6@AU=g6RTdO2-gjd1yGJ?
|
|
|
8bbdeac |
zqWYaD<{Jb*NQxutiO1^6NOQ~Jn+N1Dl%Ug@?CkJK#Fwzv&X?6+OCx(8#})NnZma=a
|
|
|
8bbdeac |
zCv89Ut^z*J=;zmPPJK
|
|
|
8bbdeac |
zFAuJ4JYf+_i|JceR=m`HTpR4~ns+-^v{fIKeo&|RzOQN6h
|
|
|
8bbdeac |
zH&;)Ies4R$lB`)=+&lh_OiJv~IU+`j1V_(*dr
|
|
|
8bbdeac |
zq~!-gUt`PrBI;_-X)PZ!vFN8?hWu0NhtFg!e&k{rV%!|J{`q(AyQ^JuSKPKF9h1}$
|
|
|
8bbdeac |
zEjXj8IgJMqpu0eZ^Y(!!I(2Jt$$co%K<@5#ztg6)6YrYKc7X-c#wcvKNc9`}0Tc*3
|
|
|
8bbdeac |
zz4Oyk&*As|B=n2JiTj1utIQQXzPoOQ1?U+
|
|
|
8bbdeac |
zD2*f*Hv;%?syyb6L#y
|
|
|
8bbdeac |
zU>qOfl3<+YUR%mn@0v$)3CCPf1A4DgjeKr`4`DFU8CV6>^t66L_q^T@0qIls-AIht
|
|
|
8bbdeac |
zp~DkiK*y6#;&L|ZkZ$kVrNjXP-qqE(PS~q+a5=kn0G-zq2Ud2xkHc#XG@Yi5iXOfL
|
|
|
8bbdeac |
zK<4ilYpXa{Uo~_qX#6O>%`M*{1ZPZC6X^0laJQ&Hdu1~2WO^-u8na@FGbz;tflV*6
|
|
|
8bbdeac |
zc%b9_Ctt{N4OIcGbhATZobvSm|B45^H)sH2lbnfa(1bl>i6_XhfA)|t;F*E|a})zX
|
|
|
8bbdeac |
zp=vB26%D}orNNzB*1-tisUPTzWg=nLfdt6SFCzKRlAB5i<^fz|_Hls0r2L1fC;+qK
|
|
|
8bbdeac |
zY(FQ`0NB;3Zq
|
|
|
8bbdeac |
zPlK1LjENKR+}^1t@OByKwv-~2ebkje!{boazP{_S+i0wR3?G=Je`hsvZf0zQGXTKZ
|
|
|
8bbdeac |
zaoC(N4uEa>-C|ZzSp!l(xn0Sp1OUYPPa&A7PI$mVEo(vgUwgs>iH*ejYq{3Hy$Ay`
|
|
|
8bbdeac |
zr@{5tX-L^FD!_9~D99GVx~l>6vH}1=VvP^K@oWwa5V^nVWGJEk-g-PuCG;5;P=KH#
|
|
|
8bbdeac |
zX)XYO;;Rjt%t8{dc8W@k3H;fL8J^k~+t@9wsKNqt&x#J38%*lBYcTzuPAWKqrusc9
|
|
|
8bbdeac |
zf4(^znGpHp3*etadOI}G!40Dr;H^%T4S#GgKVGu9{;0SO4^TscI|7b
|
|
|
8bbdeac |
z5eH&1Y~}W+e;vz0Tvmhh&kq@p+b947UXH_qYl6q11rh^gM6x?gt4D(*)Z_L3Iu-{a
|
|
|
8bbdeac |
zgee6Hs2j@0`9qavCT`rGXpIVph?>d$8hrKp7>;Oy2&CKk-FSL#e_dv`8?mNb
|
|
|
8bbdeac |
z2_VG^?XB}S@^-oOx^xDNMu+74;K%^OvOofcvZ)XSW7ZVDLsr^~PjE}yPkBr@oSjPp
|
|
|
8bbdeac |
z;_G;TdrfZI0NFL#bN~%>Q4PgNSpChHRKB`hL`+w*JJmOUpggA}P+
|
|
|
8bbdeac |
zT%?bYasLw)&x_$C^cyT^=$*s>AlLCFYJ`Q{KkxUOlt1Zhz%PvNz$24={zn`m5qCsD
|
|
|
8bbdeac |
z3fD1!<l%vvo<D|tV-JDHg!S}uG68I2W}QeeKu1x`0UY-X0KeZ#x%zPLtziLu>c`V+
|
|
|
8bbdeac |
z;M@6;`g>DEchp%4764->djG;V2Pf{{t4yt8`Dmh~Mnr!xK2(@$Si(z^s_h-HPW-)h
|
|
|
8bbdeac |
zuPo
|
|
|
8bbdeac |
z0N{^9XMhGf$!>JZ
|
|
|
8bbdeac |
z^e`y-F|NBj?|GK<uz*!7oKv=9^%tVsZi4E7d}Yo(N~C13-t>ouz8K&W${VvEENf{k
|
|
|
8bbdeac |
z9u(by`u%VY8NpOSq}!L_Wh0i$fHl>M*Ki84shstr5)4p^Ju|$qpD;WNAkX)3CWKuC
|
|
|
8bbdeac |
z;?TYCT-qQoXIsc20_ynU*8=YJ*{6tl6AA1KkCHF;WZ55H`1M1#62W&88bF$_<8+qe
|
|
|
8bbdeac |
ze0E@W>U{Qa*0y$G6szsl9q^KN_DNB*SNg+yD^lI5nAhs4By;ceCw{?7cghgo$*Yv+
|
|
|
8bbdeac |
z(rrA3@)w82YdzW_h<m=zcnt@y>l(XdX6Y7N0?c;2AJ8mOL!&>#my72QC>@1kvaB?o
|
|
|
8bbdeac |
z(D(2Rf!ngRRJd;MHNFJKGd)+sES}5k8I1K7ofaY=3|=8Lf~
|
|
|
8bbdeac |
zStAAulHVQLbmEgQh|Bz$O|{#zjA`^t#o|IP?z66pVd;KTBI^ytpX$hN_BwOn>)>_%
|
|
|
8bbdeac |
zD*Ni&0)fA7!oQe+COiUC6t&D&YkJAzQ^KLPqj5zb0Ri_^nys&k&agXH7bVFIj6t6u
|
|
|
8bbdeac |
z^9rx5I(8^GHy&-JfcTt9q+vauN%4@{wGge7MDgC*nIR|tY!hY!O#j@MTKmBjZGh4}
|
|
|
8bbdeac |
zO8ho^k?Rj&eq(%?9c<(<%(wh~
|
|
|
8bbdeac |
z
|
|
|
8bbdeac |
z6xeQWwP(Wfb~uk4M2NCLsjJM~AB!jH<$oL{>CO(v>WEt*Dj^BN!>GA#x9OdPp<^|i
|
|
|
8bbdeac |
z0{s!{Z-xp(b}JBmc3b{iEK
|
|
|
8bbdeac |
z{m$al5wk-^0E3gd;ej}||1oowJ&X;2Sp6+vfClC6XuIxkGSju){4fg!Z=YWU;(!?1
|
|
|
8bbdeac |
zYK7?K*rvhg=|^~RK)Wt00PS2_SbzWd?H(RWGr|KQ%}vbbK1QiAhd#%C+K6℞-8p
|
|
|
8bbdeac |
z2q4l_;&6GB<2+2k3yLP#$Z!&aG7WkHN4m2c%J&k$UJK~%^PcQ_<o$Gnw)De>bl+tX
|
|
|
8bbdeac |
z_%$mP1{|to{=8SB!qf!m?*Y>L<Z%N5Q1lrH7k&!$+#zLxhTq2l6114&>M?vaE`|Iu
|
|
|
8bbdeac |
z*7tAxWluTb0nP|&UL?>6ASzG=yuVQld0{8y_%
|
|
|
8bbdeac |
z=?9B5yvUwm;rj0t&@pv7y8-NQ;9408Tpl&SdW!^{S=kbd6l8N(3bHfSc*1%j5H0)A
|
|
|
8bbdeac |
z2xi`etk%!)G)LR6AExH==B`S_i_k)4{N=0QXIB!5%z9J-zp`J|FCY-!!B%@cFxXy(
|
|
|
8bbdeac |
zWRr8iFMQ2dzYOG;BC3Y?h`5P3kIxILep%E^Gfaj6U}*q|?#Qn<1pK$t3q1;8?Mbd~
|
|
|
8bbdeac |
zIm4;Y!wHveLsyIn?YD^>+Icr?(DO-Qvs|?X?Ez!8*>?ae;hT=P(q2md
|
|
|
8bbdeac |
zSPQG_LbadB94brK
|
|
|
8bbdeac |
z1(;WwYsTk
|
|
|
8bbdeac |
z3|q;7A$pw<yD*(z2*(oHid8Ovoi)oB#JNYdG7r?CfJEu&#zwr?<sKUYDX*9gmLkm>
|
|
|
8bbdeac |
zX6_vdDK4{D;)9FcI}ni{IYepV4!6^xGooxv0#$OrAoyBZ>zR4S7=Cqo2S8W|*(pex
|
|
|
8bbdeac |
zS0xw1u&rRf2t>H2YGDAiS=>+j697stm00Uf5N5!;APM?SX%KA^mm;FIS^*IVb{Ga3
|
|
|
8bbdeac |
zO2Rljg0XbXSo;-oXN@rlEN0lq;JXqkDm_&Y2`_>k`XSc>Ga%}XZOC4>NTvtF?Dd74
|
|
|
8bbdeac |
zX#7d~$k|8{hs{&mx>97%liI2rYl4EMJFgWWO1(
|
|
|
8bbdeac |
zESmdvmkU>G6iyGR_!|tr1RV^i+&R0s&k89PRW~tLRd+A%jSNc*S=Cx3kyDqr1{!$!
|
|
|
8bbdeac |
z3>~0fiH&{@H^JPc-KlusE*i9n5+hO`tS}PMh7cZf
|
|
|
8bbdeac |
z1RKvF>Z=$RMmccpKOQaUm4fD9M6>nD+ei_q&O!p&xR4K$>#4JMBZuw)#&lmKI|(%Q
|
|
|
8bbdeac |
zgD^h;^#mJStgllv=R6iMX(%!x_s1^)m}Ff<3K-ITE
|
|
|
8bbdeac |
zm{5Ekm=tnlKFFtl-5=D!-i>{wH7B9@z*77(8;~185ko`a%!GRw1UVeKMm(Rr$pava
|
|
|
8bbdeac |
zPhe$quO}VPFB}V~43mZU?{LL`gEIav?)7f0ePR&5xlIbAohSbVW=e_4i&hKk2mA{m
|
|
|
8bbdeac |
zg@lCs8*csU&i`yMe+ou+w$6WHsqQw`Ro`Wt_E{0T?`X7(BQnGt`h^XdS3qFERH0PJ
|
|
|
8bbdeac |
z@**mTN1J<-gGi^1{63mV*NhZ~!bKjL!#jF>OZ6;u{MOlA>UV~q$(Agdxn)r3%M68+
|
|
|
8bbdeac |
z&+co6^=3?7Zw@o8R8a$NGpSbDwYf!;oUb{6EG+IubV{n?+KAPbwc|t9)@QUW=)KCk
|
|
|
8bbdeac |
zqox9@B<pPT7|;>6>l*iXT2z*eDC+ku+71BtGAts^GQoW40o>>e^U6C}RZ4k;r_to{
|
|
|
8bbdeac |
zxE^&C!S8NaYEvh;dl#-9tGbnmR1U5#F2Nvf_Nnlk8|mD+n1h{%o2i2<)B}9YJ2A8m
|
|
|
8bbdeac |
z(?-Meqs<<>rVi#|B-8bl90$7*%ZV&`d1y?LRwVu<CtdpEb6$Nz^>7Xgvhwsdc#H$n
|
|
|
8bbdeac |
z8y9)#vJLae!}7vn(Z3^qV$B$N6wPm!V}!wBuk#7;yx|XDA$h(Lds_wVnSz!u^i!3c
|
|
|
8bbdeac |
zAUZ5$LSt_;!$SVz=#~xbfBI3&0(`_-4^eB
|
|
|
8bbdeac |
zHH)xpUloM|{Ee0%HMZ)muVsww!MnrD7J&}Vh$3%$3M^zXbVvlJuVt$^LF&^{NE;7L
|
|
|
8bbdeac |
z6f?3W9Q3!lZ8v3XmcdV~RZQu9#(g=ib&+68GF;%xYI=X~k~XAlu~Wii1=gsFZnZBF
|
|
|
8bbdeac |
z6F0YLR$1`&Z5IKi5RxpF0#r*{R7BQ@*%wJqPk~g^7TGL2_`wLHXo
|
|
|
8bbdeac |
zN8bG!iB
|
|
|
8bbdeac |
zlvLEnEa;FMf~{zmUda|x)w#m(h@{*N%`2ETFOknE2xw{QcR$ecc?y&RT|kmHFd!sV
|
|
|
8bbdeac |
z2`&yL2tB4hb<5u?uX}47H_kQA&R=UgeFNHR>tI!>aVtF;BWq1-IOECvDOVGua7z+a
|
|
|
8bbdeac |
z^7f8kl#gL8Jyk>CNUS@3*u5Hvo7)0UB?<)
|
|
|
8bbdeac |
zw`W16
|
|
|
8bbdeac |
zl#*?*Zm%r1vEWCN*MxHK%Ts92$6rFfEaeS$jfu1i<_H3wcqQ@nr0PDdcOd4>w|l#?
|
|
|
8bbdeac |
zgLYhF>GgdB3&6_gGKra+LJFB}#i*1DFt1j&W!)jwKlNa0vWV=a!=(tB3|!
|
|
|
8bbdeac |
zpcZQXxF!bG;I6X6S1ucx7;BG>!5oxc=T_%Fn%i4$G%u(G^hAMoN^?ra+BpcdxJ-ta
|
|
|
8bbdeac |
zs1~IW{QxfX5lnPT0mY7b-&Y7r@-uJ$59o5Zwk~k=x)Fwxx}%nW7c`y@Z6D5YbChs2
|
|
|
8bbdeac |
z43h(xOYeuh1B7gBR=<$QxSK2i&7&x2wfJl9F`5AbEUg`LZlJX|{3^|v
|
|
|
8bbdeac |
z@g1K5PvpF6GWb~OP3nH{!T`9L*!Ub)hiRhAMlWX{zKUnWBYut7-xhVD*M(iz69b=z
|
|
|
8bbdeac |
zFp4q|kmSTGtoon;02U$u@Si_Sf33?nIeS=}IQ{iqy3o=}SZhY}y{h@mIM*$NOm!jm
|
|
|
8bbdeac |
zz>Q$beG_#dZ}h|k5*HhUP09(Nta?9l0w9t~#%W4xu1w0`#Tq-%b3RXjK>!{Ok4h4w
|
|
|
8bbdeac |
zn?)tZ8iomR6#|h)4YPk+e_*~JjSI~9T;HwrbnaB3MUN8iIK;)v5|uqhjUYjqIU0oj
|
|
|
8bbdeac |
z6e6kz8;&0n3;9NjL9Kh8X)JHP
|
|
|
8bbdeac |
zLq+`#xVZZ{0s+l89=3`z!Xw>COiPWIDc#2hmR
|
|
|
8bbdeac |
zb$1-55B58<0wjqiGZ)nG&aazd(Ve_U3*D{4O34&a*bs0U?`_pK9fX*$i*|@~_rSsJ
|
|
|
8bbdeac |
zWyT4)r>Xdz%Pg{P>xhNoVTz}OpMtDkug`fgU~%wSGI#8`5nz)L40Dcex0!ciDs=iN
|
|
|
8bbdeac |
z^Qky;C3oQ;YkQk`CR
|
|
|
8bbdeac |
zuo`d-ivIE{MN8sEl>%L?3w70E@y_)DTn$i#*r432%Jpwl<|
|
|
|
8bbdeac |
zB{9%JbK!?&v*6mw7^-#EW1kTiShT>+5y*nKi6}yBP%I?P=H}N0Q8z3q$zH)Fc}jv*
|
|
|
8bbdeac |
z2J|8oWG>}9xJAe_u)qmNFbeHTbcLB^^iMu7Hu)BkSNMtq;~t%IEYO?nc#eYxZrVGk
|
|
|
8bbdeac |
zxk0~VyM2skwAgs-{j5j`0uj7L7LEywBUw6!0z&#ABhrlIsn!I*{RX&F{Op`oXY_BQ
|
|
|
8bbdeac |
ze4$O2{drzt%`0CQS}
|
|
|
8bbdeac |
zlDnylMao*``IKwLV7H`16sD*@rC|Vv_zt4S&U7dgY>l+*tKYA#Fx(oVE4(7-;
|
|
|
8bbdeac |
zXlV$mwd$J?oUo>l*MLoNu)^coy>N^XxrHmDzRGvWmVtgr>mQlnYDVXn-mT&AB8a!g
|
|
|
8bbdeac |
z3fZ!#DP87=s>0Uw>_+013iEy^w_}O9-zo}Q-wwJ$RHq3SR`}WH%o{l;zuPUQ@|%
|
|
|
8bbdeac |
zxB)VrD<*GT1c&~ZquT1HY4qh!X1j;{T@khA)DTNP{fplk0TcRoJmu^okCQYLg%}Q8
|
|
|
8bbdeac |
z=*!z1f@`s?0{y|ep74+&>4>%(OyeBOa{3eM&;fZAU>Gy%ToJagjW$#Yf|*c-$
|
|
|
8bbdeac |
z8p8LsmD3oXhM93w;>&A
|
|
|
8bbdeac |
zeL*}i55}UHGOJ)ZLx|$jeqcUwkP#Ygekl`)qMnN!(;%g3=p1E2uA*l0C7d^fu@8g?
|
|
|
8bbdeac |
z&E3f9=3UY{{_*rAsN|f2+;ZTff7`H;C}g44v3U$y)|t!cDseRO`G|RbQI+zoQX-0!
|
|
|
8bbdeac |
zi=zSe&8UN?SU<jm7!PHH?T`ZLVQR^W>9ZCky?}`DGt{f2spVBu)=H~$JU_l<+Sf%P
|
|
|
8bbdeac |
zLnjf
|
|
|
8bbdeac |
z)=_}fG&AppCU)JcJLb)a4ij2aAu7TiDMLILp^)^sRgD@HCe`XejmGU-<+H!42~q4j
|
|
|
8bbdeac |
zp}e6a>!1{V4-iAXUxYj24JiV>BWyX9<(Yq?=?hQU?K;)ZZD$nOC^qJf_6cENy!K-K
|
|
|
8bbdeac |
z@EJ|;Nzs^AZAFEl6aZ*ckB{;)zxnZX?@ON~us4Dm6iPiBqlxqm_`yu9^4J}K&T$$S
|
|
|
8bbdeac |
zJM>zIKHauy&VMtP?YTOgcv$;zmC9JM@U~T@j;0KzzpT&7@77(LIU{>e9hqu^qj4>g
|
|
|
8bbdeac |
zLc2>d%hVLQvZRjre3%#eUQ;UnWH#GL
|
|
|
8bbdeac |
zcNRUXHFsY#p!5pZ7~&ciP)
|
|
|
8bbdeac |
zjj}7?JrZwb78@rR1`Kb^DZGulE3lXkH-b73+7kxvz3NkFO-NgYUM~dbs~a7ysL#mI
|
|
|
8bbdeac |
zKuFAZaSrl#>BA}&T$#gm#rAyhroCPT(9BVcV1TY_A0bSrimSC>v!kdc9<*|Kb{<X>
|
|
|
8bbdeac |
z;D;=F@6lUcN=gSWs%)SXfY-GzW3}2TA6)cP09H-|6;4ccU=z+t@{g{Yhwa6e5W|>8
|
|
|
8bbdeac |
zC(h!Np6!UxbS~ofBYUHGIE!($E%0j0XS(!eTn}v9_i0b)%+-F8Xi`aBCRYXYD6|_g
|
|
|
8bbdeac |
z-Ufa=wyBqY87#52G}(K;0aL_Tg@`Oa$`?SoBA?0ae
|
|
|
8bbdeac |
z#UBPUuYr+h`K%*ob$<~_{LcH#5W?}+
|
|
|
8bbdeac |
zg|w58fhKWuRk@ec!$)h_Q(}7SQ)24ir5;1Mb_
|
|
|
8bbdeac |
zcD9rU;f&
|
|
|
8bbdeac |
z5mv!zCu@6>1~mhOVP_K{2Eo?^npfwDRv9-CT$j?_fW*Sl(x>v&HYer|n&)>Lw+vS<
|
|
|
8bbdeac |
zCPN()esrOSjFflg*GNmxG#hy%r_8TE4G0a2ayl@SxI-Dw0Zy*8+UJ|qr8i9N2eI~e
|
|
|
8bbdeac |
zuIC-?7;I2=!8i98A`>&VIwd#S-@=BlKwc7u%0`eZGkGxJ=J|Oci1E6p3kPmkJ1<06
|
|
|
8bbdeac |
zOIW9K$aYR8r**MrXLJyL&**SWnZBPgPU~S!aLjZ<9Hq|!uOe5++)vVoyk1^*L!6|~
|
|
|
8bbdeac |
z3jclKqC%J(TfuB&El
|
|
|
8bbdeac |
zIA3=Y#x1`49qn(Lf?E9xaquNI(5EZz+*g|jKGGnT60M-8<fFp^dl8a8?>aLsO1?YF
|
|
|
8bbdeac |
zNQxeM^}E_9JssLe$u!M5h;~dg_e%i>xhRSFpod06dPCU@4@*IsId4!Qx>xovQpxvN
|
|
|
8bbdeac |
zk{xi)r)
|
|
|
8bbdeac |
zB&}~1Z0<N$eI3!`KYn^(gX76oRZxhm%!qz5(|Tfdd<(&H&2bR5&&&wvqM<DT0MK>=
|
|
|
8bbdeac |
zPW4(6BZIsXn5IViDvYK>K{srqkF-qZpO`GqP;7DhDF+o69Pba5K8!-*h2q!C8uVp%
|
|
|
8bbdeac |
zAieYycKL(FWPoKj-XCu$&$s(%KKd*$WU~B!{@9OF<8b1fxe{fEwYFb&0Ma;L|E9Oq
|
|
|
8bbdeac |
zu7@N$DWGd}?AoYx5u*PwSomVJE3yrTPhBo@%Lpzb9AQ#akY0s5pPpV5SoPg@%ap;j
|
|
|
8bbdeac |
zOU1k_$NB5}>4M;|Ss}z1Vf`l5pOp;W|28Z9J37e3+2F4^VRYiOZ6+h)(3KCgs2A9p
|
|
|
8bbdeac |
zpnjdYqxr(OSv5=Q2Xv1MjYYcUkyJ9DOnw=?%0s>SjumM%3R7Q}EslY(-N&-BE|OGv
|
|
|
8bbdeac |
z%ccjZFdqceCE;?*Ge56qOzZcxTe-X^uhAdSlW*XOaM-mIPDSMfPL^j+;!2a;D@udd
|
|
|
8bbdeac |
z$E61
|
|
|
8bbdeac |
z@ra3pXn45a^}dmKSxQ-b(6a6}oJi64a|+$PNq-j)dtC*@M8`Re(89zZhqQFJMETWU
|
|
|
8bbdeac |
zk1#A<#ITPUGLs}V#xDSI^j5MTcom-s^dz}W3)F>RspVEIYx8!sJ^uI>!rZ@4-s|Dt
|
|
|
8bbdeac |
z01-eXZ;=`5P(R8pm24)Ha~C0O?^(rKz#)}dC=~-GRRCPIJo2@6Ealh?(VwQKO6bWF
|
|
|
8bbdeac |
zo~(yI!Z+GYud7=$UGdDIEAl-a#uIA#{4ULPvFW&Se-pLE`nyQ4OU?PBo1WLE!9e+U
|
|
|
8bbdeac |
zp{_Te^=hSh(KVD?GE;REb+1-g*wwJ{=J#!L+dggb#I+CmSoHQ}hmxCgk#TD@O2#?%
|
|
|
8bbdeac |
ztNp3oqZ4QTUZjnn%Yco6)5qSC4xX~tlHse2dnUO~l>0h1&rCQmi)IDJA7SCBj8iB;
|
|
|
8bbdeac |
z4lza;
|
|
|
8bbdeac |
zwy-t(+n4ClRB~G7MD*>^i@WiXjxV+tAa(XnOb!7BH)mPmFkny*t$dJl^!M|lSt+FI
|
|
|
8bbdeac |
zTSC=(5)HV}@o?+0>q%;TZI%BuLqa*Jqzh4ECm%o(OC+vMUma*Sw|Nt~ZFE*clR51H
|
|
|
8bbdeac |
zISDyH3uF<)hAGl=Oya41YU=yKJ(6fmJg3b;CL_opxBLrr|FQ1yt|Mbg<8xBezO579
|
|
|
8bbdeac |
z&}i1QpiZ-DvvRXrsL4E2S67#Pec_^tXpBp*b5Ygz$?1F8^Zp2bEW;2N4-XfY-ToJZ
|
|
|
8bbdeac |
z#2|4_@FA_a&0ej~$D-;E;TPv2I5JK~!LC(D
|
|
|
8bbdeac |
zZI>ZCl@1amhS1r5`OWOFvq^Y;TkmC`?YQtKY<@4d+t2#+8-`wtn@^LREN{*(&WTsj
|
|
|
8bbdeac |
zp#@Cha;D=US$e@M_f#TieP(m4q&@@w*ZKncq8)e=$_9Qj;hxoZhyGb3dJ=V!duH`F
|
|
|
8bbdeac |
zm
|
|
|
8bbdeac |
zfamV`3wZ26DXPyY1eQ+_rnLC74Z}#KG-+>EeVhqd46)=99a)S;nnW$zuE5qxxOs-X
|
|
|
8bbdeac |
zS))9mCcldmh>+qM3PM6w#0OL#hu*O#@0U!iF?tN=rY~^I=o-7?7mPH+5Y4+B=LICB
|
|
|
8bbdeac |
zR4l4_DzILWsZ5`743fj5pZjMNYk27N7|<+j<1;Q?C&XkZ!8LB?GT}o-b_ky3LR%|e
|
|
|
8bbdeac |
zmFn1czn5<D#$P8KepX%S1vHrVMt{eUhAuB*O!FUg&5*M>;16!Xf
|
|
|
8bbdeac |
zksCDqg{rk&xyjUYo+q7}w(FBT(L4BSZalgV9-tUe5B*qT%}%;^&kaM*xBMlV7w!qV
|
|
|
8bbdeac |
zH;Y}R?;TGy%+LOUkeDRZA9THaL@~YczUIC`+3aYo*V9nFZ2>(K7E1o@;CJ
|
|
|
8bbdeac |
zfTYZZ(Ju1Uz&Hn2frZ7%x;4=5z|V@>QSmu2Jr^~9V|x38aElUl*=}=h;W&(IG&5aB
|
|
|
8bbdeac |
zbEYMeGW;LVQeH|t?XA~9FsK2Yy(Oe<8T60_dFp<>m#N`AvVnNN)&dv`H-^f#
|
|
|
8bbdeac |
zuI%|Kc8*CHeE9TP5IF|r6KfVh%j1PHO^3ui1>xl1Cxt{;%~&oNNU4t
|
|
|
8bbdeac |
ziy3^{-;>2B{F4N}Nh%BZc>#Nb{+ga80h(3(S)m0WfSyuv2c3Z{s21I>P*L`Xw-{`v
|
|
|
8bbdeac |
zBZ-L6wnVmM-_jxPm*wobBALSuA*L2|fN0!w+|ervA#)*4e?}`?ml_imFyS%yd9AS>
|
|
|
8bbdeac |
z#fJn5W`9!Fc#mnVhHntTMS2!GqJF3IAnO6GNwArf(^bX1Ycu?O
|
|
|
8bbdeac |
zB2rXA`^c*_hatb6tXBBu{$nKEaaa)yf7R45^;S`gZ!K>%tuJ%o%q`X_Y}&VxLi?dd
|
|
|
8bbdeac |
zoP!*LXht6+A<-1m%T@L5u)L`B>ZNU2(G|>+U@hlSE^0ao<D>sJn~$SW^sL!g2A
|
|
|
8bbdeac |
zJM1S_J|*+o5PVWdORlk&6S+iMA=8|ZOrsZRZb*Y)7>Pt_+rxgDi3y8QMKuNc{EJ9A
|
|
|
8bbdeac |
zUD)cSfFC0@BCA*^1y7QD>dweg3EM)Lu_1u=HgH*%s=TWT(2#>Nq2k^OYXy^@tm87b
|
|
|
8bbdeac |
zy<)-~G@F$cas0BOD@(>bb>`O5m*|O&yr2FabPa;4T<(`}U};!!ArJ1DB_^N4&g!BE
|
|
|
8bbdeac |
z-}*R{7inapEFB{0f9(g8p~Io#gmHvNpSId*YlQW!;uz*#&d_AxWKRDGh=5W`=#w@m
|
|
|
8bbdeac |
zk5rn3{|<@XkyU(sQq-i4n+XT#72i&Oig|}*##MCW&G^M(?1x#FElo(dn<3*ybKGl#
|
|
|
8bbdeac |
zci@wGx9RHj%g|z+?>2e25wlUg(GxS@uZcF?KyahDWp?ouizL)syaOM|biMFwP|beh
|
|
|
8bbdeac |
zMv2TePoCO&@R59`I85mq;1id@%5mim0o&1>+|tlldC4!W-g3O~nf>l7+H(Y{-}tDF
|
|
|
8bbdeac |
z4+)E#me~+uE!4Aowt+L_Q=iRr`~~_912tBdi>h)02=>Eo(HK41R*4_gwGRw`%{v
|
|
|
8bbdeac |
zG3B7a0f02h|Mna5CzcqXU}$M#<V?uK@NanefsU5lUOUnsT#C_K{>P&ba#;o$$*9mY
|
|
|
8bbdeac |
z{i|~`
|
|
|
8bbdeac |
zrLyk2LYY)CirOz;smOzm`==T|wty1`1i#k3NHOdNkN&-qOtdDXyL@y%g
|
|
|
8bbdeac |
zb0zhuccs!59!Lk3=}R}6H5xO~=>wZigB5uy5A+@Gt*5XOOV(O?-0F`DL*hSEoYb;*
|
|
|
8bbdeac |
zjtisMQ{a<*f|Yl!!Frspo5!NSFf^x^l(O(E4Ks=cTi#B}tCyU{SFPC(hnPIt8qG07
|
|
|
8bbdeac |
zk}WSVaGyRF6-
|
|
|
8bbdeac |
zr%0%v)a2h9t|?}@xM%G<x@UpLOcr>$fF|_55@RpaF!Ws5
|
|
|
8bbdeac |
zab`PhGN{6v<Eqdtk^gE+H~a17RR2~iYo!)&c{6(HkT}>i
|
|
|
8bbdeac |
z0Zj=HOJ7UQX{${-M*icE*bf%nI^I<``Dr)y+5GYX!
|
|
|
8bbdeac |
zxh79mS_>Yo>l-FkOD-DZqx#?LaEFnr8E~iF
|
|
|
8bbdeac |
z16E3o2w{y0cE?S6VCbH|5s4!5e6Qed)@fi)l2a-UnQX$!oiuw#`_{~ZktzgpL^a;-
|
|
|
8bbdeac |
zJ`>5x33nu}3w4KN+rQ+*sJVqV=IyoOJj>=@&zX5cDEmwGU|wYL`hg(Xnq~ixvfpnU
|
|
|
8bbdeac |
ziWKbeK5rb5Uy>fVoIDf~vAi&#gL1YOyQN4W$C_f*mGc=bi@+_nTEa^=AD?2V9Zx@}
|
|
|
8bbdeac |
z`OKW9iQu-_n~C5yS;&C(i-y|<Dw0y6A&XSX>nwzJ+`J2!Mi*wIwq9O?E$)%5nEHi-
|
|
|
8bbdeac |
zNvIE|co`VJWO=1zrHo>vaz%ZXcq$v&v~rfzAQ-8E7Uh;czY@87-Z^fJZLw3@s_41h
|
|
|
8bbdeac |
zdp4u|zDJf~i7e7G@ZijIX)?9$I1OvueB*&??x37K-!QH2S6FkUWl5{Bp_%$_a%q3q
|
|
|
8bbdeac |
zYY7mcKv@)N)uKitOZ{=2NxLMLp12`|#({-*Zg#v>hH<}|G&%>h<(jG{1u~u~FLbas
|
|
|
8bbdeac |
z4<-c*AqcIqWxPNVv(dsrj~q>|FEN|*e1Pce40h}YA2WS?Rt`SiO9KJfcd$^})@!La
|
|
|
8bbdeac |
zUJgd(`b)Ou1h_gZ(ZM?Lw0&diHFmupId9aFc&x*wqN7%5WH=48&Mum#*FnDnZMr6Q
|
|
|
8bbdeac |
zT!_7vi9@dxOutS!-De{hOnBb>qTq>T-Z*cFo;M-YI^N^V#JjZI-p)L1+%jg#s5c73
|
|
|
8bbdeac |
zD{I1}0yuNvsk9Q&bqR5WFYY5*$H6s4M~C9cSftY)%1{uleqJGEU+?ubsJF5kh+Lm*
|
|
|
8bbdeac |
z`J%d0zJxuK#>j=-DA8RZg>ozcp-s;kE8^JfZ(0?I929w`GWb<%KBjr@mQR}Ki`Bi}
|
|
|
8bbdeac |
zIf^aL#8=z6?~hjdDO!29T1_Z^s8yKLg@YGMn48JakjuaeHBD-4%an5mXVyqJx8|g8
|
|
|
8bbdeac |
z7#VG<Qtw>C@=oQKTe9Uop8r|?h^>5XFREmrkHD#`L3nKF*omH|{LZANv`~m1Fhf%F
|
|
|
8bbdeac |
zeKNnOFHQb8OkKjKftT*ny3}bJ5S*SQb;Q1+t4#`-^t;D|2UWkCN+je^GO@*S1Jtps
|
|
|
8bbdeac |
z(Vpie5zbO$_)|diwYoy}@6%r?8d5oI2bJd1k2Vyp1)(l!he~ZM%>!f3n)TX^V~*JR
|
|
|
8bbdeac |
zg*t*B$W&5j5?E(#OBQsKZAdhXQpZ4bLGl6OK}5yXshVV_XQ4HQI|%}+w1;BKA1_mu
|
|
|
8bbdeac |
zqi*Q>vs&5ezv5G7q0;x<H6E~wMn=U{q~hbH&PH3+i}F?{bG~jH_)>awwAy-gZAw&I
|
|
|
8bbdeac |
zanyD$Q=uVLiQ|I74>G#_WQjI)iE=(a-$?hA95vC#ndQLEZV@u6etr&&w?J+QItjn8
|
|
|
8bbdeac |
z)IK|#da}s9W4X}Ber*AN>rRt=5-1J;QleH15U#E+a4&-Aojs-X7LxFdsi#oGGK)U_
|
|
|
8bbdeac |
zZlcm7U2y7ZilvzTV>smZo=|myP;eQWLS%c5<)Un=x1)dym49vA1CJ!WF3k%C*-MEP
|
|
|
8bbdeac |
z=@)CvzFC#pq0JK1mj=|=3-*q{9#l_wy|p@H`xYU3+Hy#USD*i~T|qyTs
|
|
|
8bbdeac |
zz)-G9cPK&(ipHe>CJ`fPa}klO;7lAAx#NNLsNY7ysHXC8dH39y?kV059vk$)zY5R{
|
|
|
8bbdeac |
zBg0T^y9!VFanr_H=1PH9mQJbncvICf5gv9=*zc3GqV-cEtz#9fj
|
|
|
8bbdeac |
z)7Yp>@j8|a*3bcpTciS=onYZxl^DKKH{QrjxSa44cD#a}+8Yvo%+RpVE(x
|
|
|
8bbdeac |
zjdV~Cfh8eLE~re+e28ZeJ37IxmFw=_wS&kS6CR
|
|
|
8bbdeac |
zloUSUgnKVg(yC-{I5!8Nm^!=m*__^Cia@u9#Sh&QNB9qyXvRA5uit@VaB-aqsS>4F
|
|
|
8bbdeac |
zF!4{5vILls-q;BIx#|#b-Mzt
|
|
|
8bbdeac |
zYxcUvJu7ZCnlVO24Br5PcHkyq_~h#FH{~VS7=D$L0B5ALw4$&F%?LV=(g_x>!Urc2
|
|
|
8bbdeac |
zKrgex3fQBc0&m^@*3Yo0oxJ{YY|VnVsCnXJC?sDfcNfE~iJ^EV^i2P?$>p$B4`R7e
|
|
|
8bbdeac |
z9hrF14RdwpU&^ohlItNBwvSe=mfB`c;WCeggSS4R)o)Jtx{pryn*ROSoQ-f{mNX)X
|
|
|
8bbdeac |
zJnmZmyE)|E56F3*0UBc5sxU!mTG5kgkNoKU@MaMkl+1Sa=>j26l4rz->#{**R)7zj
|
|
|
8bbdeac |
zVBvuEa8ce#fK3-!6a>+AKY$_brco69ic_wFxVCfSvF!7<fGi5!Q1DvFc~Wo<A&>x1
|
|
|
8bbdeac |
zGzF0b;Grpli6EN0i8zT8-b{ep_z`P46mW18gYs$$Xx>a_#113sgP2)>N8WHc3bWgG
|
|
|
8bbdeac |
z$_Q+7Q^E*Y&G6_XQMwRCoqTE34k12Zp1%=J@W+t(V`f+|TMnR^#m(1D4}`ndWz!Hs
|
|
|
8bbdeac |
zwQ&kk%y5!&kBbda87w5p<7jm^+ES?>0S749u|L2`7jekF4p(2PEM%|{BrmFAH%+h<
|
|
|
8bbdeac |
zI&SufHiBERVvW(=iz_^gMgHQ8Q-7idb!LH+ESwmcp@-x&#{i{tF>SW6>Z{C)f*|b_
|
|
|
8bbdeac |
z2!t{&1qyezcH$x2ApEWO*_?>
|
|
|
8bbdeac |
zfERN|2U`?#Cyj*5ZTlG=vkaVMk&839h2UT=3?MA<t36am_JW&H?Evx=n-t_G>-W9>
|
|
|
8bbdeac |
zge~M=AB5dZZr_pR@F4xB&I?Xg=q)fX!+Gg25>XI-m>bRj1mYM4Eu_zdd!Gc%LbYq>
|
|
|
8bbdeac |
zb_^t8r(7T;;S7Bua^qVV2R8w<_7Cj$dvOs=B=O@=_a|ms*QN{dl#Z>z6OLdGOT@f}
|
|
|
8bbdeac |
zrn@T^lWVQ#^?fwrhkZBU-uzmkC`gif!A=}3f-|}6w`)Q76mU51X=kc+5S_yJYc;no
|
|
|
8bbdeac |
zn
|
|
|
8bbdeac |
z<@?2h+5O10#geoB-p7Zynf(Izy+Q8da2}hUhrp+ZBp#&nmdUq?U%C;{@A=)mf&03>
|
|
|
8bbdeac |
zX08|XH~Bs}VDqrS$k6nnx3|v|!=j@aN}+k-E{PCdnL6wKw@;7i+e6ZZn=U>t`
|
|
|
8bbdeac |
zAKoW}1i}}{Uz6*nS@=(!KOrXM7XNK>jq>l4>wngKv()5%t`Q=3J$+Z#RkcKbZ*EZK
|
|
|
8bbdeac |
zSS0r<Tg|Sx;3CH4F=tX2+&%BP@)tmFmbYBsNPSA>Ab|DtZfE7?{#KNRy2hzh
|
|
|
8bbdeac |
zM~3pi{`v9F=Mk3UN`P;o$|M}A9RE!uSgO(EKt)0jz5O_P?YU5tsLr$
|
|
|
8bbdeac |
zjil^)CfI4=s&ycF7H`=M$CF8B6dlL@#-Pm%;&G*@e?z%`P*~o_lPo2kA)O*gHq2Vn
|
|
|
8bbdeac |
zdYK0eW9rv9J3sauI;4wE%jqIbnPs94JI;P(f
|
|
|
8bbdeac |
zCN4hvbIsVXQ&(&G(W|uke%Qk9E4RIRzDrxD=oxdY0;&~8$K?#ao-|j{8uIIqo7D8&
|
|
|
8bbdeac |
zJ^q6g!p26BTLe})FJ~JRMQQ>SOnsUaVy_7#A{5`+?N4))z;4f5j6!poq_iNFaRz>4
|
|
|
8bbdeac |
zik#I)b8O!(n<|%}#d2D+JVLYR+~B;Ic$R_<9s3%)BfmggO7n({C|WW2{jE
|
|
|
8bbdeac |
z0GJ1kYI$~u1(^b{us;xQ;ZI%7@>Dj1OLH;%fGs2K&*8WM&_{X5A>;z@PL^+y4a1UY
|
|
|
8bbdeac |
ztlS2`tIEy6!|<0ii&iY(JCF26R*`uU3{GKvJ4+~ky6tt$32<~sWGI+JXfwwmwk4r8
|
|
|
8bbdeac |
zNBhBgz431NMSIDNI*;F2Art4%@OE-D5>Tnl;iF=LBc(9DTq-}ok((clDz-6fFVjL!
|
|
|
8bbdeac |
zPS8*)%>Bf-*bES}>H1khP)L2z2*!im&ub_;;~OP#0p3Z(K4i^4goI>b5S6ZBH?V2#
|
|
|
8bbdeac |
zY#-Ct&%aA$5yD3nZADb!h*}gK&%jDm2VdwD$VOLH>+@MFVAM3t;nmTZv#>Hypa6Ks
|
|
|
8bbdeac |
z-3Zl0BQqtHDqtB&?~&z1YvKwhR!vt>uA)MSdqLaR%Kcy$4cT
|
|
|
8bbdeac |
zVW|TK0O
|
|
|
8bbdeac |
zSu{=MF~*+^0*1e3qfW|Ojt+S)Y??dflia}9s0*A#eFAuY_e&Oy<96{1*fyJgUpGE<
|
|
|
8bbdeac |
zR{>6C&94yZkb{fy5~;9V@lGt5vNUzC&@A?VqjL&K1HYf`Uu4Y)I2
|
|
|
8bbdeac |
z*n09McpXYkEw+d#nFCAO&9LIul1oIzq{c+il=X?gaAke3nIEZ6ielOlBH@=&Z~!7g
|
|
|
8bbdeac |
z%6@{;(WI)d!oXZcL<m{GnbZ*S>u?T3X}O$6l)eTfx;pDqBY{?|n=nFUsF&&ig-hl!
|
|
|
8bbdeac |
zitO@ixMl@HupfH*v~MuDDd%$VZ28{afvekcLlo1A=4oE(0kLC`NHH9y2-zC-BbGHD
|
|
|
8bbdeac |
zv6vKhEHRX|ND3KL3YK}G$C2fI09x;jWsu@8({BdM6Z8H-gB|{u|391lFErT3z}CXl
|
|
|
8bbdeac |
z#L1c7(b#k{VbV5`5i#hBH`ruqS&#t?%#m`e%`&H#EkqrR;Wiz4vpXh1O{uW_G-rOV
|
|
|
8bbdeac |
zTAXDorZMBf0Cyy^zO+w;)rg90OwzpRgoe9=zO87Ddv&>)h9Dj9#xk%dhq~R(mYPd1
|
|
|
8bbdeac |
zIhc+E)_S@jpVB@3j#r_RxNm{eK@xVTF$NL}KU&!0Vc#2@YibwD^t+PtS#GSy6Cq#Z
|
|
|
8bbdeac |
z26tI*J+wiya#v_GVcZYFXeimSAm>2bc6pgWmgGAnuD-mB-C_N%xxjp0{cD<->E+EZ
|
|
|
8bbdeac |
z*y01-?XKEO?Z7SXBy-P8BTtvP!J93TMEy+WONG-89*?i1Px|REtlgSMS5a%hsRFat
|
|
|
8bbdeac |
z*rUc<0#%8czs%S8WIhY_$9#c*@}K{+`Tk1L7O}H6wJ>vW{5vt*iJ8H`$jHRn
|
|
|
8bbdeac |
zk-^Bt(eeL{CH#{;{YUH{dcdCt^7r;HvHz3x{r_J4`-J`H_
|
|
|
8bbdeac |
zd$#z$^Zk|J{eSYATH6^on>hYoa{b9BcQG{hZ(Icbi!KWr12YpR24M?l8v}c%|Dy7L
|
|
|
8bbdeac |
z>!7`zy^H-{djAU_?*F3H-qFs?(ZtE=zc=@PGtFNn{qJ1=TRWYc4V+#6P22w#M~e2R
|
|
|
8bbdeac |
zopNF-LUdB{;tc=a`1-R-*Ob_2+s_Caa>Xl_bT)5npH2-OD%ByMz6=sHPbU
|
|
|
8bbdeac |
zqBkyTkj||H-m>iQ`DJzP+`X=qa6u?~QEU9|bAnm$fI3=kl>fWk3yc;$xf6}j5@H!A
|
|
|
8bbdeac |
zUHv2O5I?O3v^po23$3DN7+6`qNAFmfF;LmFh8}L#>oKtY5PHJ-`FAT24=;Y)sRb8i
|
|
|
8bbdeac |
z@~3!qG87TwqsCzA@l1GpY4R=(O)1OqU+^@(pob}$nfeN{Q3mQZ@j3
|
|
|
8bbdeac |
zLRu^S$Bz<il%exCO;4PJ>v55`UWvAafj`{cG+;=trlCbI^fz-JeY(KJ2)3hDen$(T
|
|
|
8bbdeac |
zZk1VcZ#zZ$vZMVxHMG0Vb$xtAII*hneQQv~!4mIY`xX;g-re6?<%#`aQUh
|
|
|
8bbdeac |
z#zK??3}SN}phy+eW47a``(4*mcA4n9u&rI?c;aYx>8IZf*k8k`4uU{d=Fcc)`2$)0
|
|
|
8bbdeac |
z=TVCD=V|;4u2eR$w>B^``SX@JJ2CtZf_af;WsUnCZTPCX>#^ExX=+>wcj?B-s)JqX
|
|
|
8bbdeac |
z@x-OqHZxkJvbDJ^g`6%7(Hy$iBER?`uhHAyey-ethI${G=mAOWUS=Tx67>f_D3^D=
|
|
|
8bbdeac |
zR0tYb1*{3ViWpP{bS4=A$Z0xrW#ZxCoD^kR&MviK_Izc-BlC{u>ucF)dMZl`x_|?%
|
|
|
8bbdeac |
z1wuW3hol!f?U`~P6KAt;c@Apm6AGpe$DIko@ElW*cSIl~C+Dyx8LGl&PbN!2Q>L+&
|
|
|
8bbdeac |
z<Xx4<4~-QWG+JQ?NCu3)dO#rSz>a1zO(C^HVj1LJbwrYF8kpq}XU`#)p{}o#w~??*
|
|
|
8bbdeac |
zU7RZJ!G2SBYFQV}>WZ-}4J~aYNI7V_>OeY!+vApW9$)|G4abA^(=SDbVdI;_o2&sZ
|
|
|
8bbdeac |
z@=$?#v$N|^i6KUuKY!VfJ@?)g@sSsO=gP9EXfvpH3(v=7F818nn7KksL+=ZU-l?Uy
|
|
|
8bbdeac |
z3qt&=QyK6lDhVmcdLy5=2qI!sYv$L$m{=7i{+g*4R;5F4o5!B`6w;mt**@bbbjCwS
|
|
|
8bbdeac |
zm!147d$|1dQ;UHPVp3nElyiW
|
|
|
8bbdeac |
zml)tIpcGbDHXnv}{x0!U&&3frU<vT~$+!rngw>fDw9V%4#~1LoKnfyvxa}74I{L7&
|
|
|
8bbdeac |
z?E_NK8lZO$BXtZ>lk2}(__ZVdp}MLZXeXo&Oi4iO1i!AK{kKXP+CMD5u4Mmc`Ff)M
|
|
|
8bbdeac |
zyRBSMeO7?4x`ltpJ}Inf|397HRv`cI
|
|
|
8bbdeac |
zfB1V^(Ejedyzn)4?^ie6KNY*n-hVovK>m+@-m_o-+-Pz8+v@*Psps;yRsU7N@%)G7
|
|
|
8bbdeac |
zy`bwK{htH`|0X#B=ijUuneh*gx5!xM5J%Ciup!mo_Bdeur`3KWf&Wh
|
|
|
8bbdeac |
zh{%YD0)xo4j1DNv8aXop35WxXA{7+nK1UHj1TsQ|aH+^42&{4qC;_icumHJ3K_DYh
|
|
|
8bbdeac |
zS%DZe;f&l9l7PsWU^us1U^*aF?JxhlSKZ%lzt{asSG`aD`a!ey($^z`k9hgE`Kv*v
|
|
|
8bbdeac |
zrA~{CXW_ocg|c^v+$rYuu;j7pO*?Ks1s|!&9fm|mhNaIrG5FWVZ9O=3C^jpNE4GxO
|
|
|
8bbdeac |
zRcOWgH359qTiu00^p%EV`%1&CccpQVv(k_mTWNd|fDKsvG%4;(=+WDU$LkR8u@nxN
|
|
|
8bbdeac |
zLz450*yR)jrYW|>(ttX7PRj|Up&n|}N2wQE&QtU8oIgDhR+4?YyX+UV{Yo-}oh&iO
|
|
|
8bbdeac |
zcI#)0PcptH-cyQhMnm%na;&LQi_Bu@_5JfPTO0$rLVMoi)h0(5liOoS_mn<0C?!Rb
|
|
|
8bbdeac |
zb_D93lW)8)oqL_t(yA+%*xvK+zv{KfNDDW)K>P6v%JIcZ_FE-%dmWOg&T5i_|7h$b
|
|
|
8bbdeac |
zzEBVJ=pT6jBaX#les1~AKsu#b@8)r~K`f@P!T_UedD$>AMl1OxCLve0=;yvBy@;Fr
|
|
|
8bbdeac |
zh=7xQo>E9jvOY!QhJv3*G}65)T
|
|
|
8bbdeac |
z)%c+Le9pM797P|ek>a6lVjt^qFlM_4-0$`yyaar~rL6kZ9wm3{5C77o
|
|
|
8bbdeac |
zNuse;T}4yY9i91ze2%0Yz4#oFLqAXC80#>nLZ$fgQF8owHz|IEUK~zLfh){9IDFJ0
|
|
|
8bbdeac |
z35Qa%LXIUp#^+*~Q&m3?OYWYI*q?%Hz#c<$_j8Y)j>owZEs*NwG|sRsIw7AkGi*zb
|
|
|
8bbdeac |
z^CoIOxF?2GhjWFlJBK9~VaOX2(_|V`_D8NHN}hj
|
|
|
8bbdeac |
z{p5e(?T1$rSf9&BYtwT_O^0^T7cECJv-3GL6{1gx65pgf5$Db|M=rGmbjL|dN06yC
|
|
|
8bbdeac |
z77|=Vn|yq#{zH6Ymo2^a{%N{`%W3+1L*~_*&V762rdu>^>8(1
|
|
|
8bbdeac |
zp9UgF^EaXoS%q&>tID50r8%rPY>6Zlk`7-GM{<k`lRlc!>kUW5_P$H2bo5A(K%x
|
|
|
8bbdeac |
z@vTF5n^-j9=1K9Cv4(qmcmtv3
|
|
|
8bbdeac |
zTIfkuwr{i~peo1S^@J0oRWD_K4DVBQy#!YXjZ#esv#zmfP>`iL?Cn=)oZ2GD=cR@%
|
|
|
8bbdeac |
zdRhtZpS=2}RwzdH`qUU?!bnnOT__ZL9_2~yx^Pz7YGQZ!WdFp??Ug}omxNBT1KPjV
|
|
|
8bbdeac |
z`eFWAd^fIgJcBgtNi91=En}9%?i`eOT&Q
|
|
|
8bbdeac |
z*`S>{GT}LuqXpJ_v-O1NRA-b;=d8X3Dx{NfyPC~NFGAb>WtW9SI$aj(Um0QO3z^<%
|
|
|
8bbdeac |
z2Y7izP8HubCt|pa5TE6OqIJyb9|t9-MI{kArF`Ew@Q91O6N=U~t8Wb+k>zKi%d1ed
|
|
|
8bbdeac |
zduTU7g
|
|
|
8bbdeac |
z`u4OD!X^uv@jYGs!iwHD!UA|?;dBz45#^F6NJG0#2Y;7JaDGoH`ElMVI_)mSoa+}T
|
|
|
8bbdeac |
zgVN!IF
|
|
|
8bbdeac |
z1Lr~sTtRvatIot~Xs#-nU>zLZ^kUQ
|
|
|
8bbdeac |
zx$Y55PdZ>`G9q`3g{nRl9R3=VeE?*sfpXpW5Ky)N$eNyT1%;r$4j1q@{HX@X0SBTo
|
|
|
8bbdeac |
zTR#dXSdci%A3w8s7QLiMU{9#<Jn+Qtc)*D9vfVx4iRd%HiA%$>-S}&OBS$B)SKzkr
|
|
|
8bbdeac |
zh&2UX`Yd6LwMeBsV$G=lCY`puq&nX5m7b&>V2S(l_wc5ESHHx!PjO*adQ~Dm2P531
|
|
|
8bbdeac |
zc+b4XD!i!o&QR|$kIcnIem3%VJn83{xbI?bN&85tmv4cWuiqb$)WndEk~_>2DT9`J
|
|
|
8bbdeac |
zFN!2Xyt{axq0GxT_LDd^(JM(w(5l2M87NcA)Ke1J8%vkoh_8NEb#kyS6gF=!gQ}~(
|
|
|
8bbdeac |
zHB0R?7e7R`Y
|
|
|
8bbdeac |
zugy=CkLBC^_scJBLj~Xev0r
|
|
|
8bbdeac |
zwNbVm9~#qh`&xRV!+pi@i~G+XF}iryrnI&L<qiO__(pVj%qLiFE+wv3p>
|
|
|
8bbdeac |
zRy+udPC<`^zE(u-9N$T4COF}*6egDX)gzYD(eYuJXlZI!ic5Rz*4iez)~zP`GcC%C
|
|
|
8bbdeac |
z$@1@8**>w&^u+YMb9Pbo74wCTLZ^vISGJFvo$&{$u9w{@!8=k}!hLYWk!>gCJGRap
|
|
|
8bbdeac |
zd>(8{`r;md`67pkSK-K^=dRS#!cfUmAq^47O$QnMGTN1wXfq*=9U&HTEg7SGr9Uq%
|
|
|
8bbdeac |
zA!MXp=5@TyYtz{lK2$W%8H}QC_0VrQ@+zyN(Nnc0S0~N1iC{YEYnb3mpDaiY6v*V^
|
|
|
8bbdeac |
zLW>c{ODwam@MdLaau!R6bM4f;I;PJ5=Z15~?!{;F_CCq4uNF*j(w?4<C5>LE!;760
|
|
|
8bbdeac |
zml-Q1)j#YFz*rSOf-8b8VsbE`SOHjeZ?v%*uq+UX)os?+tJd$J21#sy=GoOv)Yk2%
|
|
|
8bbdeac |
zw(7FFIu!lP2mHzqia=noC{jbQUMN}#3VsCy#dctI3i09fI?-ytuh`*lq3QvE`K(a3
|
|
|
8bbdeac |
z^(xW&50DK(aYkcp-QaqqDBK3?L!ijiUR{2ztrl7DAPNgX2oA**Ld0S7DT^X6kSRjJ
|
|
|
8bbdeac |
zHWD$|Z0@4SXYJfQfhyd;SMdNPTR(E}LaS5
|
|
|
8bbdeac |
zz*H0ut<8E!x4Z)&)IW^+c5o0b`hQ(6Y~TXnqs?7FfCNR(1}@*=q|MFN-k|mk%tZ0h
|
|
|
8bbdeac |
z<~|@`f?^l2`^$QswiY*S?gRoSC{AqP1mUO6UDnPkdIJ|x9JTDT`pOZ7BOs81f&}<%
|
|
|
8bbdeac |
sh^JO_aMeQeZ3<EpC@hYx{-ZWzDz?_*0FnWU?tx#pI1J_hzAIt>1O9w?I{*Lx
|
|
|
8bbdeac |
|
|
|
8bbdeac |
literal 0
|
|
|
8bbdeac |
HcmV?d00001
|
|
|
8bbdeac |
|
|
|
8bbdeac |
diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx
|
|
|
8bbdeac |
index c7bcff1..390f13f 100644
|
|
|
8bbdeac |
--- a/chart2/source/inc/CommonFunctors.hxx
|
|
|
8bbdeac |
+++ b/chart2/source/inc/CommonFunctors.hxx
|
|
|
8bbdeac |
@@ -85,9 +85,9 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< ::co
|
|
|
8bbdeac |
return ::rtl::math::doubleToUString(
|
|
|
8bbdeac |
* pDouble,
|
|
|
8bbdeac |
rtl_math_StringFormat_Automatic,
|
|
|
8bbdeac |
- -1, // use maximum decimal places available
|
|
|
8bbdeac |
+ rtl_math_DecimalPlaces_Max, // use maximum decimal places available
|
|
|
8bbdeac |
sal_Char( '.' ), // decimal separator
|
|
|
8bbdeac |
- false // do not erase trailing zeros
|
|
|
8bbdeac |
+ true // remove trailing zeros
|
|
|
8bbdeac |
);
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
else if( eClass == ::com::sun::star::uno::TypeClass_STRING )
|
|
|
8bbdeac |
@@ -128,9 +128,9 @@ struct OOO_DLLPUBLIC_CHARTTOOLS DoubleToOUString : public ::std::unary_function<
|
|
|
8bbdeac |
return ::rtl::math::doubleToUString(
|
|
|
8bbdeac |
fNumber,
|
|
|
8bbdeac |
rtl_math_StringFormat_Automatic,
|
|
|
8bbdeac |
- -1, // use maximum number of decimal places
|
|
|
8bbdeac |
+ rtl_math_DecimalPlaces_Max, // use maximum decimal places available
|
|
|
8bbdeac |
static_cast< sal_Char >( '.' ),
|
|
|
8bbdeac |
- false // do not erase trailing zeros
|
|
|
8bbdeac |
+ true
|
|
|
8bbdeac |
);
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
};
|
|
|
8bbdeac |
diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx
|
|
|
8bbdeac |
index c043fd7..7a4f2f7 100644
|
|
|
8bbdeac |
--- a/include/oox/export/chartexport.hxx
|
|
|
8bbdeac |
+++ b/include/oox/export/chartexport.hxx
|
|
|
8bbdeac |
@@ -64,18 +64,25 @@ namespace com { namespace sun { namespace star {
|
|
|
8bbdeac |
|
|
|
8bbdeac |
namespace oox { namespace drawingml {
|
|
|
8bbdeac |
|
|
|
8bbdeac |
-const sal_Int32 AXIS_PRIMARY_X = 1;
|
|
|
8bbdeac |
-const sal_Int32 AXIS_PRIMARY_Y = 2;
|
|
|
8bbdeac |
-const sal_Int32 AXIS_PRIMARY_Z = 3;
|
|
|
8bbdeac |
-const sal_Int32 AXIS_SECONDARY_X = 4;
|
|
|
8bbdeac |
-const sal_Int32 AXIS_SECONDARY_Y = 5;
|
|
|
8bbdeac |
+enum AxesType
|
|
|
8bbdeac |
+{
|
|
|
8bbdeac |
+ AXIS_PRIMARY_X = 1,
|
|
|
8bbdeac |
+ AXIS_PRIMARY_Y = 2,
|
|
|
8bbdeac |
+ AXIS_PRIMARY_Z = 3,
|
|
|
8bbdeac |
+ AXIS_SECONDARY_X = 4,
|
|
|
8bbdeac |
+ AXIS_SECONDARY_Y = 5
|
|
|
8bbdeac |
+};
|
|
|
8bbdeac |
|
|
|
8bbdeac |
struct AxisIdPair{
|
|
|
8bbdeac |
- sal_Int32 nAxisType;
|
|
|
8bbdeac |
+ AxesType nAxisType;
|
|
|
8bbdeac |
sal_Int32 nAxisId;
|
|
|
8bbdeac |
sal_Int32 nCrossAx;
|
|
|
8bbdeac |
|
|
|
8bbdeac |
- AxisIdPair( sal_Int32 nType, sal_Int32 nId, sal_Int32 nAx ): nAxisType( nType ),nAxisId( nId ),nCrossAx( nAx ) {}
|
|
|
8bbdeac |
+ AxisIdPair(AxesType nType, sal_Int32 nId, sal_Int32 nAx)
|
|
|
8bbdeac |
+ : nAxisType(nType)
|
|
|
8bbdeac |
+ , nAxisId(nId)
|
|
|
8bbdeac |
+ , nCrossAx(nAx)
|
|
|
8bbdeac |
+ {}
|
|
|
8bbdeac |
};
|
|
|
8bbdeac |
|
|
|
8bbdeac |
class OOX_DLLPUBLIC ChartExport : public DrawingML {
|
|
|
8bbdeac |
@@ -145,14 +152,14 @@ private:
|
|
|
8bbdeac |
void exportHiLowLines();
|
|
|
8bbdeac |
void exportUpDownBars(css::uno::Reference< css::chart2::XChartType > xChartType );
|
|
|
8bbdeac |
|
|
|
8bbdeac |
- void exportAllSeries(css::uno::Reference<css::chart2::XChartType> xChartType, sal_Int32& nAttachedAxis);
|
|
|
8bbdeac |
+ void exportAllSeries(css::uno::Reference<css::chart2::XChartType> xChartType, bool& rPrimaryAxes);
|
|
|
8bbdeac |
void exportSeries(css::uno::Reference< css::chart2::XChartType > xChartType,
|
|
|
8bbdeac |
- css::uno::Sequence<css::uno::Reference<css::chart2::XDataSeries> >& rSeriesSeq, sal_Int32& nAttachedAxis );
|
|
|
8bbdeac |
+ css::uno::Sequence<css::uno::Reference<css::chart2::XDataSeries> >& rSeriesSeq, bool& rPrimaryAxes);
|
|
|
8bbdeac |
void exportCandleStickSeries(
|
|
|
8bbdeac |
const css::uno::Sequence<
|
|
|
8bbdeac |
css::uno::Reference<
|
|
|
8bbdeac |
css::chart2::XDataSeries > > & aSeriesSeq,
|
|
|
8bbdeac |
- bool bJapaneseCandleSticks, sal_Int32& nAttachedAxis );
|
|
|
8bbdeac |
+ bool bJapaneseCandleSticks, bool& rPrimaryAxes );
|
|
|
8bbdeac |
void exportSeriesText(
|
|
|
8bbdeac |
const css::uno::Reference< css::chart2::data::XDataSequence >& xValueSeq );
|
|
|
8bbdeac |
void exportSeriesCategory(
|
|
|
8bbdeac |
@@ -186,7 +193,7 @@ private:
|
|
|
8bbdeac |
sal_Int32 nAxisType,
|
|
|
8bbdeac |
const char* sAxisPos,
|
|
|
8bbdeac |
const AxisIdPair& rAxisIdPair );
|
|
|
8bbdeac |
- void exportAxesId( sal_Int32 nAttachedAxis );
|
|
|
8bbdeac |
+ void exportAxesId(bool bPrimaryAxes);
|
|
|
8bbdeac |
void exportView3D();
|
|
|
8bbdeac |
bool isDeep3dChart();
|
|
|
8bbdeac |
|
|
|
8bbdeac |
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
|
|
|
8bbdeac |
index 2f0853b..d0fa7dc 100644
|
|
|
8bbdeac |
--- a/oox/source/export/chartexport.cxx
|
|
|
8bbdeac |
+++ b/oox/source/export/chartexport.cxx
|
|
|
8bbdeac |
@@ -119,12 +119,12 @@ namespace oox { namespace drawingml {
|
|
|
8bbdeac |
|
|
|
8bbdeac |
namespace {
|
|
|
8bbdeac |
|
|
|
8bbdeac |
-sal_Int32 translateFromChart2AxisIndexToOox(sal_Int32 nIndex)
|
|
|
8bbdeac |
+bool isPrimaryAxes(sal_Int32 nIndex)
|
|
|
8bbdeac |
{
|
|
|
8bbdeac |
assert(nIndex == 0 || nIndex == 1);
|
|
|
8bbdeac |
if (nIndex == 1)
|
|
|
8bbdeac |
- return AXIS_SECONDARY_Y;
|
|
|
8bbdeac |
- return AXIS_PRIMARY_Y;
|
|
|
8bbdeac |
+ return false;
|
|
|
8bbdeac |
+ return true;
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
@@ -1533,9 +1533,9 @@ void ChartExport::exportAreaChart( Reference< chart2::XChartType > xChartType )
|
|
|
8bbdeac |
FSEND );
|
|
|
8bbdeac |
|
|
|
8bbdeac |
exportGrouping( );
|
|
|
8bbdeac |
- sal_Int32 nAttachedAxis = AXIS_PRIMARY_Y;
|
|
|
8bbdeac |
- exportAllSeries( xChartType, nAttachedAxis );
|
|
|
8bbdeac |
- exportAxesId( nAttachedAxis );
|
|
|
8bbdeac |
+ bool bPrimaryAxes = true;
|
|
|
8bbdeac |
+ exportAllSeries(xChartType, bPrimaryAxes);
|
|
|
8bbdeac |
+ exportAxesId(bPrimaryAxes);
|
|
|
8bbdeac |
|
|
|
8bbdeac |
pFS->endElement( FSNS( XML_c, nTypeId ) );
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
@@ -1566,8 +1566,8 @@ void ChartExport::exportBarChart( Reference< chart2::XChartType > xChartType )
|
|
|
8bbdeac |
XML_val, varyColors,
|
|
|
8bbdeac |
FSEND );
|
|
|
8bbdeac |
|
|
|
8bbdeac |
- sal_Int32 nAttachedAxis = AXIS_PRIMARY_Y;
|
|
|
8bbdeac |
- exportAllSeries( xChartType, nAttachedAxis );
|
|
|
8bbdeac |
+ bool bPrimaryAxes = true;
|
|
|
8bbdeac |
+ exportAllSeries(xChartType, bPrimaryAxes);
|
|
|
8bbdeac |
|
|
|
8bbdeac |
Reference< XPropertySet > xTypeProp( xChartType, uno::UNO_QUERY );
|
|
|
8bbdeac |
|
|
|
8bbdeac |
@@ -1626,7 +1626,7 @@ void ChartExport::exportBarChart( Reference< chart2::XChartType > xChartType )
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
|
|
|
8bbdeac |
- exportAxesId( nAttachedAxis );
|
|
|
8bbdeac |
+ exportAxesId(bPrimaryAxes);
|
|
|
8bbdeac |
|
|
|
8bbdeac |
pFS->endElement( FSNS( XML_c, nTypeId ) );
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
@@ -1642,14 +1642,14 @@ void ChartExport::exportBubbleChart( Reference< chart2::XChartType > xChartType
|
|
|
8bbdeac |
XML_val, varyColors,
|
|
|
8bbdeac |
FSEND );
|
|
|
8bbdeac |
|
|
|
8bbdeac |
- sal_Int32 nAttachedAxis = AXIS_PRIMARY_Y;
|
|
|
8bbdeac |
- exportAllSeries( xChartType, nAttachedAxis );
|
|
|
8bbdeac |
+ bool bPrimaryAxes = true;
|
|
|
8bbdeac |
+ exportAllSeries(xChartType, bPrimaryAxes);
|
|
|
8bbdeac |
|
|
|
8bbdeac |
pFS->singleElement(FSNS(XML_c, XML_bubble3D),
|
|
|
8bbdeac |
XML_val, "0",
|
|
|
8bbdeac |
FSEND);
|
|
|
8bbdeac |
|
|
|
8bbdeac |
- exportAxesId( nAttachedAxis );
|
|
|
8bbdeac |
+ exportAxesId(bPrimaryAxes);
|
|
|
8bbdeac |
|
|
|
8bbdeac |
pFS->endElement( FSNS( XML_c, XML_bubbleChart ) );
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
@@ -1660,8 +1660,8 @@ void ChartExport::exportDoughnutChart( Reference< chart2::XChartType > xChartTyp
|
|
|
8bbdeac |
pFS->startElement( FSNS( XML_c, XML_doughnutChart ),
|
|
|
8bbdeac |
FSEND );
|
|
|
8bbdeac |
|
|
|
8bbdeac |
- sal_Int32 nAttachedAxis = AXIS_PRIMARY_Y;
|
|
|
8bbdeac |
- exportAllSeries( xChartType, nAttachedAxis );
|
|
|
8bbdeac |
+ bool bPrimaryAxes = true;
|
|
|
8bbdeac |
+ exportAllSeries(xChartType, bPrimaryAxes);
|
|
|
8bbdeac |
// firstSliceAng
|
|
|
8bbdeac |
exportFirstSliceAng( );
|
|
|
8bbdeac |
//FIXME: holeSize
|
|
|
8bbdeac |
@@ -1734,8 +1734,8 @@ void ChartExport::exportLineChart( Reference< chart2::XChartType > xChartType )
|
|
|
8bbdeac |
|
|
|
8bbdeac |
exportGrouping( );
|
|
|
8bbdeac |
// TODO: show marker symbol in series?
|
|
|
8bbdeac |
- sal_Int32 nAttachedAxis = AXIS_PRIMARY_Y;
|
|
|
8bbdeac |
- exportSeries( xChartType, *itr, nAttachedAxis );
|
|
|
8bbdeac |
+ bool bPrimaryAxes = true;
|
|
|
8bbdeac |
+ exportSeries(xChartType, *itr, bPrimaryAxes);
|
|
|
8bbdeac |
|
|
|
8bbdeac |
// show marker?
|
|
|
8bbdeac |
sal_Int32 nSymbolType = css::chart::ChartSymbolType::NONE;
|
|
|
8bbdeac |
@@ -1753,7 +1753,7 @@ void ChartExport::exportLineChart( Reference< chart2::XChartType > xChartType )
|
|
|
8bbdeac |
FSEND );
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
|
|
|
8bbdeac |
- exportAxesId( nAttachedAxis );
|
|
|
8bbdeac |
+ exportAxesId(bPrimaryAxes);
|
|
|
8bbdeac |
|
|
|
8bbdeac |
pFS->endElement( FSNS( XML_c, nTypeId ) );
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
@@ -1779,8 +1779,8 @@ void ChartExport::exportPieChart( Reference< chart2::XChartType > xChartType )
|
|
|
8bbdeac |
XML_val, varyColors,
|
|
|
8bbdeac |
FSEND );
|
|
|
8bbdeac |
|
|
|
8bbdeac |
- sal_Int32 nAttachedAxis = AXIS_PRIMARY_Y;
|
|
|
8bbdeac |
- exportAllSeries( xChartType, nAttachedAxis );
|
|
|
8bbdeac |
+ bool bPrimaryAxes = true;
|
|
|
8bbdeac |
+ exportAllSeries(xChartType, bPrimaryAxes);
|
|
|
8bbdeac |
|
|
|
8bbdeac |
if( !mbIs3DChart )
|
|
|
8bbdeac |
{
|
|
|
8bbdeac |
@@ -1807,9 +1807,9 @@ void ChartExport::exportRadarChart( Reference< chart2::XChartType > xChartType)
|
|
|
8bbdeac |
pFS->singleElement( FSNS( XML_c, XML_radarStyle ),
|
|
|
8bbdeac |
XML_val, radarStyle,
|
|
|
8bbdeac |
FSEND );
|
|
|
8bbdeac |
- sal_Int32 nAttachedAxis = AXIS_PRIMARY_Y;
|
|
|
8bbdeac |
- exportAllSeries( xChartType, nAttachedAxis );
|
|
|
8bbdeac |
- exportAxesId( nAttachedAxis );
|
|
|
8bbdeac |
+ bool bPrimaryAxes = true;
|
|
|
8bbdeac |
+ exportAllSeries(xChartType, bPrimaryAxes);
|
|
|
8bbdeac |
+ exportAxesId(bPrimaryAxes);
|
|
|
8bbdeac |
|
|
|
8bbdeac |
pFS->endElement( FSNS( XML_c, XML_radarChart ) );
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
@@ -1848,9 +1848,9 @@ void ChartExport::exportScatterChart( Reference< chart2::XChartType > xChartType
|
|
|
8bbdeac |
FSEND );
|
|
|
8bbdeac |
|
|
|
8bbdeac |
// FIXME: should export xVal and yVal
|
|
|
8bbdeac |
- sal_Int32 nAttachedAxis = AXIS_PRIMARY_Y;
|
|
|
8bbdeac |
- exportSeries( xChartType, *itr, nAttachedAxis );
|
|
|
8bbdeac |
- exportAxesId( nAttachedAxis );
|
|
|
8bbdeac |
+ bool bPrimaryAxes = true;
|
|
|
8bbdeac |
+ exportSeries(xChartType, *itr, bPrimaryAxes);
|
|
|
8bbdeac |
+ exportAxesId(bPrimaryAxes);
|
|
|
8bbdeac |
|
|
|
8bbdeac |
pFS->endElement( FSNS( XML_c, XML_scatterChart ) );
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
@@ -1862,8 +1862,7 @@ void ChartExport::exportStockChart( Reference< chart2::XChartType > xChartType )
|
|
|
8bbdeac |
pFS->startElement( FSNS( XML_c, XML_stockChart ),
|
|
|
8bbdeac |
FSEND );
|
|
|
8bbdeac |
|
|
|
8bbdeac |
- sal_Int32 nAttachedAxis = AXIS_PRIMARY_Y;
|
|
|
8bbdeac |
-
|
|
|
8bbdeac |
+ bool bPrimaryAxes = true;
|
|
|
8bbdeac |
bool bJapaneseCandleSticks = false;
|
|
|
8bbdeac |
Reference< beans::XPropertySet > xCTProp( xChartType, uno::UNO_QUERY );
|
|
|
8bbdeac |
if( xCTProp.is())
|
|
|
8bbdeac |
@@ -1872,7 +1871,7 @@ void ChartExport::exportStockChart( Reference< chart2::XChartType > xChartType )
|
|
|
8bbdeac |
Reference< chart2::XDataSeriesContainer > xDSCnt( xChartType, uno::UNO_QUERY );
|
|
|
8bbdeac |
if(xDSCnt.is())
|
|
|
8bbdeac |
exportCandleStickSeries(
|
|
|
8bbdeac |
- xDSCnt->getDataSeries(), bJapaneseCandleSticks, nAttachedAxis );
|
|
|
8bbdeac |
+ xDSCnt->getDataSeries(), bJapaneseCandleSticks, bPrimaryAxes );
|
|
|
8bbdeac |
|
|
|
8bbdeac |
// export stock properties
|
|
|
8bbdeac |
Reference< css::chart::XStatisticDisplay > xStockPropProvider( mxDiagram, uno::UNO_QUERY );
|
|
|
8bbdeac |
@@ -1882,7 +1881,7 @@ void ChartExport::exportStockChart( Reference< chart2::XChartType > xChartType )
|
|
|
8bbdeac |
exportUpDownBars(xChartType);
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
|
|
|
8bbdeac |
- exportAxesId( nAttachedAxis );
|
|
|
8bbdeac |
+ exportAxesId(bPrimaryAxes);
|
|
|
8bbdeac |
|
|
|
8bbdeac |
pFS->endElement( FSNS( XML_c, XML_stockChart ) );
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
@@ -1961,14 +1960,14 @@ void ChartExport::exportSurfaceChart( Reference< chart2::XChartType > xChartType
|
|
|
8bbdeac |
nTypeId = XML_surface3DChart;
|
|
|
8bbdeac |
pFS->startElement( FSNS( XML_c, nTypeId ),
|
|
|
8bbdeac |
FSEND );
|
|
|
8bbdeac |
- sal_Int32 nAttachedAxis = AXIS_PRIMARY_Y;
|
|
|
8bbdeac |
- exportAllSeries( xChartType, nAttachedAxis );
|
|
|
8bbdeac |
- exportAxesId( nAttachedAxis );
|
|
|
8bbdeac |
+ bool bPrimaryAxes = true;
|
|
|
8bbdeac |
+ exportAllSeries(xChartType, bPrimaryAxes);
|
|
|
8bbdeac |
+ exportAxesId(bPrimaryAxes);
|
|
|
8bbdeac |
|
|
|
8bbdeac |
pFS->endElement( FSNS( XML_c, nTypeId ) );
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
|
|
|
8bbdeac |
-void ChartExport::exportAllSeries(Reference<chart2::XChartType> xChartType, sal_Int32& rAttachedAxis)
|
|
|
8bbdeac |
+void ChartExport::exportAllSeries(Reference<chart2::XChartType> xChartType, bool& rPrimaryAxes)
|
|
|
8bbdeac |
{
|
|
|
8bbdeac |
Reference< chart2::XDataSeriesContainer > xDSCnt( xChartType, uno::UNO_QUERY );
|
|
|
8bbdeac |
if( ! xDSCnt.is())
|
|
|
8bbdeac |
@@ -1976,11 +1975,11 @@ void ChartExport::exportAllSeries(Reference<chart2::XChartType> xChartType, sal_
|
|
|
8bbdeac |
|
|
|
8bbdeac |
// export dataseries for current chart-type
|
|
|
8bbdeac |
Sequence< Reference< chart2::XDataSeries > > aSeriesSeq( xDSCnt->getDataSeries());
|
|
|
8bbdeac |
- exportSeries(xChartType, aSeriesSeq, rAttachedAxis);
|
|
|
8bbdeac |
+ exportSeries(xChartType, aSeriesSeq, rPrimaryAxes);
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
|
|
|
8bbdeac |
void ChartExport::exportSeries( Reference<chart2::XChartType> xChartType,
|
|
|
8bbdeac |
- Sequence<Reference<chart2::XDataSeries> >& rSeriesSeq, sal_Int32& rAttachedAxis )
|
|
|
8bbdeac |
+ Sequence<Reference<chart2::XDataSeries> >& rSeriesSeq, bool& rPrimaryAxes )
|
|
|
8bbdeac |
{
|
|
|
8bbdeac |
OUString aLabelRole = xChartType->getRoleOfSequenceForSeriesLabel();
|
|
|
8bbdeac |
OUString aChartType( xChartType->getChartType());
|
|
|
8bbdeac |
@@ -2048,7 +2047,7 @@ void ChartExport::exportSeries( Reference<chart2::XChartType> xChartType,
|
|
|
8bbdeac |
{
|
|
 |
15b5d79 |
sal_Int32 nLocalAttachedAxis = 0;
|
|
|
8bbdeac |
mAny >>= nLocalAttachedAxis;
|
|
|
8bbdeac |
- rAttachedAxis = translateFromChart2AxisIndexToOox(nLocalAttachedAxis);
|
|
|
8bbdeac |
+ rPrimaryAxes = isPrimaryAxes(nLocalAttachedAxis);
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
|
|
|
8bbdeac |
// export shape properties
|
|
|
8bbdeac |
@@ -2181,12 +2180,12 @@ void ChartExport::exportSeries( Reference<chart2::XChartType> xChartType,
|
|
|
8bbdeac |
void ChartExport::exportCandleStickSeries(
|
|
|
8bbdeac |
const Sequence< Reference< chart2::XDataSeries > > & aSeriesSeq,
|
|
|
8bbdeac |
bool /*bJapaneseCandleSticks*/,
|
|
|
8bbdeac |
- sal_Int32& rAttachedAxis )
|
|
|
8bbdeac |
+ bool& rPrimaryAxes)
|
|
|
8bbdeac |
{
|
|
|
8bbdeac |
for( sal_Int32 nSeriesIdx=0; nSeriesIdx
|
|
|
8bbdeac |
{
|
|
|
8bbdeac |
Reference< chart2::XDataSeries > xSeries( aSeriesSeq[nSeriesIdx] );
|
|
|
8bbdeac |
- rAttachedAxis = lcl_isSeriesAttachedToFirstAxis( xSeries ) ? AXIS_PRIMARY_Y : AXIS_SECONDARY_Y;
|
|
|
8bbdeac |
+ rPrimaryAxes = lcl_isSeriesAttachedToFirstAxis(xSeries) ? true : false;
|
|
|
8bbdeac |
|
|
|
8bbdeac |
Reference< chart2::data::XDataSource > xSource( xSeries, uno::UNO_QUERY );
|
|
|
8bbdeac |
if( xSource.is())
|
|
|
8bbdeac |
@@ -2456,6 +2455,21 @@ void ChartExport::exportAxes( )
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
|
|
|
8bbdeac |
+namespace {
|
|
|
8bbdeac |
+
|
|
|
8bbdeac |
+sal_Int32 getXAxisType(sal_Int32 eChartType)
|
|
|
8bbdeac |
+{
|
|
|
8bbdeac |
+ if( (eChartType == chart::TYPEID_SCATTER)
|
|
|
8bbdeac |
+ || (eChartType == chart::TYPEID_BUBBLE) )
|
|
|
8bbdeac |
+ return XML_valAx;
|
|
|
8bbdeac |
+ else if( eChartType == chart::TYPEID_STOCK )
|
|
|
8bbdeac |
+ return XML_dateAx;
|
|
|
8bbdeac |
+
|
|
|
8bbdeac |
+ return XML_catAx;
|
|
|
8bbdeac |
+}
|
|
|
8bbdeac |
+
|
|
|
8bbdeac |
+}
|
|
|
8bbdeac |
+
|
|
|
8bbdeac |
void ChartExport::exportAxis(const AxisIdPair& rAxisIdPair)
|
|
|
8bbdeac |
{
|
|
|
8bbdeac |
// get some properties from document first
|
|
|
8bbdeac |
@@ -2519,12 +2533,8 @@ void ChartExport::exportAxis(const AxisIdPair& rAxisIdPair)
|
|
|
8bbdeac |
if( bHasXAxisMinorGrid )
|
|
|
8bbdeac |
xMinorGrid.set( xAxisXSupp->getXHelpGrid(), uno::UNO_QUERY );
|
|
|
8bbdeac |
|
|
|
8bbdeac |
- sal_Int32 eChartType = getChartType( );
|
|
|
8bbdeac |
- if( (eChartType == chart::TYPEID_SCATTER)
|
|
|
8bbdeac |
- || (eChartType == chart::TYPEID_BUBBLE) )
|
|
|
8bbdeac |
- nAxisType = XML_valAx;
|
|
|
8bbdeac |
- else if( eChartType == chart::TYPEID_STOCK )
|
|
|
8bbdeac |
- nAxisType = XML_dateAx;
|
|
|
8bbdeac |
+ sal_Int32 eChartType = getChartType();
|
|
|
8bbdeac |
+ nAxisType = getXAxisType(eChartType);
|
|
|
8bbdeac |
// FIXME: axPos, need to check axis direction
|
|
|
8bbdeac |
sAxPos = "b";
|
|
|
8bbdeac |
break;
|
|
|
8bbdeac |
@@ -2568,6 +2578,23 @@ void ChartExport::exportAxis(const AxisIdPair& rAxisIdPair)
|
|
|
8bbdeac |
sAxPos = "b";
|
|
|
8bbdeac |
break;
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
+ case AXIS_SECONDARY_X:
|
|
|
8bbdeac |
+ {
|
|
|
8bbdeac |
+ Reference< css::chart::XTwoAxisXSupplier > xAxisTwoXSupp( mxDiagram, uno::UNO_QUERY );
|
|
|
8bbdeac |
+ if( xAxisTwoXSupp.is())
|
|
|
8bbdeac |
+ xAxisProp = xAxisTwoXSupp->getSecondaryXAxis();
|
|
|
8bbdeac |
+ if( bHasSecondaryXAxisTitle )
|
|
|
8bbdeac |
+ {
|
|
|
8bbdeac |
+ Reference< css::chart::XSecondAxisTitleSupplier > xAxisSupp( mxDiagram, uno::UNO_QUERY );
|
|
|
8bbdeac |
+ xAxisTitle.set( xAxisSupp->getSecondXAxisTitle(), uno::UNO_QUERY );
|
|
|
8bbdeac |
+ }
|
|
|
8bbdeac |
+
|
|
|
8bbdeac |
+ sal_Int32 eChartType = getChartType();
|
|
|
8bbdeac |
+ nAxisType = getXAxisType(eChartType);
|
|
|
8bbdeac |
+ // FIXME: axPos, need to check axis direction
|
|
|
8bbdeac |
+ sAxPos = "t";
|
|
|
8bbdeac |
+ break;
|
|
|
8bbdeac |
+ }
|
|
|
8bbdeac |
case AXIS_SECONDARY_Y:
|
|
|
8bbdeac |
{
|
|
|
8bbdeac |
Reference< css::chart::XTwoAxisYSupplier > xAxisTwoYSupp( mxDiagram, uno::UNO_QUERY );
|
|
|
8bbdeac |
@@ -2869,6 +2896,17 @@ void ChartExport::_exportAxis(
|
|
|
8bbdeac |
FSEND );
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
|
|
|
8bbdeac |
+ // TODO: MSO does not support random axis cross position for
|
|
|
8bbdeac |
+ // category axis, so we ideally need an algorithm that decides
|
|
|
8bbdeac |
+ // when to map the crossing to the tick mark and when to the
|
|
|
8bbdeac |
+ // middle of the category
|
|
|
8bbdeac |
+ if (nAxisType == XML_valAx)
|
|
|
8bbdeac |
+ {
|
|
|
8bbdeac |
+ pFS->singleElement( FSNS( XML_c, XML_crossBetween ),
|
|
|
8bbdeac |
+ XML_val, "midCat",
|
|
|
8bbdeac |
+ FSEND );
|
|
|
8bbdeac |
+ }
|
|
|
8bbdeac |
+
|
|
|
8bbdeac |
// majorUnit
|
|
|
8bbdeac |
bool bAutoStepMain = false;
|
|
|
8bbdeac |
if(GetProperty( xAxisProp, "AutoStepMain" ) )
|
|
|
8bbdeac |
@@ -3179,12 +3217,14 @@ void ChartExport::exportDataPoints(
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
|
|
|
8bbdeac |
-void ChartExport::exportAxesId( sal_Int32 nAttachedAxis )
|
|
|
8bbdeac |
+void ChartExport::exportAxesId(bool bPrimaryAxes)
|
|
|
8bbdeac |
{
|
|
|
8bbdeac |
sal_Int32 nAxisIdx = lcl_generateRandomValue();
|
|
|
8bbdeac |
sal_Int32 nAxisIdy = lcl_generateRandomValue();
|
|
|
8bbdeac |
- maAxes.push_back( AxisIdPair( AXIS_PRIMARY_X, nAxisIdx, nAxisIdy ) );
|
|
|
8bbdeac |
- maAxes.push_back( AxisIdPair( nAttachedAxis, nAxisIdy, nAxisIdx ) );
|
|
|
8bbdeac |
+ AxesType eXAxis = bPrimaryAxes ? AXIS_PRIMARY_X : AXIS_SECONDARY_X;
|
|
|
8bbdeac |
+ AxesType eYAxis = bPrimaryAxes ? AXIS_PRIMARY_Y : AXIS_SECONDARY_Y;
|
|
|
8bbdeac |
+ maAxes.push_back( AxisIdPair( eXAxis, nAxisIdx, nAxisIdy ) );
|
|
|
8bbdeac |
+ maAxes.push_back( AxisIdPair( eYAxis, nAxisIdy, nAxisIdx ) );
|
|
|
8bbdeac |
FSHelperPtr pFS = GetFS();
|
|
|
8bbdeac |
pFS->singleElement( FSNS( XML_c, XML_axId ),
|
|
|
8bbdeac |
XML_val, I32S( nAxisIdx ),
|
|
|
8bbdeac |
@@ -3192,7 +3232,7 @@ void ChartExport::exportAxesId( sal_Int32 nAttachedAxis )
|
|
|
8bbdeac |
pFS->singleElement( FSNS( XML_c, XML_axId ),
|
|
|
8bbdeac |
XML_val, I32S( nAxisIdy ),
|
|
|
8bbdeac |
FSEND );
|
|
|
8bbdeac |
- if( mbHasZAxis )
|
|
|
8bbdeac |
+ if (mbHasZAxis)
|
|
|
8bbdeac |
{
|
|
|
8bbdeac |
sal_Int32 nAxisIdz = 0;
|
|
|
8bbdeac |
if( isDeep3dChart() )
|
|
|
8bbdeac |
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
|
|
|
8bbdeac |
index 878276a..ba32712 100644
|
|
|
8bbdeac |
--- a/oox/source/export/drawingml.cxx
|
|
|
8bbdeac |
+++ b/oox/source/export/drawingml.cxx
|
|
|
8bbdeac |
@@ -1206,7 +1206,7 @@ void DrawingML::WriteRunProperties( Reference< XPropertySet > rRun, bool bIsFiel
|
|
|
8bbdeac |
PropertyState eState;
|
|
|
8bbdeac |
SvtScriptType nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() );
|
|
|
8bbdeac |
bool bComplex = ( nScriptType == SvtScriptType::COMPLEX );
|
|
|
8bbdeac |
- const char* bold = NULL;
|
|
|
8bbdeac |
+ const char* bold = "0";
|
|
|
8bbdeac |
const char* italic = NULL;
|
|
|
8bbdeac |
const char* underline = NULL;
|
|
|
8bbdeac |
const char* strikeout = NULL;
|
|
|
8bbdeac |
diff --git a/sw/qa/extras/ooxmlexport/data/no-numlevel-but-indented.odt b/sw/qa/extras/ooxmlexport/data/no-numlevel-but-indented.odt
|
|
|
8bbdeac |
new file mode 100644
|
|
|
8bbdeac |
index 0000000000000000000000000000000000000000..e435acdad35e581e1eb627d054951a4c81697712
|
|
|
8bbdeac |
GIT binary patch
|
|
|
8bbdeac |
literal 19535
|
|
|
8bbdeac |
zcmeFXbC9O7wlCb%wx?~|wvA~|+qP{?+qP}nwr$(y*R#L9Z=G{$pHp@JySM5-RjGw!
|
|
|
8bbdeac |
ztxA4x-ehGZza)WxkpTd}0RR^CNJX^<8K6l40091$Zxw*0simQVtBs+qjg5t=zOI9*
|
|
|
8bbdeac |
zwH2+Cl>v>luDz)}jkS%Tm4UUsqotvh1C4{Bi^H$~<Se7WpOg~>0N`&y`*x;i;%KR7
|
|
|
8bbdeac |
zrE6+oPwVh6md3`)IOLa%C=4V9
|
|
|
8bbdeac |
z;Na%w=I`$x9v&VaAD^0
|
|
|
8bbdeac |
z`R(NE|9$@tf&cpvm@HJu|Ndh
|
|
|
8bbdeac |
zeiT1);19>*M}hCx@al8@$`gseU^bgCmis4@CDXC_`ocf5e)eeIq2kSHvvJO|xc0Hy
|
|
|
8bbdeac |
zndW#2w|UQLR)WH
|
|
|
8bbdeac |
zkTVs#Dv`Nbm)IxC?Uu2rFT!&Nhe<#8Zr?yUL8?YGV#lpH6C*=Qz$0JtM|{zu;GA6E
|
|
|
8bbdeac |
zDj61Gfk>?&cqCFoGOPkl^@12xyCkh3x^DRec3HcKa>c4p_%mo#Q?|KrwStw|R3T5?
|
|
|
8bbdeac |
zMN^cNBB$Y@)Y3FL_2mW6i=wni*D-lObyA^SV{&y#VRtsjyg}{BbhU76TusINAw1)2
|
|
|
8bbdeac |
zo5^jxgH
|
|
|
8bbdeac |
zRSM|%{r?LtI5_w}R`0(x|N5Z58GUOjhrdg+i>1YZ+JxO23w-AjIor6DY{5(3a^n1Q
|
|
|
8bbdeac |
zicG2$r#@%KvbftAA23-C@edRL>K3>ed$
|
|
|
8bbdeac |
za~hQROm1zW8b`^1{Pc{K&lqF%fIut-7Vf&O&33z>$Gbb)%p0;?d~|&rBM9A52zG_*
|
|
|
8bbdeac |
zB|uY>A&`ghNnlKSq7p2|czAZ@o#dhbC3*cg_w+Ri<^0w#_pqb!!g>Oz1(n}-mBYE>
|
|
|
8bbdeac |
z-ec@_
|
|
|
8bbdeac |
zO_=QL%`R+y-xZ_;+tXmR5|OMXJA4psRk$GK{?h(psyaa&i-kbw$l-^qxF~JUc$^Gg
|
|
|
8bbdeac |
zGX-PXfezVhiD9g=x&nCG+Wf&{h?H-H?atsp>znMYp+#lSPvmK7y7{wMfPZdN7iGPW
|
|
|
8bbdeac |
z>!{sH2?`k`wGGo{Q=!R)rTGYR<;ahM0Q%8}&^>s!S|pv+GW$o?72qF1E63EukSgD3
|
|
|
8bbdeac |
zY(QW2Xmg_wPNgpwS6l2!F~7v|doQCu3?=aD1cdh_4kB*nkg;|-W;(f_Fi1|6#hz&;
|
|
|
8bbdeac |
zM3*$q(iOjp0QZ!YZH%`CP6T(@o8rf_mMJql>;=LxAYz&Z-h}K(>a4Ahuenw3<_)3A
|
|
|
8bbdeac |
zYb|c|)UpH-rqF
|
|
|
8bbdeac |
zgn$4J?47H@?{MP@Hkgskpn;9dD;yNb124cTZuDq&-7`zgixOo6kdPew4ZnP}0R8J8
|
|
|
8bbdeac |
z?qm@PVH{8
|
|
|
8bbdeac |
zY9v+hr4ixPPWA#)xJ8ZbY$Anxslf44lh`zYoHP9vy0)YR$Vdtz=o&
|
|
|
8bbdeac |
z<B0w|XgL3=6YWkixKmex)GvZ^N(O8Cdt!-}_tkB3lt-PX+tt>5s`ML~GG@`6=LDtq
|
|
|
8bbdeac |
zkN2CZDcr9{o{!J9BHqvSG)`1iG5Xp{gt$d@5#3S}uOegWac-;_dx`^;wHeDV{
|
|
|
8bbdeac |
zA_Pr%4_XG~!M^qpwWM@MYZd>i>qyNRgV>SvWXGA4MaZR{3^!jr4utvE?75WHYJU=S
|
|
|
8bbdeac |
zxT;HQ=BL*LAMW`@Nwd)(6PP2mFcf(_s_~3Gpe(F5EKQCpW*^gqj@atf5=s}
|
|
|
8bbdeac |
z3D!Op7dqvOSLP0!#O7Mq6(eeLu-2VqlN|}ylU5yw0mp
|
|
|
8bbdeac |
zR3f|8u$$TFva4!R(rno`&O$o<tL3!hQ3;GapRtEB6tU;?u1m%Vo>R=6Z!XetXXO
|
|
|
8bbdeac |
z3jvxHZJJM6cG!lH42m<;BM
|
|
|
8bbdeac |
zjg$kgkB9j-AA|yOCKo|(71Ct8Aab+XzQ^t*H7um5N8>@9AX+~J7&*n{`za9oe~T&Y
|
|
|
8bbdeac |
zGpk+*e-_e^ggqoKSIgZUC^Kz>dSF&Ve=`1l6uywtK|cpcR2%LG)tlM@94dmx)qSY^
|
|
|
8bbdeac |
ziWe8o
|
|
|
8bbdeac |
zxnS;+6~o;`eGGoS;itso*ON#=iUWtg@9k$n5%w)}-UlPreRC@*AnV&UFwKLXBaNsN
|
|
|
8bbdeac |
zpfWh6;zt4xEvjw#H84S}^pe)OJ$zRmC8-Fb+Jx!*<w~E$Mbywq2#$2KjZ}2>W0p5~
|
|
|
8bbdeac |
z4hXnrebfvH;wA{G)-_Ht^Rp5TclVWYGGWI}MYjn2>}eokv{Jcj){087=h*EDbO@$5
|
|
|
8bbdeac |
zfU=-#zZ96{*RD|fD7taK26X~!lH@^;cq!G0erN@$*5{N#DfB__M+_D>69ir}obOW(
|
|
|
8bbdeac |
z4kIEkW4(<$(?(^2G7+`1S6KO)`cwOKqTXv+wYxkO#xDOfZgN@!g63O|@FrX?9^WPk
|
|
|
8bbdeac |
z=+fabHB8VC^bCud2Uc^W-9%7XTRInx)!yw@@cNnUMkFV1-bGM
|
|
|
8bbdeac |
zTMKZjkvAEsVh+Ou^!bE1MzhIaO!U$_yP+Wg;=MCfDG@guUln0QT?PTvSA}O`%AElv
|
|
|
8bbdeac |
zQu+=@*HQ!V2qt1pL_yo<ej0cWo>+Z8^6e6qP1S+5X{R_HX($~^Z4@t!&z6&uZdx;@
|
|
|
8bbdeac |
zB%!fqpuB|)UmNqkNu#{jxM5{P{pa>_Sg-x#;$p6{;?*W_-abFBDJ0+Z*M9B&5=Pu}
|
|
|
8bbdeac |
zb)Kc-og7P8X+?eY7)HfpgFe42YgY#f7p7O`U?%U;R*j>I45_8_mGz4%N8CfMas2od
|
|
|
8bbdeac |
zcBE3ptI^TX?(%YZ5Qw6zOh1pPkpmg~v$yV)mvXaB#KMa4k{dy#bWxN1__XB3yyeat
|
|
|
8bbdeac |
z;FlyAxLTpE(<>+dfYtZ8=D*)E|8d|kbkO~~Uq-}@S*6pV1wMH~3blb~H^ZO^qC}L^
|
|
|
8bbdeac |
z#5T$o$vemBf9aZ_W1>&dd8YG7YEvDqigSeZhT3=bdG{c*9trMcbUQRCt7io)Kk-3O
|
|
|
8bbdeac |
zn=4s<ShvCT40e%kA-|rKpmgV>3;~g0Vs+b12`deen4jTB=%qS44k7dM4VCM(f;0#%
|
|
|
8bbdeac |
z6Hg2Z#MxPyJ=mXJRal}6cy9giL^e~vk3C|?*Z@h;J6O##6_J1hhJpUcAtd03;&goN
|
|
|
8bbdeac |
zorbYImRP@Np7SFs6=zH?T%U=X*1<5}q7r6%8N3Cy<)Eh|=(FN#Vo#eY{q>-BBPXI3
|
|
|
8bbdeac |
zEe!#**->b__m{lXE`aC{8K-y##5yv_IJTZWrEJQO6KXv3GadsxuMp7I*!&gfE(WdH
|
|
|
8bbdeac |
zTa!W71nuDqnz!U__tuwJie?6ddO#4F>B9ChTo@0Wqn1D<34tbM=exoU``gP(<)OR2
|
|
|
8bbdeac |
zC+XMd!A+3YX^an`0AZ$yOg$+dyA;4dS1SBb+kJyx!q_;fJSIv0$&2?2b+MjAP2wMu
|
|
|
8bbdeac |
zK<O7^{bagKaGG>0{k8&-^*TVjmE(q6_8adn747afA-K&ugbm4aK4(2w
|
|
|
8bbdeac |
zw?m+SIZ>mnQ75u`p4$r)yQ=e1eLhtSkA6gDMlOafZQ9`$EN+(jxibzZ1DiX&eyZ3K
|
|
|
8bbdeac |
z#*!^_(^uwDnqz^KcW@y!QKNtzY+lE!Ra!hif9DRV=J-4)AOHXv@c%S-pufW{dqW2Y
|
|
|
8bbdeac |
zQ!8Wpzw>87ZNmz4=x67ZLa`8JJ)faOJ(YU7uz$XkC<`$H(a$_nclvd1BG%Ll)$#FE
|
|
|
8bbdeac |
zf=~cV_8+lK6L8ajme{1y@>{4EhGLl4c_z3z+BwEf;;K1fk}C%QCke$HEA~c{Q_i1<
|
|
|
8bbdeac |
zj~V(&m0W=M*prR+XG@EAl-*QToaId!oEA&U)(4mIUQTJwZIK|tY3iL&QWX-vAd`lF
|
|
|
8bbdeac |
zzNe4q-MVoeK`HMGanue6L)8|S6Fm7y^HOGNYlf!~%SM*;MK;=d7PRZ}@S;Ii!c=PS
|
|
|
8bbdeac |
z
|
|
|
8bbdeac |
zbUC>9;=R<JlG!v^D3e4zEH>H?*FF#X_N2_)-F3e0uv+iD)&k5PYFWLCz;JsAvY#DD
|
|
|
8bbdeac |
zoSm^+Z%%6G+c}Op9+$S{FV)U?9xs>jCfV!^u1-`~^lt$dEoF6G^t$bcNW|2?dQ1aj
|
|
|
8bbdeac |
zPC%D>_PXI2vpKL8@%^sM4}d#yIj;@f27+*34-%el3mB!0({>DLI;F#m?CB&ce_=uK
|
|
|
8bbdeac |
z_TR)0QbBsD<gQaH3CIhqm}rUCN`SJgs&2G3XXM@x-n8qe?u<z+b>KiwyrQC4McTwh
|
|
|
8bbdeac |
zvZ8T9a_F_Fr_><7oFvs+Ztl#Cd|pd$vm|0RxACM=B#|nO!+%mrP}nl8^Wx6Qv>U4`
|
|
|
8bbdeac |
zR$=2+OV!tomyGxw8usG8B|)C5xdI582-rq)%^#XE
|
|
|
8bbdeac |
z2T6Dz1yKnDOuqoH;YJ1k#1VF4K5PO{SVOeJJ6j2VR!rJFWn}B7DpiV=Fj7*&7>~Y3
|
|
|
8bbdeac |
zp}d84HFEe$|KaZE;yJ|7@PTG1ecCJ%`9#ZcL
|
|
|
8bbdeac |
zL3M0z)<^Z5+FyF*?zoyC_{6m062Vq+ua~%V;>oiKs74AJyAq-m)+bOa(bp@@0XCWq
|
|
|
8bbdeac |
zr|78qAZ<o7K3r3fR?8$8{c-bF7@9}z2~LijI_X#IJ7c>5dxa-;1vWn@{UYs`l+vjS
|
|
|
8bbdeac |
z&N9r9d?($`GV^GNJTOv;=jEUpt8KX8VvpSknGxdyEYP2ji8AK+=ic}jX{>z7mu~pc
|
|
|
8bbdeac |
z#)fz)eitYZ*&UuMG+Vw48>QV5P;jU_8ff9PG?H{bg;0&{%Ci#PpJWS>%^toN2n$v4
|
|
|
8bbdeac |
z5UudE3PnQ>q{c56qfW7RI1X*eOsT~Wh8Ye%mr`zWg}I2qQX@USRrT3tXluvT*x8Lt
|
|
|
8bbdeac |
z=%UW<;ZViw0;L>w8v_(RC7MRD2RX(_ARKq5{%3OUmcv7o$xm45{k-KzFWW!5d-tgc
|
|
|
8bbdeac |
zeb#iY;GxBj-BPG1X6UVcC#FOQ=!zmLFjZVq
|
|
|
8bbdeac |
zLl45IdH^YGqK^7qMZbD)Y#JkK6LkyAE(nLb6@%XvD?QEO3T&DAocDu8`eeLtqPR%I
|
|
|
8bbdeac |
z^keXFQF%us@zhGKhjq
|
|
|
8bbdeac |
zTrCtFh`+6nP;o_ti{DX!OpgI)0wF0xqauonN~o8@nY&!){@Ls#LJ3B}nmDfpNVz~G
|
|
|
8bbdeac |
z)x`5Ojx3HMD*!se)6Jo{hsElM2F>k0L(BUo@n}gEkm~CC^$&36L|9#zEZvxv`s`*G
|
|
|
8bbdeac |
zya4`Yq`mGGO9NcE1&Fg3@Ng&t5b^<q0S4R`+HALFiIoykz=ICHDitvc3LnGPNqu>R
|
|
|
8bbdeac |
z=CSi7FK=
|
|
|
8bbdeac |
zT}4;Cu>McI+eFYj;Qmp)+p@aXM|96r(4FA^T|uO>y>YaCaYZ{LDm!~ueM5WKH+LrY
|
|
|
8bbdeac |
zT1>Ba7@o)xJRu@kB6;3Id89MPXC_RMgR*%ytTWGTCht`y?^JG|O84()#{;|yg{M`F
|
|
|
8bbdeac |
zIkT8u?;BTN&$n$!Q!@Tt8KBxhJ%4nsZP7dsL9>E-j&!e+OzypyUg
|
|
|
8bbdeac |
zw}faj3sTSDaRG-qMrCKwCV++tz6bfNua>`djt9$erBk`FJv;MbOzLv>mQw<(7z0}m
|
|
|
8bbdeac |
z!c;dD(24zXN(@!ZSU*mvd}6O&>Zx)3y45{gHwi%vOb@dJtE>~g_}&!1>Z`Gtw*0
|
|
|
8bbdeac |
zr7#|D7wd%QN)e*2o6nxN&|8(4S3x-|`N~0L2mO?}Mt@(wXAO_7^c9iXm~w6G#)7?M
|
|
|
8bbdeac |
zIp$
|
|
|
8bbdeac |
zBtK*#U%#t104OLr$feOEZ;m^P<ftxH>=j2nEl}N**0O#++Hd`cbDEfkImdLvQew1X
|
|
|
8bbdeac |
z0O=)u$#6H4C)HZg)*3@3k@gL{b85j;o1%zwK8OgHqqIvjS=K~YwjX+!%4h``LZVGi
|
|
|
8bbdeac |
zl{{xH^UaG3kx_S;SIDjWPP6x%o!QI6hFrR0GGs#tc`sbc=D~2JT!M?+VBt8bk__(m
|
|
|
8bbdeac |
zo}QM8jLwRcl25XG#;#~?b|y>GfvPIcgewlD1_j+!$dRJRVc%S{3#@+xliXf#jw
|
|
|
8bbdeac |
zkgA6umG=&glh+K)!|c~T0zhY{<j^oM0DwK3e{JIb%6R`PU-Fk?d>27$D
|
|
|
8bbdeac |
zy6qWg9jvV_Y;>&*EolF9a{E8p{Y`HFS34sMYh4FJyZ=qA?@YR*p6>sy)!#n;&sJFf
|
|
|
8bbdeac |
zriV6m*2Z>*_V)j?<-fzk-a*&F@jux8yZqDN8-)LgiLSoBp@rc$wAOaC`i^#X|IAH&
|
|
|
8bbdeac |
zC-=YOtiOPMhgtvl{(GqZU3YA(Z5(a>BKJRljr;BQzjnveQrFnfo>sur!BW@8{-4JG
|
|
|
8bbdeac |
zZY+O;J4;
|
|
|
8bbdeac |
zk#Wj$`K6~>^Lv#dj9ZcQX&1U!!(p|>J&H{F
|
|
|
8bbdeac |
z{smbSt
|
|
|
8bbdeac |
zat>$N(XLN;++iCWCE2x*x{dN3e;V;(eEA|Eq(%cA{IObPBnKE1@8sBfaxQj
|
|
|
8bbdeac |
zbGdY`DI=$rH-n)I545&BsxLMCw>%O|+%EOq9OnjZwg}^O(itvgPun<Mzm7g>roPa3
|
|
|
8bbdeac |
ztLmMEEchn#j9;UV>ThwCM63S(X7x`dvmieJ0Q|piYX19k)z5GEq=gmvsl{bPX#W?E
|
|
|
8bbdeac |
z-$8Oke2-Nh9(2%^XK3&l^0Hg%uQ(iv3y4-Qoqq9{ZXuo0#|zQi#uFw-v-))l{m-ws
|
|
|
8bbdeac |
znq>>wNfc4=8JF^9Om9Pw?8k_nO1-SNsM`$7vxPx&CTgMBrR?D+y3N_p0-xD3lU$(#
|
|
|
8bbdeac |
zJc-%aC!dI=ksq<|E3~3T>P}$QMh~UQ?`rxv<4=9Ar&e(dhE>PE=x@XfC^${RDNfb}
|
|
|
8bbdeac |
z2Nbu|^L`$%*!BlSb-!oEA*Bb0utUEI+G!VuNBC9ZU)8vG>!hFZK_As=)Qe&~-(ul{
|
|
|
8bbdeac |
z!|m&_WfowbSm4vpocYY(mh;7<+Pki13@tj4ho>Pd37Ep5*q!=MlLvHxeeqV2sxXsa
|
|
|
8bbdeac |
z!MiYMY*CJTBuYm7DfH}RbMDXxYC-7w^m)bn3-1FM;UBDTczOQEqsQNSGkXVD3&VdL
|
|
|
8bbdeac |
zJT5#XqxOcK4mZ2}hD9)+dId?gq8yCTH5W9S)`m+jOUlo*pu+(ba^>5lV*tesl^0KY
|
|
|
8bbdeac |
z(Z=n3dH@);T%cW8>TXBFR-Tu}dnLEJ=t%wGZV>oEaAU>9H8qJtY
|
|
|
8bbdeac |
zKTq#Q_cGJz?0~)=B@p{5CvS{<)*o=KtGvE$sI9d=7Rq?vNPbhTr`R*X8Kouc4S67U
|
|
|
8bbdeac |
zxybbM8}YV^BU)Fn
|
|
|
8bbdeac |
zgqujZUVuHO(%aHMan)z3G7_q7o6^4#=uEt`-#!a>Px&pZMs7$@^0-%ion0(2L@u!|
|
|
|
8bbdeac |
zElo{L_0|yp@9Z@gs4g
|
|
|
8bbdeac |
zYzK^&*XXwencd$HQz6JkAuo<6It^1{CO1P@F&O_*NkP4<Ja-ZA>2LP}3wh3Rc2-vf
|
|
|
8bbdeac |
zS1EVIUqvi4%4sw5nh0o3<^}g_FCi1m&2Da~B`aMTxdME!Cw#F#9+dfwm&F`AWnrCY
|
|
|
8bbdeac |
z&-FVd8Ps8x`PcO%65?DqhY+nawQ3t|h9mr-t02lbC}cC?(P=}t3XW#SFEf!>w8
|
|
|
8bbdeac |
zd6P&xm{L%`N#2&pI~5h;u@z_^r5^xkIhv|;ax*f_M$!G|LUCm
|
|
|
8bbdeac |
zl6)!&472ZCF9K*JYPr)d3Ka$9M%%LmV@$Q>$Z`z$G>68Rn7oPg==r;=2sR)1>HHt0
|
|
|
8bbdeac |
z@tsH1gklimw%?w2FbZypp8(#H7Zr|~4$4$i;ab46oi&yj|73A8(z-oJ>#f`lY20Em
|
|
|
8bbdeac |
z-#(s_nml}ro#F!^08%E(RcKrl#5Pj{r<4r)I(Z%D5k0iF#A;`+@o%^a73U>4QtMp|
|
|
|
8bbdeac |
zGFEHJIvtbf%@?_yz9DQ
|
|
|
8bbdeac |
zEJ3t9O)}=>@-{8;-zR~j?)LyZbhaIBwtQNk|1zH-kInk>mE`%luljl~^8P@*-1_|N
|
|
|
8bbdeac |
z`ds6Euj)y)Z%S#gPit%X2!89h>V=<+DW)cbXJjIBbIL0Q!McCt+~JR&3w&Eix!Mnh
|
|
|
8bbdeac |
z@+Y<cY;pFL{Zl5;^cB?MtOAz?t}?hGm!_1v>YcZ_ocRXdx}NdY9F7T36-!@l)>N{x
|
|
|
8bbdeac |
zQu%Y
|
|
|
8bbdeac |
zB)xm**z^OUayhn;?u7iKwr6g-e~HbNQ3nh*m?L`t%FozFkmWnP`
|
|
|
8bbdeac |
zE|_-{TK;3P(0JnWn%geh-j<6vv#mlb38Vd;fJ5TY3?
|
|
|
8bbdeac |
zt{m%&rTQ1yS1wz$&R5V0Mr&oKXUg!(>!)#)pq{(gnxh#~)py_x4w
|
|
|
8bbdeac |
z$2Sw24~}OKcVasNQt{CKk=jC1Q#yJNQt{fJkyt9X_EI&j@o>k@U8R&HW~~~RfqreN
|
|
|
8bbdeac |
z&3&an#vM$sF2e|arZ6Ce;r<*c*;qhg8
|
|
|
8bbdeac |
zAx)ilhjbnF?Pmpsy^>=DMZtlnLB=?=Ie#Qo4XV^vl$r$enh7M+bJZkrKF?=jMYXvF
|
|
|
8bbdeac |
z<6ZCLI*3mz6N{OSspU3Vgyxj`A?|-nB?bF*z`Rzn90#zF
|
|
|
8bbdeac |
z67NP62MIP%I5HfF&6?(wBubTic8={Qmi0x>l%P(vx-@GQ*U!pNA?A-omXW6(i6e?O
|
|
|
8bbdeac |
zgkm$j4hF76_Vm@Dur|X3;iyXEg95CwkEOYZ_2pqx^eMC{-JE}AwPL%&GE3XevP@Id
|
|
|
8bbdeac |
z3?hvU0mf2X?!`^*SBJD7KK6bF<b?`}1;i~5IY#}1d#WMO`=bK_GUC>*84tmm?AmEq
|
|
|
8bbdeac |
zqPq)E{+M%^(KrPwUmbE^;7d?MdN-DV9>PsU1J}a`q$U=T9)bebtjE<=F)~2i7t=p^
|
|
|
8bbdeac |
zzCQ!k!rJ$jbaOzb<$K_nE1e`kPxx?4K;jzWqG}nw95YOV3Axf(G@C66A(C0nlDr{^
|
|
|
8bbdeac |
z=P^Le@JZq@Cd#Z!wGBn}u)J?k>);6
|
|
|
8bbdeac |
z>u_23PbDN*sQzKaXenJqX?8#Y$p8xuIK$)goG?bMKS6piv2x~$WW)7}&$&GOkjG%N
|
|
|
8bbdeac |
z7|);qLH%WXM!r%M$&d|kOT=W-q7VeZMfp3qIT-|{(y`gT3|2qPvbpx;`lhv!pj!$k
|
|
|
8bbdeac |
zn^(B3SlSV)R7s-JNb#+*m2;dyX!w{hDrI7siC+NUcZ7bKAUpw4_+hf0jNkz<0OI~G
|
|
|
8bbdeac |
zpUMU}&LG0cB>P3=ag2x9Z7D1$4@wII2%19N2b=&nXv*;`6+)IB=uX663oLYokINBg
|
|
|
8bbdeac |
zq%ypJMF_G44Xd5u9Ym%NNU&*I5Q!L*&EJnnsUCpxXXdF74h52uA4MDy%qon>pHu34
|
|
|
8bbdeac |
zVgWK8M_({5kE|c$)nMiY{d+
|
|
|
8bbdeac |
zkJlIuE!U`GF@wPbQQ8O;Kl<|UtpMJb*
|
|
|
8bbdeac |
ziH_ykd4hFiu*;Xq*1kXtGGrN?A$34W47Y3n>{z#i6KS?UXQ-wdLhg#ScEpDAx=!8T
|
|
|
8bbdeac |
z&bURB@vRw`S-#X<<OR;1zeJ*RIeJ<E#}>k?hln-HyN!`ZB;Ghycs}d$^rv$|x$hO2
|
|
|
8bbdeac |
zcdt~_VaxIaJ-VGtRx+&Kvv$GyHy{ntjMv1Bh-=%RxbVBUKP2Ryre@qAuT*diL{|)0
|
|
|
8bbdeac |
z*bY$pr5Tfj!Y$H2w!Hm_@-n_^4k%e>gcF
|
|
|
8bbdeac |
z^4?G4KlXx{Zv8=!Fd?!_dM{tcQL;CsDp?VOI4YHL-s8^Ib`vYR*pAwW`ZMU$oU@+3
|
|
|
8bbdeac |
zOLBcsJUFw7)z;?}fN!G(i73CZN$Zf2bv^vgbd7hQt~Yev7n>x1m|L;su&cBCL7>O`
|
|
|
8bbdeac |
zuT+HQ&vkxEQxj{x8^c-=Bg^m$u;?@$>>P5Sjum!xGv^CSmKY$5YlPB}Jzj)Fw)J>a
|
|
|
8bbdeac |
zV3SOGc#?FS7VT)8u`@K@JBu${ecoQep&>Y
|
|
|
8bbdeac |
zJIgG#76B!rkytX5v-CdI3)Ryk!^Bt?LP?jqPAz=3&&Tws`Vo_Y&vXvg2Z;~Y)7g?n
|
|
|
8bbdeac |
zJlWTqOEV~)5u9qY5UiUrkr@!+MB1~0J^gE!smv+ghi2+!0GG?riL@!QowEquFjjHj
|
|
|
8bbdeac |
zVV`dGUU#7QHYGeH%}yOu5Y>jpS8@5+voNwKt@yCmLj#mD3a^~HT1{M91|tTtrQpRh
|
|
|
8bbdeac |
z6IJ|^9MTa2uO0_C89Be$4>36Y;Ca9ita~&(-pr23XuhY4
|
|
|
8bbdeac |
zc}TP~LAd!oZ4@-h$!
|
|
|
8bbdeac |
zNw$Ug5t9b*%o7~pj4d6u&l~2YKZ>jJ=2H{poz!JV>=cxhY7KUKy+;s#o&)q0Gf`Pr
|
|
|
8bbdeac |
zPa8x`n39uOKpevuF=?vP7pGLdSwpop3J!VMoV(_v<&~mw*-*^>R+7af7e(U7WY%24
|
|
|
8bbdeac |
zcj(d)$fiV*Q)%^lgzu+cg%83dP4hPD=6+sZ-gNRwDaMU8pLe9i-hb}usO_&hISn`D
|
|
|
8bbdeac |
zNzo}LcoqD$HHx96^yjHTNJ&m@Wjvncq~fmWP?$e{JYLt|`AK2sF@Rgq(%2;;y>TyW
|
|
|
8bbdeac |
z|HZUwb`WuUNmuzK3U6T;`x<^+yH;Rq6F{ivXWUycw|Lpehk<6;=_}(nhrQOhed!~d
|
|
|
8bbdeac |
zFDvbV7$Spf39)RpGklsG*ig|Utoi~i1A**dxlUpOXY!o`0zqteq2GQE0XlGr@RiJp
|
|
|
8bbdeac |
zexu|`TluImztQ17CT3eT><R*qs)>TCCOUEGSu%gcXj~U08K*-e%@z>&Y1HTX3s-iF
|
|
|
8bbdeac |
zy{&6R9-2on5&Nx=r?wnVU_ZIb@7RoBc;^Xv8M*zr8spYl+0$ZqNEwb`HG{cX9VC4l
|
|
|
8bbdeac |
zt|N$vjJweoLyDi*W3-2F6B4s-a5f-H%4Gf;{D=>SzL$%%z8?zj{&nC2U^mC~uHmG6
|
|
|
8bbdeac |
z%e?3MU)2}fYqSV!bjy6+W_hxXN%YI?rBo4%^G-pzR44P6wr%8(bM$Ba7?pmp!xIt&
|
|
|
8bbdeac |
zxC-L?o)jTRRJ*H8bW-`1w@eG9s
|
|
|
8bbdeac |
zjeMabi^}|^a18H$!x3|J#HnP&l>SQ%?bs;4oXR}jKD95Gz9cOVxj?ApQX7QW3lqsQ
|
|
|
8bbdeac |
z>WMt-YY7b$VpL@r8_o@a
|
|
|
8bbdeac |
ztGJk%$({UxTzfuKSiygMa#kP3r!?~_za|OS@DV}A7G=UMyt=|~m6)r4Rb-RKlMPVi
|
|
|
8bbdeac |
z22`|AHF?}6?v*;$qhBxzE5Vu5E6t!fq(9#^iTFLCSFpEJ+JUj_A-
|
|
|
8bbdeac |
zUZH=iW#nL(M6nktL@}!
|
|
|
8bbdeac |
z%CQp&ns#
|
|
|
8bbdeac |
z#biHR8OsHGncJpZcd3TD(Q$k!>
|
|
|
8bbdeac |
zk6?{mJGOA{Lf_&)Tvzj83Ez*}2s^pRI$Zi{J74WfM#w%5n>%}0ZQhuu;N-YZ%{$%*
|
|
|
8bbdeac |
z`)Fy|V2S=PA(>EtZs{yhZ4t;hzDl_;j%)o9<tb>&KS<_IV292*UKq^7U{pFNJSak{
|
|
|
8bbdeac |
zkBh*LSPd{l=z7Lu)oZ!mIhq3`GzJ1yDbRo$W6sn`iJWfP^}u*eCWox4O=SjX6OB#W
|
|
|
8bbdeac |
zv81mK6B^a54rtvV1A>qN`=l=R1ZKSB13n%UqqGVNT9-jSUT7R%7(I28cCmxsL|*-<
|
|
|
8bbdeac |
z{aZRl^X2z4h{{C|9fC^!F|d4^0=zJ{3CGp6aYonm<5SunUbZ@H=wkSWogaZS%xlU8
|
|
|
8bbdeac |
zYXh~F##OJ>{q2q1wBYYXHR2(Uq%6#7nZmo}srUQ@4$ArUZqGGj`JAvK^6GtjwWwdh
|
|
|
8bbdeac |
zWpPnkuXyz^b^Pg@mK0(fWwrL*l8i5)XY0|m1Ejc3xDHXWe{9=`ju*G>1)Z|OaQi3W
|
|
|
8bbdeac |
zvGg8W9i9$rr$o)%?M6hWpAec`Rjk=A2$wJ1uAcatYq|4#c=b+*%WMS(62#pc1;ZuC
|
|
|
8bbdeac |
z8OICOuCBMvs62$^wbk)V)VPzI=bO~HUBdR+y&whPj1v8u<4v%OSLb~{&sQ!ZZ*WOY
|
|
|
8bbdeac |
zcwZ&OS8>KiV%4w$byec?{-B!a65X7WsKOP5FK>crB
|
|
|
8bbdeac |
zOVvZ-`vUJALCc1c;c-;TF!_Djb^jKAbI{K!)47ti>v}qJ&(IAYKz-
|
|
|
8bbdeac |
zguzg?b|9sn!nfKKo8p&u^v-T}eLChmZ48afAu@ReibVP3xVC}6VWrcDRDQ-p)IwHx
|
|
|
8bbdeac |
z@4M2<gA*^ry6rZ!cRfeCq-9e?ON#H`(enZ_d@uaPr>%l=a8K-r)!8%*lhG=BtIRPp
|
|
|
8bbdeac |
zHF4HGx9C=$;PIZx)re}#Q+ib`Yu#2`>u)D(yg?0BA&p3;;gzSb&
|
|
|
8bbdeac |
zs
|
|
|
8bbdeac |
z5=8~ta=}a)YZF2`!L1xIcMaCIN?!!w{bBF_8gAEhu?dEo_GdYwgWm|}0=0(1K5=DM
|
|
|
8bbdeac |
zD~~%D3
|
|
|
8bbdeac |
z3yZJkxwPJU|Mdnym?gq)=OX5-nQ<ZvJ&MOV%!M`>M7WR5BLu2LQ77mJ{=Bp-LQ(3Z
|
|
|
8bbdeac |
zQy{m*Z6zKp(h1^YWT3=3Kas)_Ls%(06uFIsgiiUlioumb)X<T>w(v5hKP&Gu9NX4o
|
|
|
8bbdeac |
ztk#VW&jaqi-6{Mzue`+J;OL)qKp_)6)-(PLM5xC{o4pKH$j~oH(3ihijLK8nPfM#}
|
|
|
8bbdeac |
zv%sDCnaD+k9XR1+2#-HzPvu-W9VXQ8w{q^_fsK=Ou42u|R4)6%C;X86SPnMxDdr#+
|
|
|
8bbdeac |
zBDYnu6XFChLx+|dn~jVprZAZkh)0AV60KJti}r
|
|
|
8bbdeac |
zocZ>|1oq#`2XcIh5Kg=eM64eQKkFTUlS32fout0@NP=$;5(Q;y6K_V%*^`O=h-0t>
|
|
|
8bbdeac |
zm_%#MR4Wpbo@~{2^i`a_40~1Vr
|
|
|
8bbdeac |
z1)ureGnn0o>CjaQ(8nofs?j;tG*`}<d)z6Xwwcf+vYx!uOssg>wT9ZpgWo2=I=b-F
|
|
|
8bbdeac |
znk1=ZKP9M0z3))
|
|
|
8bbdeac |
z^g9&IWN9X@1m0Tm(rPJ}*?^H|<@2SGDI-jq33|}5hb~0pLB|!#Pkmy!>*GLICiI2I
|
|
|
8bbdeac |
z1#A)qJA~RLkWsrMfqo;hSE_a)riOV%Kvsf&NZhm@FM$KR&D`nK{#@0(3cgsj+~oYs
|
|
|
8bbdeac |
z0TPfggr0l2HxVTYO|vDVsekY1BZX5#l?A*QRIIsm!WK9yJbnbooB`1_(Qdlu+r|p4
|
|
|
8bbdeac |
zSB3?bIILWP1
|
|
|
8bbdeac |
zeg0!lh#z_3o-u5%z47SIpvd4Aj}lO}$M(ItcaCl?ThS|AJLk0;uj`cK@UREea`|}_
|
|
|
8bbdeac |
zc_yn-nZmvsB$>VVJyBkJ!&))kT2GB8+bvBqbij%d>dy>vPLWs?kiG--663TT-
|
|
|
8bbdeac |
zKUJxMD8`;DWVYXWvu+50<5x$izQ4zDhIE2w{JH01Bur2n%^von%vpx=c0Y0#w>}wv
|
|
|
8bbdeac |
z4$`1QC^$E=el5;(@OX|8qfGJ~`Q^CIcn#>L>QW~A1k012(bUZNCMS3t8+clNu80GV
|
|
|
8bbdeac |
z5vw|pWhmEN32Q4Q6?vgXPgyv1MQA0{6^H>R?b5A4ss}cGmA8qN@!6~Z(pn4RKnuP1
|
|
|
8bbdeac |
zba1j&G98Yp;Qa|pKS_T-R_^|&K}96;G&i6nm%xRkAd47!us!ecr~awC`L3!23rbMK
|
|
|
8bbdeac |
z3T5|j4Qvh7BN{#z4Cr&g;bnij*>wR4`avanLM8e_B|5Xj;NdZ7;GOpqEhQS~Jlv<@
|
|
|
8bbdeac |
z6cqZarY^nus_wo|x5r_g+sc8U`TZ!m7$`?#VxzNULQ~ob2NC=UYVaUzjIFQ9Ief}L
|
|
|
8bbdeac |
z*o6k9xPGW+eK3{Wh(a`O5>Gw(Mo8}%)+QEOV`PyN$%%;3^twZRgGp7+r?K=prv)JU
|
|
|
8bbdeac |
z$<-0X!}JEE=y7&)(hD?uC!9FJ$;wzf=S1L^I-=nWV*X1i2s>l(XiiDLbyY-@xN=Ej
|
|
|
8bbdeac |
z`pijzoMS9T5o<r`V-9>sK>-+vI$~XLalv3-70_%&eIUpS%B@3b%$dwI1J3^O32lup
|
|
|
8bbdeac |
zgo;Ucy)V?*N4$mo*)l3ilfE9J#6#bf-w8Lre?H`bfo;>fzT4KUYf`aJaJRX~=Q-ju
|
|
|
8bbdeac |
zm}Q7os2$0bExOK^{%6tc1~972dxkb|@rPxW*Ga__O^qcg4Fx^QJZKRXyDcUS|HXDZ
|
|
|
8bbdeac |
zBZsq@$dSy%@p=h*1}Af#eUXvF<$U;LM(Rw9LLT*K_5L{pgpsj0-S^N|R1wD~V|APo
|
|
|
8bbdeac |
zf$Qpsk~4^N-d3X)R1wR+b&iR^WpzZqGl+XmsUVb%#j95(d!0vOx@IFhkB8QL8mTEJ
|
|
|
8bbdeac |
zYC77YC}(RI-v~L<&p1~=8?{Fq4HY$F0ve{qb4|joxAf$|wIUc4{pt4JF&#KitZ8IS
|
|
|
8bbdeac |
zbGz-2kP$rqsKY7*^2IQt!*QmcG;6AxCd`A8rJ;!@){DL@cy}lKu5K<(8I}-WR7l8f
|
|
|
8bbdeac |
zxI9IcuNTRrVP>yMeph5u3BC5Hvi-UYx4We;*f%r47Li|AmK*Rzrl-agZD<|*v|b;M
|
|
|
8bbdeac |
z$Z)lbH=}%TRxFWav}w8DdWiNy%HKkUqdYu!|2?O^aZ~v?3($pw0X$=y;7a}mP3)R_
|
|
|
8bbdeac |
zr60}`J#KoqWVy?K#E^P%=22HqP7xnMp1U7vfL&DV-U(SFzk@~tY|vyf;G#KEY;hHW
|
|
|
8bbdeac |
z0~ps0)=>j-w{9r`M3EAg-MS|*EykLWuUxVN8@GX+zzJ*OoKCl8%V&BTKto@w6&R!)
|
|
|
8bbdeac |
zta_~lc8AK+A{gJ7;^)7~MbyO0sMMk7FqBeK+LN;U&>O&d;nI1=1M9!9*!xuWfVeCi
|
|
|
8bbdeac |
za+y4BtCXt@l)a}>61`bHUdTj#QvkK$jjGmNV2YfGZ`aSi%>BCgmbq!v)8|;dv9zW|
|
|
|
8bbdeac |
zgR0Px*f3&O-_=*53v6E>rlJ0z0Q0MQ8roq`gV$c8b)rF)w6UpG#u{9(o#WcB%1roo
|
|
|
8bbdeac |
zlueaco6YG2V5qoTioTMNH~66oR?@{m&O({9&uuQAglaNmq9mWQ+S%asdH;^vU|I%a
|
|
|
8bbdeac |
zyORZm^5MR+R@=G!CboWHd}-2t#y)kOv7@^=POAUqymYSJFYXqY$(w$pET@@~
|
|
|
8bbdeac |
zaq<>ObaSOD*32ZABFr=KVGK%L9O(CYCy!N{5
|
|
|
8bbdeac |
z3j$0X?-5N5h~BAvA81^HJu@cHe)<&Ol#}zZ*M73hb?aY2TZrn>JcLvX2oE`Reg50C
|
|
|
8bbdeac |
z=k*@Cc{TV2NyACBqe6c)JH>YAcgLjpX3x=+T|(W8@-;Fl2TE(t+VZytIqiGX_Gp&0
|
|
|
8bbdeac |
z6x9BZHR~~$&valJu{}JFM&#h8CV+s48By@h-)od9gwk}TkRXhCFp9=kU-7OTW4}3q
|
|
|
8bbdeac |
zInx|FAqw4UZiChDI0crk6^=V_)!XoL29$V(9=kg~REOA5uWwAM>V>pUIaKeDW!KXs
|
|
|
8bbdeac |
zm0-*{MfR=TRy9`D>pCRVC#qU(7K}Mtu>{#oyTno*1fvY?y^JRmlWe~YI*TZ+g|UkH
|
|
|
8bbdeac |
zFb~%jbeY%OAypj4xzr2{3(7{ZX4O^8Uw;%J>z$$pBif-=9(-Tum*YriaN6_GQVXPs
|
|
|
8bbdeac |
zyG&`e*wz5x1U5mk=n^B}A(?HCKSqxLbb_6!2?PuLvEKVp&}3+6FvjKQC@=6rQY%1F
|
|
|
8bbdeac |
zfM(SBMWbsvaf<8raEEHr*T~5Rd*p7Ho-xO};pwe=`%7xjVr2Ik$t5FSLkZlr`!gPk
|
|
|
8bbdeac |
z)Bxdqt~+Hw*WsfYsX8)>1*&?BtleQ}2hfs15P#SXPj0`XzL6qvAm4$lXYCWK4G9a!
|
|
|
8bbdeac |
z5w}St^8;Yy8Bw5KI!MtXkcb+SR|7Z`l?$jDj#eDHd)bT3CVH7gtiU!j=8qi`TmcG~
|
|
|
8bbdeac |
zROko?i-uc3D6jq|g>-v@`<*g6y){&V@y
|
|
|
8bbdeac |
zf}4M#3>uRH2Dy<Ml98G9c>Rc8A!I3svhZ9Q-`sblEDDn}yflGPsm>?|L>-mxRWiDC
|
|
|
8bbdeac |
z@<|6hBS}~a4VeLV9I)iPShA@fzUiOtaf{yZ
|
|
|
8bbdeac |
z?351vIufW<@?neyQ3dg2bUzwgKn8Ild^%MTO26XRwj4c)kU3QWT;-&=(Dxz31y9fd
|
|
|
8bbdeac |
zN5;_zrZr-Ym(t&AIfwVV5gDI>g@$J(Y(G
|
|
|
8bbdeac |
z5|?20KSv%}CYwKy+qPG=j{2ZgVh?m|VzBT#wo@z51ao_Z(<8+H1cmN@9)m2zW8>6H
|
|
|
8bbdeac |
zumm7N3k2I3s=|Vzj@->aRg%APK#%$e=c4ygjrD93yl}boFl*BOf$eilbxJW
|
|
|
8bbdeac |
za2@-vL;pTxDM*dl?C9=M1}tc**sMI%-*XQZVmdd)CJ5ZYu95yd!nZc}e&($_FyetX
|
|
|
8bbdeac |
zz#!D2
|
|
|
8bbdeac |
z-2<8Fv<6_%NVd`SgGS&FYh`nJ+%)?40rf)%(;RaHV>38u^sPK<`g3|0`)rrtkImsT
|
|
|
8bbdeac |
zLo+x@f@e~wTf*)ZgU8b*5fKbdq{8kRgU2l<QDHXI>
|
|
|
8bbdeac |
zAJgA{UWqt#7`
|
|
|
8bbdeac |
z^EmxxoPXQEE88xNl#Qw;iZ|1EN%k&ghMxKT6dc77n&#g%+G6VS0`L&qO?0@k)~U@0
|
|
|
8bbdeac |
z#wy!;JpKB(@s>qFOYsZUL(tW|wIm8@78(quT~fqD5@`a6-N3ig<3qvI2Vs;(W6eI-
|
|
|
8bbdeac |
zidO)d&$gr}*fphlX^Mm-ZM!?D-&O=3nP1yUF+~4v!IP!{q?m_wWdXo6!eGU>g3Vn7
|
|
|
8bbdeac |
zT5MRqI88Lx{KIkwmxEeJiJxAr)FknMEV%KGe4|Gn>nR;&gEo{s
|
|
|
8bbdeac |
zRLRvzd#;4vRNhk
|
|
|
8bbdeac |
z)M7*0(g&++>DnVh%B<~^VT{g-ZE9g8fXk=ib&RU7d523IRe_Q*EjkKw^v;o{0ppbn
|
|
|
8bbdeac |
z3GFq#MqS)u$&}%00W(S=1Q8XKGvOFt7u1>J<7oskBpLU%!WC!43%rne8p(-58eQVF
|
|
|
8bbdeac |
z765(pX6@1owt!qvTvMT_{{x*n{v%y{F0gilRSei3qqFC4U7t8yu842k4ck%xwxmK(
|
|
|
8bbdeac |
z++|31H#>-|5bw~e!%jTrqYlzeysEQ~>~am0A=`<SHe|Yj&D*0rjWoJU9(DR4@b>wM
|
|
|
8bbdeac |
zPAW}i1s9m;9j1dl6*){K@qtccLD!dc+)vn=4-s!$M9dHOmZZ-iUTL)HM$C@^a*O+`
|
|
|
8bbdeac |
z1HIPcqi2AN1CwvMynX%;`d2plr~H@xl`Z}$|E1sZkyR_%aq)&sJm2K
|
|
|
8bbdeac |
z?ojhd1%ALHJC66;6Ypn|0>H_9RKv#`?$_PDZt7rSJWpg6lCSAI=j&^;y$oRfO_t~J
|
|
|
8bbdeac |
zUN$>SFiA~VcGTX1kWOl^ayidse4Nj>p?e0n*d8v&y`4uoumloUwlD-i1UAO~^Nb)T
|
|
|
8bbdeac |
z)8~$NB)o@m)e`aP)Ciwz$g918jaKewI$C;CG4J=o!*8`|x68L$?H_9Rf2e`~s!McS
|
|
|
8bbdeac |
zN9DY|UIu`{3pO!zYwbFN<0Z>a32utI-n!y`LWoDhgbE!)9;gwf>yyQ>g+rZ;|4IOf
|
|
|
8bbdeac |
zI7H9SPCZ1UEhUnbk1SmWT=-&CRs8AerVa+Oz%=x$_!Dqr59?Fp?U6hqrPa*Oq!EZ^
|
|
|
8bbdeac |
zf?ms!xFyL>QOQWre?+eo3eqx+9c1pib#f;JOU_xqy8DspYSYlkICKsEas3N5$Qsj7
|
|
|
8bbdeac |
zF%134lY>#vGO|=EYAB#Zs(yP=^1dGjr65&^pOC%obRnB*VojP}tnBHyR1FaX1@$5{
|
|
|
8bbdeac |
z%m&k#OE~?BghOi222c8@;ZdtjN(Gp>cw)x(MYB>%oPEht!J{hs{N;W8^!HeHEvX6>
|
|
|
8bbdeac |
zJK+Cx+_(3r
|
|
|
8bbdeac |
z#u-3o#W~0Dpu=!Ho{G$1Q9W1WR~o8xfw4ll2wTMD@~qvK%P5G=HWxZq?1@h)v=`J}
|
|
|
8bbdeac |
z+7_SbJnpFZ-g&SW$SEKa#cUlgXW{oejm|ONiC0ncSe*_7YVxEP4ftoNZVjYSQ
|
|
|
8bbdeac |
z0j%o5&-J8t_cxYC;ZlfZHj5Hnf9*M~!GUZI>(dW_jk17efO;QJvDAAar=0%#*kspc
|
|
|
8bbdeac |
z54wI!gg4`7(A}~`p27wpk~$aLDo%=L1tin6`u&{hPqs8^I%8AxqV}!>XzIQDrpojJ
|
|
|
8bbdeac |
z!}RCM_`3RVg-si~pu`*C#@O@%({>BQmS?Hf7pZVxmJl>*mJknh4{!!#PJG;s=el)a
|
|
|
8bbdeac |
zM(N`<T$xeC!D`=rvL`2nO-csWWDE}ikrsE(jSCXRWJrjN^*FF)bG`VdR0BNC>Sa_E
|
|
|
8bbdeac |
zm`|9zcISQI>g7sqm7eT!31bNTWf;A9XMc@tHUKOb8Hl|09{pRJUr~s2D3Piv;;_}a
|
|
|
8bbdeac |
zePq_l%{n#KR2c2xBCcNp`!(6to79DhD7mo#W0|4$k8lQ$rQeJb4shK$|L;GrgI~Nc
|
|
|
8bbdeac |
z0lU_+l4PONQI0aJ+Z=T2>D)E4b5C_$@FZZ@
|
|
|
8bbdeac |
zl(m*qY(7an7LK`wrKt^FCWK%%Jjv9smFdNX>)Hk}KrWQyD8?!>V+<_7Fgd>m1+9Cm
|
|
|
8bbdeac |
zuFaAwA}gen>K;))_W&kg>jqBZks89^pdV}jP(xOBgGWtQ1`Ek>koSh$`S*6E*oBQp
|
|
|
8bbdeac |
z;hec7PR__(WrJVCI=x~iWUGLzKgAn)Vm!!r*E7(r-@<^}WSvJqIy1tIV4ksEX2Kt6
|
|
|
8bbdeac |
zvg?3t-Y;nu+q@?cd0x$a_0{A9Re{!QKHC=pTv9gP@?=n;K0Apx
|
|
|
8bbdeac |
z&z3vCq?3DyCnqXDW3$ylox$)JLu@~z{!F&MU{`o2*=_dK`ygvH?!sB{zMGqRDhm8^
|
|
|
8bbdeac |
zeX*8-@4UO+O2_g!I_P3&f1aH1w)X?bjQcv=-{xffni%=vqV<`E6mZr4&Poclo$}Y9
|
|
|
8bbdeac |
ztLDY}9nXot3*{N=$rfp~I7K6~dy0!Q)T#=FA3kquC541_Fu((0uZesDWtZYXkj^{D
|
|
|
8bbdeac |
zsODpZ0X$8BNvH;U@ICIr63?8(P<1R9FmCBFPhoV=cy}o8_OQpof2Px_4{#`p6swqZ
|
|
|
8bbdeac |
znwa&PV+mtxrP1e?bPTaGU-)v2vDlc5*IhAHz@H1@6-v-B;r(rY>C(WahFSJxl-dL2
|
|
|
8bbdeac |
z*lMPU2jiT&-rC}vLehfqjKGc?J)9b3#U0}1epUG$Ic}m^dvNCNwL&wL+Z(~fYNj#$
|
|
|
8bbdeac |
zV?Ua~>=-9D*^}$a`HFNT%C4X%M`M{@rs&uEqK*(C7ZvA0V+e6{$EkhMw;uc3IS?rK
|
|
|
8bbdeac |
z1Gnr>dbiXw-cMl{N@pBe-;7qgQ5Up;6RTP3cnHRmt1izP#jjL#G7m`$Lh$G&)t7`q
|
|
|
8bbdeac |
z61X#JnXDq1CEyhbYi48fk+U9kf)KwPH0)G@m^4JtsRXC)I5$FN9VNNmSzFws-^TkE
|
|
|
8bbdeac |
zY;R?I<u7b54!Z?Nn_Bp;W>IM0f#%R%sfC~D!y|W&Hsjiu(}BQ|FJ@EY5m_l(7PfAD
|
|
|
8bbdeac |
zxdlpkLBI;sLR>bySTUCexZbbii@QH~>4a~w$~q=z$zgy~8TQ&C&s_vcYALwSGB>vJ
|
|
|
8bbdeac |
zGm-7C146Ak^+yl$HOstV`;o0o(T!xHrJoy9%rn2&az;;j&kPd*;Ib*HV3aTCI?dMD
|
|
|
8bbdeac |
zj8))8qtpLPA6!Or=@{7R?R(iqgJ_^;en&D8BGPwddg8&!O@vF2byR`
|
|
|
8bbdeac |
z9$gx~FN+%%70-rGY^bS|RpWAH#>W|zqG_@=XriK;+>|+NmDpyYS+?QQ$ed8=9)Tl#
|
|
|
8bbdeac |
zNx1yI4)lvp`83vHbE1FW6!a6x@^jog^OW)oZ?;ui;DsJUHbp
|
|
|
8bbdeac |
z|0<>k*U$+hlei1iTRo3m!c)8Tsa0Y`5LKA}fyRiZZPvHM?^xM^qM6l}Z6*q@2>CRu
|
|
|
8bbdeac |
zIU3D%v3UVKV%GsR=51qvrsmiP9Ui*5OC8SLK7euttviG;0am06DW8gB$=X(r{o(;>
|
|
|
8bbdeac |
zS+tTpN|wgZOA=WLLhqbUKjBn5mwdPqQC>H0Wn<)|>{TwS3^0cRKnbPVIKaZZ2=;Yh
|
|
|
8bbdeac |
zmOc_$(BwAs>e8hdF{q)eSSB6eNGq!lVcF&>AqcryYG=Plc@oN}h~yzA-a%9gyf=7(
|
|
|
8bbdeac |
zjEKlE6lehfy0Da_jL
|
|
|
8bbdeac |
z3ooL*O?3^JJm$%aG=qyMeEP0vD8K8E%?{Efb1GFe7nt@Zi5feF#MD#|fQ*=nP3t;c
|
|
|
8bbdeac |
zmf%z<`3>g8w0#E@@?D?=FW8TQa=%feGorA!<c<k-`TLz?)%jFG(!@S3X>htlW2_1>
|
|
|
8bbdeac |
z329AS(X
|
|
|
8bbdeac |
z2EI2A_tX(FGnXo;IMP@iL+iHw4`OZkx%(ABXVC?5(qX$n=F)csk~}8rSf-Zl8q{it
|
|
|
8bbdeac |
zVU>
|
|
|
8bbdeac |
z3E}2E@rS3kd~{t9TUwrR&sR5HCA3}bBGFuwu-dcn@{99F(gi4;1LpkH4DFRh;Qq!O
|
|
|
8bbdeac |
z4T_eLd#*4MF}1eaFj}R%dr8c*qi9tu1?I|UucOFzX&tX8eP_75g_0rW^@YDn8l?rb
|
|
|
8bbdeac |
zoUMY>S@!3gArQpyb;)5OO0`N%^$|uWb5gKEl_d6Oi{Pv;JM9UQA-vC~ywx~AKUPy(
|
|
|
8bbdeac |
zrVZ9}yxdk*aguxVLL$=JDgibH0QZ5!eg3}{eSP&+&FOBzk-d$M6JO`w`O&&r`P{R2
|
|
|
8bbdeac |
zb3br)+3YG<5t$`?Cdqo^2CpZZG)$i}m}Ry%#AdQuCuL?mnN<4V2$$=Lj^F!?k5_-+
|
|
|
8bbdeac |
z{V`^D)z`axdf%?O>YXk4+x5IG?CZB=!_Q~U-k*zl-|YH_=W-Zd)ny9@nFs&w#I5~5
|
|
|
8bbdeac |
zsXHx0rFY7FZdsE_X>JykM%?q}T$uU!_LOX)A4k=Fb*^V0Zhf`j0Po@*D_IuXJ@EJ}
|
|
|
8bbdeac |
z^83Rwp);|o*mmvUXl`%eh|_#r|7q)q{cTBgZTn<$J3Y(<4MS#bli+3SlAfY;yg2P-
|
|
|
8bbdeac |
zUeoQ>H`RDP_RT*dByu8NaDwc
|
|
|
8bbdeac |
zNBk?6RlVYubFObac&}_vgrrzn|7Ks?$V30xK?{VpemnN
|
|
|
8bbdeac |
ze1NNjkpS#qA9P*lXZ9ep_yU=@PVj-50$V(fyx$gd5CsD410G+Ij5wA8T_f^lOYn{W
|
|
|
8bbdeac |
zxXzEjMfkw8h`^h3(RCs3?f|XTM*v-Z)NPqCow#;?Aas5b!`v`{ycYyDuo3zoM;#&f
|
|
|
8bbdeac |
zTH=`IAohk3Yf1tZQxJPah&5#z7E=&=M{t`0+C72*XRw%px|amENucc;2*3v1ID@_^
|
|
|
8bbdeac |
z19@)=#2i?n0_lTo5CQEjK>#}}=HS?CLVN<4ip5amohG
|
|
|
8bbdeac |
zDp1oimn7;=6qt8lVT8P60JQA_0X%_0k989Ux)I1_3TSHq0<4fm-e?fu%?jL6&%huE
|
|
|
8bbdeac |
NgayD23Mbt`JOD+tDuw_6
|
|
|
8bbdeac |
|
|
|
8bbdeac |
literal 0
|
|
|
8bbdeac |
HcmV?d00001
|
|
|
8bbdeac |
|
|
|
8bbdeac |
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
|
|
|
8bbdeac |
index 2af85c3..efd9223 100644
|
|
|
8bbdeac |
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
|
|
|
8bbdeac |
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
|
|
|
8bbdeac |
@@ -1004,6 +1004,15 @@ DECLARE_OOXMLEXPORT_TEST(testExportAdjustmentValue, "tdf91429.docx")
|
|
|
8bbdeac |
|
|
|
8bbdeac |
assertXPath(pXmlDoc,"/w:document/w:body/w:p/w:r[1]/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:prstGeom/a:avLst/a:gd", "fmla", "val 50000");
|
|
|
8bbdeac |
}
|
|
|
8bbdeac |
+
|
|
|
8bbdeac |
+DECLARE_OOXMLEXPORT_TEST(testTDF93675, "no-numlevel-but-indented.odt")
|
|
|
8bbdeac |
+{
|
|
|
8bbdeac |
+ xmlDocPtr pXmlDoc = parseExport("word/document.xml");
|
|
|
8bbdeac |
+ if (!pXmlDoc)
|
|
|
8bbdeac |
+ return;
|
|
|
8bbdeac |
+ assertXPath(pXmlDoc, "//w:ind", "start", "1418");
|
|
|
8bbdeac |
+}
|
|
|
8bbdeac |
+
|
|
|
8bbdeac |
#endif
|
|
|
8bbdeac |
|
|
|
8bbdeac |
CPPUNIT_PLUGIN_IMPLEMENT();
|
|
|
8bbdeac |
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
|
|
|
8bbdeac |
index 9adbbb1..ed29d59 100644
|
|
|
8bbdeac |
--- a/sw/source/filter/ww8/wrtw8nds.cxx
|
|
|
8bbdeac |
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
|
|
|
8bbdeac |
@@ -2698,15 +2698,19 @@ void MSWordExportBase::OutputTextNode( const SwTextNode& rNode )
|
|
|
8bbdeac |
SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
|
|
|
8bbdeac |
{
|
|
|
8bbdeac |
aLRSpace.SetTextLeft( aLRSpace.GetLeft() + rNumFormat.GetAbsLSpace() );
|
|
|
8bbdeac |
+ }
|
|
|
8bbdeac |
+ else
|
|
|
8bbdeac |
+ {
|
|
|
8bbdeac |
+ aLRSpace.SetTextLeft( aLRSpace.GetLeft() + rNumFormat.GetIndentAt() );
|
|
|
8bbdeac |
+ }
|
|
|
8bbdeac |
|
|
|
8bbdeac |
- // new first line indent = 0
|
|
|
8bbdeac |
- // (first line indent is ignored for NO_NUMLEVEL)
|
|
|
8bbdeac |
- if (!bParaRTL)
|
|
|
8bbdeac |
- aLRSpace.SetTextFirstLineOfst( 0 );
|
|
|
8bbdeac |
+ // new first line indent = 0
|
|
|
8bbdeac |
+ // (first line indent is ignored for NO_NUMLEVEL)
|
|
|
8bbdeac |
+ if (!bParaRTL)
|
|
|
8bbdeac |
+ aLRSpace.SetTextFirstLineOfst( 0 );
|
|
|
8bbdeac |
|
|
|
8bbdeac |
- // put back the new item
|
|
|
8bbdeac |
- pTmpSet->Put( aLRSpace );
|
|
|
8bbdeac |
- }
|
|
|
8bbdeac |
+ // put back the new item
|
|
|
8bbdeac |
+ pTmpSet->Put( aLRSpace );
|
|
|
8bbdeac |
|
|
|
8bbdeac |
// assure that numbering rule is in <pTmpSet>
|
|
|
8bbdeac |
if (SfxItemState::SET != pTmpSet->GetItemState(RES_PARATR_NUMRULE, false) )
|
|
|
8bbdeac |
--
|
|
|
8bbdeac |
2.4.0
|
|
|
8bbdeac |
|