From 02efb8f802023373ace492bacbd9e09ea5f26e4b Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sat, 18 Mar 2023 00:59:29 +0000 Subject: [PATCH] revert: [bug-66503] Add flag for Excel 4 macros in composite documents. git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1908462 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/hssf/record/BoundSheetRecord.java | 28 ------------------ .../eventusermodel/TestHSSFEventFactory.java | 22 -------------- test-data/spreadsheet/66503.xls | Bin 23552 -> 0 bytes 3 files changed, 50 deletions(-) delete mode 100644 test-data/spreadsheet/66503.xls diff --git a/poi/src/main/java/org/apache/poi/hssf/record/BoundSheetRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/BoundSheetRecord.java index 80602dcd2c..1e7ed0351e 100644 --- a/poi/src/main/java/org/apache/poi/hssf/record/BoundSheetRecord.java +++ b/poi/src/main/java/org/apache/poi/hssf/record/BoundSheetRecord.java @@ -39,7 +39,6 @@ public final class BoundSheetRecord extends StandardRecord { public static final short sid = 0x0085; private static final BitField hiddenFlag = BitFieldFactory.getInstance(0x01); private static final BitField veryHiddenFlag = BitFieldFactory.getInstance(0x02); - private static final BitField xl4Flag = BitFieldFactory.getInstance(0x100); private int field_1_position_of_BOF; private int field_2_option_flags; @@ -178,33 +177,6 @@ public final class BoundSheetRecord extends StandardRecord { return veryHiddenFlag.isSet(field_2_option_flags); } - /** - * Is the sheet very hidden? Different from (normal) hidden - * - * @param veryHidden {@code true} if very hidden - */ - public void setVeryHidden(boolean veryHidden) { - field_2_option_flags = veryHiddenFlag.setBoolean(field_2_option_flags, veryHidden); - } - - /** - * Is the sheet an Excel 4 macro sheet? - * - * @return {@code true} if very hidden - */ - public boolean isExcel4Macro() { - return xl4Flag.isSet(field_2_option_flags); - } - - /** - * Is the sheet an Excel 4 macro sheet? - * - * @param xl4flag {@code true} if an excel 4 macro sheet - */ - public void setExcel4Macro(boolean xl4flag) { - field_2_option_flags = xl4Flag.setBoolean(field_2_option_flags, xl4flag); - } - /** * Converts a List of {@link BoundSheetRecord}s to an array and sorts by the position of their * BOFs. diff --git a/poi/src/test/java/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java b/poi/src/test/java/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java index b907fdf02e..24fba3e492 100644 --- a/poi/src/test/java/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java +++ b/poi/src/test/java/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java @@ -166,26 +166,4 @@ final class TestHSSFEventFactory { Biff8EncryptionKey.setCurrentUserPassword(null); } } - - @Test - void testXL4Workbook() throws Exception { - // This document has a single Excel 4 macro in it - openSample("66503.xls"); - assertEquals(records.stream() - .filter(r -> r instanceof BoundSheetRecord) - .map(r -> (BoundSheetRecord)r) - .filter(BoundSheetRecord::isExcel4Macro) - .count(), 1); - } - - @Test - void testXL4Workbook_false() throws Exception { - // This document does not have an Excel 4 macro in it - openSample("42844.xls"); - assertEquals(records.stream() - .filter(r -> r instanceof BoundSheetRecord) - .map(r -> (BoundSheetRecord)r) - .filter(BoundSheetRecord::isExcel4Macro) - .count(), 0); - } } diff --git a/test-data/spreadsheet/66503.xls b/test-data/spreadsheet/66503.xls deleted file mode 100644 index a018e6d74ceb9fa3f0e19aa410e62971c8522828..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23552 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 D`Y1Bu -- 2.39.5