From 37236f2b52b97d1c5da71fe1dd7da7e083699575 Mon Sep 17 00:00:00 2001 From: Andreas Beeker Date: Sun, 1 Nov 2015 22:52:49 +0000 Subject: [PATCH] #45908 - RichTextRun.setBullet(false) doesn't work, bullets still here git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1711858 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/hslf/usermodel/HSLFSlideShow.java | 47 ++++++++--- .../poi/hslf/usermodel/HSLFTextRun.java | 16 +++- .../apache/poi/hslf/usermodel/TestBugs.java | 73 +++++++++++++++++- test-data/slideshow/bug45908.ppt | Bin 0 -> 70656 bytes 4 files changed, 121 insertions(+), 15 deletions(-) create mode 100644 test-data/slideshow/bug45908.ppt diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java index 1162cbaa48..0ba0fd87ec 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java @@ -90,7 +90,12 @@ import org.apache.poi.util.Units; * @author Yegor kozlov */ public final class HSLFSlideShow implements SlideShow, Closeable { - // What we're based on + enum LoadSavePhase { + INIT, LOADED; + } + private static ThreadLocal loadSavePhase = new ThreadLocal(); + + // What we're based on private HSLFSlideShowImpl _hslfSlideShow; // Pointers to the most recent versions of the core records @@ -127,6 +132,8 @@ public final class HSLFSlideShow implements SlideShowjfi$;YP(p9ElM4iv5&QECoY(_I&@krC|ZeK zUQ%bY^KJa!v(J8fd+*ge_2fQerJ?`0&-+0cP$rZG^@j#P+0a19hA;#u2g-#8L4%n?>!8KZ66ktpDfC6?2Ix!B-$OS-Uxxkx`U-RtR0UN-%b=T~Tc8@K7OI18g_c7r zpq0>9q1&L_p;gdoXbto=s2*Ait%JA^zm97Iv;o=(ZG!HAz5(3{-38qZZH5-Z(rV;% z(DGHd)~g(dNYV|Vw3zvxOt$FtBAN8Pr3nvVb?GfF$4mKL>ov1*Wr2-5|2a(D-#!5Y zv%$my&n@*ou({^Zio-eETj(h|bjiECwl7@bRIYBQt*>0YV%0ilIxnj+&d|qzn6T7t zKC*e;=e?t<>A|-~IK0n%V4Ap}x4yo<7Nss-TU*b2k(cWX5n1Xa5*zEot?#v0U)wWb znE&B_&Y*GQ+xGMNo)#CzYr1Ru5%{@Wb`FHLsXc^km4@%x4_s7LxuCr2%B2g~CWoEG z z47=E6D0#YCtzqy}bcy(J+mCO1>`Yt5a{u=q1ivxQ{+9RK9Vc{qxy=_sJVtmQEC}CM zVmE2PE>@4w)!4mwPjTR{N7!13@0UR<5X<`*@3Td)$>Wdvp%B^&@!n;q65v66yyNuZ zgn$qb0zyCt2mv7=1cZPP5CTF#2nYcoAOwVf5D)@FKnMr{As_^VfDjM@LO=)z0U;m+ zgn$qb0zyCt2mv7=1cZPP5CTF#2nYcoAOwVf5D)@FKnMr{As_^VfDjM@LO=)z0U;m+ zgn$qb0zyCt2mv7=1cZPP5CTF#2nYcoAOwVf5D)@FKnMr{As_^VfDjM@LO=)z0U;m+ zgn$qb0zyCt2mv7=1cZPP5CTF#2nYcoAOwVf5D)@FKnMr{As_^VfDjM@LO=)z0U;m+ zgn$qb0zyCt2mv7=1cZPP5CTF#2nYcoAOwVf5D)@FKnMr{As_^VfDjM@LO=)z0U;m+ zgn$qb0zyCt2mv7=1cZPP5CTF#2nYcoAOwVf5D)@FKnMr{As_^VfDjM@LO=)zfzLL9 z#<~*uPY4JBAs_^VKwk(DQ6&3C6Glh;x8FEvcz&+WG&4+N)ZmQu)x}p1G!Z*wG; z`8R)5YZyLl@ZiQ-|Ml|zj`lO{pPYN=#PMfVO?%>xX9nhHoc{UJsne@>F3Ig)?#qqq z-+py}M`!!Vw@urW@_afX1{ENz&(EH;Fez=TUxX6)jgN5Y&fu~D6@N^um0lbzB{WPy>-e@ zb}o7S!?q!oNB@5E{)^+T-m$x`%&A9(wx^Mm~FYN#5%&9lu_``P}+Nop1o#^fY zZSVctLwkOdH*Dyryn#9@uArTj7sr{E+rAJ0*lf1{d=%s*6H8B*m16{ z<-ODUcI@c*__f_DuSP*nten#Fal2=UNHeYSt}WM%-Bnw>;f4v$=zJuL^smnHT*J)P zKfK)0(SGXPKk2Brf;=rt;CT}ONHUeBJ5bp2RVQ)VFy z28IwF_iM4=K$s80dt2rB9?r1ojJXpL6X_M3KhqS^uWU<25!v)wzao|JIlCNT*V78R zooZ< zITA;uqup*Bm(lWYn-Zt*DJI<^deR1Z3Q!$>@njIn4QKeCodsV%$VZtOM5XkEJ-1d!^}I6P5rH%#N&^GTX7{y4;JCq0#pof4ku(*V_LJ+_dK>a+*JV?LEO?U z)IT^9*Ubh!AEGUa=1Yd3{M2ONCL?5IPzD)3G(4k}E^g(%gN+Q1#{4RxRdbs`|kLZ8! zo#%sdq0kS||D1CTePUu9DYph5_nzZQ`*U&qteGlSm+=(*uRw{eUS$--RhgNEt2_ff zu5zL)n;U@cD#S;O=RK;-RgA7OH(?I_R;@&6tXhe(X%tm-3!8nV z;n5RG7fxf4VO6TsWT1+7Yj59vwdoes!8V;W+jDrtoHj3nS&lQ}h7XrkO~HN+uBZdw zQXmjeS88sgl9Fa>ZVu6b0|z4MkTQ~%vxFLv93IZSYuBzwx=^TD*{Q25flZ>4MqD`r zHbc#IQR#HKB_$;sOUI5KQ*~Ila3Qs{v~)}7){kv)T~I@6YHCWDj^n6K*N;%wMC~nU z3{fNM%>TH(lyHp)b%+2G(P~rVFypO8=^kTLQ7r&pfHFj#Pj*OK-PJG_qL{ah1)4jZCD&BdzmlI9J zJI@PfMHdxrS2UIQJaWqLIssK;th@noyeEY2q?i*Fk2#)0>_Q=4RSa_Yrqc+g?V2-g zS_h*eHZ4wR3G9|)uEeG_6WXoD9EnY9h0}J;4Yv*fD`3T@t?s3j6n1Vdy^hHz zXQ4_Ro7TIP-gezqCS%uaWin~k#I=&wr|22N>%&n<*PLSdlGmm9v^>+@w0hmst@N_X zGu%z9*E`)xFS|Um-L!hm(yg>9c1Cj?&*<2+f&Uk+v}u5~59dIee8Jtg`Y9ub3#GHL z^4nwv$E$cNScou#GJ}3xU1tPvG=_YXrSkECPd_zS!Lc}e<%YuzgcBae-pA9yjqu(L zOKB9Kkwu$mGkv?tpnK@ZL82|nzg79SsY32WN}`uw*rJ!<<>v^F_z9mM>2-Cu3*nTU z8Gfcf3RRQq$T6xeIBMFI6Rz=3`*X|Ku>qU1gFDpSW07ZYqP_O@2peq8uqrHv=2)dx zkyUJ6ZcW48Tx$w^W!7ATIW!f&CDv@DoUKxD*aD=Ofi$y_o>MzC)4ImG%DUECg!b>V znd&%ICLRjZ(<$Gn=Ab@S@Ex2~U1Gij#7-tbjEhK}SkPo*xpq7;t{)$vnOM0xOKW1f z-h1ui@OTqrR;AWF5SfeLQn2WmQ8wiwa_*h3T=b7L!AicJ%z90{&orUc4EO0IKLIiUv+`^OyZLZuSk2@bix%W@l5i?%%r2A z`b=7cTDogHpCfr`dl+Xw-a`WF;ILVp-}L+8hmEG~_tSR_|96+;jF*d?{Ju4VER$D| zIVRp3;@p?q8#}zIG_S?7VNk1jSqnn}7y-Qj)&PX_N!P;F37>RL#BoAC>Fz;dUQr7X z*6T?ZdD4_!E4Uw5x3ze^?YRP<#JaH=QG}B&J6=2V>Y>*UqVqlJ9z?CrzS;Js*G{Hu zm>twRi{8o5c-6}2TKf{z`pL6OYH^$ei?eL>_lMu0)wGBZDF0MDQ#a&4qWH zS_$-63vlH?t)#9IUuv2g>p)6>sp0V0CoDdS%t1ZzU-$`&(*%aB@o^0=gC(~_U%14# zP$EA~1<0Dhqo}BspYk3#!2QMkt;!!=pWa4M_c~NlrInHEpbptV7>0{It>L&7`Fgqp z-#=I2T~jT>9=CbC01I4bgFbbbh{K+Rw@x)GoMZjyS3l0T<5diwWBCNfG5Q2IRP}UU zPjLLv$faj8J;?oz=B|yrLiT-a+%f1zHKx8fXtC=1AFFStRmA@)@$Y(?gpo*e|Da+O z|K0>%7}~z_GoxtOl_%gG7arR9?pEHKuF{NYbr2ElcujR3p8~iSY?{@||KC)pF}Ib+ zsliJ-8+jR5qF5trH`)lN;75#ZMs#h;TKOFgXHpfyl^q+HL!(;9tGhz=rIF*gVAt6+ zvz37(r)n9;S9s*nBSj@dCA#OqELIQpy!#x75qJ0D3UNKUuK-gJHo)46cwPav;#wNL z0$>^86=1lEPjW{>9(M)!63W~+K);j0lvYD_9_AxMjGl3?tM7}k^ZKB1McVHEqqDqL zW_&_Ky)5;m*tPEq+jm#tX#0uZ*mR%EydxCZN4o6@K%kzClG+itF6dCVF0nfT?*-p6 zcwgx2Od_h!W0nTy47=R`zX#u6gLpK~=T8Lmq5gu6%Kt~U9?L#Qk54uFG2g{~UJ3Bu z;jE^0tif7!Gp*EtDg5SQ7w3JPZE`)5%{o1t&_KDjseLrroU!S$P`caxWXtEK^D577 z9<2xSdengFJNRRcwd${ubZqax`6!=v4xWk0me0KOPC}UTE3iMWQ?=l~&`Q-Y|5V%0 z?-bl}(r5|FzFqw-7>~UL;82GVQLjSQp?0f#{2Q^taQS@BPPYBb>-iJ929>bipop_? wMYtEr;lD-IOZSUg+wNDld_F@ZTmE{ay~5G9(kQ;H)Obug5B@w?PU_<6FSj(5-T(jq literal 0 HcmV?d00001 -- 2.39.5