Patch from Andrew Novikov from bug #53972 - Presence of PLV record shouldn't affect...

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1496499 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/poi/hssf/model/RecordOrderer.java b/src/java/org/apache/poi/hssf/model/RecordOrderer.java
index 764d5a5110c0e356c3668db6bd9aa91ebbfae1e0..6ea8ea95be3df2b3e1f71dceea700674075f734d 100644 (file)
--- a/src/java/org/apache/poi/hssf/model/RecordOrderer.java
+++ b/src/java/org/apache/poi/hssf/model/RecordOrderer.java
@@ -344,6 +344,7 @@ final class RecordOrderer {
                switch(sid) {
                        case UnknownRecord.SHEETEXT_0862:
                        case UnknownRecord.SHEETPROTECTION_0867:
+                       case UnknownRecord.PLV_MAC:
                        case FeatRecord.sid:
                        case EOFRecord.sid:
                                return true;

diff --git a/src/java/org/apache/poi/hssf/record/UnknownRecord.java b/src/java/org/apache/poi/hssf/record/UnknownRecord.java
index 963810f745ddc539dc370752692b9ac8859fd46a..4231a659d3271a0791f22c8793638bf503bb7ab7 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/UnknownRecord.java
+++ b/src/java/org/apache/poi/hssf/record/UnknownRecord.java
@@ -57,7 +57,8 @@ public final class UnknownRecord extends StandardRecord {
        public static final int SHEETEXT_0862        = 0x0862; // OOO calls this SHEETLAYOUT
        public static final int SHEETPROTECTION_0867 = 0x0867;
        public static final int HEADER_FOOTER_089C   = 0x089C;
-    public static final int CODENAME_1BA         = 0x01BA;
+       public static final int CODENAME_1BA         = 0x01BA;
+       public static final int PLV_MAC              = 0x08C8;
 
        private int _sid;
        private byte[] _rawData;

diff --git a/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java b/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
index 831cb9d378855b5e1cc89f31177734ac7c1ba30f..8a3c92ba777665e41e7e1e8f003df56f9f24de65 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
+++ b/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
@@ -77,6 +77,7 @@ public final class AllRecordTests {
                result.addTestSuite(TestObjRecord.class);
                result.addTestSuite(TestPaletteRecord.class);
                result.addTestSuite(TestPaneRecord.class);
+               result.addTestSuite(TestPLVRecord.class);
                result.addTestSuite(TestRecalcIdRecord.class);
                result.addTestSuite(TestRecordFactory.class);
                result.addTestSuite(TestRecordFactoryInputStream.class);

diff --git a/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java b/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java
new file mode 100644 (file)
index 0000000..fce575b
--- /dev/null
+++ b/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java
@@ -0,0 +1,59 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.hssf.record;
+
+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
+import org.apache.poi.hssf.HSSFTestDataSamples;
+import org.apache.poi.hssf.usermodel.DVConstraint;
+import org.apache.poi.hssf.usermodel.HSSFDataValidation;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.DataValidationConstraint;
+import org.apache.poi.ss.util.CellRangeAddressList;
+
+import java.io.InputStream;
+
+/**
+ * Verify that presence of PLV record doesn't break data
+ * validation, bug #53972:
+ * https://issues.apache.org/bugzilla/show_bug.cgi?id=53972
+ *
+ * @author Andrew Novikov
+ */
+
+public final class TestPLVRecord extends TestCase {
+    private final static String DV_DEFINITION = "$A$1:$A$5";
+    private final static String XLS_FILENAME = "53972.xls";
+    private final static String SHEET_NAME = "S2";
+
+    public void testPLVRecord() throws Exception {
+        InputStream is = HSSFTestDataSamples.openSampleFileStream(XLS_FILENAME);
+        HSSFWorkbook workbook = new HSSFWorkbook(is);
+
+        CellRangeAddressList cellRange = new CellRangeAddressList(0, 0, 1, 1);
+        DataValidationConstraint constraint = DVConstraint.createFormulaListConstraint(DV_DEFINITION);
+        HSSFDataValidation dataValidation = new HSSFDataValidation(cellRange, constraint);
+
+        // This used to throw an error before
+        try {
+            workbook.getSheet(SHEET_NAME).addValidationData(dataValidation);
+        } catch (IllegalStateException ex) {
+            throw new AssertionFailedError("Identified bug 53972, PLV record breaks addDataValidation()");
+        }
+    }
+}

diff --git a/test-data/spreadsheet/53972.xls b/test-data/spreadsheet/53972.xls
new file mode 100644 (file)
index 0000000..5fd0ec9
Binary files /dev/null and b/test-data/spreadsheet/53972.xls differ