|
 |
f085be |
From b9dcc06bf04c7a60fee2d5612caf3ca9a4d2d273 Mon Sep 17 00:00:00 2001
|
|
|
f085be |
From: Rohit Deshmukh <rohit.deshmukh@synerzip.com>
|
|
|
f085be |
Date: Wed, 22 Jan 2014 18:03:21 +0530
|
|
|
f085be |
Subject: [PATCH 061/137] Fix for Footer is missing if fisrt page different
|
|
|
f085be |
header/footer is set
|
|
|
f085be |
MIME-Version: 1.0
|
|
|
f085be |
Content-Type: text/plain; charset=UTF-8
|
|
|
f085be |
Content-Transfer-Encoding: 8bit
|
|
|
f085be |
|
|
|
f085be |
Reviewed on:
|
|
|
f085be |
https://gerrit.libreoffice.org/7589
|
|
|
f085be |
|
|
|
f085be |
Signed-off-by: Luboš Luňák <l.lunak@collabora.com>
|
|
|
f085be |
|
|
|
f085be |
Conflicts:
|
|
|
f085be |
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
|
|
|
f085be |
|
|
|
f085be |
Change-Id: I2a2f2abc0dcf5542b7b950f9a232d7155a055fdd
|
|
|
f085be |
---
|
|
|
f085be |
sw/qa/extras/ooxmlexport/data/testTitlePage.docx | Bin 0 -> 16479 bytes
|
|
|
f085be |
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 8 ++++++++
|
|
|
f085be |
sw/source/filter/ww8/wrtw8sty.cxx | 2 +-
|
|
|
f085be |
3 files changed, 9 insertions(+), 1 deletion(-)
|
|
|
f085be |
create mode 100644 sw/qa/extras/ooxmlexport/data/testTitlePage.docx
|
|
|
f085be |
|
|
|
f085be |
diff --git a/sw/qa/extras/ooxmlexport/data/testTitlePage.docx b/sw/qa/extras/ooxmlexport/data/testTitlePage.docx
|
|
|
f085be |
new file mode 100644
|
|
|
f085be |
index 0000000000000000000000000000000000000000..72bfdf81f886b6156144eda28ccb66ffd2ed394b
|
|
|
f085be |
GIT binary patch
|
|
|
f085be |
literal 16479
|
|
|
f085be |
zcmeHvWpLffvbEVUGc(7`%*@Qp%#1N(%xuS$nC+NiW@ct)j2$z^{O!XzIp^K_e!i-A
|
|
|
f085be |
zRi&+xMyqF}>F#OGtlkRJpkSy#5I}E$fPjdA%$?uTrvd{3y@dh-LIHXMqAhH1=VEH-
|
|
|
f085be |
zqOaoVVCt+(=V5C@m<tB-_9GAo;Qs$^|A*f|Z_0>O4+Em;UC2w&RQ;lq(%XXGq1;$g
|
|
|
f085be |
z9E%6w_bf58wvrNw3mfjZ+@F$2*<@wdAUw@Zo0yqWLU&x_A*CJon7PcJiw8g^r;BAK
|
|
|
f085be |
zjBi=r!4PO}Dq4^^
|
|
|
f085be |
zg}$fV?}Thy2Tc_tv4H(DYmm1ELuwRneBNBRkc
|
|
|
f085be |
zfkIrmy8oS}<|PIhlV9R3$pEnH8f0|8DRf|j!*@F9;ce<2RCO^r=+Y>;5!`dj1k%K+
|
|
|
f085be |
zO8U7nX5`kQbPUhhSXAN}?pN`59;>^X^k=!#w*8>QXfB2y)$D4k0+-Cq>3k#Du_dDf
|
|
|
f085be |
zZL1>J7Nyxg0F`rHRw>)n#sw;DKBT%UKsD?lRP@uce@=X%-b#6bf3P2_?050oyLa!j
|
|
|
f085be |
z=k?o;(1h3JC@#Q}CCuto;GK9yZeS{kOX76w_u^Vw<6mCKTQhZ)fYWwJ%X*nPjv#&K
|
|
|
f085be |
z=BKa@jam$9)82Lv<qJ^7*H=&=g}>P|emr)=8K6WCV6HF#d)9X{wQ;7W`{nn)cKm
|
|
|
f085be |
zcz<~GvV<;x9m5Ko1w98%wJ9!lVdlxv8&9raE
|
|
|
f085be |
zNu2a@&J=UqOwv8aPEmz>-v%{*uh*mf*y;h49MW3A=rQlG4V$rlYxX=$B1t(M6sd{!
|
|
|
f085be |
zegYdJ{(E@ZSSQLJmB{U05sW1<<;1KpX-!_Xqw2z4nlJOmbjG=PD+z6H$WmU>_E5a$
|
|
|
f085be |
zaV%eGGyX5B%(QW_-Rsr5y(&kEjZD#2ls7ckHVpJ+nej$t(Aej#Q%7ET9YuW+Av92*
|
|
|
f085be |
zpd#oWeav)_wO$V1?_=?^oe^o)>TlWOWa
|
|
|
f085be |
z3H@(IVq$OXY6}?pei`%rFc@IKzz4Yd|Mpg!JYpC0i{npzKp1>9BD8%_kYQ6Tu+e@1
|
|
|
f085be |
zhR4UJS{%&g`~IjUNR%(ChHl1*;dyF!YQVOVQxDZHkf9|hw#`5cJg5_)l@irzPS1`&
|
|
|
f085be |
z$}m{48J*B6fe>ml^X>B(H4E+uk@8#?lnsU@W(i^og_NwG;D~H7SKO`SCzp|_l;(WA
|
|
|
f085be |
z34RYKmWW)|xfy&?-fvjPU?g4?Wq$MS4wCk&sIKr6RIfII+fm@ONkWtLBnxDOB*J)M
|
|
|
f085be |
z^+=ztUM_|yfR<|
|
|
|
f085be |
zWk?d|?dG0C8@`x2s$>S8zxRI!s_ZX(Qms$l0eM
|
|
|
f085be |
zGsxl|F_XFRCaWulC@KMF+woo$)1K7pc1GIoUp25%oZI&T;GMq#0x%?iV*RRtKk8n-
|
|
|
f085be |
zs
|
|
|
f085be |
zeqU74hwY;XMf>Pv@<92guPoQRqbTvn+44^VVJnGW&MbpG-WP9rY}
|
|
|
f085be |
zk&p^)x&R9N=0TDep^r(jLpUiJfHhqdMJi
|
|
|
f085be |
zO1W*F|BM}Tk_Q#R`Ih+;CKF*PkAXzFlqbknWUOk^q%>NCupS68nJ1--#!wDRC{?;I
|
|
|
f085be |
zBr5dLVO-=D&P^ruono-4g`I*9x`<8EJLMK1X|UsNK9SBxvAN-3-E61_;e@bN9RtOF
|
|
|
f085be |
z%Hg6A!@KGUSM(4Or3#
|
|
|
f085be |
zHlR+cHn&vSSsJ-2E87t}nk#_J6-RcVJ02n=4ITB-1b?+zo!9ymnS5L+U%TPG>fAj{
|
|
|
f085be |
zP|^h(qa+0%Y=!J75@-hjvtx9Es%soFEv1x$S6f!f@|)YNsfdY-#ET%hY4dD1$Crab
|
|
|
f085be |
zWo3G2Ra=R@HZcQ~Xzw7!MQ)ghEHc<3&bX)gr=@taaHX>P=n0ihpxgboVN1)dUc0;M
|
|
|
f085be |
z5nH4lF(@v?JrIo(s>0S(jR9CnlE~+V6-9S(DjZP{Igo7Z-Y!ARDoQn#>FVNB1|DvY
|
|
|
f085be |
zLwZec)hZuZwV~Xp158Dks;IsXhsxtDMLfdVi60y+yqavX(1B+Pn9)Dd3TznaHlbn`
|
|
|
f085be |
zXsqqPQh#^dN}<v-{_1P`x%71U6U=#n>(O@?T(NN?lx|#Lem
|
|
|
f085be |
z`0!Qc1f1UK^u9qzGE>D1-&VLVstBSUSwD_;5NhiK_wXHYqljL1ANLk8OoDNzZ
|
|
|
f085be |
zQp!9jPP~sXq~0(1VuW*QJ%sPiRO~X>QBIDeq8^5fJ>j`xEDYOs)oK})UOgrTHQ;Q7
|
|
|
f085be |
zJh*3LLHpU
|
|
|
f085be |
z&Z9|Pb^rqjJp;Xk4?T_8Ws!v;kwbuEyH=}R0WGe^g{cz}OxW2w5nuX}SSK3Cma0pm
|
|
|
f085be |
zOw9j6YD;_e@|9~z>HsY*GhbN@*%AzO*v9GdaUphyR?=s)aFZ1?Ju&Ng*Y4(drFu-t
|
|
|
f085be |
z-+)jehp^{+SsgKj>KnGa*+?m?(;_V>Nc>?2w2zcY1;`2Yo6uawl;76NK#AH0g6~#s
|
|
|
f085be |
znkc+8edR%^;qX&7Sr9Cm;pSG`*xUkLMuNN)>!7(!YWn;GGFiq=yn9VhQH87ZCVjDp
|
|
|
f085be |
zS2;Z&<5
|
|
|
f085be |
z>fQ~@qbR%eix3+{afo+!a6*!OpmvscDwxM*Wp8`IHMm7LU{8fRC<^Mww>V;24)Vm)
|
|
|
f085be |
zyjXYvv*zF3nSL@g%BHrvK$s==Uc_{GDi9Ops0M4v?w$Bh7E_U#Kh`~-8
|
|
|
f085be |
zsw65$Zh2ra)yrM(F$~ossH3}4mM7j&mqKQLbpEo-Xh*v^X5_mfjIXQHx(9-mi$WjN
|
|
|
f085be |
zyAsgnuho}5wx4$~D>BpyCGgcsa^O6h@#}G{&e
|
|
|
f085be |
zyUL~nSiUzH|E3Sy<`oqQ0DV9J2LeL;Lmw
|
|
|
f085be |
zf=D9c{>I`KW;s6r^
|
|
|
f085be |
ztjy_?-%#JR@<*R4?1Ii=C5v65+BS;c)r>@1W}&7>3Y5Q7(oV@G2Foxw*6c#NF(yl6
|
|
|
f085be |
zUf(qwjp`0mK#3LRSI5Cw%@!=^sslja6#
|
|
|
f085be |
zE)XmWMl}SrVLD_a7cH2P48uHuWlb=#E{19Ah8t>09)+VuTlh2
|
|
|
f085be |
zl0ox2?r4#mitN#~F4}(lbJyw=b~ippuWvmXWs|FKCT1cqnk6E4A0iCD^Q{~znpe(u
|
|
|
f085be |
zeQ{@p#)}h6|IZshEqs+66XQv4@+b#W=nu{VR&+N|Wfg;A+E)kZn&`9La4IyKWp$1&
|
|
|
f085be |
zWL-!}G=a*oA2zVZJ}xa5%YBqIwWlQB4UnmTVktbG$vmh{+A=6qZEa?w=@E0%&{9m#
|
|
|
f085be |
z#gJn@Ma-6UY{-o`L0Mip#`(AY>xd61egO2}Ho%_$?7v^^+0=>Ym;NhLU9rm$Kzvs@
|
|
|
f085be |
z>nHGN2U>Ab|CU4Qq;XgqwSk~2bT9W
|
|
|
f085be |
zR;I#4;^~VxE;$L>0TbNN2LHDygl$Y|Q<<g&8d7ev!ISN8sToufG#qKPvI>W9Nz?1N
|
|
|
f085be |
z9CT4kWfYjvJ;8>Hdt*q*bdpIudsn3dkL7qatg~5)!?A)?q^YE>Bp@l|rjpE%vm!tQ
|
|
|
f085be |
zY1@U4prI#1@QIoW**5lh8n}CJ_j#kBC4rf~5{h{Xx=Kw#AEoet(rwu)t5H#bCDt3d
|
|
|
f085be |
z1USxq%pY>%O}bEIaWUhS@T>?|I_ImHez|VOD)U!sg!NAyj9nq^(%w5jdUqBWF^l*Z
|
|
|
f085be |
zB~6O!d@BVuwkPoPX&#qlA*T(&;1XM)XaVkky;umr;@;H);nFi!)&9ucz*U%!W=w~|
|
|
|
f085be |
zEKxC<TS25tm<nx@R$P>W39{vMHiuPn(=acKs#BQC7aGdyynUj`gTb{>yf}L1#^!cp
|
|
|
f085be |
z14o_a6L
|
|
|
f085be |
zu8_zIR85eb94#{%NmEf*(FF$Daf$w@#T@4gF*6|iqGU{T7VdLmE6p()*5fTLLla9+
|
|
|
f085be |
zSDYJ-dP5#9-giuVGcDuVu^*du2&^s${!LFhPkKcEVduZ;3F9Aj-b47Cox|PX%vPqE
|
|
|
f085be |
zWiirWpG6Vy`ztmh2MGJu1MGacZe_Mt#(hQ^`pj96V{g=sFG>#kFbE_g(PdbIxZGc8
|
|
|
f085be |
zNmXuL?~G!B6e@lt(7K9=!WwIE?CIKM-puqGs?>H+i^55%?<<p3P;vg2p;gj3;>Rdu
|
|
|
f085be |
z;7}n=Dk4jm_K)T?rq3BygeGs&j$&3qA(=Ku<*_*|9jn3YJ$gUsEA~8lpO8zq^OP1$
|
|
|
f085be |
zQ&q%|Rfxgv=HIg6ASRZ7l1s3Kg)>z7E_`W63WHb|&vuJdl8Vji50~uJV*8XDnmG5y
|
|
|
f085be |
z(sxC~_`0#e^{~&8Rl{T5Xb~9Ui@uGBn0@A}oXiq1+99HL9}#-{K5iCf#WCGQM~vB-
|
|
|
f085be |
z!^}tr@OV4u>QUo1k4N!ZOkqqO@A4h(=ayMN131z34K0rGQRzOsbpev
|
|
|
f085be |
zA!MGL{KxVk+>B`HW!Mari%gV$yQMkKo_-b|t-*u^uG6vW_Y@mpsg3i
|
|
|
f085be |
z@?U+#!q9Y&a~8+<bN+SQ{tx~4r=R|B|NZanzyC1K{%L>z9cTadj
|
|
|
f085be |
z?~apRi$2D#1LCAeK%DgFynv~l$q%1B((*eDhy!O5k9foz+7xR_3bRQ)YAxHL9zH-j
|
|
|
f085be |
z9MPi3Uu=q&e7*ZUtNlxb=)EKKnLF+$WR7pf^i@T@4YR
|
|
|
f085be |
z69+vDoz()+u{hs|+p+P}&C61`RCK{$5DB%^GV+iV+>sZ|UMRiY-
|
|
|
f085be |
zWH*q_z_~d*u`vq^Mu#Kp!k4klJm#9?CLTh}f`_J)YTwb)U4`*cDFbU7?&?xgZJHns
|
|
|
f085be |
zuMz^*B)^{P1gS<*!9kK+@R`A5QF+^qPJ6QsdAR|p1P#p!=tRo0kfmL^r^m_vIF{^-
|
|
|
f085be |
z`kcW+nu(_#LVXG=hfJsP?m<>!Dc9aWgrtv<IEc|ThiG>PBP7{-NnY?5HOqBW_NFIn
|
|
|
f085be |
zgA05Ew*%IL*pOuz7Ek;WwT`GVhnkMgql_muR`=|*umr5ufcHfW+;Azp>cwxg(GBPF
|
|
|
f085be |
z&b1TAuD3;Gj}Rc>G8smh5K=Z%MwywUwYY<%eWorSqk0#^a#Gb-45sXCMZ1oM{dk&S
|
|
|
f085be |
zv_F5hs%t$ZbZ3JdXNUor3P;o1+(Cp4lL}3sP1)IQhkvhm5->UTA?6g%cybAEY5e2!
|
|
|
f085be |
zE#
|
|
|
f085be |
zDgCd%zk1|jO=)`+aoi5|BX`Ubyr*!ygg20VF>thCxxEUGxMwl$kQ1k6X8lm@st#o;
|
|
|
f085be |
zB~;~JZ
|
|
|
f085be |
zK98km-IXdreD49UY<G%#%?5YF7Ey@<vOzz}^d-57S86@~(<bq{5>f;d$b*R8Rtg4X
|
|
|
f085be |
zvYjf`beJj4#8nb$75gr6KXf5+85jrw=ti3A(cF<2SwG8#LZGpMw=qXPpWwT(>6L7z
|
|
|
f085be |
zGp6rSNwY9~C}AI1zr2NI!<@SomNN;1atYQP0p$edKTT{I7KW7u$DysX;?pyIG%6r8
|
|
|
f085be |
zvVyXWs4(Z_)RjYwItrBw4hpQAx3
|
|
|
f085be |
zd$<N{I5e`Ad(N!Ra7X%S0sTDV#I2>tatrP)4jcM8&fHDE+*&t|0-Fup(Z>3r%RFr>
|
|
|
f085be |
zuxZZ?xX)SlzE@8_jzX^mla|0Y5A=9SLgDcWjx8LZjWqI3SXD|>b+Mdc(
|
|
|
f085be |
zgTP2M*|-n+CgJZoT^)E3QLTYJA~&by>UT#%$Y^0C^(R&8T4R-A(HMhTJsx%
|
|
|
f085be |
z+9)XQd^wx^UU%0g;7h4Fphi?CI$pQW!g6vu@cr(dy43AjX?FZx4{J7jpQqteOgC#P
|
|
|
f085be |
z37#)@r)uo^Ua!I+;lIap1~IkD8xv2tIz_>Iz=m>y#RYiqzV{8bOgEx{B9p5sbo|&t
|
|
|
f085be |
zRXw>tk+wJW#lhCd`#i-TeG^0vf8z@(UsSJ#BILOhs&*&uxMl`Sk*s=MSv5w#
|
|
|
f085be |
ze$!RpesQ{`tfud71C+a$EVQ;3A~dXbSi!hqq(sn%ynMvHf^Hc~BbDB>7&@1qgc>NV
|
|
|
f085be |
zjE`I-bKuKtJ|O9SV(c~DRzlpiy*E2Uw{qS$>X44HAyol4qe}_av}=tTfF6*Gb{riZ
|
|
|
f085be |
zwAK)%BSWC*Zos8O6X7C_%Ci&5cbQs6M3G+mjOi86eC%z5ydv@G>tIN0C?`FM`+YIW
|
|
|
f085be |
z7KiJROk#1=vqTJ`DC6?Ma0yrgwa5e!JclOssdkdamanVrM*gRQX&S-nag9c)K!+B5
|
|
|
f085be |
z3Y+i<L%sBGbBwZj^Nm;`<5`j%E&XuimrD%@Ygsp0HcQ;+w@!1TK6!ef8TJ!+bRZ9>
|
|
|
f085be |
z?gzR&a<@>Z!JrTAoE`S#ulM_{W!V$$WE0I*oPqKP%b~KZ*R#C&QFx_LBn$b68_1(D
|
|
|
f085be |
zUR4(4p~W1#MM$vDj_7o#i&62LM<}JaJ#UH#3(ZJ_nauG36PHlxFg3@!
|
|
|
f085be |
zua%%I%5FX4Xe*QHGr)0}Va7t-s4QfeHB=XuLuQ~pn|7iV%tcv6PD3YVO^=e?k
|
|
|
f085be |
zKNJNod-0;cMFe6&)ow6D%v5E1hMNR~CJacdv{^`ueYXW~IE>smnr35NQI^mqlQ4CR
|
|
|
f085be |
zCfhEY;+9P+gf&x~cI8%&q4{F|6|>fAJ_G;KarrXTVKvY&6NJA+8_mpc`qC#k<8s(2
|
|
|
f085be |
zn|(1WrS3>6h!&|N&I)7XZ61?0Cz7<;!$Jn!NmvbI=Tx-XjFD~LEqWb8tdqr%gM?3=
|
|
|
f085be |
zi7DII-FFQnM@;Ymi_ZRSprCaw)vj!RDG${&of#BhG%Gg)Gj(4*@T-pd-MIiw?5$Rc
|
|
|
f085be |
zL*y*2w63wn$*xhUBeWXMwT($s
|
|
|
f085be |
zro$h2fgvGDV6KG}(6z{Vujv=H)SXzqX=5QMD>xV_Lb8Yi3Kc2G6PoDnxwQvs(w@Ed
|
|
|
f085be |
zG~JE5
|
|
|
f085be |
zl~iT3*V2`NV>2b^A1as2jA_F^v#a~g6*|ZYKEPnJqw!^A**`u3<;E^vi$oA2O_)L=
|
|
|
f085be |
z
|
|
|
f085be |
zDm4$LEp_v2`Zz$EoOM52j3%+%#
|
|
|
f085be |
z2xn6l7fU<yUnfp$)mH3w*bv{*Px>)j>xg4$JJIxNayZVK8J^LV9z!Z1+oEiV5>j%H
|
|
|
f085be |
zFStuYT#y|RuZiZ!jHPoj3y=4)=jdVL9apJ{oTp>xfv*EyDX9e8o2}m!*?645C5g2P
|
|
|
f085be |
zsW|Xl!E1Qt*!jJlnB`EFu@;vAD>x)qJMG)nRVZ($@1Zm2SBOM&`dbrWO`lV;^9f%z
|
|
|
f085be |
zm4p=-uukU_CVdSe02kbLWii@kO(??ai;Gu+CYxVQ%QtExCp-1c40#IQm^UFB4mGSO
|
|
|
f085be |
z7uPp}W_(jopRX1Z{Y-=7uPt8vsEEuhmbK0Y%NKX5H+VF*O|pd*r1c(|8XTdw7$)vK
|
|
|
f085be |
zZ|8zLmwiKhvqgGJDZmqRamI4@!jB}J?hWd*1UYRjX^2R5c_JO0T45{>9VyjY6|#J0
|
|
|
f085be |
z|L|7rw
|
|
|
f085be |
z&TvWwDy)UGx1y4afta_4V#E+=C#3U*-PW@T&%y6?BC(U)-Y8{>=wj}nOR8AWTwy17
|
|
|
f085be |
zy3seL1ah@W`5-;uHw$;~)S<6P?Q5&-h)S2)*^87$eZ0ztXhH1|C~PFgZmuIo6Q*aT
|
|
|
f085be |
zhwfMI*}PLco~c9p02AFYG(#UAq{3{ES>I0I%Le&6jed2sHUK`+G&_}vRZr5Di5*fC
|
|
|
f085be |
zM#dE`)}U?{--^dB(1jGl&W}Sxt!Q{f7)?q*FKui<&x`ABKlAO)k&u+q7KO5P6Q4q6
|
|
|
f085be |
zSH|A%T+;A?m?cP5eS$AhAOX04)5Q~7^Uk5d4lK!
|
|
|
f085be |
z`OD!|cSVT}_=lbi1xY!yX6`i7oo^NTz`VqQsC3ny^a&!7CEqTXNu$IrOr|1xhl+D(
|
|
|
f085be |
zu|@O3!t{2DTJe`cn??FHaW`C3y<(oc`6M}f!@cw5s!h1gZW2ur53ef_(nIq+xDJK)
|
|
|
f085be |
z1(~3|NYW
|
|
|
f085be |
z-}{I+_Q1d@W9AThDswn+*Z}t-7GS~3LM~bxTZ*c{fsSP#LJy6_H_XJfDPd;hY&4F>
|
|
|
f085be |
zbY99+erOiGL!Psp;!bwpIi-PGknYaZVHG_s<0vaaDc+h}$f~__Y0Z9D`pNS6T!VPU
|
|
|
f085be |
zQ4Qm2>u$9cMoek~O_2G_mAm!TNCdn@W@2k=r}~>FmGg|3N61mL?TQh~IFA&YHXb$#
|
|
|
f085be |
zoIcvqP&Gjx`BBxNkz(W$g35
|
|
|
f085be |
zhOvCYMyD3L)`BIAJ4clyFLJYbfx5o@EpXhnRtqEP6
|
|
|
f085be |
z$pQk$5Xw00Za%X)NTH6dV7~xa5aHd5FUXyqU7zs(t6K>G;jQ$51-KM1z$E-1v8c0)
|
|
|
f085be |
zr_FDxF~?cD?ipO@p=ajh_XsrlV>
|
|
|
f085be |
zl5ezc#nNbRO~(3k$oh{VKe=}Z;lMs!ew(0)_C3!
|
|
|
f085be |
z{!LLujYeLB%GsCCYk%+Sg1g`I2)(@h$PwqBX+DtWJzM02_*JP^>)HnW4(Ei%y%e2C
|
|
|
f085be |
zMSJEDv2pT)2G6m1nTHPDtx-Cy23a97+T7L4R#(^IpwW9iRL+cuG{3kDrX5ey?K_xk
|
|
|
f085be |
zs@&0$CXFPxlM;jzN%W!II7WKux*1KaD<<+wG&3Jqf%I?~&0)
|
|
|
f085be |
z=>>lj+)W4Y!R-cigeICr7S*;&Eo92YuUSVgBK-v4qiAPJX9*%(x_xVNMsuvw)lILj
|
|
|
f085be |
zQ<A?R-dT-6CqVT*dc>z1<+pE@mC;Fct<qN>Gd(}+R4!s;r6$*WZ
|
|
|
f085be |
zRB({j(_=PNVAtDUowSEA#*}^bE~7D;li-
|
|
|
f085be |
z{&YBc4VqE6#j
|
|
|
f085be |
zmng9KFHMw6=*Pv)w5_%pGFpTNg~%T7zmDOwICL{#D3U@=WT9O(NqoQKoajjA(WHMp
|
|
|
f085be |
zStc#hMI14$c;V;5$q
|
|
|
f085be |
z$^*ynL#z<)QTX)Iirc=E^~RW1F&tjoY-o(Wl`sW;9g%Tx>f+>*wC&d$Y1=`Amkb
|
|
|
f085be |
z&u+hYvEU5gSzX*%oGIMcrAge_RKTtZ*ij~N<#Y2mvw6gvc`V;=sxaM}eo8zR&$c<+
|
|
|
f085be |
zKjjk(c628|?rv;}1u|S+1NFspzx$5gzs8#x=I9=~4!9J=nyoEgmy2Us(~5muot~sh
|
|
|
f085be |
zM~$!gbl`wJf;NIG#=`S%atC}!4%y%+ehfbxa>mGv?`#~=c=~+Dv%tDZVmvq9Lj%1u
|
|
|
f085be |
z8-Lj$`*pLV)P^L5^u72S8jm^}9$w^x8StEozyro285^$R3a~t%bXh1T=Pvv~4IcUM
|
|
|
f085be |
zmP(=oSm@8eYByIp86t?JuKn9W@b(`}Om=!G6yeXP;Ud=QXOd99*jXx#R)sD=Krpwm
|
|
|
f085be |
zFr;lI2Xw*G!{Uw=HxEvSdks&AbBzK*pz?9~Qr{Yu+~4-vt!Fp-(plJx(=y}L*VQ#s
|
|
|
f085be |
zs+*GIu9LLzu*?#u&hwsVUUTfVFM+(MHjJ^?5r=MNEfb3;t*JxKF7l2t+VREvH{_yp
|
|
|
f085be |
zb9#|JoUOv_7ApH%7vaZs+elb8eK>YsCagY`QCJXI9;FXCY1Mt0kMl}*>z+2{{e*YQ
|
|
|
f085be |
zrUo}rRR>%ls+h3!5l=d
|
|
|
f085be |
ztAgp$j=^-DjPiXi3fFc%l}VO$#U4U5X&a4SGVOjDYN6V)z%~CYJ4RRDgbkxd*r^h^
|
|
|
f085be |
z6ZTrgEfe{4xE;jB#miOES3NqH^b+n+i0^u8$)kg5w=$a>?N^5zme?Mj-fupoTiDZw
|
|
|
f085be |
z%OPMb77%g_&XT4h#?P`S?*{H-T6w%~Pbd$)4-R!xKYwtiK%*d*)2J_|zyn)X+SyLT
|
|
|
f085be |
z_IqO{9C~N3_U4^l_^`?yDZ@dnVN>SI_|BH_T6vVjIP5!3wf(2O^rH_JT&w4n-4J%)
|
|
|
f085be |
zQM-yu;1Rg|pxoR**?r8}9aOlz)2pjd*QJZQcuLo7J!T)dTff)vqz@a_%N%l50VmuT
|
|
|
f085be |
zfRcU_N~f!7&0jU{Az3x-$y?X&PGaN
|
|
|
f085be |
z0mXS?#)D*gYT#mxvVh*~EWV7oK9_e%9tcp}OaEbCnhFb_Ftb9IaSwNlQ{g-yJcMWQ
|
|
|
f085be |
z?5hc((YTNaZk4(RCE*a%nmL8$oM9&&Y<)pu2Ug0-lY^pIVU3a6J@b*8XBo@2!RW$L
|
|
|
f085be |
zOes`C&eGN
|
|
|
f085be |
z8U1X*q@Q)-&R7J=O_CA#j>P5;V&&nfwkfB8_Ly0|m&qC%+P;v3_lUrT$&2K>hx@q~
|
|
|
f085be |
z`4=S5X=Y@*D;M`&uas6K&-q_YTqh)UW}*k__<aoejID_?UH2wR`>#khG}Y0|1GU*#
|
|
|
f085be |
zk|jP5)}!)#8_tFMEP~-!R*5d)`rz45ura~&;t>`3gc_Cgl(gP{Nzx2^oBWFSFc^cy
|
|
|
f085be |
zGIp!hk-fOS8lNt5ht27yJ^ax6+z(##!tT0O9HFdtS)A-V``SI%|90nWV7(`rV9I;-
|
|
|
f085be |
zg2W3!z*nR)eh?=HI{_fkI1z9;?vi9O4~>U-Q;Zrj7N^|6XV3zik|=M^U(+8@%C#x}
|
|
|
f085be |
zF&Y}lA`d=|@;lPoyufq9JR#`iV#EM8DiJ^lg#kxiw@0R;p-;FX5m|3>T;Oll0SF
|
|
|
f085be |
zUvIP8TwTY(H&Kxg#6csT6bpG%t2pN4=&xwVGhWQV2S6Yj{a8i>VyhA^0Jv2_417ya
|
|
|
f085be |
zECjVy@%Kx0?Q;yP#SHl7DwqTS2oxh#{%=kDy`o>+^Uo$)(V@dLP(=-3q4kGhqA3YQ
|
|
|
f085be |
zK~w(Ow%;JXoDLTg@(ljfdfj_Vdc_A{GyeXZo9h>&j@JU}mEy|N@>RN{V*XOg
|
|
|
f085be |
zz2G|~KCyCkeEf8;JOU9JWuh@ks|i!rRBK=4fadf2z3NAJf>gfqPtvz~Z=A
|
|
|
f085be |
z0-dP_bSclo0*TKWsb|(C7{2kGV!vCHaKHo{U83nT2nvdOklvhPn`Lf(p=h
|
|
|
f085be |
zaF3pnBRt-!h+l#V##?2@=MJEV$IooYlLzp$4v+2%{3nxR;I~HQze-6Lt1{yX8(*W1
|
|
|
f085be |
z$$$NvoinK}#t&Rjgb{=>A1g$CEFK~WXB(Q#wOZ^8qGl!WCIQ=^yCAgKpoEA@#)^Z%
|
|
|
f085be |
zs2~)qY<4TCCI^v}wKG^6PO(c#SS4-tTp=_W8@WnJ7)0$T0Mdk>T*oRLIt4qoJ3lm$
|
|
|
f085be |
zyKFYj|F=@1xLF_+I#v;I0MJk=hzg6AmDJ!@k#RrDOP$@P84jI&8
|
|
|
f085be |
zu)28+2B9J?=VDN|iwN?WtXMUVvqH;B^a|yn^nl_zc}ia3@UU+)
|
|
|
f085be |
zq$m1_!l0mERa&paaZagdw$Z9Y*-EEwHx*l*woWqobINi)JVEAjFya4L48YndA@C4-
|
|
|
f085be |
zGj9DNQVwuqf<8dREIDh1mQ~^(a$5f={I!xH`o9$}=l|3K`MTQI+6xf!F}5>OWoq>a
|
|
|
f085be |
zn2MaPlU0Vq*$Kir4B)Z%>_bPQl3W@Mq}7%A)seD6C*VC^k>rSWRN0?x`)&^
|
|
|
f085be |
zK33T6Fir@ptydi=mJ||wqqCT=*KKY`)v9c8T&k&AOFq4fVZ)K+dMs8OTj*qGgLAJ_
|
|
|
f085be |
zs5AdCPk*BHy1E+y!n1^-Hb*P#Ta8`N-mz=>kUnQU65=<PG*SAnauLvE>HF=`^7)C~
|
|
|
f085be |
z-p3FEn%=;#hVe%HahpNjZ$Un|LA|PtvSe*?dTsvzRoHuZqaLoMOv{)czIhG%kvzN^
|
|
|
f085be |
zCtb*I$_!$CN?yw*Wg%aBFG=@tG67$d(nT(94jx_(VO%bQak~ARtZ6kC$n1t0FR#aJ
|
|
|
f085be |
zjLx7E!g1w^#eSJFsb2Zze(}p%O3L(QC-?3u`ygH=pT`E_f_Z0nYQeBDbCfMb(2V5@
|
|
|
f085be |
z@~pn-H~6*bPp+*O#nsYC`gg`Pht0lM1Gg267=Z@WCFIZi8463gF3a^`H|oMQLr0H7
|
|
|
f085be |
zOC~v=4e$l4+W2uMbUH~>Ku;2NTVidv6KxfgJoIi$5Z0X28S!k^w+`vTN9KyW2-GT%
|
|
|
f085be |
zaaV>aABV@i(y#W%0wf#Px^#!(#>Cl$9fTfKAN3E<+~ik>_b;$lo{xAuL9b`1N~!lw
|
|
|
f085be |
zY@B%sAlg{?+O4P{rdR9jBXv6nZr$teCb;o
|
|
|
f085be |
zULFLjugPaGp#L^uu5J6A2nAR@xd7~_e|)64n;I$qF#VA<)g=YWhzPOSvdK-;)Ubq(
|
|
|
f085be |
zrrAszuF@L*kx$^mczu@)`DlK{%^{w3xdi=9iX;;O^HbsycmENb21vntRA^lZp{G`8
|
|
|
f085be |
zt<~7bm5+lh6(t?5Za!G~QefKB^^?ssJ1<T4N7QG^WGYGQ>vGN11RU$WO5iM5O5y2&
|
|
|
f085be |
z7);%%1a)-04!g@v6f^a1;$DS%H=PA_vx##`Xjk2H2Wj7+xZ#QoCJ{8sAuf~qsR!lS
|
|
|
f085be |
zY>)JGp75`Hm>s+>M0jaaeMrGw%uueT#UsZQ%Zkf<rS23_9i4lx{ujUk8>^MbU$jM{
|
|
|
f085be |
z1t>~TnU%-<ouDxJ4CH)zW?`zHo81_dUcWmOg*>CoUZecmtLrs_h!h08wm<+W6$wCz
|
|
|
f085be |
z25?aooa`N(>5c83On+fs01^lO%Yz2!RAz#rG#~+HU<15Ec*r{=UpW2KiGZm*JQ&4$
|
|
|
f085be |
zd!i=SE^;_Yod$dRWxK2(-g`Iq*VpI9mVAw4*Tmya&$$oCQ&AtmqAUuSTqD*OMqFZ$
|
|
|
f085be |
z2^!;DE#Z>B0^!q^u4D*lkZVC!R@7|
|
|
|
f085be |
zji$xeXobi`af)RHqx0Nsge-I;&LvTL4`u16!wi()Iq469!c&OVXKoKv^gI_Tc)v4C
|
|
|
f085be |
zg-fGTm)$$mc4x)prkm
|
|
|
f085be |
z
|
|
|
f085be |
zD<4_>MLg4BpPL<>>zsfGj?Rt
|
|
|
f085be |
zk<G7)H=Cpzv&?`RvO(>N5Wf+|!7q%(Vklx6|G<QR*9>HgTXmE(=q8~lOwba0`mx3G
|
|
|
f085be |
zj*(psL`5K=<Y7_-dQ0bV_hIJC89}=QQd#;JozJkMyip*9#d;2PqmxBT*Jl18-@>&J
|
|
|
f085be |
zKcS6GhH73jcs(DrWAAHm;&l3$h9#I;?CCJV3QMcYAg|1TD=UoF#rJmU*T9l7=8SBI
|
|
|
f085be |
zT4^E<9OyVSKp96p7S}PRHh$$fNNSs@O_Jf{=Vy`e&r@^jgIQ@(O>I
|
|
|
f085be |
z5#6DHQrFIS%gd0EiEZn8>Q$9iPht-~Lvp;4zlgP}XO3tOM~dgGL1jCr1LX6S6o{F{
|
|
|
f085be |
z>JV~H0SPJu3dzT=ksejVa)h|JJYo<r<^px2yQW<^b5<U89`x`%=7?3I8KK>7rUV^Z
|
|
|
f085be |
zmKC*~t@7K(yw7s_C_Uc_KP2o)zfE$BVZO%iL6a{kR?LMhAdI5WCadV!t1MPcC=av_
|
|
|
f085be |
z@yapl&B_sNn{b2mVYYdL8|SfoS)zguhIEQlTd||R(ed(hQLZ}-ocHFgi!)&3mT%Z%
|
|
|
f085be |
zlD|JZNlrhcSXaDS7!?6x#_s+xJog1lgjGBC!b!x~LOL^iSi3W>-ViWHa-bM7@Ti#X
|
|
|
f085be |
ze`yxyX5yyU#7&Ugf8YeqOqULauZiX}o4}IJNs0^_55}f&#IERshP3nUm4w&?9PgD8
|
|
|
f085be |
z8}2<9F@03%w4Iq0+Y0LOS^elst{>
|
|
|
f085be |
zv6+<zl9~MaD;V5ffECn#>K&|ot*{M1Bl`flhxntvGjwqHue$^Ix!<=;C0XfS2E;a)
|
|
|
f085be |
zm$2zaHeE%ebTJc*i%krhHQq3jWr!J4QccI#Hs#NCM`PJ$>!UpD-f%i?H{{-Zh;=op
|
|
|
f085be |
z?KHzY!qi#Q_2rib4`z<>=8RCEgB{U7Klw9uY!8T^qh=1ovGhm1wJE!#Bl8>5NW!}%
|
|
|
f085be |
zMrWyKvDEo0n#)!@${L;0=;pMMCwrVvGlA7kRtr7XEgyV8=yCtyMY=Q-_qxya-Fff8
|
|
|
f085be |
zr~Y-E_&9#p)ItTin@)06tJL5U*VtB4535bdTFiUoMUBpJaI~
|
|
|
f085be |
zcskzpwWtwJdv{t87`lno0|;N19N=u)K}-ySoCsXFV4tqgPiyg1qrgj`bK$z(bEXU7
|
|
|
f085be |
z*_1GK;$7F@pdc->15qz{8%D&)qFuE0n(MdR#C0DG$vc=i7AZGe2yN5XFypcX=Mvu}
|
|
|
f085be |
z`a}6^KVWsi9=lj;tLSt4K??h
|
|
|
f085be |
ze;ofMNmoJo?*jgw2lxl@m*XTLe)=IR@MqxP6Qq6wo&&7uKc!3kEa~S&m%n5=0g{dX
|
|
|
f085be |
zk@oU4{O3G?zu*ag$>?9<f6EH^8UHgM>MwjQ{O|Z5SmZyWe`YQJg*F0^nE$N(cMkK<
|
|
|
f085be |
z=%2Zef1%$4M!Fx+zw$W#|It!_(Dn!Pue{2i(f{*vL!
|
|
|
f085be |
zS5Dc_b^pv^`r)~;en
|
|
|
f085be |
zpVvD6f|HQ{0snL5<7e>C-yna12bq2c|MW%jvxL8g;(y_RfIwM*fc_Df{|x^*qWVjK
|
|
|
f085be |
zH{0(GFaxCb{~2HXjQ{({_!k-o=!)Zq>VF?66{Nud9^se24L|{^1uQ!!bN_Po{{U_w
|
|
|
f085be |
B@YDbR
|
|
|
f085be |
|
|
|
f085be |
literal 0
|
|
|
f085be |
HcmV?d00001
|
|
|
f085be |
|
|
|
f085be |
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
|
|
|
f085be |
index bd8051a..e740174 100644
|
|
|
f085be |
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
|
|
|
f085be |
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
|
|
|
f085be |
@@ -2085,6 +2085,14 @@ DECLARE_OOXMLEXPORT_TEST(testBnc884615, "bnc884615.docx")
|
|
|
f085be |
CPPUNIT_ASSERT_EQUAL(false, bool(getProperty<sal_Bool>(getShape(1), "Opaque")));
|
|
|
f085be |
}
|
|
|
f085be |
|
|
|
f085be |
+DECLARE_OOXMLEXPORT_TEST(testTestTitlePage, "testTitlePage.docx")
|
|
|
f085be |
+{
|
|
|
f085be |
+ xmlDocPtr pXmlDoc = parseExport("word/document.xml");
|
|
|
f085be |
+ if (!pXmlDoc)
|
|
|
f085be |
+ return;
|
|
|
f085be |
+ assertXPathChildren(pXmlDoc, "/w:document/w:body/w:sectPr/w:titlePg", 0);
|
|
|
f085be |
+}
|
|
|
f085be |
+
|
|
|
f085be |
#endif
|
|
|
f085be |
|
|
|
f085be |
CPPUNIT_PLUGIN_IMPLEMENT();
|
|
|
f085be |
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
|
|
|
f085be |
index 2675cc5..a4edf4b 100644
|
|
|
f085be |
--- a/sw/source/filter/ww8/wrtw8sty.cxx
|
|
|
f085be |
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
|
|
|
f085be |
@@ -1748,7 +1748,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
|
|
|
f085be |
{
|
|
|
f085be |
const SwPageDesc *pFollow = pPd->GetFollow();
|
|
|
f085be |
const SwFrmFmt& rFollowFmt = pFollow->GetMaster();
|
|
|
f085be |
- if ( sw::util::IsPlausableSingleWordSection( *pPdFirstPgFmt, rFollowFmt ) )
|
|
|
f085be |
+ if ( sw::util::IsPlausableSingleWordSection( *pPdFirstPgFmt, rFollowFmt ) || titlePage )
|
|
|
f085be |
{
|
|
|
f085be |
if (rSepInfo.pPDNd)
|
|
|
f085be |
pPdFirstPgFmt = pPd->GetPageFmtOfNode( *rSepInfo.pPDNd );
|
|
|
f085be |
--
|
|
|
f085be |
1.9.3
|
|
|
f085be |
|