From a4e29760f894f8af8a1b7225cbcc3df3eb000251 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Thu, 31 Jul 2014 15:07:27 +0000 Subject: [PATCH] Fix bug #56502 - When shifting XSSF rows with formula cells, if the formula can't be parsed, log + leave it unchanged rather than failing git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1614916 13f79535-47bb-0310-9956-ffa450edef68 --- .../usermodel/helpers/XSSFRowShifter.java | 23 ++++++++++---- .../poi/xssf/usermodel/TestXSSFBugs.java | 28 ++++++++++++++++++ test-data/spreadsheet/56502.xlsx | Bin 0 -> 11902 bytes 3 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 test-data/spreadsheet/56502.xlsx diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java index da65972edb..1b51568867 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java @@ -20,6 +20,7 @@ package org.apache.poi.xssf.usermodel.helpers; import java.util.ArrayList; import java.util.List; +import org.apache.poi.ss.formula.FormulaParseException; import org.apache.poi.ss.formula.FormulaParser; import org.apache.poi.ss.formula.FormulaRenderer; import org.apache.poi.ss.formula.FormulaShifter; @@ -30,6 +31,8 @@ import org.apache.poi.ss.formula.ptg.Ptg; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.util.POILogFactory; +import org.apache.poi.util.POILogger; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFEvaluationWorkbook; import org.apache.poi.xssf.usermodel.XSSFName; @@ -43,9 +46,10 @@ import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTConditionalFormatti import org.openxmlformats.schemas.spreadsheetml.x2006.main.STCellFormulaType; /** - * @author Yegor Kozlov + * Helper for shifting rows up or down */ public final class XSSFRowShifter { + private static POILogger logger = POILogFactory.getLogger(XSSFRowShifter.class); private final XSSFSheet sheet; public XSSFRowShifter(XSSFSheet sh) { @@ -194,12 +198,19 @@ public final class XSSFRowShifter { XSSFWorkbook wb = sheet.getWorkbook(); int sheetIndex = wb.getSheetIndex(sheet); XSSFEvaluationWorkbook fpb = XSSFEvaluationWorkbook.create(wb); - Ptg[] ptgs = FormulaParser.parse(formula, fpb, FormulaType.CELL, sheetIndex); - String shiftedFmla = null; - if (shifter.adjustFormula(ptgs, sheetIndex)) { - shiftedFmla = FormulaRenderer.toFormulaString(fpb, ptgs); + + try { + Ptg[] ptgs = FormulaParser.parse(formula, fpb, FormulaType.CELL, sheetIndex); + String shiftedFmla = null; + if (shifter.adjustFormula(ptgs, sheetIndex)) { + shiftedFmla = FormulaRenderer.toFormulaString(fpb, ptgs); + } + return shiftedFmla; + } catch (FormulaParseException fpe) { + // Log, but don't change, rather than breaking + logger.log(POILogger.WARN, "Error shifting formula on row ", row.getRowNum(), fpe); + return formula; } - return shiftedFmla; } public void updateConditionalFormatting(FormulaShifter shifter) { 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 162ee4aad1..f33b345916 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java @@ -1787,6 +1787,10 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues { checkValue(excel, eval.getStringValue() + ".0"); } + /** + * New hyperlink with no initial cell reference, still need + * to be able to change it + */ @Test public void testBug56527() { XSSFWorkbook wb = new XSSFWorkbook(); @@ -1816,6 +1820,30 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues { assertEquals(5, hyperlink.getLastRow()); assertEquals(3, hyperlink.getLastColumn()); } + + /** + * Shifting rows with a formula that references a + * function in another file + */ + @Test + public void bug56502() throws Exception { + Workbook wb = XSSFTestDataSamples.openSampleWorkbook("56502.xlsx"); + Sheet sheet = wb.getSheetAt(0); + + Cell cFunc = sheet.getRow(3).getCell(0); + assertEquals("[1]!LUCANET(\"Ist\")", cFunc.getCellFormula()); + Cell cRef = sheet.getRow(3).createCell(1); + cRef.setCellFormula("A3"); + + // Shift it down one row + sheet.shiftRows(1, sheet.getLastRowNum(), 1); + + // Check the new formulas: Function won't change, Reference will + cFunc = sheet.getRow(4).getCell(0); + assertEquals("[1]!LUCANET(\"Ist\")", cFunc.getCellFormula()); + cRef = sheet.getRow(4).getCell(1); + assertEquals("A4", cRef.getCellFormula()); + } private void checkValue(XSSFWorkbook excel, String expect) { XSSFFormulaEvaluator evaluator = new XSSFFormulaEvaluator(excel); diff --git a/test-data/spreadsheet/56502.xlsx b/test-data/spreadsheet/56502.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..72bd173337c69b34d77954c7ebabfefbf10bc3a6 GIT binary patch literal 11902 zcmeHtbyQUQ9xvS;(%sS_-3>~2NDLs|ozf^>N(|Bs(hMB~NJ@8yNQZ!cl)TY%@AVvx z_pSHuTleg>_UyG6^ZhX2`h8RNDJ&cw6ao|y6ciK{RCi5K$UA5#C?-TGC|oEc7y~Is z2R91`H)Bn2Ckxl-Y+m+ul(}#)jM-2yknjI<{SQmvqt=jeHwRWL%?V~gWwA38j$|4;cBgdwN{QO9yT)DYf@j!7oMNy*N1am<`HS@zyuq@$5Cjl z7`@llR4cuhZOjQ&OpeK@Xx~~!$jh?=44plTIr}kP&3)N)W zut*;){`yQw0^|DbX-Npfm#I8rspxP|4mDS~`MY4T%H&o9_L{}%ru0&*$Fi37)Q=vE zwO&a~peDVZHVMwuL3?NREF0}DlxCAK{ZRBS{wsb?JQoH_n21C9j@m(i8tm|b7_Z)v zW7A^K3(Iq|%a4chGvXJyI3gvHt|_PtVp8dC5gbF9A$6=u8o90NGnMWXYmOLsc1GJ| zs3m8%fd+eox42{kFY{r)P0&^@<(+dUFP2pZ)y4SdEA+@h)p&n5l7V#%#j@Uo5^?~e zd?j=(!AaEtM5TGKnULJP!g!z2&U!`eX&8!rL=|wcoPtMPQ_o<{ye~9ni-@`(w{>7{7wK!rYDXxi%B5qE;r2+7eso zA^IYgie3v})im%ZIeM{g`2$jvqs23Eg@!ynOT9oX8C@(+mmE?E!9UBG#2&bzHiONi zUocepdJp1vrhfW*On&W5cs0^he1AWPEz7FpTib~6Mp5XxlKD4N@CQsyV+iAa_Y#{@ zA5C_M|D3@=K@meCL3`P;|KTW}jxM$UM@QQq(eK|*0}Tm*knjF)U#-c@iai`yVaM>R zIh!kmhkK7}4viSQf_0ij#pR2XtbxfNix(UCG{Yr% z?`rs?b)odrTPG|AMPu3dFj>TL1PNls<7>#{4{P_!mPvSmm*_RMB7$7UQ@LcOL|kIk zC73yQ$gF0WqV3_ECf>H<);yy7LK_KM8WGV2eL=(U9z3A(yy|Or9Y|?YQq#oAjJdUw zm`p=rlcC8P`+{yyNN8KSN)CoD1F(Kc8nA@KXEn0oZ zp$igTb@s$`+odwIA7RIrf*z-omNI52wNgEbC7V~q{oYPOW2BBD;_WFS)WUt?H?Ng= z8(b|}7A^ZJ9!IrlOY)HWx;B79L=8Zuk)iOOGEc6`t;x$TwPAtOL!SZ(hY>hF(d6?8 zj+Z?L;8AX?>ZM_&!5L99j|k%JY-EKtqzmCkE0XvSn#&NLc7++ihLX@-HUdOR7D^zD z|G0h)!mBTc@}{D-Q;tL`+gH(EUwM}=&9%SM=+wzA2-a+H(&13Ln?QQqFseW}Y2u81 zWq}kC{AA+2+DaPPUF0Nx=0*QXWK7_U5%44 zk%ID~K>(d=H8 z{!m#mc;x#6*>?Aw?okyzb@mCCgSbK0cK%1#7Z;T8&W7rof%a z^uBd|Y4x`}{*63(xi$!$bFJ} zH_8HI{GF6Y4Ge?ejwt1xGoARbCO4mlyZYf>;Ss~enJ>M5k`a_Ff0VZ=wn%v=Cg9b_ zmK8BRLK4P#17GV@xXG8$f*;60GK;FZq4 zbwvR3HxfZW<}tWk4SwYt8B>Hw%l6tX>*>WR&htzXRA3riQ}Vi z94X8aGwdjE-QQ`UW$}}$tAj3aA0a)!JY+aDJ#ZLVK%Q4xaiv~cb59q+IsBY0XVXUd zRlYDKB>d&&j@a4G`!?|aSewGCC9p6e+X;t7(FbBpG09`Q%C z{N)!vV`XR@II@caPv#Q#yOfu2(o7hdlm;Jlqt-So;CcaJF(v*I@6NZD)S~nAXQ$E6 zyucgb5|S4f2`p31Fkzc!1XfjFd>2?dB&zxMmhg~Sh2u>p+1k@#m6a7=_r>etqgIEh z(cTeu2lUKW$0C=+i*C&;y!Pf8xQZefD=)RNKQ%_IV^^*}X4&-D2@w=g*ZY1D>rWx< zkk>IHe>xhfAP{dNnkz5RFLQVr2$0zKyvVfm$ABxe|2TAZf&4oONUY4kBty8Lf}9Kg zND7^(>s;NSs7=#19RtQYFQ>hSPDF}KGrJ%bun;c zkth3+msmubkYOWvIz)4mre`RN^<6kIsrV zUY*1XLg73^DoG|&>(F|fhS91_bb-Y`Y4SClKl;6*KiqSblva&d?|{5kkiy~~=fA~;WU@1=YUZa5CZSKqq@JMI|SDUksKMO3Bo z5amX_ZZSZIukI@vZ=8`9uj?Yry{^$lDs%{le3jDa&YQz11VOyC>)C0gGwMA=NtS-} z2YoI3i|1U%>0X>Qw|^_d zhEE_j-XFH?YGvwTVXookV(nn*`a_H6v0xiWjVpZ|cH3QZDXXmblqt~E6GKdFg~AwH8upS3pFTp2 zcJ6vQ1Yb=T#DXC=y*o^}D?2DLV?k|{s8J%Y6YS2xrG?TKEuEe;&pRA7K*c4g^Flj9 z1&O=w>{-jp3+>#7Jxo`E*!-E|hAo}DU4Qc?SD2zi1b|mKtXiAuvz~^xdTck$5MKVy z?Ob5siU~vxlJHPa=>Ou@&D+l6C!6`2tG0_ASOF9VFR^@7KAS6~z%7Q+KEZ2NlSlA< zV=sU`jY%``ytVq?pJBdQHBwP6{YiX(M&>SMQoX-@De z#=QCK1b59hnpPihmbjvhC*mjo`}*JuhF($_BnwrL zY|l*i_{6o8db}RqGLAx17g?A7qk9Ahg^$$_EPcs9{ECP}g>PDJ^LI#O}Q!mebkX;sM!^;3iSYG@ zE-JR3PMa-campA8vcBlSPKh>uE89jRu#^V})iL|LoYdm3owIvjDC#8tY+-0G(RpL& zgl^R!v|4u@LxA?Hg$yYP=Rvo-tmh`An6P~hbXe^caUUWUG zIHw}XYyN~P8j@lcJ*q2C>y5-#v0P9#-sE91w=IHV>=LKzsD!ogfUn15ZRegb$t@kW4=`r7B+mgmv0uRj6JQ`-opBVZDeb-mm(k_~`2C3_@ zsKM66#oz?wfmY^>+`k~0pA6%)kIx@@%#yW2>)rYwuXfDnJ2ra3q7cOt(baiab!4fJ zQsItxFt3w9tri!2fk(-u!ek!?beYxj%u)MgMTt`KB$~>YRUnNUbJM&%`B>$-LV z;Rs$F#Irw@N+(Ke&wg#=d(1#MVJdMveRgal@-h-~yPSTRALyn~Ar}$!{uWa3nPusN zv#Q~@Q=rQIw>_G#H8v_z_%X6kDmt#z%hUOw5yba2 z+u?=8?p!+wj@(DsaI-L29Ne(4q**xXIm;r7WGzP;#!dqaD9d@pA=U*7;clC76M%8H zm`?Vy$M3+?vGy0oxfqsO`p5A!1jxuidSPFrx=6WKdbq>#9w$nXR_B5*t5C{9Nk4`e z_nha$s33+qPm$oZ<-N)K4hwz#C?fz>3S8=TBMOvbQ)d)>pW756z)tP?t&U`av7`&b ziu6(S@c>gOqb#DK7WlFWNOeti8~CZMS7J;x>^ z^r@+jVV^9QOku~|m)dcoxG%bR8Gsg7cH2VmGOgWfx8p{Xg}#AHzah7Y+;wZ6@8#E>GyOlsMnux3UxRkX;ZG6 zHdOB2U?&(14+DH6?{rS3wNBZC%yZYPUj-wp?qA?NFD|J?R;9XmyLJe}0 zFTc2&!>HU{Kj=(I;#7y<(gkwrPr{81*&XUD;<@>fy>MrpYHFH}u_}Blxa9Jt{`K%U z>9fo-gpj5uIrS1_SV3=Q*T*XLx`Pn8xn?{XL19L1gg>bpA3h&>m+4Ux(1nC-{ZKtk&IN2a$GN0KfiYSAuj|JIT-@!fdMVj4u zA?0VT)P`WMY=eRW*`}y6fcp1DO{VaZ`)BxVS)F7(3%b6Y5iO=c2_wm%zAzL4%^ceN z0AulO6B|TnRKwFQ9yt6ZRp5Ov>Fz!6HVb;vj8n2^1dn)dS3tg`L_c&g9j?D6R#}m6 z3f+LZBz-Q*#$ZpR2(?@&x;whztZz$%B$B&^(gc@@Q_-hUe-&;kydC`TvWvm~Nqm;EYhE3TVu>a9aCK&O6x_|)#0^>Hr4BYSO{AruqsITU^Cg^ofbf+ZXK z509-|7e0obg&pg>_pQH#+4gYS(8$1tAs!DK)4mxGyOI)c zZIK3EIQ_grFMqEe19QOWM&8ZZ4%s&c4l~7cli)Zl7%5B<4sWOdM}hPLgO|U}9RD9` z0Iq*(fd3zA0F>1JI{>7bqlP3Z)PJNR7G7=^E)J%4&#WD6UD^Nq_A@hyPF!{f<{%6o zO*tS>&$I;#@VzzxHPO-c;-16UT*dc(j|UOA-QZ(=;7@#azHg8z?6_<0lL$iw)~(Qr z?hXjVW-QdG@Zel2f9Z2fs3)hT7^aQ&iCb4#DKm@S$;AW@AGPA5Un)7q`N$9(8=!}g zxX{ifenmSetG+E)O9SE%*8sxuGxbv<$x5qNI4QlNy}^`LuNA`+DYTFvTXg|1Hvvp( z^>|j9?02-i<~8{3`U9>4-)0cmyKh~S%ecLDMu-bHk`C{OgQ~mi2f=4vCCp^6`GQ;`PG%suOaqMhkVl{iblo}}ET1_YLW1913k9G=# zP=;RBy;JXR4E_q3OOHRD;54#p7k#_Bzt^I@P?x4Ar?bWeKZvaLwW%X$ZO^&GSV6Ps z=n|1^+tL4M6w}dSFnfY>*nsW6ta2gx^Q3YBL=S(jTNDHjNB1C_`JpA&-)ZQNro-R# z^hfU@e)vcE7J3}k9x~U`ri@vT+)p)DN4TV_cnW1;eJ8c~CLwvF)!*GJCrC1`w%f1v zqfhNKWq+4fc?9TXH839ltz-qWPQtLEx$uc#MJZpp>4M|51eN8as-Fs1WsS{FU1nprhsCf-3+%5LW9 zV)5f-f=vDX8DKy}=a)Ec)5Sp;c8us7k$96X9o4AH+_*j+3Krz`AV@Su=e1U-DN(5f zw!LNt)lFAO&0DyP+<(r<%CBu>%T=jTe)A%7Comf+nz4XupUG!{-~>))#FfTdjW{(I zmY-+H!BJg}Q%&Ei#sYqZ*-4F(s89Nd49PKbcr`A`*b;hhH=MJU{;)s)!jp=|xzi_W zR8(f=VAlbWz9$?Ng4BXk1v~N65v;_4c!VfpCav9W;wP1}A=5{D;(1>)^sl7w1>bF4 z%&XS{wpWCvi9B1DP55j8p|^M)tQ1+m(rT{r3b<^RH^IoLODVhty74B{yy+AjamMK+ zNgJ7ll{IT4?AdBK(4CsB&oOdB`U+ma0Rm z%ukIXzHu8zIIw?Z8oZY#)*w!zElQ@7;w8R(Whwr4BPuTO?zhIMi0`fY2J)8@$c+WL zA#)BhQ#&&$D^qKSAGRnQD}e&Ti3N8Y{E~3%=mkD@0&NshyEp|_O&&6B5*@DeOUG6( zYewQy1C`^9H5n~{X~?3fH06aw>@AO1$8$b8IO|x;6qF<|CbF_e+r$dpOJp`KH`plf z*n*3?qF?rbIU}mGBYDA#S;3j2#DYX19aeqDlmjW|V^3)P!yIDaV{E{EV0=JHx%NHw z4WvEtcYk`D9Q`;75+d**ofC#XSa5>$h#-MN!@|w&N3)3i!8<1#z}n$JThEbH2CL$_ zxyaIE*7w^hGX~LKj0oI*`;ex#G*VtkVOlJzO~mM4nEd_(7-2KWE(Q772o26HeC8=l z{5RNJSn`iLlP%zppc#c%I80AU(+>A4Dq|}uR^0Vc&eZ#f0#N7US(}tcKBG3V^c4&> zm677t&=zg72&7+Upj9$3+zZf-RD4V!arGHR^toQSw%9^S zPF@XGhi5JUiNS0G<8AvSFeiAok@6IHKQ+WqazBKQb3R~n`?N;rduouCF9ZG+ycjS{ zooq@V4lYOY^D*d{R$^i~qiU9d%UO-is(#SQ)vCPHc6DRK1zE%&k~xG zQEM~Cd5+YRtJQ)1gpBh^Ny3}fY{Mv3mf{7|eR8>A$D#nbGv*0i>$fc|m%eD@PRv@n z(sXCiA%*D{G*9|D{NoeUcgKpG_O>l*&8ffF2STyQqPufg%}%`qJxA;o%*_)Fhb8Qj zc-E*u+GYC8l$bkJCRX6%C#1~oGcRa%0JNMl8cYbfR_U#o{Tg&nT#rLi=6aFcl4f5(fP|5Pg}Hx z&z^+)YOGE)oRd8tugH|j*>t;lRZW*GXjNTEmDakDJ5Lt!gWwus79lsG7Cwug`Sq$l{?MdLM*0pEwhBDc0_C zHPN)uqpyaRZyrUi8Yg#2evwV9yX~Xc&s!?HGViTO`u%?S_BDOQApA-wMSM#u{_3X~ z-Tpn%XJX|6t1~nL@{5a$4bShFc@4cH7C#MyVC`Q;`f1&TFR_d4B){ItZYWchb+jA!1;9Vx0fgD;w14q^AZwHx)F{MDZ_6ot zXa_D#%CN9{Q&zW(e^7Gkb(U$7(5Y>b@gevfM~%?cMT{=uHfMZqDjg~bDv03}btG@W z4Awc(9GJWihQL^0+V}jqZP=wU8F5{YrT6#PPYGk%y35~mq0ck(N1Tv!#-A3uK}q4f}JyXZ8x1%|D{{NQJkhvZ_jUY5`I0nth^yZ$dMe z!fV*t#-v6IE~=2&?LI;Lq`Nxky&509-#cQGt>$%Lklaae zE|-&^47a_e{Z;MD*RaRm?Cw6|e0DTsp7p9?xbjl{0?%X+fOBhz8@CV;rPA(pDekrM z(Ou2%0;@`KNO(Ub*h~H?av`_gA^50D@bZ?)?Q+N4OWMUpXkgpBnL00hEoGbf<$rQ# zXc$(=G~@T{oc~tqzn{NZ?o@sHSAf56j{TeP$8!eaJAc|Edr0`#Wtu+|-a=Zx|9!RQ zA7sn@C%R% zvIz1op8ou^eoho0qCA{m{X*G?q*)M@zfH3qB0QW4{X&?>{sZAZ6QYNt4}18(NX;R$ zG{`@H*wKFo@ZV)X2N?_eMg~7SDi2W}*6+W5#xdznlt0&nzp3UQ;ytW3f8iyN{|4{> zR(n2#{%cM43m6Kj7qTDpw+ihc`NJ&w7k~z&aRHInUvlb))DIKbU(}Cieo{Y3Uw@m< oJ_P-16#WGW1+_*0CyxFVQ&peBLmdA{J&FwlglyOiGyQn`KeFmZ;{X5v literal 0 HcmV?d00001 -- 2.39.5