From b4da1cab0418200996eb2b3225bd5b18ef4cde4e Mon Sep 17 00:00:00 2001 From: Yegor Kozlov Date: Wed, 2 Dec 2009 10:56:01 +0000 Subject: [PATCH] fixed RecordFormatException when reading LbsDataSubRecord, see bugzilla 47701 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@886113 13f79535-47bb-0310-9956-ffa450edef68 --- src/documentation/content/xdocs/status.xml | 1 + .../apache/poi/hssf/record/EndSubRecord.java | 5 + .../poi/hssf/record/LbsDataSubRecord.java | 340 ++++++++++++++++++ .../org/apache/poi/hssf/record/ObjRecord.java | 25 +- .../org/apache/poi/hssf/record/SubRecord.java | 171 ++------- .../poi/hssf/record/TestLbsDataSubRecord.java | 170 +++++++++ .../apache/poi/hssf/usermodel/TestBugs.java | 8 + test-data/spreadsheet/47701.xls | Bin 0 -> 17920 bytes 8 files changed, 561 insertions(+), 159 deletions(-) create mode 100755 src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java create mode 100644 src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java create mode 100644 test-data/spreadsheet/47701.xls diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml index 26d6341242..d9c53a0156 100644 --- a/src/documentation/content/xdocs/status.xml +++ b/src/documentation/content/xdocs/status.xml @@ -34,6 +34,7 @@ + 47701 - fixed RecordFormatException when reading list subrecords (LbsDataSubRecord) memory usage optimization in XSSF - avoid creating parentless xml beans 47188 - avoid corruption of workbook when adding cell comments 48106 - improved work with cell comments in XSSF diff --git a/src/java/org/apache/poi/hssf/record/EndSubRecord.java b/src/java/org/apache/poi/hssf/record/EndSubRecord.java index 518dc2524b..e31692b021 100644 --- a/src/java/org/apache/poi/hssf/record/EndSubRecord.java +++ b/src/java/org/apache/poi/hssf/record/EndSubRecord.java @@ -46,6 +46,11 @@ public final class EndSubRecord extends SubRecord { } } + @Override + public boolean isTerminating(){ + return true; + } + public String toString() { StringBuffer buffer = new StringBuffer(); diff --git a/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java b/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java new file mode 100755 index 0000000000..71217651df --- /dev/null +++ b/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java @@ -0,0 +1,340 @@ +/* ==================================================================== + 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 org.apache.poi.hssf.record.formula.*; +import org.apache.poi.util.*; + +/** + * This structure specifies the properties of a list or drop-down list embedded object in a sheet. + */ +public class LbsDataSubRecord extends SubRecord { + + public static final int sid = 0x0013; + + /** + * From [MS-XLS].pdf 2.5.147 FtLbsData: + * + * An unsigned integer that indirectly specifies whether + * some of the data in this structure appear in a subsequent Continue record. + * If _cbFContinued is 0x00, all of the fields in this structure except sid and _cbFContinued + * MUST NOT exist. If this entire structure is contained within the same record, + * then _cbFContinued MUST be greater than or equal to the size, in bytes, + * of this structure, not including the four bytes for the ft and _cbFContinued fields + */ + private int _cbFContinued; + + /** + * a formula that specifies the range of cell values that are the items in this list. + */ + private int _unknownPreFormulaInt; + private Ptg _linkPtg; + private Byte _unknownPostFormulaByte; + + /** + * An unsigned integer that specifies the number of items in the list. + */ + private int _cLines; + + /** + * An unsigned integer that specifies the one-based index of the first selected item in this list. + * A value of 0x00 specifies there is no currently selected item. + */ + private int _iSel; + + /** + * flags that tell what data follows + */ + private int _flags; + + /** + * An ObjId that specifies the edit box associated with this list. + * A value of 0x00 specifies that there is no edit box associated with this list. + */ + private int _idEdit; + + /** + * An optional LbsDropData that specifies properties for this dropdown control. + * This field MUST exist if and only if the containing Obj?s cmo.ot is equal to 0x14. + */ + private LbsDropData _dropData; + + /** + * An optional array of strings where each string specifies an item in the list. + * The number of elements in this array, if it exists, MUST be {@link #_cLines} + */ + private String[] _rgLines; + + /** + * An optional array of booleans that specifies + * which items in the list are part of a multiple selection + */ + private boolean[] _bsels; + + /** + * @param in the stream to read data from + * @param cbFContinued the seconf short in the record header + * @param cmoOt the containing Obj's {@link CommonObjectDataSubRecord#field_1_objectType} + */ + public LbsDataSubRecord(LittleEndianInput in, int cbFContinued, int cmoOt) { + _cbFContinued = cbFContinued; + + int encodedTokenLen = in.readUShort(); + if (encodedTokenLen > 0) { + int formulaSize = in.readUShort(); + _unknownPreFormulaInt = in.readInt(); + + Ptg[] ptgs = Ptg.readTokens(formulaSize, in); + if (ptgs.length != 1) { + throw new RecordFormatException("Read " + ptgs.length + + " tokens but expected exactly 1"); + } + _linkPtg = ptgs[0]; + switch (encodedTokenLen - formulaSize - 6) { + case 1: + _unknownPostFormulaByte = in.readByte(); + break; + case 0: + _unknownPostFormulaByte = null; + break; + default: + throw new RecordFormatException("Unexpected leftover bytes"); + } + } + + _cLines = in.readUShort(); + _iSel = in.readUShort(); + _flags = in.readUShort(); + _idEdit = in.readUShort(); + + // From [MS-XLS].pdf 2.5.147 FtLbsData: + // This field MUST exist if and only if the containing Obj?s cmo.ot is equal to 0x14. + if(cmoOt == 0x14) { + _dropData = new LbsDropData(in); + } + + // From [MS-XLS].pdf 2.5.147 FtLbsData: + // This array MUST exist if and only if the fValidPlex flag (0x2) is set + if((_flags & 0x2) != 0) { + _rgLines = new String[_cLines]; + for(int i=0; i < _cLines; i++) { + _rgLines[i] = StringUtil.readUnicodeString(in); + } + } + + // bits 5-6 in the _flags specify the type + // of selection behavior this list control is expected to support + + // From [MS-XLS].pdf 2.5.147 FtLbsData: + // This array MUST exist if and only if the wListType field is not equal to 0. + if(((_flags >> 4) & 0x2) != 0) { + _bsels = new boolean[_cLines]; + for(int i=0; i < _cLines; i++) { + _bsels[i] = in.readByte() == 1; + } + } + + } + + /** + * @return true as LbsDataSubRecord is always the last sub-record + */ + @Override + public boolean isTerminating(){ + return true; + } + + @Override + protected int getDataSize() { + int result = 2; // 2 initial shorts + + // optional link formula + if (_linkPtg != null) { + result += 2; // encoded Ptg size + result += 4; // unknown int + result += _linkPtg.getSize(); + if (_unknownPostFormulaByte != null) { + result += 1; + } + } + + result += 4 * 2; // 4 shorts + if(_dropData != null) { + result += _dropData.getDataSize(); + } + if(_rgLines != null) { + for(String str : _rgLines){ + result += StringUtil.getEncodedSize(str); + } + } + if(_bsels != null) { + result += _bsels.length; + } + return result; + } + + @Override + public void serialize(LittleEndianOutput out) { + out.writeShort(sid); + out.writeShort(_cbFContinued); + + if (_linkPtg == null) { + out.writeShort(0); + } else { + int formulaSize = _linkPtg.getSize(); + int linkSize = formulaSize + 6; + if (_unknownPostFormulaByte != null) { + linkSize++; + } + out.writeShort(linkSize); + out.writeShort(formulaSize); + out.writeInt(_unknownPreFormulaInt); + _linkPtg.write(out); + if (_unknownPostFormulaByte != null) { + out.writeByte(_unknownPostFormulaByte.intValue()); + } + } + + out.writeShort(_cLines); + out.writeShort(_iSel); + out.writeShort(_flags); + out.writeShort(_idEdit); + + if(_dropData != null) { + _dropData.serialize(out); + } + + if(_rgLines != null) { + for(String str : _rgLines){ + StringUtil.writeUnicodeString(out, str); + } + } + + if(_bsels != null) { + for(boolean val : _bsels){ + out.writeByte(val ? 1 : 0); + } + } + } + + @Override + public Object clone() { + return this; + } + + @Override + public String toString() { + StringBuffer sb = new StringBuffer(256); + + sb.append("[ftLbsData]\n"); + sb.append(" .unknownShort1 =").append(HexDump.shortToHex(_cbFContinued)).append("\n"); + sb.append(" .formula = ").append('\n'); + sb.append(_linkPtg.toString()).append(_linkPtg.getRVAType()).append('\n'); + sb.append(" .nEntryCount =").append(HexDump.shortToHex(_cLines)).append("\n"); + sb.append(" .selEntryIx =").append(HexDump.shortToHex(_iSel)).append("\n"); + sb.append(" .style =").append(HexDump.shortToHex(_flags)).append("\n"); + sb.append(" .unknownShort10=").append(HexDump.shortToHex(_idEdit)).append("\n"); + if(_dropData != null) sb.append('\n').append(_dropData.toString()); + sb.append("[/ftLbsData]\n"); + return sb.toString(); + } + + /** + * + * @return the formula that specifies the range of cell values that are the items in this list. + */ + public Ptg getFormula(){ + return _linkPtg; + } + + /** + * @return the number of items in the list + */ + public int getNumberOfItems(){ + return _cLines; + } + + /** + * This structure specifies properties of the dropdown list control + */ + public static class LbsDropData { + /** + * An unsigned integer that specifies the style of this dropdown. + */ + private int _wStyle; + + /** + * An unsigned integer that specifies the number of lines to be displayed in the dropdown. + */ + private int _cLine; + + /** + * An unsigned integer that specifies the smallest width in pixels allowed for the dropdown window + */ + private int _dxMin; + + /** + * a string that specifies the current string value in the dropdown + */ + private String _str; + + /** + * Optional, undefined and MUST be ignored. + * This field MUST exist if and only if the size of str in bytes is an odd number + */ + private Byte _unused; + + public LbsDropData(LittleEndianInput in){ + _wStyle = in.readUShort(); + _cLine = in.readUShort(); + _dxMin = in.readUShort(); + _str = StringUtil.readUnicodeString(in); + if(StringUtil.getEncodedSize(_str) % 2 != 0){ + _unused = in.readByte(); + } + } + + public void serialize(LittleEndianOutput out) { + out.writeShort(_wStyle); + out.writeShort(_cLine); + out.writeShort(_dxMin); + StringUtil.writeUnicodeString(out, _str); + if(_unused != null) out.writeByte(_unused); + } + + public int getDataSize() { + int size = 6; + size += StringUtil.getEncodedSize(_str); + size += _unused; + return size; + } + + @Override + public String toString(){ + StringBuffer sb = new StringBuffer(); + sb.append("[LbsDropData]\n"); + sb.append(" ._wStyle: ").append(_wStyle).append('\n'); + sb.append(" ._cLine: ").append(_cLine).append('\n'); + sb.append(" ._dxMin: ").append(_dxMin).append('\n'); + sb.append(" ._str: ").append(_str).append('\n'); + if(_unused != null) sb.append(" ._unused: ").append(_unused).append('\n'); + sb.append("[/LbsDropData]\n"); + + return sb.toString(); + } + } +} diff --git a/src/java/org/apache/poi/hssf/record/ObjRecord.java b/src/java/org/apache/poi/hssf/record/ObjRecord.java index 32231d9ae5..cf696bf282 100644 --- a/src/java/org/apache/poi/hssf/record/ObjRecord.java +++ b/src/java/org/apache/poi/hssf/record/ObjRecord.java @@ -78,20 +78,24 @@ public final class ObjRecord extends Record { subrecords = null; return; } - if (subRecordData.length % 2 != 0) { + + //YK: files produced by OO violate the condition below + /* + if (subRecordData.length % 2 != 0) { String msg = "Unexpected length of subRecordData : " + HexDump.toHex(subRecordData); throw new RecordFormatException(msg); } - -// System.out.println(HexDump.toHex(subRecordData)); + */ subrecords = new ArrayList(); ByteArrayInputStream bais = new ByteArrayInputStream(subRecordData); LittleEndianInputStream subRecStream = new LittleEndianInputStream(bais); - while (true) { - SubRecord subRecord = SubRecord.createSubRecord(subRecStream); + CommonObjectDataSubRecord cmo = (CommonObjectDataSubRecord)SubRecord.createSubRecord(subRecStream, 0); + subrecords.add(cmo); + while (true) { + SubRecord subRecord = SubRecord.createSubRecord(subRecStream, cmo.getObjectType()); subrecords.add(subRecord); - if (subRecord instanceof EndSubRecord) { + if (subRecord.isTerminating()) { break; } } @@ -107,7 +111,8 @@ public final class ObjRecord extends Record { } _isPaddedToQuadByteMultiple = false; } - } else { + + } else { _isPaddedToQuadByteMultiple = false; } _uninterpretedData = null; @@ -123,11 +128,7 @@ public final class ObjRecord extends Record { * to the its proper size. POI does the same. */ private static boolean canPaddingBeDiscarded(byte[] data, int nRemainingBytes) { - if (data.length < 0x1FEE) { - // this looks like a different problem - return false; - } - // make sure none of the padding looks important + // make sure none of the padding looks important for(int i=data.length-nRemainingBytes; itrue + * - EndSubRecord (sid = 0x00) + * - LbsDataSubRecord (sid = 0x12) + * + * @return whether this record is the last in the sub-record stream + */ + public boolean isTerminating(){ + return false; + } - private static final class UnknownSubRecord extends SubRecord { + private static final class UnknownSubRecord extends SubRecord { private final int _sid; private final byte[] _data; @@ -111,140 +124,4 @@ public abstract class SubRecord { return sb.toString(); } } - - // TODO make into a top level class - // perhaps all SubRecord sublcasses could go to their own package - private static final class LbsDataSubRecord extends SubRecord { - - public static final int sid = 0x0013; - - private int _unknownShort1; - private int _unknownInt4; - private Ptg _linkPtg; - private Byte _unknownByte6; - private int _nEntryCount; - private int _selectedEntryIndex; - private int _style; - private int _unknownShort10; - private int _comboStyle; - private int _lineCount; - private int _unknownShort13; - - public LbsDataSubRecord(LittleEndianInput in, int unknownShort1) { - _unknownShort1 = unknownShort1; - int linkSize = in.readUShort(); - if (linkSize > 0) { - int formulaSize = in.readUShort(); - _unknownInt4 = in.readInt(); - - - byte[] buf = new byte[formulaSize]; - in.readFully(buf); - _linkPtg = readRefPtg(buf); - switch (linkSize - formulaSize - 6) { - case 1: - _unknownByte6 = Byte.valueOf(in.readByte()); - break; - case 0: - _unknownByte6 = null; - break; - default: - throw new RecordFormatException("Unexpected leftover bytes"); - } - - } else { - _unknownInt4 = 0; - _linkPtg = null; - _unknownByte6 = null; - } - _nEntryCount = in.readUShort(); - _selectedEntryIndex = in.readUShort(); - _style = in.readUShort(); - _unknownShort10 = in.readUShort(); - _comboStyle = in.readUShort(); - _lineCount = in.readUShort(); - _unknownShort13 = in.readUShort(); - - } - protected int getDataSize() { - int result = 2; // 2 initial shorts - - // optional link formula - if (_linkPtg != null) { - result += 2; // encoded Ptg size - result += 4; // unknown int - result += _linkPtg.getSize(); - if (_unknownByte6 != null) { - result += 1; - } - } - result += 7 * 2; // 7 shorts - return result; - } - public void serialize(LittleEndianOutput out) { - out.writeShort(sid); - out.writeShort(_unknownShort1); // note - this is *not* the size - if (_linkPtg == null) { - out.writeShort(0); - } else { - int formulaSize = _linkPtg.getSize(); - int linkSize = formulaSize + 6; - if (_unknownByte6 != null) { - linkSize++; - } - out.writeShort(linkSize); - out.writeShort(formulaSize); - out.writeInt(_unknownInt4); - _linkPtg.write(out); - if (_unknownByte6 != null) { - out.writeByte(_unknownByte6.intValue()); - } - } - out.writeShort(_nEntryCount); - out.writeShort(_selectedEntryIndex); - out.writeShort(_style); - out.writeShort(_unknownShort10); - out.writeShort(_comboStyle); - out.writeShort(_lineCount); - out.writeShort(_unknownShort13); - } - private static Ptg readRefPtg(byte[] formulaRawBytes) { - LittleEndianInput in = new LittleEndianByteArrayInputStream(formulaRawBytes); - byte ptgSid = in.readByte(); - switch(ptgSid) { - case AreaPtg.sid: return new AreaPtg(in); - case Area3DPtg.sid: return new Area3DPtg(in); - case RefPtg.sid: return new RefPtg(in); - case Ref3DPtg.sid: return new Ref3DPtg(in); - } - return null; - } - public Object clone() { - return this; - } - public String toString() { - StringBuffer sb = new StringBuffer(256); - - sb.append("[ftLbsData]\n"); - sb.append(" .unknownShort1 =").append(HexDump.shortToHex(_unknownShort1)).append("\n"); - if (_linkPtg == null) { - sb.append(" \n"); - } else { - sb.append(" .unknownInt4 =").append(HexDump.intToHex(_unknownInt4)).append("\n"); - sb.append(" .linkPtg =").append(_linkPtg.toFormulaString()).append(" (").append(_linkPtg.getRVAType()).append(")").append("\n"); - if (_unknownByte6 != null) { - sb.append(" .unknownByte6 =").append(HexDump.byteToHex(_unknownByte6.byteValue())).append("\n"); - } - } - sb.append(" .nEntryCount =").append(HexDump.shortToHex(_nEntryCount)).append("\n"); - sb.append(" .selEntryIx =").append(HexDump.shortToHex(_selectedEntryIndex)).append("\n"); - sb.append(" .style =").append(HexDump.shortToHex(_style)).append("\n"); - sb.append(" .unknownShort10=").append(HexDump.shortToHex(_unknownShort10)).append("\n"); - sb.append(" .comboStyle =").append(HexDump.shortToHex(_comboStyle)).append("\n"); - sb.append(" .lineCount =").append(HexDump.shortToHex(_lineCount)).append("\n"); - sb.append(" .unknownShort13=").append(HexDump.shortToHex(_unknownShort13)).append("\n"); - sb.append("[/ftLbsData]\n"); - return sb.toString(); - } - } } diff --git a/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java b/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java new file mode 100644 index 0000000000..e0b4eb133d --- /dev/null +++ b/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java @@ -0,0 +1,170 @@ +/* ==================================================================== + 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.TestCase; + +import java.util.Arrays; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; + +import org.apache.poi.util.HexRead; +import org.apache.poi.util.HexDump; +import org.apache.poi.util.LittleEndianInputStream; +import org.apache.poi.util.LittleEndianOutputStream; +import org.apache.poi.hssf.record.formula.Ptg; +import org.apache.poi.hssf.record.formula.AreaPtg; +import org.apache.poi.ss.util.CellRangeAddress; + +/** + * Tests the serialization and deserialization of the LbsDataSubRecord class works correctly. + * + * @author Yegor Kozlov + */ +public final class TestLbsDataSubRecord extends TestCase { + + /** + * test read-write round trip + * test data was taken from 47701.xls + */ + public void test_47701(){ + byte[] data = HexRead.readFromString( + "15, 00, 12, 00, 12, 00, 02, 00, 11, 20, " + + "00, 00, 00, 00, 80, 3D, 03, 05, 00, 00, " + + "00, 00, 0C, 00, 14, 00, 00, 00, 00, 00, " + + "00, 00, 00, 00, 00, 00, 01, 00, 0A, 00, " + + "00, 00, 10, 00, 01, 00, 13, 00, EE, 1F, " + + "10, 00, 09, 00, 40, 9F, 74, 01, 25, 09, " + + "00, 0C, 00, 07, 00, 07, 00, 07, 04, 00, " + + "00, 00, 08, 00, 00, 00"); + RecordInputStream in = TestcaseRecordInputStream.create(ObjRecord.sid, data); + // check read OK + ObjRecord record = new ObjRecord(in); + assertEquals(3, record.getSubRecords().size()); + SubRecord sr = record.getSubRecords().get(2); + assertTrue(sr instanceof LbsDataSubRecord); + LbsDataSubRecord lbs = (LbsDataSubRecord)sr; + assertEquals(4, lbs.getNumberOfItems()); + + assertTrue(lbs.getFormula() instanceof AreaPtg); + AreaPtg ptg = (AreaPtg)lbs.getFormula(); + CellRangeAddress range = new CellRangeAddress( + ptg.getFirstRow(), ptg.getLastRow(), ptg.getFirstColumn(), ptg.getLastColumn()); + assertEquals("H10:H13", range.formatAsString()); + + // check that it re-serializes to the same data + byte[] ser = record.serialize(); + TestcaseRecordInputStream.confirmRecordEncoding(ObjRecord.sid, data, ser); + } + + /** + * test data was taken from the file attached to Bugzilla 45778 + */ + public void test_45778(){ + byte[] data = HexRead.readFromString( + "15, 00, 12, 00, 14, 00, 01, 00, 01, 00, " + + "01, 21, 00, 00, 3C, 13, F4, 03, 00, 00, " + + "00, 00, 0C, 00, 14, 00, 00, 00, 00, 00, " + + "00, 00, 00, 00, 00, 00, 01, 00, 08, 00, 00, " + + "00, 10, 00, 00, 00, " + + "13, 00, EE, 1F, " + + "00, 00, " + + "08, 00, " + //number of items + "08, 00, " + //selected item + "01, 03, " + //flags + "00, 00, " + //objId + //LbsDropData + "0A, 00, " + //flags + "14, 00, " + //the number of lines to be displayed in the dropdown + "6C, 00, " + //the smallest width in pixels allowed for the dropdown window + "00, 00, " + //num chars + "00, 00"); + RecordInputStream in = TestcaseRecordInputStream.create(ObjRecord.sid, data); + // check read OK + ObjRecord record = new ObjRecord(in); + + SubRecord sr = record.getSubRecords().get(2); + assertTrue(sr instanceof LbsDataSubRecord); + LbsDataSubRecord lbs = (LbsDataSubRecord)sr; + assertEquals(8, lbs.getNumberOfItems()); + assertNull(lbs.getFormula()); + + // check that it re-serializes to the same data + byte[] ser = record.serialize(); + TestcaseRecordInputStream.confirmRecordEncoding(ObjRecord.sid, data, ser); + + } + + /** + * Test data produced by OpenOffice 3.1 by opening and saving 47701.xls + * There are 5 padding bytes that are removed by POI + */ + public void test_remove_padding(){ + byte[] data = HexRead.readFromString( + "5D, 00, 4C, 00, " + + "15, 00, 12, 00, 12, 00, 01, 00, 11, 00, " + + "00, 00, 00, 00, 00, 00, 00, 00, 00, 00, " + + "00, 00, 0C, 00, 14, 00, 00, 00, 00, 00, " + + "00, 00, 00, 00, 00, 00, 01, 00, 09, 00, " + + "00, 00, 0F, 00, 01, 00, " + + "13, 00, 1B, 00, " + + "10, 00, " + //next 16 bytes is a ptg aray + "09, 00, 00, 00, 00, 00, 25, 09, 00, 0C, 00, 07, 00, 07, 00, 00, " + + "01, 00, " + //num lines + "00, 00, " + //selected + "08, 00, " + + "00, 00, " + + "00, 00, 00, 00, 00"); //padding bytes + + RecordInputStream in = TestcaseRecordInputStream.create(data); + // check read OK + ObjRecord record = new ObjRecord(in); + // check that it re-serializes to the same data + byte[] ser = record.serialize(); + + assertEquals(data.length-5, ser.length); + for(int i=0; i < ser.length; i++) assertEquals(data[i],ser[i]); + + //check we can read the trimmed record + RecordInputStream in2 = TestcaseRecordInputStream.create(ser); + ObjRecord record2 = new ObjRecord(in2); + byte[] ser2 = record2.serialize(); + assertTrue(Arrays.equals(ser, ser2)); + } + + public void test_LbsDropData(){ + byte[] data = HexRead.readFromString( + //LbsDropData + "0A, 00, " + //flags + "14, 00, " + //the number of lines to be displayed in the dropdown + "6C, 00, " + //the smallest width in pixels allowed for the dropdown window + "00, 00, " + //num chars + "00, " + //compression flag + "00"); //padding byte + + LittleEndianInputStream in = new LittleEndianInputStream(new ByteArrayInputStream(data)); + + LbsDataSubRecord.LbsDropData lbs = new LbsDataSubRecord.LbsDropData(in); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + lbs.serialize(new LittleEndianOutputStream(baos)); + + assertTrue(Arrays.equals(data, baos.toByteArray())); + } +} \ No newline at end of file diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java index 5e15be8405..5a75e91484 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java @@ -1522,4 +1522,12 @@ public final class TestBugs extends BaseTestBugzillaIssues { HSSFCell cell2 = s.getRow(0).getCell(1); assertEquals(1.0, cell2.getNumericCellValue()); } + + /** + * POI 3.5 beta 7 can not read excel file contain list box (Form Control) + */ + public void test47701() { + openSample("47701.xls"); + } + } diff --git a/test-data/spreadsheet/47701.xls b/test-data/spreadsheet/47701.xls new file mode 100644 index 0000000000000000000000000000000000000000..f6cf8a2d7890a253cca6504232fd5695c7109976 GIT binary patch literal 17920 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 KlrkS?{{IGIIfNVl literal 0 HcmV?d00001 -- 2.39.5