From b9dcc06bf04c7a60fee2d5612caf3ca9a4d2d273 Mon Sep 17 00:00:00 2001 From: Rohit Deshmukh Date: Wed, 22 Jan 2014 18:03:21 +0530 Subject: [PATCH 061/137] Fix for Footer is missing if fisrt page different header/footer is set MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed on: https://gerrit.libreoffice.org/7589 Signed-off-by: Luboš Luňák Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I2a2f2abc0dcf5542b7b950f9a232d7155a055fdd --- sw/qa/extras/ooxmlexport/data/testTitlePage.docx | Bin 0 -> 16479 bytes sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 8 ++++++++ sw/source/filter/ww8/wrtw8sty.cxx | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 sw/qa/extras/ooxmlexport/data/testTitlePage.docx diff --git a/sw/qa/extras/ooxmlexport/data/testTitlePage.docx b/sw/qa/extras/ooxmlexport/data/testTitlePage.docx new file mode 100644 index 0000000000000000000000000000000000000000..72bfdf81f886b6156144eda28ccb66ffd2ed394b GIT binary patch literal 16479 zcmeHvWpLffvbEVUGc(7`%*@Qp%#1N(%xuS$nC+NiW@ct)j2$z^{O!XzIp^K_e!i-A zRi&+xMyqF}>F#OGtlkRJpkSy#5I}E$fPjdA%$?uTrvd{3y@dh-LIHXMqAhH1=VEH- zqOaoVVCt+(=V5C@mO4+Em;UC2w&RQ;lq(%XXGq1;$g z9E%6w_bf58wvrNw3mfjZ+@F$2*<@wdAUw@Zo0yqWLU&x_A*CJon7PcJiw8g^r;BAK zjBi=r!4PO}Dq4^^;5!`dj1k%K+ zO8U7nX5`kQbPUhhSXAN}?pN`59;>^X^k=!#w*8>QXfB2y)$D4k0+-Cq>3k#Du_dDf zZL1>J7Nyxg0F`rHRw>)n#sw;DKBT%UKsD?lRP@uce@=X%-b#6bf3P2_?050oyLa!j z=k?o;(1h3JC@#Q}CCuto;GK9yZeS{kOX76w_u^Vw<6mCKTQhZ)fYWwJ%X*nPjv#&K z=BKa@jam$9)82LvP|emr)=8K6WCV6HF#d)9X{wQ;7W`{nn)cKm-v%{*uh*mf*y;h49MW3A=rQlG4V$rlYxX=$B1t(M6sd{! zegYdJ{(E@ZSSQLJmB{U05sW1<<;1KpX-!_Xqw2z4nlJOmbjG=PD+z6H$WmU>_E5a$ zaV%eGGyX5B%(QW_-Rsr5y(&kEjZD#2ls7ckHVpJ+nej$t(Aej#Q%7ET9YuW+Av92* zpd#oWeav)_wO$V1?_=?^oe^o)>TlWOWa9BD8%_kYQ6Tu+e@1 zhR4UJS{%&g`~IjUNR%(ChHl1*;dyF!YQVOVQxDZHkf9|hw#`5cJg5_)l@irzPS1`& z$}m{48J*B6fe>ml^X>B(H4E+uk@8#?lnsU@W(i^og_NwG;D~H7SKO`SCzp|_l;(WA z34RYKmWW)|xfy&?-fvjPU?g4?Wq$MS4wCk&sIKr6RIfII+fm@ONkWtLBnxDOB*J)M z^+=ztUM_|yfR<|S8zxRI!s_ZX(Qms$l0eMPv@<92guPoQRqbTvn+44^VVJnGW&MbpG-WP9rY}NCupS68nJ1--#!wDRC{?;I zBr5dLVO-=D&P^ruono-4g`I*9x`<8EJLMK1X|UsNK9SBxvAN-3-E61_;e@bN9RtOF z%Hg6A!@KGUSM(4Or3#fAj{ zP|^h(qa+0%Y=!J75@-hjvtx9Es%soFEv1x$S6f!f@|)YNsfdY-#ET%hY4dD1$Crab zWo3G2Ra=R@HZcQ~Xzw7!MQ)ghEHc<3&bX)gr=@taaHX>P=n0ihpxgboVN1)dUc0;M z5nH4lF(@v?JrIo(s>0S(jR9CnlE~+V6-9S(DjZP{Igo7Z-Y!ARDoQn#>FVNB1|DvY zLwZec)hZuZwV~Xp158Dks;IsXhsxtDMLfdVi60y+yqavX(1B+Pn9)Dd3TznaHlbn` zXsqqPQh#^dN}(O@?T(NN?lx|#LemD1-&VLVstBSUSwD_;5NhiK_wXHYqljL1ANLk8OoDNzZQBIDeq8^5fJ>j`xEDYOs)oK})UOgrTHQ;Q7 zJh*3LLHpUHsY*GhbN@*%AzO*v9GdaUphyR?=s)aFZ1?Ju&Ng*Y4(drFu-t z-+)jehp^{+SsgKj>KnGa*+?m?(;_V>Nc>?2w2zcY1;`2Yo6uawl;76NK#AH0g6~#s znkc+8edR%^;qX&7Sr9Cm;pSG`*xUkLMuNN)>!7(!YWn;GGFiq=yn9VhQH87ZCVjDp zS2;Z&<5fQ~@qbR%eix3+{afo+!a6*!OpmvscDwxM*Wp8`IHMm7LU{8fRC<^Mww>V;24)Vm) zyjXYvv*zF3nSL@g%BHrvK$s==Uc_{GDi9Ops0M4v?w$Bh7E_U#Kh`~-8BpyCGgcsa^O6h@#}G{&eI`KW;s6r^@1W}&7>3Y5Q7(oV@G2Foxw*6c#NF(yl6 zUf(qwjp`0mK#3LRSI5Cw%@!=^sslja6# zE)XmWMl}SrVLD_a7cH2P48uHuWlb=#E{19Ah8t>09)+VuTlh2xd61egO2}Ho%_$?7v^^+0=>Ym;NhLU9rm$Kzvs@ z>nHGN2U>Ab|CU4Qq;XgqwSk~2bT9W0TbNN2LHDygl$Y|Q<W9Nz?1N z9CT4kWfYjvJ;8>Hdt*q*bdpIudsn3dkL7qatg~5)!?A)?q^YE>Bp@l|rjpE%vm!tQ zY1@U4prI#1@QIoW**5lh8n}CJ_j#kBC4rf~5{h{Xx=Kw#AEoet(rwu)t5H#bCDt3d z1USxq%pY>%O}bEIaWUhS@T>?|I_ImHez|VOD)U!sg!NAyj9nq^(%w5jdUqBWF^l*Z zB~6O!d@BVuwkPoPX&#qlA*T(&;1XM)XaVkky;umr;@;H);nFi!)&9ucz*U%!W=w~| zEKxCW39{vMHiuPn(=acKs#BQC7aGdyynUj`gTb{>yf}L1#^!cp z14o_a6L#kFbE_g(PdbIxZGc8 zNmXuL?~G!B6e@lt(7K9=!WwIE?CIKM-puqGs?>H+i^55%?<Rdu z;7}n=Dk4jm_K)T?rq3BygeGs&j$&3qA(=Ku<*_*|9jn3YJ$gUsEA~8lpO8zq^OP1$ zQ&q%|Rfxgv=HIg6ASRZ7l1s3Kg)>z7E_`W63WHb|&vuJdl8Vji50~uJV*8XDnmG5y z(sxC~_`0#e^{~&8Rl{T5Xb~9Ui@uGBn0@A}oXiq1+99HL9}#-{K5iCf#WCGQM~vB- z!^}tr@OV4u>QUo1k4N!ZOkqqO@A4h(=ayMN131z34K0rGQRzOsbpevB`HW!Mari%gV$yQMkKo_-b|t-*u^uG6vW_Y@mpsg3iz9cTadjsZ|UMRiY-!Dc9aWgrtvPBP7{-NnY?5HOqBW_NFIn zgA05Ew*%IL*pOuz7Ek;WwT`GVhnkMgql_muR`=|*umr5ufcHfW+;Azp>cwxg(GBPF z&b1TAuD3;Gj}Rc>G8smh5K=Z%MwywUwYY<%eWorSqk0#^a#Gb-45sXCMZ1oM{dk&S zv_F5hs%t$ZbZ3JdXNUor3P;o1+(Cp4lL}3sP1)IQhkvhm5->UTA?6g%cybAEY5e2! zE#thCxxEUGxMwl$kQ1k6X8lm@st#o; zB~;~JZf;d$b*R8Rtg4X zvYjf`beJj4#8nb$75gr6KXf5+85jrw=ti3A(cF<2SwG8#LZGpMw=qXPpWwT(>6L7z zGp6rSNwY9~C}AI1zr2NI!<@SomNN;1atYQP0p$edKTT{I7KW7u$DysX;?pyIG%6r8 zvVyXWs4(Z_)RjYwItrBw4hpQAx3tatrP)4jcM8&fHDE+*&t|0-Fup(Z>3r%RFr> zuxZZ?xX)SlzE@8_jzX^mla|0Y5A=9SLgDcWjx8LZjWqI3SXD|>b+Mdc(UT#%$Y^0C^(R&8T4R-A(HMhTJsx%Iz=m>y#RYiqzV{8bOgEx{B9p5sbo|&t zRXw>tk+wJW#lhCd`#i-TeG^0vf8z@(UsSJ#BILOhs&*&uxMl`Sk*s=MSv5w#7&@1qgc>NV zjE`I-bKuKtJ|O9SV(c~DRzlpiy*E2Uw{qS$>X44HAyol4qe}_av}=tTfF6*Gb{riZ zwAK)%BSWC*Zos8O6X7C_%Ci&5cbQs6M3G+mjOi86eC%z5ydv@G>tIN0C?`FM`+YIW z7KiJROk#1=vqTJ`DC6?Ma0yrgwa5e!JclOssdkdamanVrM*gRQX&S-nag9c)K!+B5 z3Y+i z?gzR&a<@>Z!JrTAoE`S#ulM_{W!V$$WE0I*oPqKP%b~KZ*R#C&QFx_LBn$b68_1(D zUR4(4p~W1#MM$vDj_7o#i&62LM<}JaJ#UH#3(ZJ_nauG36PHlxFg3@!smnr35NQI^mqlQ4CR zCfhEY;+9P+gf&x~cI8%&q4{F|6|>fAJ_G;KarrXTVKvY&6NJA+8_mpc`qC#k<8s(2 zn|(1WrS3>6h!&|N&I)7XZ61?0Cz7<;!$Jn!NmvbI=Tx-XjFD~LEqWb8tdqr%gM?3= zi7DII-FFQnM@;Ymi_ZRSprCaw)vj!RDG${&of#BhG%Gg)Gj(4*@T-pd-MIiw?5$Rc zL*y*2w63wn$*xhUBeWXMwT($sxV_Lb8Yi3Kc2G6PoDnxwQvs(w@Ed zG~JE52b^A1as2jA_F^v#a~g6*|ZYKEPnJqw!^A**`u3<;E^vi$oA2O_)L= z)j>xg4$JJIxNayZVK8J^LV9z!Z1+oEiV5>j%H zFStuYT#y|RuZiZ!jHPoj3y=4)=jdVL9apJ{oTp>xfv*EyDX9e8o2}m!*?645C5g2P zsW|Xl!E1Qt*!jJlnB`EFu@;vAD>x)qJMG)nRVZ($@1Zm2SBOM&`dbrWO`lV;^9f%z zm4p=-uukU_CVdSe02kbLWii@kO(??ai;Gu+CYxVQ%QtExCp-1c40#IQm^UFB4mGSO z7uPp}W_(jopRX1Z{Y-=7uPt8vsEEuhmbK0Y%NKX5H+VF*O|pd*r1c(|8XTdw7$)vK zZ|8zLmwiKhvqgGJDZmqRamI4@!jB}J?hWd*1UYRjX^2R5c_JO0T45{>9VyjY6|#J0 z|L|7rw=wj}nOR8AWTwy17 zy3seL1ah@W`5-;uHw$;~)S<6P?Q5&-h)S2)*^87$eZ0ztXhH1|C~PFgZmuIo6Q*aT zhwfMI*}PLco~c9p02AFYG(#UAq{3{ES>I0I%Le&6jed2sHUK`+G&_}vRZr5Di5*fC zM#dE`)}U?{--^dB(1jGl&W}Sxt!Q{f7)?q*FKui<&x`ABKlAO)k&u+q7KO5P6Q4q6 zSH|A%T+;A?m?cP5eS$AhAOX04)5Q~7^Uk5d4lK! zbY99+erOiGL!Psp;!bwpIi-PGknYaZVHG_s<0vaaDc+h}$f~__Y0Z9D`pNS6T!VPU zQ4Qm2>u$9cMoek~O_2G_mAm!TNCdn@W@2k=r}~>FmGg|3N61mL?TQh~IFA&YHXb$# zoIcvqP&Gjx`BBxNkz(W$g35G;jQ$51-KM1z$E-1v8c0) zr_FDxF~?cD?ipO@p=ajh_XsrlV>)HnW4(Ei%y%e2C zMSJEDv2pT)2G6m1nTHPDtx-Cy23a97+T7L4R#(^IpwW9iRL+cuG{3kDrX5ey?K_xk zs@&0$CXFPxlM;jzN%W!II7WKux*1KaD<<+wG&3Jqf%I?~&0)>lj+)W4Y!R-cigeICr7S*;&Eo92YuUSVgBK-v4qiAPJX9*%(x_xVNMsuvw)lILj zQz1<+pE@mC;FctGd(}+R4!s;r6$*WZf+>*wC&d$Y1=`AmkbmGv?`#~=c=~+Dv%tDZVmvq9Lj%1u z8-Lj$`*pLV)P^L5^u72S8jm^}9$w^x8StEozyro285^$R3a~t%bXh1T=Pvv~4IcUM zmP(=oSm@8eYByIp86t?JuKn9W@b(`}Om=!G6yeXP;Ud=QXOd99*jXx#R)sD=Krpwm zFr;lI2Xw*G!{Uw=HxEvSdks&AbBzK*pz?9~Qr{Yu+~4-vt!Fp-(plJx(=y}L*VQ#s zs+*GIu9LLzu*?#u&hwsVUUTfVFM+(MHjJ^?5r=MNEfb3;t*JxKF7l2t+VREvH{_yp zb9#|JoUOv_7ApH%7vaZs+elb8eK>YsCagY`QCJXI9;FXCY1Mt0kMl}*>z+2{{e*YQ zrUo}rRR>%ls+h3!5l=d?N^5zme?Mj-fupoTiDZw z%OPMb77%g_&XT4h#?P`S?*{H-T6w%~Pbd$)4-R!xKYwtiK%*d*)2J_|zyn)X+SyLT z_IqO{9C~N3_U4^l_^`?yDZ@dnVN>SI_|BH_T6vVjIP5!3wf(2O^rH_JT&w4n-4J%) zQM-yu;1Rg|pxoR**?r8}9aOlz)2pjd*QJZQcuLo7J!T)dTff)vqz@a_%N%l50VmuT zfRcU_N~f!7&0jU{Az3x-$y?X&PGaNP5;V&&nfwkfB8_Ly0|m&qC%+P;v3_lUrT$&2K>hx@q~ z`4=S5X=Y@*D;M`&uas6K&-q_YTqh)UW}*k__#khG}Y0|1GU*# zk|jP5)}!)#8_tFMEP~-!R*5d)`rz45ura~&;t>`3gc_Cgl(gP{Nzx2^oBWFSFc^cy zGIp!hk-fOS8lNt5ht27yJ^ax6+z(##!tT0O9HFdtS)A-V``SI%|90nWV7(`rV9I;- zg2W3!z*nR)eh?=HI{_fkI1z9;?vi9O4~>U-Q;Zrj7N^|6XV3zik|=M^U(+8@%C#x} zF&Y}lA`d=|@;lPoyufq9JR#`iV#EM8DiJ^lg#kxiw@0R;p-;FX5m|3>T;Oll0SFVyhA^0Jv2_417ya zECjVy@%Kx0?Q;yP#SHl7DwqTS2oxh#{%=kDy`o>+^Uo$)(V@dLP(=-3q4kGhqA3YQ zK~w(Ow%;JXoDLTg@(ljfdfj_Vdc_A{GyeXZo9h>&j@JU}mEy|N@>RN{V*XOggfqPtvz~Z=AA1g$CEFK~WXB(Q#wOZ^8qGl!WCIQ=^yCAgKpoEA@#)^Z% zs2~)qY<4TCCI^v}wKG^6PO(c#SS4-tTp=_W8@WnJ7)0$T0Mdk>T*oRLIt4qoJ3lm$ zyKFYj|F=@1xLF_+I#v;I0MJk=hzg6AmDJ!@k#RrDOP$@P84jI&8OWoq>a zn2MaPlU0Vq*$Kir4B)Z%>_bPQl3W@Mq}7%A)seD6C*VC^k>rSWRN0?x`)&^kUnQU65=HF=`^7)C~ z-p3FEn%=;#hVe%HahpNjZ$Un|LA|PtvSe*?dTsvzRoHuZqaLoMOv{)czIhG%kvzN^ zCtb*I$_!$CN?yw*Wg%aBFG=@tG67$d(nT(94jx_(VO%bQak~ARtZ6kC$n1t0FR#aJ zjLx7E!g1w^#eSJFsb2Zze(}p%O3L(QC-?3u`ygH=pT`E_f_Z0nYQeBDbCfMb(2V5@ z@~pn-H~6*bPp+*O#nsYC`gg`Pht0lM1Gg267=Z@WCFIZi8463gF3a^`H|oMQLr0H7 zOC~v=4e$l4+W2uMbUH~>Ku;2NTVidv6KxfgJoIi$5Z0X28S!k^w+`vTN9KyW2-GT% zaaV>aABV@i(y#W%0wf#Px^#!(#>Cl$9fTfKAN3E<+~ik>_b;$lo{xAuL9b`1N~!lw zY@B%sAlg{?+O4P{rdR9jBXv6nZr$teCb;ovGN11RU$WO5iM5O5y2& z7);%%1a)-04!g@v6f^a1;$DS%H=PA_vx##`Xjk2H2Wj7+xZ#QoCJ{8sAuf~qsR!lS zY>)JGp75`Hm>s+>M0jaaeMrGw%uueT#UsZQ%Zkf^MbU$jM{ z1t>~TnU%-CoUZecmtLrs_h!h08wm<+W6$wCz z25?aooa`N(>5c83On+fs01^lO%Yz2!RAz#rG#~+HU<15Ec*r{=UpW2KiGZm*JQ&4$ zd!i=SE^;_Yod$dRWxK2(-g`Iq*VpI9mVAw4*Tmya&$$oCQ&AtmqAUuSTqD*OMqFZ$ z2^!;DE#Z>B0^!q^u4D*lkZVC!R@7|MLg4BpPL<>>zsfGj?RtN5Wf+|!7q%(Vklx6|GHgTXmE(=q8~lOwba0`mx3G zj*(psL`5K=&J zKcS6GhH73jcs(DrWAAHm;&l3$h9#I;?CCJV3QMcYAg|1TD=UoF#rJmU*T9l7=8SBI zT4^E<9OyVSKp96p7S}PRHh$$fNNSs@O_Jf{=Vy`e&r@^jgIQ@(O>IQ$9iPht-~Lvp;4zlgP}XO3tOM~dgGL1jCr1LX6S6o{F{ z>JV~H0SPJu3dzT=ksejVa)h|JJYo7rUV^Z zmKC*~t@7K(yw7s_C_Uc_KP2o)zfE$BVZO%iL6a{kR?LMhAdI5WCadV!t1MPcC=av_ z@yapl&B_sNn{b2mVYYdL8|SfoS)zguhIEQlTd||R(ed(hQLZ}-ocHFgi!)&3mT%Z% zlD|JZNlrhcSXaDS7!?6x#_s+xJog1lgjGBC!b!x~LOL^iSi3W>-ViWHa-bM7@Ti#X ze`yxyX5yyU#7&Ugf8YeqOqULauZiX}o4}IJNs0^_55}f&#IERshP3nUm4w&?9PgD8 z8}2<9F@03%w4Iq0+Y0LOS^elst{>K&|ot*{M1Bl`flhxntvGjwqHue$^Ix!<=;C0XfS2E;a) zm$2zaHeE%ebTJc*i%krhHQq3jWr!J4QccI#Hs#NCM`PJ$>!UpD-f%i?H{{-Zh;=op z?KHzY!qi#Q_2rib4`z<>=8RCEgB{U7Klw9uY!8T^qh=1ovGhm1wJE!#Bl8>5NW!}% zMrWyKvDEo0n#)!@${L;0=;pMMCwrVvGlA7kRtr7XEgyV8=yCtyMY=Q-_qxya-Fff8 zr~Y-E_&9#p)ItTin@)06tJL5U*VtB4535bdTFiUoMUBpJaI~15qz{8%D&)qFuE0n(MdR#C0DG$vc=i7AZGe2yN5XFypcX=Mvu} z`a}6^KVWsi9=lj;tLSt4K??h?9MwjQ{O|Z5SmZyWe`YQJg*F0^nE$N(cMkK< z=%2Zef1%$4M!Fx+zw$W#|It!_(Dn!Pue{2i(f{*vL!C-yna12bq2c|MW%jvxL8g;(y_RfIwM*fc_Df{|x^*qWVjK zH{0(GFaxCb{~2HXjQ{({_!k-o=!)Zq>VF?66{Nud9^se24L|{^1uQ!!bN_Po{{U_w B@YDbR literal 0 HcmV?d00001 diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index bd8051a..e740174 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -2085,6 +2085,14 @@ DECLARE_OOXMLEXPORT_TEST(testBnc884615, "bnc884615.docx") CPPUNIT_ASSERT_EQUAL(false, bool(getProperty(getShape(1), "Opaque"))); } +DECLARE_OOXMLEXPORT_TEST(testTestTitlePage, "testTitlePage.docx") +{ + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + if (!pXmlDoc) + return; + assertXPathChildren(pXmlDoc, "/w:document/w:body/w:sectPr/w:titlePg", 0); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 2675cc5..a4edf4b 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -1748,7 +1748,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt { const SwPageDesc *pFollow = pPd->GetFollow(); const SwFrmFmt& rFollowFmt = pFollow->GetMaster(); - if ( sw::util::IsPlausableSingleWordSection( *pPdFirstPgFmt, rFollowFmt ) ) + if ( sw::util::IsPlausableSingleWordSection( *pPdFirstPgFmt, rFollowFmt ) || titlePage ) { if (rSepInfo.pPDNd) pPdFirstPgFmt = pPd->GetPageFmtOfNode( *rSepInfo.pPDNd ); -- 1.9.3