From 027fbec9d7b761d86368ce488a242fc2cfa13a36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B0=D0=B7=D0=B0=D1=80=20=D0=9A=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D1=82=D1=8E=D0=BA?= <16141974+NazarKalytiuk@users.noreply.github.com> Date: Sun, 15 Nov 2026 12:47:03 +0200 Subject: [PATCH] xlsx/xlsb: read Excel 4.0 macro sheets Fixed issue where a workbook with an Excel 4.0 macro sheet or an international macro sheet failed to open. Xlsx rejected the xlMacrosheet and xlIntlMacrosheet relationships with "Unrecognized sheet:type", and Xlsb rejected sheets under xl/macrosheets/ with "Unrecognized BoundSheet8:dt". Both now report SheetType::MacroSheet, as Xls already does, and their cells and formulas read like those of the .xls file. Fixes #802 Co-Authored-By: Claude Opus 5.5 --- src/xlsb/mod.rs | 3 +++ src/xlsx/mod.rs | 2 ++ tests/macro_sheets.xls | Bin 0 -> 27136 bytes tests/macro_sheets.xlsb | Bin 0 -> 10351 bytes tests/macro_sheets.xlsm | Bin 0 -> 10777 bytes tests/test.rs | 45 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 50 insertions(+) create mode 100644 tests/macro_sheets.xls create mode 100644 tests/macro_sheets.xlsb create mode 100644 tests/macro_sheets.xlsm diff --git a/src/xlsb/mod.rs b/src/xlsb/mod.rs index 49ce436b..29aa1bb1 100644 --- a/src/xlsb/mod.rs +++ b/src/xlsb/mod.rs @@ -328,6 +328,9 @@ impl Xlsb { Some("worksheets") => SheetType::WorkSheet, Some("chartsheets") => SheetType::ChartSheet, Some("dialogsheets") => SheetType::DialogSheet, + // Excel 4.0 macro sheets and international macro + // sheets. + Some("macrosheets") => SheetType::MacroSheet, _ => { return Err(XlsbError::Unrecognized { typ: "BoundSheet8:dt", diff --git a/src/xlsx/mod.rs b/src/xlsx/mod.rs index 31132fb6..c527a7f8 100644 --- a/src/xlsx/mod.rs +++ b/src/xlsx/mod.rs @@ -652,6 +652,8 @@ impl Xlsx { Some("worksheet") => SheetType::WorkSheet, Some("chartsheet") => SheetType::ChartSheet, Some("dialogsheet") => SheetType::DialogSheet, + // Excel 4.0 macro sheets and international macro sheets. + Some("xlMacrosheet" | "xlIntlMacrosheet") => SheetType::MacroSheet, _ => { return Err(XlsxError::Unrecognized { typ: "sheet:type", diff --git a/tests/macro_sheets.xls b/tests/macro_sheets.xls new file mode 100644 index 0000000000000000000000000000000000000000..f5cb85f260113de31ae3db30d32c9d587e9ceb2b GIT binary patch literal 27136 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 Z3Q6#pCbmG+%s!{{v^@naThF literal 0 HcmV?d00001 diff --git a/tests/macro_sheets.xlsb b/tests/macro_sheets.xlsb new file mode 100644 index 0000000000000000000000000000000000000000..8eacc4a4110f515845b22baa93d23a2cc2736f3a GIT binary patch literal 10351 zcmeHNWmr^Q*B)}{Zcw_B5TsMO8)GS#PcO3OB>NaOKQtb#4BjKL_E{|fs(=HX zI*s1Q1e*Xs7xnlpj?H74va;lj2&AI?7J&?JlBgv(9QpB!EoutoYJ_^Ylwut#k>Y4` zR^xRQZh(DN?1-fn+9<}>?GF{#7kN*OR@-TlBFbL{cs(hN$S`%Hud6lDS)JJq*P*A8 zv%Uky(Gi2viwg2(;b!!AATYePii9i7ZfNiN^*{UPBv6@q2!*L%GR}k04x5|0d1~)!BT3 zN%c7MS-`0(y|A><*O}L*`;?6Hn;*{%oAfj1_WOw5d5Na0*#sK<$cb6r)Ys{7=j;)A zu|F9Ri&mOA1_@~1hNgX#tbQ6sA0-c4iYYjrq?4m~XrKV`UFj6DqxjO&ijRP;mie+# zxge+sc!PeW#<&pg(M$98^}2fH;(Kx9V*ATbX5-x8Xi>AE4Eyr{ zcg+Bc!Y=&@-JQ3M&od;uWZn$3JZ2Yk2{QKad+DHn>@# z?4?bT^RrXmHdNp@&85J&QHT+__A>3U!aONC<&NmvmA`T>%ex*Ck}CxnAeycSxf>xG zEa14!pceh1W^%frdV z&ceybj?==%F)~ioZd3}dJJZ2Js)$UphA7BvH1ElNW*$G2R!njY9z&RJW#I^6t!9Dsi8Xb1a~w!%n> zR65h^)IAN@`HEQLms1M<5R)Shiu;o1!um;e#+WpEZ&7Gcl$sS zn&0wSHGFFpe`1|sPb}es*3?2Wkt9;*st|r7Vf;xxL@~8myvkc-BAq{t-}oKF_#}5> z{%r|WulnUn(=G-prj;7&I882Z6hd|#!Y8U8eFM)fy{vMpcvwd>`NdQ=i%0DQxc4i2 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 CxuJ9b literal 0 HcmV?d00001 diff --git a/tests/macro_sheets.xlsm b/tests/macro_sheets.xlsm new file mode 100644 index 0000000000000000000000000000000000000000..54889fa49657f70296d6684cccfc3f18d5c28e28 GIT binary patch literal 10777 zcmeHN1y>yD(jF{i&;f!I+}$M*+zD<0f=h6B_h1Qu0Kp*ycXxMpch|s>;Qmc^_nz#s z`F_E@eNIoGIn(u=dApygdaCMGkb!}H26zH^3IG5|0O4#xI?+%7z$hF5fB|?4ttDb( z?PzT6sH@^;YwV!S=xSw2oB<0>oeqG8-2cDhzxW9h#tg`HFoVP{ByUAF8KmF5CJsz2 z_brDdUxj(%G5^}ha$rOF=Hk_xr>L>~qFios4kIa{Z-dptr?Elv6tg@DOV4xUdNgpwDF_egZ)7z@&J&nq${#X!MPp50_ ztXpCgf`khNL+F%JWRe;5`q&mIBD;$>iKgsWsGy1Gm6jrmg`OvN=j(Tc^Yr6&mU*2) z!di*}@%dOPr-txMSZ>G>H;%P_F=SHP3wtQNXY3eao*AML`2@F??nwps~4;`_)oc1tiXNF;m zbMRcp+8*JkaBA9Ip2w(f0(D$4(vnt5t_Au0NRMn*9XcJyjP*z&`t$^hrmJk_H}}rK z5oJk{cxQOkgD0-1C;-620}MdnAFf=b%1m|&;pZ!ery@dJS=Zj!(t(Nb=jZ=i_`le1 z|F-nPXj%CVW~5-SalLAYmC7A;|_36>nduMbxVIU&-;8TBry>DtG}f5O|w<}!hM01`xn>tUBkanYXZi=KW zsLlN%)3-tbH$#$mLz9ac&f^#JZ7Z^srD~O-E@sCTTeujS}^WB8RU|C zl}OpqFIh(`s3joj~005|v zC*x|#ywasaIgt|fM-+A$&}PncW)I% zsy^f1mzb<-)vr4Vy?z{jnam_qgPp=n()1LC^(VJ9-h>-i+mIuUVcDT`GOa| z*ks*oS7Cbkxgh;Oe#{72Zt+xt&)saLKLeeuhm55a-RePWq#n-T9{H@hi;A{M#^FM2 zBf!*9;yUF47C*2Nq3zrYX;>s9c=bSO>$p{#o5*O3pfs5br>!MITu}3?n&;DH__1#= zT*@u=Z(=c9R;1JowJ(CEXq97&RSQ2$=}4!JoZ-G&K=!F34rV0iM{ov`%uc;82uQXG ziaWu?r>z5!$R9f_b!G>ZmBZ@8#%^ZlM@v|d3BB`Z@m6&pb5^NLw>|vu@G{0;MTTLWV#6%ET;TAs`jpSd7XvD{NKaRX z`<5PR+F*5q1p2Pj5RmV6d(udM7 zPPja^ut}-qt6EoepEof3zreNtyV{UEo~?D33oWLGzA;ar&L~Tmtss{Z*6I^{S#taE z)gn@LPaajct6Wc*5q2PT^}Ab-I>~`hsbL|~s)saZV)68(Z>NFOU&2D%!JbffbI8dzHxw%*PYa0;nHOYPCByb*ZMr(kPz_Zd=*xqu| zuwD8T60R=J^4$n=PGk)Kw>^RCNtSnIo=KDO&u~+kr@wim_P0P^T!1|_N4C6Ws?es= zB(n1D3QJ(-r{p1l;oqTy*nvZf3ldc1A>jiL@DvIXI{r+te-9x4Nw-iC#SFRkzxybR z8Gj;nk~&P{~mmT~l@Ab+0>5Cnj`*Jp{AHj#uA4cAC4nmAQ(M@epQca>a;Z zN+jeaB*6oeI5eg5Y(~2z_X1)Gh7^Rzro`2rR`eO6td#`6CN!mViwgaSJwvJiPK>{j zTrkJvyNXucVz?}y%$LWkrgX8?*&I2-i~5?3glSJ{xkEN;Cy$?+jrLklU|FmUgPCmJi$z zNhb`c&~PAk{FSjBOpT2l9hm;Ou>4G2$uY8#Nz9;NaO^b^ecHT;0soIsUsdYR`ggJU z)eEW54O~;UP}D{nu`|ic&S-lpoF2?j%<_rWVC~IAx`Q#R$Jw!yGHs zE#xx78uImrKA`RtP#0=Do~xJ}n65A7oF0sDvI0yxV{XuWbo0vBh27nV?4L z$Z{3Uh#*PY+Ma8P+gsUGhU0;>V1<;8V(?{zSGPlb$)JndZNHczo-1!ac@bFXJlcLp zZxz6Ieod=nZc0GwCc2t}C?G9!n6~=F`Q*q8=iOj-F)_9RUOiu@oFs|@?G2HPPR}C0 zxM0?2=vzIS-ova$E+rjxUmsmqK74xUx~5*tnX|;pl-|?kUZdKlwM6gSZa1#>l-J=x zA9%>?mRh>-f6Sd$a4;}jVyFh0vgf-l&vErgrrbGoA6pt($fn4%%u5>@d1=Jjs@X9Q z;EK4^#cY?C227=Se;4>I+l;uyy@ercqlK^y_fNK2=^NVH{EKdxG1@ls%+G?sREGku zoA(+0G5DcHNiYL4)aF0GZqVlaAVR;+U5*T^dIRRAq_qr^%KcPoWSF*-d@)qEu^=92 zI#7j{pSYU7Vc1ER&8k>LdAVn|_MVwFP7RkqwTsGi1i4vuxg{JQSE|2~6>bL$DvK54 z&1)@*KpZt&DOriBM*oyIW>O6FXJPT04vEkGjilkE}{7%Hi)?(sWVsoWJt!m4O%&5zVR8^90#}5nY*%w!W-lem6-M;RD}rg za6+}%adw8bddgkpU_9g&#t6cQz)m<;qMU6bZLXvED0j_VH{3d|;od&G?@gBSxCmrB zgqV_tcJA7kk~2V3h`aD(txq~&% zDZ4LkPWkraIQg{syL689r^?DM>H$x;v0*;N*L_u!d6N!ksJv_j|^HetfTH7&7pJ0W2y#6uMob#!F z2n{3tJlc9ny)X5i%UIR{Vo^M!42^G_Tx+bOLwF!clv$bDXsuj;Um|a1t6F)L1dH^d zzw%Wp!c$KY{r4ub>{~T;hch}wqOk!q~ z%alPaesRe}Nx%Ywzjw15f!8RfX6PnVx>pikL2*p++qGrC(zDS+_1o#_kgI}78Ck7 z6HDQT(;=4o4REvEzIMOhN7FOx8>GV4Cla(A4E{m9 zpNc+_hjPvBQh%ld22=M{IpEp&Gv*(+17bj@-yc3}HW;oRULW8|`}~$_=X#YwweSD{ z8tKoT=N}o>(bU+=nCXwtKa%M;&7nyA8q5~>-Uq=!?dic?4}G4|9Io>t_qAB@#UazlDSL}|_F1FpQ}j26b8 zmpynR@@O3fGb*0=qx>e+k$aTVo=_F-Tjq$Z=c&=K-deV3hHy0o8YzgLKzBnmWUm&D z_bjq}F{?O}{F?N;5$U07drJ${L@c$kF_SQCl*5(g22wcRZuv%^*2Te4j>4H}qi!dh z3;^qt2n}A-UVb^a+8!xbZqVw2uLCK27|GZho_rqIf<8GJ9i)kyILy4Kwwwtl@`lkf z$L2CWcqrnBX|2HJGwaSOWHV*IbB;HZN&hzfrC|cWoU=KzrMiP>m;FY6Y1~FI;r{xF z?E~*u{f>5gg?KJKGx@`VXj28Ko?AT1AhL%=jgTVP#ckJOG+a=$l(yD~+!AXW=^!Zr{7G znNlARpN|=5vZ}@{lE}pw*Ad;{_dML4x$L$)+%KT&-uJ!#YX{@Of< zM(6&jKwa18><5$2bw)VMVaJd9AeUJCa?LsvmVgd~B4uq3Hhq^}r&1b)`< z_M^h+SNrhTu#4p_G59e*8oz11DR_%DQz2RS%xUnJIgDYIWv6f?XaazG_J#scUafEZ zW!>voyGWL1+o6}Op} z)Tg*&UawLp6GrneC4)vu-nTJXU<=t+87FPzn-yH^?JCfkeZO0oHtsYJ#YWJgY zw?G~yvUj(hpfzqM`)nzdZg1KV5>b{HTm5hX+vf;l7pw5e-<&R#rRiN-_|f?MVAZo# zU_|?kEsbYV(}#C=OXAc_iO|}QDN-@~Q$6?fMtAazPy9~< zo|gBM*uhQ1SoY*M%ZCKAO3iRI(EJFIrZXDpjRvndG&aY%PIHHr&E{OeHd+TAsk9n6 zD!6u<>=>^CgMOf{cbUaVpgYF+dsNCFm<1L!$*jn@G!_SKwQy+|mNKR-IcobO)s-QU zpL10Y!LnKSlj>2%XOOAa!=Vk_1%)iDzn|@=sVT*_T6;nrQRq&U-FFa{hCvV8a_eTE zhN^Z}i`gR6RKZk2pi^LfzUCcNH3TY&R)${avtF-fu(FoH2R}4d&eg=(ASN#OZ&#<= zHTipe^v}-KPj95re3|_n1AKTxPi^?te5f~yy@&`{!g0cal$aW0_R9Lk*9`XawVNI^ zV$HMJUgEYXo7}Kr(qv&DYG&=htU*;K3hBDQ>L^^!I~9A`8Z-W)bwmD<`IPLI&9{^> zuQ4~gVesVVxGVEjf~~862o2eYER|{}svQLT#x(&$$Bj5c69Yso*e>zV>mAO$Upo@e z&uiXwtMX<8%(Y5dJ-Ga9&WdMp-$ta9!E;={xuJ15>u#9m0Z&cbMD+Ee0gAe`Ipx^qiODA!RNx`t6`j93 zu9732v4@fAPw=PMMW1$k8a^z-mh9XFclv&fRgT0p)BB>`68MgZjiMa$fisT+Qwg~& zf;Bv;@Y5AlcG%NS)5WvX6Ppe{3d&HU%@?JPK6#tMO{?B!o2>`cpZg4iO!B{7jE7V^ zIwR8X%U})bzQ0@us3O<(YZ%G6qDU-{b&VkD#48f?aFL@RAc9RO*m*YGQJqj2(qh4@ zoO)LzQcOx@7$?rXqSQaf7m$Q(EYq`SWu;I*kcNv?Z_&P|1TFaR02uSw2H!>?}crb&#yZn3$HfmE5FLk+sP*%0TLTroJIf?R*t!WglGdI1lgO zkUi680$r^7yls%0zjM>d^?MyJ5a$!jmL(k3{i=FhGcNZk>5{QrxUb@?s5fgng7RW^ zqrJ_ZI2~pnt(_Ht`0pt;#Op(TGby-{1&f{=3LMK^D}u0V_cp|>QG#>?aA&31D6|3k zqlJ?l`W55WQ|_@svjo8}XDgF7mUjs2nOD;V2tM?@FC8ZU6dzsS#p<+h=CUt*_2xzq zKl_5Z>UmS=UxSn4;Gor-wdMqt_-!#$ht*<~2ho)3PXGYqKNG!!qno9%!_Rs-Q`O31 zff;nqKkEa!KI(Vgpa)jVOiU{5_NPDpR$wp?nyV9$nK|5j?;-E3L-3+{%sW&*XTo7* ziA;OEKnfVX>2lOH%!YP3kbnI^I7;6JP2%{ZQC!H?yXOk0b*6yR~@9e#|2@lk!_4kkrsg zHc*-YfB!NX@yPi(mUwycQc(=2BaN>){(IBVc~eV+$wZOp;Ty`x&8#uCnImZ1&|(Xn z@*2k+BWY7NVd%{Z5-}ifqhem`L@pDJ#d4s@lUv@RC|N9PnHt^zT5-jHu40@i|5$5z zPGT$XF0@+3m#UjwUWTDk2qiOMSZw)gu8~)#(?+Ej>LkwHx{En&-Rzmi(wf{4uhLCo z-$>Hb!F$6s5cawx!#RCxR8IOALvhSfL5~}=82~)oOwqf&^?S4?R!8ivzE!{;`u3hu z5<>As9u2&DDuNm>vH7L>VT&Bsal_vE-_BaS zpA^R$UsA;l?%7PTW&ZN9X>Q{TF;YPEpiBTMeEyn%2n1g_B1tqs#^fGMben`}>vaw? zty^oiJA-fc)u_tB3eDHVuO>|kI!GE&l2a12D2WIzqqLF`1x-w9F)xq6(^)eos zC?0BQv|rg(n~hFSDc-B>2AxR083`5Z<=xQ-=tGhVGd`4(Pt-_Z1I!5GhA)7W8w2Fj z(bPH-5+@6pl1~;txeSMW6jc;(;=3~1t~K&62vCC$3f2Ju<9ulR31WzId;)JVe^)0- z*beHJLAZPdIiLN-X;XcBVg8p2hp}wV|h^fAr^-s^``yhk>SspCd-v?*=$OIEDiX0K4S&#@+{uN06i2_5^ z$EMNMj2bUrOCFrODyC|nAF!Y=N_=ko;g;RCMVm_k*6hRE&j_E|P=RvJP2Nv@TGZhhOmcz-R^!z8}5w z3e_IaZXk`4fA@+Tn0vYTA^l%{Nc2I2^oosa3>EBcY#o>kZS0MIt^qQU{a=e1@@`|I zwPZS&ae~2c4bmZFLB zS{Hy}=1F29w|7#)$MQ1)u}32?UaV%)Yg!n~j^ioiJoxQpUXBLzoU)(TD|E;%F>b3h z1TN&?2ko150aW4M@>B>mRZnRn_n0DE`B5b;0W9`!DF@xDd{=5dEgNIGHr)f@2;shX zjtWqfRJ`jsL{Qa8WH1mmu&)@BOwD%V^Z^&&J2hhvaBfPi3Upo>2=l?@L+g5m?c@KB zbm2dG1r@=*@%E>8Ld)j~;|5keNZC&qZlEUj2-Oz@m znF@JQvM0K}h=l6vA>_rUJ*egwA^}khN^#VDMWS7c^jYM}`pE1uR%tJcLpW@uH*|u_ zE1#4ExD}37@Qs|vgu;vK>e)?41RChQslL@2CykdQS^|HNMK7G%$+nvY!W!^k)p*OIrc+wM_Nv~ieuF_MSK^X;7c?UoKwK)Tn!YyR6*Ql z20RoNvKwC9TF@L5@wdPtQN%I-9rDruWGSMCVD9}i5`KlC-b^ECq%QtsgPbz$T{l$8 zHXlD2^%m#q_^lMoz8J0u9v`n)IS#X2Ljq2a!92+wH5cd#(~vQ{`}D^XttVMCt<0)i z^J9oa&fY)XT6&#)lY2q6ejic+zBy=atR%&jJ0Pu@wrM0g~;0ziI71 zuk}CI-)v!1kohOTKex*K$MENM0OC7;+c@*s@bUJ6U#7HmcSf+SrC%J2LBk6|A7ZGXXpqW=r#pIzL? zP>=g^zo1SbN(b_f9(U;;13cFIzW|m9{s8!;{vVq@mQ}w@%ZUCoeJrvbBRp0uzYt=G z|3LVMhIwrLPr>lZ7E-*B0094z50B0N8T$WjK1lXA^S=^-f(#sltv_obWPk#M@D-Fl Gzx^Kt>&8|9 literal 0 HcmV?d00001 diff --git a/tests/test.rs b/tests/test.rs index c6c7e7f4..0a9179d3 100644 --- a/tests/test.rs +++ b/tests/test.rs @@ -2457,6 +2457,51 @@ fn test_ods_sheets_metadata() { ); } +#[rstest] +#[case("macro_sheets.xlsm")] +#[case("macro_sheets.xlsb")] +#[case("macro_sheets.xls")] +fn test_all_macro_sheets(#[case] test_file: &str) { + // Test that Excel 4.0 macro sheets and international macro sheets are read + // as macro sheets, along with their cells and formulas. The files are the + // same workbook saved by Excel in each format. See issue #802. + let mut workbook = open_workbook_auto(test_path(test_file)).unwrap(); + + assert_eq!( + workbook.sheets_metadata(), + &[ + Sheet { + name: "Data".to_string(), + typ: SheetType::WorkSheet, + visible: SheetVisible::Visible + }, + Sheet { + name: "Macro1".to_string(), + typ: SheetType::MacroSheet, + visible: SheetVisible::Visible + }, + Sheet { + name: "Intl1".to_string(), + typ: SheetType::MacroSheet, + visible: SheetVisible::Visible + }, + ] + ); + + let range = workbook.worksheet_range("Macro1").unwrap(); + range_eq!(range, [[Bool(false)], [Bool(false)]]); + let formulas = workbook.worksheet_formula("Macro1").unwrap(); + range_eq!( + formulas, + [["ECHO(FALSE)".to_string()], ["RETURN()".to_string()]] + ); + + let range = workbook.worksheet_range("Intl1").unwrap(); + range_eq!(range, [[Bool(false)]]); + let formulas = workbook.worksheet_formula("Intl1").unwrap(); + range_eq!(formulas, [["RETURN()".to_string()]]); +} + #[test] fn test_xlsx_password_protected() { // Test that a password protected xlsx file returns XlsxError::Password.