Patch from Andrew Novikov from bug #53972 - Presence of PLV record shouldn't affect HSSF Data Validation
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1496499 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
678991d868
commit
dbd1a59416
@ -344,6 +344,7 @@ final class RecordOrderer {
|
|||||||
switch(sid) {
|
switch(sid) {
|
||||||
case UnknownRecord.SHEETEXT_0862:
|
case UnknownRecord.SHEETEXT_0862:
|
||||||
case UnknownRecord.SHEETPROTECTION_0867:
|
case UnknownRecord.SHEETPROTECTION_0867:
|
||||||
|
case UnknownRecord.PLV_MAC:
|
||||||
case FeatRecord.sid:
|
case FeatRecord.sid:
|
||||||
case EOFRecord.sid:
|
case EOFRecord.sid:
|
||||||
return true;
|
return true;
|
||||||
|
@ -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 SHEETEXT_0862 = 0x0862; // OOO calls this SHEETLAYOUT
|
||||||
public static final int SHEETPROTECTION_0867 = 0x0867;
|
public static final int SHEETPROTECTION_0867 = 0x0867;
|
||||||
public static final int HEADER_FOOTER_089C = 0x089C;
|
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 int _sid;
|
||||||
private byte[] _rawData;
|
private byte[] _rawData;
|
||||||
|
@ -77,6 +77,7 @@ public final class AllRecordTests {
|
|||||||
result.addTestSuite(TestObjRecord.class);
|
result.addTestSuite(TestObjRecord.class);
|
||||||
result.addTestSuite(TestPaletteRecord.class);
|
result.addTestSuite(TestPaletteRecord.class);
|
||||||
result.addTestSuite(TestPaneRecord.class);
|
result.addTestSuite(TestPaneRecord.class);
|
||||||
|
result.addTestSuite(TestPLVRecord.class);
|
||||||
result.addTestSuite(TestRecalcIdRecord.class);
|
result.addTestSuite(TestRecalcIdRecord.class);
|
||||||
result.addTestSuite(TestRecordFactory.class);
|
result.addTestSuite(TestRecordFactory.class);
|
||||||
result.addTestSuite(TestRecordFactoryInputStream.class);
|
result.addTestSuite(TestRecordFactoryInputStream.class);
|
||||||
|
59
src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java
Normal file
59
src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java
Normal file
@ -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()");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
BIN
test-data/spreadsheet/53972.xls
Normal file
BIN
test-data/spreadsheet/53972.xls
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user