From faba225c7cdd111041e38d333c24aa6b0fe62c1e Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Fri, 18 Feb 2011 15:45:59 +0000 Subject: [PATCH] Add a disabled unit test for bug #50784. We need to add support for XSSF Colours to pull details from their parent theme where there is one git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1072027 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/xssf/usermodel/TestXSSFBugs.java | 31 ++++++++++++++++++ .../spreadsheet/50784-font_theme_colours.xlsx | Bin 0 -> 12342 bytes 2 files changed, 31 insertions(+) create mode 100644 test-data/spreadsheet/50784-font_theme_colours.xlsx diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java index abc9fc73b..9f8909ea6 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java @@ -672,4 +672,35 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues { comment = cellWithoutComment.getCellComment(); assertEquals(exp, comment.getString().getString()); } + + /** + * Fonts where their colours come from the theme rather + * then being set explicitly still should allow the + * fetching of the RGB + */ + public void DISABLEDtest50784() throws Exception { + XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("50784-font_theme_colours.xlsx"); + XSSFSheet s = wb.getSheetAt(0); + XSSFRow r = s.getRow(0); + + // Column 1 has a font with regular colours + XSSFCell cr = r.getCell(1); + XSSFFont fr = wb.getFontAt( cr.getCellStyle().getFontIndex() ); + XSSFColor colr = fr.getXSSFColor(); + // No theme, has colours + assertEquals(0, colr.getTheme()); + assertNotNull( colr.getRgb() ); + + // Column 0 has a font with colours from a theme + XSSFCell ct = r.getCell(0); + XSSFFont ft = wb.getFontAt( ct.getCellStyle().getFontIndex() ); + XSSFColor colt = ft.getXSSFColor(); + // Has a theme, which has the colours on it + assertEquals(9, colt.getTheme()); + XSSFColor themeC = wb.getTheme().getThemeColor(colt.getTheme()); + assertNotNull( themeC.getRgb() ); + // TODO Fix it so this works + assertNotNull( colt.getRgb() ); + assertEquals( themeC.getRgb(), colt.getRgb() ); // The same colour + } } diff --git a/test-data/spreadsheet/50784-font_theme_colours.xlsx b/test-data/spreadsheet/50784-font_theme_colours.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..72e2dbbf1466355eb3133c527cef2a46b13b50a5 GIT binary patch literal 12342 zcmeHtWmKG7)+X-m!97UfuEB%5Cb+vxaCdhN?t$PCJUE14A-KD{`&4qfJNI(avwD8a z{P?EdTGYF0RqcoK?(=LpdvAFua0m<#C=eJB5D*fOqQslj08kJR3@8u~bdUwmx575o zjz-pwI?ArLMh;r^@2o6|b7w%QvO&OrzyI&`KTQK)l?SXl8Bto*c3+9Ksdft#l$N4# zI&#&Ek0LXk2msLLP7yF3+v4TrOTLM-;=4&C^w^}Eyj-)=5W#~n&5-FKJ`9Jk+^nq{ zRBjp3cDo`KQdIrWsUhBjBp>m5N^QV$3zSUTiV2e|);k8R246C;>P+`$urp8*^;J;8 zInCP=ihjLz@0Tnluz-u=PL#ZLSS)ib`SX^IDR&A71JUzOPZhb6fv0VZsiasm9I8*m zJB>Y^hS^&6^e?!@hy={Of))exi4a(Vs8OnzFzgdrs&;f)MbI&~RT94vHw2P9gWT;A z8za9L`L4@>`Q<1;ycw*LWujz>Z`-$#WDx{1)8xRyhpD2>#HaCOx^pyB%bk*lzHD>2 zoc_J!M9?SYUP4EXL?2pK*x|hOPA4o7l{~iXOcQY!!{rnWbPnvwQ|&1%BTqc%N!vG( zWL|Hf5V@_NLZc3wPi@Z z>FEg^ME)-pS*OBCb^-iG8fb9vAj6(ViF3dF*AoB7SYSllh-?=lLhq4y zi}3p0uC+K!PC>J@cr%GI;b-zgqPoaDa)GPM0B}D^gSoNGt&vx67Y{ehl!@^58DzVf zs06E6^xdb--<4;nB4_K9nwVkq;YQ)>sVyv8>b%QONY|gbE3OU?$8AcuC(~yoki&pK z*|#re6Zrn-Su#^xQvrl)?gY=l52 zI?tfU<<28=%6!9hT9L0~}NSu*@VcNZIb3w;|K ziy!glAJm8VL4DwF|Np*P;z!JXlE%N)f6UV^&e|w}yEQ_v;_Vd(rNZiHH+$0MOPg2m z!c77L^f}o6pJ*~-uBPdr)w?R`zLu7IDg zop*zGm#o9RNZ|!}ZWsk*(9BVO{x{tUYCA%!jPLa4X$CKFcbr@&5x?-tG%(*!_~;i> zMoSyLoMY4L-}af{2~H7eDl?zd_H%uM85B$(1TugkLG(Ic62qN~ah8=oO`&v+U93Re@rwJnPy>z-C zm-G;KWdUff71A=?3lTj|7&uA{KBkDT-kgp}p%{lwZ!ojxL%V$pkv8Tu6Ov?mQ)4Q5 zxk$?ZSsK1gE^%lBW$w$JpmL@}N?KjfekEU;CHo8Ug28d6-^4oz$4vO9;#C>#5Hg6u z21lrTqZ>VTC7R6h!f>^8$SClc^%`fTo+%GlZL$_SnZ9F(H;^=6dINiCzu)Jzs_YI{ zHLN8RtjA%Q0EvD6nE$D_UBtCLIJ#@=d}sP$-}@RP)_9^g?PMoNd94lg=sb~m+$#Ii5VN%k`&bv8+R-jWsS6rI5%IUG z1+U3ba*651KL>(?k=BJs-69>bK!jzBdqTFQ&eXZAB1+7{K(Gc+^W5D%KBe09s#PpR z=~ zvjdSqnMQ*;F&}wQU3(KYbY&qX9ESEChM*boG2wBfx>=5wE(SEqS5cKl^?gtlCpZY41xqy*j6!I9uB`C9>m|9eO>C5VTT zQOTk=?bZAnHXzbNYqJN=AGA_WSwQyhbQ>oqMrvj?KC-f8a>YDwk2I@%O#DF4-{);7 zyX96hQ#PTb1yBO7*7@LYy>Y7OWYy7u7t=Gfc|5WC=0n~3GGhN~^5*e-+KYnHaE|Pl zv3Dj&<>0eB`SV3FBqn%)$3{L3$x7D~#A522PXn;m3UR+ydFKFH~8@%rjz0 zE=k7Ta_+*1)d{o+*&aq}oo>v>B}L{lnC9Xxy2A$Lrk=RFUM~!G^=)sgbc{X5=RIUa z5%TlSK6RYh!*JN*ufytioShKq@CvlQdOYpPlM6p#j(*y>L-z8zm0&`lF)tiD8$t5& zv_HN-L-xMAQ~>pmS@t4a%tMXcrkoL;;{}_GFwh*5(8-9-#n#`IUq*R{U1|Mc6m${a zKsCSuZOYXJf;FCWnJ3RZ>f?fZ1O{D<2VVsKGUZm;fM^c*M+*%uugKFRD4#u7W%ZJ21UhvRPH1J8NdgvEWGT&SJyn3iU)pw` zBDMRfsOKBH0PcA|(qW2l6G!A-`iN_YI7s=lHfHPejkd#ewGH&fhGT>sVw|-2a*dEp z-N@2*D<}pWeB=CTu$0IXlZ#_zrvkCGZXLL75&|A2hj2w8nPHo?2xC3|S-~uc_;yHq zTU}_)`PN2ct=+sgLWrZD>$va*M+@6@T9~B%nmRl`>=lD$%icQ-8`S=bo5(GhCC_n} z)+di8zLKPoSt}DnEVl|m!u<@(!p-fk!e=qelPU&c*5WK2Qq#Op1nS>CzNW@WBdbWj z=!_d5Eraypmnz|+hGYjKt}r@ z!(TZV?#9K#Ej^P$N5!}`Aw8OFY^$mluBKS1d-(z8gK5Dqpj=;>rFyDL29B7$Dgc6`e>He%3RfUpsZYTNjuX?2*CR zLW1wGVv!*5y?_vc34WP-K&`Xzp`^#M)B|hC%{b*P1m>rKO0O)I=^gOU7;}Qb(ZV3t z#6pnpI`R)sLWuKj3Q*J1-jH-y$s{ixndm-8TbmBpihCp?J6nt14f7Y4Cq!eQF4$HE z-&&H_GX>}r(M+>sqgm5RzaB-lohWRz(rz5$qHDT`OzxO*`WlB)bfB7SsycvWz5A}z z-}OrgbUo&-bp%g4b>TWge}V_@(}?ug9jqo10Lc-;fxJ{dqFI4;|hJJ_sOl-MBfp^*bKbu^qd} z@zjab*$kkdeVO((?SU+Y`eW(bX(kC(5t-?eOr zZN+S+I$5`~o!^>dHHpo;BfCN9P(Qg3IN>j>zi^u5K$90j83Kk zAlCRt!baSX0G@;~kCyxeD!LM%La5E+V7;8taKuJFmVi@v(T>G@e1!d7K=Zqu+m`|+ z9Js)Q1Ls%5;b3ZHhhq4BYsA0E=6vAyWfNnKVNrrOPN#0==ibzQxi0L&uu6B zI+MRm1Y^3kwzPA1x;j~y0wfVjv1li!gub?c#hMS8o2caKWLUi>1ry_JuJ?EL0jIP@ z%5o<{Bshb|XsE=3K|9%-dQk>w)ZX5(Lm~@oQt6k0N@XmDID-g;!7o|!YA!kE3gf}O z2H)uO#)j?427CG)Zwa0;QY_$m6IkH70k&!7vHL7tyI>XP?mPx89dC@@IDK0hxU8&X zXkUyvCVW+(0{H_@msj^pRTOMV4FBegM5rs{z)d*bXj!Sb)u|42ErV>`5n$a@&7Yf3 zQR8tx%9DuKIg(Xyp7-VH$S z{7*FSlZgM+0Pxs=B61XX??3HM&J!#jMxi4~GDZ0SBC0)?dnsw!Kyh=oJsltv)n%~A zsO7DJeGwjLKnh=OEkF{;Dv}29c+X#7k*&^)=p_+=^|61nc}VIiG(7puDwnb9gpj2k z)__f~ZHnDRnUYwkp|sJ3qCu+k<;t9#sk2NC$3_MC{Cgz=DEJM=+HBb=&E%}+an4?! zBkKFIA1WB2h|}fD73b?$IT#E8s^IlyipwoNY{cHz1qYYkl7KY_Hts)C0n5KmkU$dr zp#tBZDtH;F=(nLML_Ed*0HUHjNcuws1vhuQ>ght!KU8qAob`nWgz`Ylm;L-+G->C@ zL$EaAao+UPInag9l8>!{_6Jwl*3p{DPcB7zA%r6X-ar=g{ZxUgaI9O*huOp*EMR-P z_3{A~R(dL}=j;&rcXsd}IHI2q|6fP+f5{QSgRRpp0iBQ#kfHx368v;Q5lS*PbBqYB z$kW~^jyi@#;&YJo;nspxV0esxJ5E|=0{BE38U47A?Oq8P5M1Y@;W8&{e5awMhndhX zFHv%Ps**O!V!*`w%Ly9l?k~<(y2>$P&!^3U$-bWwiMUR+c&iaG^7at=K#)aLCGo}T z&|u0S`$w^yGur2OF`BL#OqXthZ?j_~$_|CEzCoOgvKLYhYS7i4(g3GrZ3Y!f69D6s znfKl=kFG9xGg!qM12Z~t+NSA6Q(#{D^?t6CM0?ur+!zrFL2wXEJQiw>n7^R=wKHY} zj)RcU_n>`3et(C$d$*z4`yqTwW?ya=&Dodr!GNAC;y2sp!(+(29-z$!p=Q`6^Vw^f zk6|5!gE9J}BT91h1)1eHmUc>-iD!Wr#@MjIulhb$dC+7K!QXgu_Uh2dqw86_6-aQX zeD+_q(B0g2YWi-^wRIw6zxdK7%C1Xd(^E;=d?Y^20O~^qbIN6gLM97_L6&lAf6HPg z2SL4aM5kaMThG2&7^6g-l~7je{3BH87T*0@C+L0E12~@Pn4)Sz+}# z?8UigMcv94W>+Qi9VYqFr2OrfCqH~!S{v84w_afP#QkYfa_Y17Nh?)D>G{KROZUIE z%B7Jyu415Xo&o-0{1KfTO!e%I43!-1&8$rvez+ses17(_Q9|U%?+NA7TFD(HmYfg9 z%hyZ5bc%h{(%hN$_DU=aJDSDD7-zg~H9s?ji@dtB!dzZlYZn|5%X(_?5GJfg>8MD= zbR`m@e9ju7ruZ90J!9C{m*tIkOl}{)MJV_4ZEP3x^O|O|+-ANO35~bjz0J-;hA5SS z4-JI+F0@j$d{gv(WjTVAI$d2~>5Eu6%dJI)X=~y})~@}KCve?=kGuV#!Ohsfq=x|# z1O)LPPv+=qY4r1vT9jqX=NT~;vE86^JbPbBu%znqg!|=;3Xv%FtJWL6%_brn==y}c zP3p2u(6pcHlG3P8wC{Lxl43ZBP#Q+Vr1O#g=L9;;?lR@q6dB(o;q~=C zqa^bNiz6jfo=uD8|;7}Udhft4A3 zPn3+1?H&Eh$)(}8m^xPMdrs?nJ^}yd!#|6`xP-g!4^yJQBWg(e=wnhata0dKHb_ zcNDzT7u?0r5(9AS&8ge+Ne%#WuG5iR?;D8&BP3C4xnVC>7Pa{1(EJ`*sii;5tj7%$ zoK?e9kH?5lBnfH8b7fGp5A);CKJKE@CtPFmnwY)62Q zdrTdR5EpS8Y>42wH?a>~7d5tAyF3N)2t+ZJoR%a8y>DO#5{5x9DL)NswGeOxzoB{j zP(Jz$(6m1h{-=v%`mxCUBnw*%6|6p+cZjh<+8v3Q`t1Euv@-#`A%+y^=U*AojlT^! zBI|81O{6xanr-h`H@gdwTIhzR9VhGX19S# z2(N-gYAAO_t_N~v^ib)MB3o*+Rhv7>WVpqwgdg^L!k-!X zRskQ^Z}WTyyxi+`h(Kz)ZPxaVofbjsgc=bj@_Sp+yX_II*S;@b9I$CcK6!PI?!CNP zG>bmm5_4JRs(!sRCq`y)8}+n@3B9-LUA3o8j^au0E(60v&#n{gKvl{%gBlqZgKj4- zibG9Bbch=SjZK5R8@KTqz4MQ zf`X!3$PT>EX^_ds{P+io#SAMbDv{_ANyvJNXyG>k4CrRFMzDim^gWU!_690wowy94 zR6KM;3}^klCAbk{qmNMS~X5)NS2lalfJ}N0`d?!galhM2!vA zoE~woOhq6-mLgF^gRm7#7z!%mmq-wbBXSusuqzQOHugQE+r_OKchHo@W6+I;i}0(q zv47*H>TGT%E&zc4*n+icnAnll8xD$N-=VLpj{Xi6+&&3G5@g$CW;gt@lLB{}?yEwr zJOmz1He6YV>N|yW%uNVw+VmW8y%%FO5tHelJ{im-x}bLmwvcE6qA<9sA_B_+#Z~%! z8SPs}ba5kVy1Y?`Avtoiab;OD>L+^eMRwc)*)awAMYo?wr$OFHhCR;qi(<;>FUT~O zX=58z?Mha1A|8*rnSDzwN8aEm&y_pf`@~yD2OV@;K-#$#-WY*<@DtrvaXygz;}SJ>Ys%QHo4aF$NKqoc)(e1%g9Zl))8r?WQtSB_cCE@tUCqLLGtYs8SA?VD=s_!coQ)k| zk9Zg>J-CE`mKP@%cCT7$ZAMZT=q31IK0+7^axqQagA8j<*O9xZWYv;uzAQ$Yg2I&} zz0rIs9xdC3NlaS>rSD}%_x;ghS9P6UuZ@Dm4Rw>SoG7@k*}LZK-z*wPq@MDEKr#Z39h68LyQ z1^Ml-kjg_&wjjXh+dBtMl{F|;w>sx#VQy?4l-6f#PZ2AGLzF>LP%CngCN!y?3r*e# z8j}bI**dzU3=m(^(IjECcXl-g7`-CzUeFGrR4zUS^B#o5)Ibcb6be$2fqStv?Rl#j z>z^_&LP92mmcU458XGOt%|XiE6^IUwW0YX*>Y!L7InILEt3{D)+jLIn_&!8nfV)r9 zO}%eF1ggn{l=fnCQmOLDnGCieP>?qjHZ;g?nrJ*-GiWD{>|cLZ)Wz#Y#{I%URM8 zpOJP=;bxu;2i}RZvBU0V8^M%j@Y{)Syo&ZF!Pfo)dTQ^QB$o+k^|R$#imjzrElKx6 zUPps7p@|m|c9%D5k~FlGWmF@4Cu;!@Lt8qg+Rg6!)k-CO>ASLPRxs>kYUep>_PG;RqsR;A*ntjO0BS1XyRO6Tf3od#(Umu3& zb=m#w2Rqd^)Z%fn10C|_qV05`oB(q;XC%tWir}ir3D_pYMRU|-bbV5X7rP%mRe>m5!Ngm%;YTA zEVHHCfl|5C5jJZ#?_4XTjn((Ah0B#ah@nJpywQ=)k&#jpO*aVo2Ao1UoM&E6$}Kf6 zc#$jf8SKUgruXePEnb^?T1j~b@AAlb)v>xxQH@}Y=OmQ-QWs+E21l9I&2PKDNHl`p zThczdeSNbsc{(NVwrzE1Ei#_m{y$G)SpMIqFsGwZ+X|tC5X}}Pqir1=d)pX=O=X{H zF|a2l92K=ZTKcJVAV4p->R2BSd{S*WSKwO|Yq4u|Ab4^jHol-I0#-6=Xo`)_mSkiH%CEFkgZfeAj!pNXeuYx`f` z{b1Z5S4Mn?HLxNSbOe5h6m%GwQHv8Kpvsg_>o#2pBH=z|$c;)V<=2fnU_Iv)U5Pzo zz-psB8-#9x=T;l0}TS`lrkdDa-Q+pvXp+A*#MA>*>ZF5PdT!iHh729RT4P`xPF zaTzmR=W!R`d+LdvZ-yr{im1HJX@kX6C-(ucYM@6hFaw?jQbG?Sw zyH788S(1vOb1dc}>I_Q9;*HzFX+iJ>KT0JAkx-==Z9e^mNnV~@Tj&0otUsm)0512f zuU7=r6*IPn2PSPf0MM_l`h^nZJ^{rgdp3tIF;pT9Y75cyoJnevC(^37x`IY9T&Yq_ zG!Gw5_3fli({xaP0{?^8t;4n5wd*wnC+7J8J^oabfdd6YGZ@@3{9Av*fB=W?Izjjy zsXArUCt(jR%0nEtMTg!UoD&!xM@DyrgV??UCv>vW_ED@hq%Q{&oMKrKcS(m`vrAL~ zdU#tBRkNiq6m+(ua> zbJ6E%*Dp~^{GX!F>PEkQ45?z#A1!}6cSWvKon{*NFnF9iwoEg&Fhz}F)L2nZ?dk5B&#pB@|U literal 0 HcmV?d00001