From 3a5298de9c9ed9e916abcf03d3b3b297d55ac3fa Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Tue, 5 Aug 2008 17:06:49 +0000 Subject: [PATCH] Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-659571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664219,664221-664489,664494-664514,664516-668013,668015-668142,668144-668152,668154,668156-668256,668258,668260-669139,669141-669455,669457-669657,669659-669808,669810-670189,670191-671321,671323-672229,672231-672549,672551-672552,672554-672561,672563-672566,672568,672571-673049,673051-673852,673854-673862,673864-673986,673988-673996,673998-674347,674349-674890,674892-674910,674912-674936,674938-674952,674954-675078,675080-675085,675087-675217,675219-675660,675662-675670,675672-675716,675718-675726,675728-675733,675735-675775,675777-675782,675784,675786-675791,675794-675852,675854-676200,676202,676204,676206-676220,676222-676309,676311-676456,676458-676994,676996-677027,677030-677040,677042-677056,677058-677375,677377-677968,677970-677971,677973,677975-677994,677996-678286,678288-678538,678540-680393,680395-680469,680471-680529,680531-680852,680854-681529,681531-681571,681573-682224,682226,682228,682231-682281,682283-682335,682337-682507,682509,682512-682517,682519-682532,682534-682619,682622-682789 via svnmerge from https://svn.apache.org/repos/asf/poi/trunk ........ r682778 | nick | 2008-08-05 17:33:07 +0100 (Tue, 05 Aug 2008) | 1 line Start on bug #45537 - headers and footers from ppt ........ git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@682793 13f79535-47bb-0310-9956-ffa450edef68 --- .../hslf/extractor/PowerPointExtractor.java | 10 +++++ .../org/apache/poi/hslf/data/45537_Footer.ppt | Bin 0 -> 13312 bytes .../org/apache/poi/hslf/data/45537_Header.ppt | Bin 0 -> 12288 bytes .../poi/hslf/extractor/TextExtractor.java | 35 ++++++++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 src/scratchpad/testcases/org/apache/poi/hslf/data/45537_Footer.ppt create mode 100644 src/scratchpad/testcases/org/apache/poi/hslf/data/45537_Header.ppt diff --git a/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java b/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java index 9dddb700b..95900a45e 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java +++ b/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java @@ -175,6 +175,12 @@ public class PowerPointExtractor extends POIOLE2TextExtractor if(getSlideText) { for(int i=0; i<_slides.length; i++) { Slide slide = _slides[i]; + + HeadersFooters hf = slide.getHeadersFooters(); + if(hf != null && hf.getHeaderText() != null) { + ret.append(hf.getHeaderText() + "\n"); + } + TextRun[] runs = slide.getTextRuns(); for(int j=0; jNO zww8k0MGz2M2-8fV%9QdW6HqXWs9^c&j3N~y1T0Q*7@7_`6i`{P7FwX|_ucz$vb)(W zn+n)!@6Or#f9^Two_p@O@7|$jYliQ5@VMQQ7v_m02Q!sYo>gukO;8~uQiBBZ2Q!(B zE)+rXSU8F#@BwI@g2{6L0YDjmb6x=m0xAJjfC+$Vz(l|#fD3>M$TR@wzYg(az*Ila zvU)##6p7>ij?@bzj$cwdIY+t>Cu9v~t@JPz8e@b;TM$}*Rr?Q@JX>?^>vEqw^65R< zn3`^Ub+)~GyH$(Auy0tJF#2kVU|gnRiUv;>BHbpdWF=}yRq=4L*p`iI>M!Xi-g2~t z?YmFZ`7&u%-gxI zi}B6arSi{pJIu*KaAl8kDHyQiHRojHQ&_;mXh2|^_JHf($k^{@x$?F%8JW{$yGy&! zAkVv$1M6LRp<*#&kzcwC@qad?8G|%Ck>0VfPNqLr+rXHC{W|Zh6T*&@`eZN4mv60Y zV9Y>V+A`hk(jKKGjDODakJPxx1n1z7_DbYlm$Wi%OC`t&%Uv#K4?6n6e8e+7k#@v_ z{wii#!embM%4FVT5`nU$o+^eQ1kds`>qv)f-Gjnuaa#0DBAp7PFeYi95V%#vlI~@J zl&9zN9|n?YPrHcb3bm$Hb4Wzwkw^$^!}eFpgmeSqtEg$gt4T-j+OzR5Pgo&X;cXU* zf={ZFj1>e9%LYrquuOjo(@0!FwqV&iSfVo|?ViBy@=u30n`32#6w|H@RZK&t88SJb z+fE6v?XNZr?31T|@P+#;`krFUpJOg?ZvhyRNK?O8FBGPtczs&CQL z%sj*O5O+WJB1`I|Ti$ah28M1VOrBW7*oS6FUEnNLtH&VzY?uq&&%|mQs8Rz^sWHK- z1IgFdaY|gdp^l;jV=hItO#PZ*jF!sjP)?EW*RdQMUw|}q|6Id-dC^zDKP$DT5SO6r zOx4zu%@PlIPeNG|hO7tw?aHuuBY6+pbzph4qBa6*((c^~gPs^F0E5y`vaiDJYD8^6 z`(19xP4U%{gx3_0btNkyp!;0T6f4-MI-oTTN$861tP$(Z=SEuF(R)!mo{S{ec_tcC zElp>}%sV-#PRmmwO%IwejL`bJ(g#=Gb?$~IVauBim7mp?T~TRfnO#I`8(Jh?;UNWO zV1cAkDHU%WenlD^H;HW8B%21Y=WHv=*un|q8W7`>gn+7v72xx2^ zl%KB1jNp5D-&+cg!ACmQ{}!}FF=&4_z86)y)vH&lIFort8V3g@)6|6VN85n`&CA6X zAx1^}a#6#b8{X;FRtc;}}^=mS@(oiu_+v~MI`10*ja znOCi>b{bz}bd$XD26%$(7Ts{3YM1`&=(ru1U8?YrkLRBIz4Z2eM^c;nB{LY6*Is&L z1YZ<*NZ-79m#Dbqt5-@in!#LPT<~S)gtep-N;RH@EvfY6OH&K8LD z1Lb5|P)16`sH1!oT9vK^b{%Y~l~e&N^;uXZXJM($!V=2D5`tx{4*UsdU9r>8APz|| zP3u9cQ?AOLbX3KG^vNi*q%y7Twx-1V+ft?a5jpvCC6Im|ajjo&qn!TE25h;XM{+GN zl}Spvm-oqait6l5_zCQOHU9RSLAui4ctM{U<$la=%am_9uGIL{{Ca}1d6x8H^oi-E z7)5-utdi32dPpqjjI~|nCF5SCJ(l#&Z|#9~_L8w=XT%5 zEcHxmj&#)&8i-MYTkc=*hnW(L^{`O9G`T)?m{}{H-z$~!d5`B?`df2A4a*MzN`rKgB!+6{XoUgq_Na@ri`VZ=!1trznw$>&K&yB1x_P>bpnK{8TzlH(!)`Q zg$Zu3ZoK{b(r3N=SO?toTJ(XF3*iJD8u0m!1u2E{{2Ak?en;LF*!~tu_4o&i^ z@@IweD^pzL?pkFISezxyrqr8yCpS5m$YaCcU)Z!nG@5N~wwfOX_vwbh82=(vp z9G~wZatQnG>uH!Q7TvE(v+tz;QD8APM19r6ew%MYx_9x!Lp%6U*bw3|Hso;UVAO_? zhsU#cpf(n=7<)H-loo?~g|Qf6qz`WW1(p^J3jt=-CO+a-ND>ZlqYLODdLTSVN9y_<*CWW!hit;{SAX{2nBQk zv=rBgBg4N4h5wG11Bq!oh4OnfL(L?7iG}Tpz~^YhBrQ9RrT@}bRABYt8Tzwe4?2-^ ze)Y2C$?yPaAWn_aA)Y!8bs)0J6;ei*HHjh?sXFY;!Cexe_>tYp62yf&!D46{r`(-@X0q z{YyGRKfXCApPl`)7aLIa8z>6j0P#0KOyI3!omo4~{n6>dmlx+inoK2Pm<$IwO zV2B_7#rX22$YQ^9Q%23Fx8MRkgiF?ocajx>{fFYh0*h`%}@MoE@;)OJCsW za!Y;wo#mL9HkU)P1g%xNkLsfSbRT;JC-bxMMue2TXYa#&GxTx-70YKQVy&GjQ}|Eg za}>TgR=tXCY@MXClDyg6SkI_xfI*~YWX%}3ELT4VTr*`WAjUZuUsDuPvJiPx$q6qP zW;U4rMhZk;}b9`vSEm;4j?0=vEod+-x9G~-X zJ%BiS0bIxZ0FJ#4K+3iQxQ`40sHHmrvGGO8;<%MJ_T!xM7kCTeiSBr!H5rR{DSG+#i*yqQ zW1!24kyUvUyR#=K`j{u34EgbN5Kdg=TdyceWML%Qx~enjEsXTUR&=RloV7eWPpZ+4 zT}UobE{b<0d%O#KBJCp-8BR0~Z)s#@cV}xdl2cFVGTp5cZ5zqWsWd0WJX& z`000co?NINqVSMYS~w0;%--Ef>80#NDGf_(Gv4t_L|byRqkH^)>H?L%+p=vpzp@x> zqg?i?cU*dp<;q>5UhrLk$4kpgmdde)M~eiolcxeHT5g!}|Ba`Mjj-t-)6>Pj`Nupn zyC3D##d`ngB9D~Co-WRijQZw`-AjMD@Co5=HvS9ZW6v7#NCc`+AAn&z&l>q5gVvE3 c_*<3ZpZn3`7L=U@drI8g1&b2m(SYVVY@;Vrc<2;DA9;DZiOvDitFH1T75Gbik1xM;6pV3v~Uyd*4kq`_m>B zwHmV(}bM08|3vng>B4P${SkG!aw|ngp5*azStbwf0>9N|dWW)3WN0 zA~XEoih7a6@k@#)=Se&AgsjC1jy+9-#~9-g3&I<&YW~5}r>9)|hTJ9FKlxfVr@9ya z^p>?}r&WQIF#8&bU|yDDN(N6Bq1+^^WffW|Rq=F+*p`iE`Y+`u-gBgd{a-&` zUzbR|nrD?XD&4<;`J$LTfw>zoa}4G7k)e4d&d+^gY>?NXNJW|gBbDUoIzD;kVSY3B zSoP<=9rA(PmDij#P{5Mcol{Vs!Ui5f2NKJ~1MYu=4gN68m3N#fT%0aDUE)HuJnOO# z+g*7+cp-9;U%89$e=e*UgEiYwzJF7t%zUJxnmH54U3h1uke)lKTb@Jx%7-ednKO}> zp8XD&c$AV_{Bxauq~^s%XfFPUS0Z=1l$B*$N+C|I-0pJq;G-WdKt9_OX+|y>uX2{9 zmJXptWioHEh(ue`PnAM2f@gVJb(CvuJ%Yw*a2oVVqMQn(Fehc682FybCEdjenUJ2x ze*h%iemV%<6>BZ4){u;-BbkuchyAaXiRo(OSJBf#S5uDAwddkr9<#zg;eHEMp&hCw zV}-!OvY}F_R%X79WhAceCT`{|EoaFSviU_(BCb8^_Q8~Oh1RY zmxC;+ln!~{p&6JuP%zizT8ndNmQ)7LQLTCo^3SH}n=9q1SVc8mst+!em#j+g$QacF zbYGKb3RkYLd5AC}6nn=Q{i^tlNB6qo5Lsqj(IUK``42vF0pA+eIdCs37X>7*W#qoGD zlHlOksHDT1!OVH>jAC_qj(cfo(2dE=CvPYPTzSvA12KjzZ#mo+Y_{xRsabyx5vizd zkaW;P2`<74Nu^RMe`x3xsj2A^>FJT40c^*dew#LJQvKfFT`!rQs0`GgYc#)~;ny>e zkpWOm&4B!@B{R(L<-Kn!K87FV*zjw}62+vw+5BEm{no5mqw-AVU8xxukW5`2<{#+? z1+*?-UXC0M%`0V9{0S-u8tIn;7tVFbERo&MZdCF=y0$@$`TcDl8z%A3#$wp)C|1*%{A&m;4;UiuZqk9s`w%x|Tu>sylA(kq#P zsJ#Bt_F;Ze@S%M3=U<}ohA&+q(P##1fq9{qS&xh6pQPI7cvEF}{{~rqMTgw9;&d6f zUu6B3tKqW>-vfZmvD@g$CwY%is)OH^72CEKIxBrvaQPl^VtsuXqzZ7Ep2ejqi%Ufomv9!BFmSOv@CUGU z#ZEtkJS?F!(SxWnLDf6ysLBKBQ&49~XQ2 zLBMSWMZD50M9rq5Xf$(t%}khKG+V!+dsN7AD4o&{b*gl8b>ghHuhSMKlRj#+G`-4i z3+oiQEU8uMoKzoainlj=ZIQ1>+9oY)jU`NZaeQ?m+3GhejzvwGR^V;}uB}tA+VQ8>{g=p%bpl1KbIqplS?8-RtTW+;aIST@Q-YRWaqcOz;+$4w ztIPIJfwrlm+w3b^l*v{%9$^eq!odD1;!x!g>eE70epdD!Ajwrc*evjxpB|~!~61maGDWcE3RpZs?rqbQve0?};P_#ab z4T|eCdT);SHU%8Pmckk}qmR)@-AZAFns7#*i28LBumYAo9oIn|3w}NY=OS-XOJ#vg z4>u=bpEYQQCwpbNt3vygC@n^xS|vrSx4d(F*6SrY!iHM$Ue0+?jDJ! z)>Dw!ti%N0I=Rt`cjcbYbqc%2vtw4^32|L;-LzaAac7kNn>%I%`wRQmV3t-ylR`1r z)^8r3R@^uFS`m9fzE+37Z${39!g`H5C8!su@F~Ibp=OaEXSAyFtBK|zpK1RgH7=!rPv6qedLWm#QJia{+E{87PY$J%D z8+$oLq)-2FywV>8-+e!=rHVz*tFhrb<$oAl42G!ZeL(YE4EbOe?|6uV9|eYxkHL_` zU4sz}p$?B`=|FERgcvXVd`3+A}JpCK@~CPKOrTibfcY^vL3nTV+w7{aFdvFqG}%_reKW0lmvJfueMR| zLB@K-C^J#N4itcB-S>1OI$?~$C>)WAqwe_q`}O%Hh)=3sLTs2HGrIo0Ezv+^%Wwq9 zRm`55S`?Z&eQ)l}>WxvR9n@hXQV<<1Ntad)8ays~FzeV+ed=HmWy=Q1`YBGam=#0uke!itAbm|1f5+#a>wDGBdqSgUQPHjM0mULzD2zqb@jX4+ zpbiv3($6*6hg85PAWLzdI6`8MW%vD2Byk+?O!*9(X&vH^C0LwOCyUGhE^e5?+JEX7 zT2S?YS^81oHVmTXd=h5Kjx*TnSjw{iO+<$w%)+v2ThL^@c_(Td?E4RX_rY&~DnNW& z%TtQqk}%vj4#alSv2^5G-~e7Wm8dT$uwYqp9Z?!YKY9;Dey@TV z0gZjLUthA0{96*S%i}9`pWJK8aVCg;2^&jdO^JACJeu^DMx(K&2;PL^eW-pNT8s9r z+aEs%nXugF&A5*b#8@`ps+fK8dDQhoIIbk?Lh_w(3k2k&eQ~}BbCjt0v?Uxo;NSr> zk?N>YxxH4lsa-Zx?X3?qFSJtPIT%k(_S+n#U(xA$OFiH{(J^1yTqawEq&-THQA5<9 z9%B#l71^s51oZOf;K$rnWpbR0`L#r0Websqm7Va_!tDCBc%8wo2K+?+6!)^vPE~%P zCE~FRzp)&j&%XbFX7t=M%Px?!m5lzoaA?lC`Qu|Uqs@O$DxTVusvg!9(XZx>Jd~-J zMD$r>XI1q74z~a8=YRM7EptB}-nbe2|FnJgaR2vVF(?Dq> z$7{;Tl$+1QWaLG?^{%2t7Db|stJ{*^qDW_~r9BVO$}xxoC@dK+j<+W}y^A{|&BO8- zJv0YzS!7j5TVpaZs-3o}Z;LfYyk&d~*g4#Y`a`9Kc+{W3Pk(3U$;Ikplf