From 3788b447f4c0fd7aeabfd9ecda2b2505ee49da51 Mon Sep 17 00:00:00 2001 From: Mangesh Date: Tue, 19 Sep 2017 15:17:20 -0500 Subject: [PATCH] 0.3 bugfixes mangesh (#127) * More constructors. * Add constructor for ptgs Fixed #120 --- .../org/zkoss/poi/ss/formula/ptg/Area3DPtg.java | 3 +++ .../org/zkoss/poi/ss/formula/ptg/AreaNPtg.java | 5 +++++ .../org/zkoss/poi/ss/formula/ptg/ArrayPtg.java | 17 +++++++++++------ .../org/zkoss/poi/ss/formula/ptg/BoolPtg.java | 5 ++--- .../zkoss/poi/ss/formula/ptg/ControlPtg.java | 4 ++++ .../poi/ss/formula/ptg/DeferredNamePtg.java | 4 ++++ .../poi/ss/formula/ptg/DeletedArea3DPtg.java | 14 +++++++++----- .../poi/ss/formula/ptg/DeletedRef3DPtg.java | 14 +++++++++----- .../org/zkoss/poi/ss/formula/ptg/ExpPtg.java | 8 ++++++-- .../org/zkoss/poi/ss/formula/ptg/FuncPtg.java | 4 ++++ .../zkoss/poi/ss/formula/ptg/MemAreaPtg.java | 9 +++++++-- .../org/zkoss/poi/ss/formula/ptg/MemErrPtg.java | 5 +++++ .../zkoss/poi/ss/formula/ptg/MemFuncPtg.java | 5 ++++- .../zkoss/poi/ss/formula/ptg/MultiplyPtg.java | 4 +++- .../org/zkoss/poi/ss/formula/ptg/NamePtg.java | 4 ++++ .../org/zkoss/poi/ss/formula/ptg/NameXPtg.java | 11 ++++++++--- .../org/zkoss/poi/ss/formula/ptg/NumberPtg.java | 5 ++--- .../poi/ss/formula/ptg/OpTableColRefPtg.java | 4 ++++ .../zkoss/poi/ss/formula/ptg/OpTableRefPtg.java | 4 ++++ .../zkoss/poi/ss/formula/ptg/OperandPtg.java | 4 ++++ .../zkoss/poi/ss/formula/ptg/OperationPtg.java | 4 ++++ zpoi/src/org/zkoss/poi/ss/formula/ptg/Ptg.java | 4 +++- .../org/zkoss/poi/ss/formula/ptg/Ref3DPtg.java | 3 +++ .../org/zkoss/poi/ss/formula/ptg/RefNPtg.java | 4 ++++ .../poi/ss/formula/ptg/ScalarConstantPtg.java | 7 ++++++- .../org/zkoss/poi/ss/formula/ptg/TablePtg.java | 6 +++++- .../org/zkoss/poi/ss/formula/ptg/TblPtg.java | 7 +++++-- .../zkoss/poi/ss/formula/ptg/UnknownPtg.java | 6 +++++- .../poi/ss/formula/ptg/ValueOperatorPtg.java | 4 ++++ 29 files changed, 141 insertions(+), 37 deletions(-) diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/Area3DPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/Area3DPtg.java index 94a60a66..04eb4a42 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/Area3DPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/Area3DPtg.java @@ -38,6 +38,9 @@ public class Area3DPtg extends AreaPtgBase implements WorkbookDependentFormula, private int field_1_index_extern_sheet; + public Area3DPtg(){ + /* For seralization */ + } public Area3DPtg(String arearef, int externIdx) { super(new AreaReference(arearef)); diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/AreaNPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/AreaNPtg.java index 78dad816..85fa03e5 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/AreaNPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/AreaNPtg.java @@ -26,6 +26,11 @@ Licensed to the Apache Software Foundation (ASF) under one or more public final class AreaNPtg extends Area2DPtgBase { public final static short sid = 0x2D; + + public AreaNPtg(){ + /* For seralization */ + } + public AreaNPtg(LittleEndianInput in) { super(in); } diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/ArrayPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/ArrayPtg.java index 89e11cc3..6c66ed7a 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/ArrayPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/ArrayPtg.java @@ -49,14 +49,19 @@ public final class ArrayPtg extends Ptg { public static final int PLAIN_TOKEN_SIZE = 1+RESERVED_FIELD_LEN; // 7 bytes of data (stored as an int, short and byte here) - private final int _reserved0Int; - private final int _reserved1Short; - private final int _reserved2Byte; + private int _reserved0Int; + private int _reserved1Short; + private int _reserved2Byte; // data from these fields comes after the Ptg data of all tokens in current formula - private final int _nColumns; - private final int _nRows; - private final Object[] _arrayValues; + private int _nColumns; + private int _nRows; + private Object[] _arrayValues; + + + public ArrayPtg(){ + /* For seralization */ + } ArrayPtg(int reserved0, int reserved1, int reserved2, int nColumns, int nRows, Object[] arrayValues) { _reserved0Int = reserved0; diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/BoolPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/BoolPtg.java index ce4a0dee..ecaf3595 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/BoolPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/BoolPtg.java @@ -36,9 +36,8 @@ public final class BoolPtg extends ScalarConstantPtg { private boolean _value; - BoolPtg() - { - + BoolPtg() { + /* For seralization */ } private BoolPtg(boolean b) { diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/ControlPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/ControlPtg.java index e618250b..07b831b8 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/ControlPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/ControlPtg.java @@ -29,6 +29,10 @@ Licensed to the Apache Software Foundation (ASF) under one or more */ public abstract class ControlPtg extends Ptg { + public ControlPtg(){ + /* For seralization */ + } + public boolean isBaseToken() { return true; } diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/DeferredNamePtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/DeferredNamePtg.java index 054af386..1198f8f4 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/DeferredNamePtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/DeferredNamePtg.java @@ -24,6 +24,10 @@ public class DeferredNamePtg extends OperandPtg implements WorkbookDependentForm private String namename; + public DeferredNamePtg(){ + /* For seralization */ + } + public DeferredNamePtg(String name) { this.namename = name; } diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/DeletedArea3DPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/DeletedArea3DPtg.java index 7021a51a..07277e49 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/DeletedArea3DPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/DeletedArea3DPtg.java @@ -33,12 +33,16 @@ Licensed to the Apache Software Foundation (ASF) under one or more */ public final class DeletedArea3DPtg extends OperandPtg implements WorkbookDependentFormula { public final static byte sid = 0x3d; - private final int field_1_index_extern_sheet; - private final int unused1; - private final int unused2; + private int field_1_index_extern_sheet; + private int unused1; + private int unused2; - private final Area3DPtg ptg; //ZSS-759 for render formula string - private final String bookName; //ZSS-759 for render formula string + private Area3DPtg ptg; //ZSS-759 for render formula string + private String bookName; //ZSS-759 for render formula string + + public DeletedArea3DPtg(){ + /* For seralization */ + } public DeletedArea3DPtg(int externSheetIndex) { field_1_index_extern_sheet = externSheetIndex; diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/DeletedRef3DPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/DeletedRef3DPtg.java index 4d2eb805..51749eec 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/DeletedRef3DPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/DeletedRef3DPtg.java @@ -34,12 +34,16 @@ Licensed to the Apache Software Foundation (ASF) under one or more */ public final class DeletedRef3DPtg extends OperandPtg implements WorkbookDependentFormula { public final static byte sid = 0x3c; - private final int field_1_index_extern_sheet; - private final int unused1; - - private final Ref3DPtg ptg; //ZSS-759 for render formula string - private final String bookName; //ZSS-759 for render formula string + private int field_1_index_extern_sheet; + private int unused1; + private Ref3DPtg ptg; //ZSS-759 for render formula string + private String bookName; //ZSS-759 for render formula string + + public DeletedRef3DPtg(){ + /* For seralization */ + } + /** Creates new DeletedRef3DPtg */ public DeletedRef3DPtg(LittleEndianInput in) { field_1_index_extern_sheet = in.readUShort(); diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/ExpPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/ExpPtg.java index 5b338de5..9a9df73b 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/ExpPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/ExpPtg.java @@ -29,8 +29,12 @@ Licensed to the Apache Software Foundation (ASF) under one or more public final class ExpPtg extends ControlPtg { private final static int SIZE = 5; public final static short sid = 0x1; - private final int field_1_first_row; - private final int field_2_first_col; + private int field_1_first_row; + private int field_2_first_col; + + public ExpPtg(){ + /* For seralization */ + } public ExpPtg(LittleEndianInput in) { field_1_first_row = in.readShort(); diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/FuncPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/FuncPtg.java index 70415397..b8f4d787 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/FuncPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/FuncPtg.java @@ -32,6 +32,10 @@ public final class FuncPtg extends AbstractFunctionPtg { public final static byte sid = 0x21; public final static int SIZE = 3; + public FuncPtg(){ + /* For seralization */ + } + public static FuncPtg create(LittleEndianInput in) { return create(in.readUShort()); } diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/MemAreaPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/MemAreaPtg.java index 8883dc8f..b8fe2a60 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/MemAreaPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/MemAreaPtg.java @@ -26,8 +26,13 @@ Licensed to the Apache Software Foundation (ASF) under one or more public final class MemAreaPtg extends OperandPtg { public final static short sid = 0x26; private final static int SIZE = 7; - private final int field_1_reserved; - private final int field_2_subex_len; + private int field_1_reserved; + private int field_2_subex_len; + + + public MemAreaPtg(){ + /* For seralization */ + } /** Creates new MemAreaPtg */ diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/MemErrPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/MemErrPtg.java index f7a9c1ae..09b5b408 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/MemErrPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/MemErrPtg.java @@ -32,6 +32,11 @@ public final class MemErrPtg extends OperandPtg { private int field_1_reserved; private short field_2_subex_len; + + public MemErrPtg(){ + /* For seralization */ + } + public MemErrPtg(LittleEndianInput in) { field_1_reserved = in.readInt(); field_2_subex_len = in.readShort(); diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/MemFuncPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/MemFuncPtg.java index 7160b244..95fdbc99 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/MemFuncPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/MemFuncPtg.java @@ -26,8 +26,11 @@ Licensed to the Apache Software Foundation (ASF) under one or more public final class MemFuncPtg extends OperandPtg { public final static byte sid = 0x29; - private final int field_1_len_ref_subexpression; + private int field_1_len_ref_subexpression; + public MemFuncPtg(){ + /* For seralization */ + } /** * Creates new function pointer from a byte array usually called while * reading an excel file. diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/MultiplyPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/MultiplyPtg.java index f8873582..597331cc 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/MultiplyPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/MultiplyPtg.java @@ -31,7 +31,9 @@ public final class MultiplyPtg extends ValueOperatorPtg { // private MultiplyPtg() { // // enforce singleton // } - public MultiplyPtg() {}; + public MultiplyPtg() { + /* For seralization */ + } @Override public OperationPtg getInstance() { diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/NamePtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/NamePtg.java index b820f604..0a9d0a76 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/NamePtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/NamePtg.java @@ -34,6 +34,10 @@ public class NamePtg extends OperandPtg implements WorkbookDependentFormula { private int field_1_label_index; private short field_2_zero; // reserved must be 0 + public NamePtg(){ + /* For seralization */ + } + /** * @param nameIndex zero-based index to name within workbook */ diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/NameXPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/NameXPtg.java index e940dead..d8168996 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/NameXPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/NameXPtg.java @@ -31,11 +31,16 @@ public final class NameXPtg extends OperandPtg implements WorkbookDependentFormu private final static int SIZE = 7; /** index to REF entry in externsheet record */ - private final int _sheetRefIndex; + private int _sheetRefIndex; /** index to defined name or externname table(1 based) */ - private final int _nameNumber; + private int _nameNumber; /** reserved must be 0 */ - private final int _reserved; + private int _reserved; + + + public NameXPtg(){ + /* For seralization */ + } private NameXPtg(int sheetRefIndex, int nameNumber, int reserved) { _sheetRefIndex = sheetRefIndex; diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/NumberPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/NumberPtg.java index 8847c3db..31c16fd5 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/NumberPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/NumberPtg.java @@ -40,9 +40,8 @@ public NumberPtg(LittleEndianInput in) { this(in.readDouble()); } - NumberPtg() - { - + NumberPtg() { + /* For seralization */ } /** diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/OpTableColRefPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/OpTableColRefPtg.java index c4f3d932..cc3d0d13 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/OpTableColRefPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/OpTableColRefPtg.java @@ -13,6 +13,10 @@ public class OpTableColRefPtg extends Ptg { private int _columnNum = -1; private String _columnName = ""; + public OpTableColRefPtg(){ + /* For seralization */ + } + public OpTableColRefPtg(String arg1, String arg2) { String[] first = arg1.split("_"); diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/OpTableRefPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/OpTableRefPtg.java index c6376507..716c8a84 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/OpTableRefPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/OpTableRefPtg.java @@ -11,6 +11,10 @@ public class OpTableRefPtg extends Ptg { private int _tableNum = -1; + public OpTableRefPtg(){ + /* For seralization */ + } + public OpTableRefPtg(int tableNum) { _tableNum = tableNum; } diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/OperandPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/OperandPtg.java index 6c116d22..b0db0234 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/OperandPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/OperandPtg.java @@ -22,6 +22,10 @@ Licensed to the Apache Software Foundation (ASF) under one or more */ public abstract class OperandPtg extends Ptg implements Cloneable { + public OperandPtg(){ + /* For seralization */ + } + /** * All Operand {@link Ptg}s are classified ('relative', 'value', 'array') */ diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/OperationPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/OperationPtg.java index bf813435..a8b6dae2 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/OperationPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/OperationPtg.java @@ -28,6 +28,10 @@ public abstract class OperationPtg extends Ptg { private boolean isOverrided = false; private int overrideTableNum = 0; + public OperationPtg(){ + /* For seralization */ + } + public abstract OperationPtg getInstance(); /** diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/Ptg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/Ptg.java index 583aa972..5f1f439d 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/Ptg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/Ptg.java @@ -45,7 +45,9 @@ public abstract class Ptg implements Serializable{ private static final long serialVersionUID = -5877373845194532264L; public static final Ptg[] EMPTY_PTG_ARRAY = { }; - + public Ptg(){ + /* For seralization */ + } /** * Reads size bytes of the input stream, to create an array of Ptgs. * Extra data (beyond size) may be read if and ArrayPtgs are present. diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/Ref3DPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/Ref3DPtg.java index 799fc307..1f44cc86 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/Ref3DPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/Ref3DPtg.java @@ -37,6 +37,9 @@ public final class Ref3DPtg extends RefPtgBase implements WorkbookDependentFormu private final static int SIZE = 7; // 6 + 1 for Ptg private int field_1_index_extern_sheet; + public Ref3DPtg(){ + /* For seralization */ + } public Ref3DPtg(LittleEndianInput in) { field_1_index_extern_sheet = in.readShort(); diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/RefNPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/RefNPtg.java index dbda2bfe..2019c27a 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/RefNPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/RefNPtg.java @@ -26,6 +26,10 @@ Licensed to the Apache Software Foundation (ASF) under one or more public final class RefNPtg extends Ref2DPtgBase { public final static byte sid = 0x2C; + public RefNPtg(){ + /* For seralization */ + } + public RefNPtg(LittleEndianInput in) { super(in); } diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/ScalarConstantPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/ScalarConstantPtg.java index 25468373..db39c11b 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/ScalarConstantPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/ScalarConstantPtg.java @@ -24,7 +24,12 @@ Licensed to the Apache Software Foundation (ASF) under one or more * @author Josh Micich */ public abstract class ScalarConstantPtg extends Ptg { - public final boolean isBaseToken() { + + public ScalarConstantPtg(){ + /* For seralization */ + } + + public final boolean isBaseToken() { return true; } diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/TablePtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/TablePtg.java index c6841e4a..e5667172 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/TablePtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/TablePtg.java @@ -31,7 +31,11 @@ public class TablePtg extends Area3DPtg { //ZSS-1013 private Item[] _items; private String[] _columns; - final private boolean _inTable; + private boolean _inTable; + + public TablePtg(){ + /* For seralization */ + } public TablePtg(int extIdx, int firstRow, int lastRow, int firstColumn, int lastColumn, String tableName, Item[] items, String[] columns, boolean inTable) { super(firstRow, lastRow, firstColumn, lastColumn, false, false, false, false, extIdx); //ZSS-1013 diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/TblPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/TblPtg.java index ec4a39dc..524fc83e 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/TblPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/TblPtg.java @@ -38,10 +38,13 @@ public final class TblPtg extends ControlPtg { private final static int SIZE = 5; public final static short sid = 0x02; /** The row number of the upper left corner */ - private final int field_1_first_row; + private int field_1_first_row; /** The column number of the upper left corner */ - private final int field_2_first_col; + private int field_2_first_col; + public TblPtg(){ + /* For seralization */ + } public TblPtg(LittleEndianInput in) { field_1_first_row = in.readUShort(); field_2_first_col = in.readUShort(); diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/UnknownPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/UnknownPtg.java index 80246f3a..76fa5873 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/UnknownPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/UnknownPtg.java @@ -24,7 +24,11 @@ Licensed to the Apache Software Foundation (ASF) under one or more */ public class UnknownPtg extends Ptg { private short size = 1; - private final int _sid; + private int _sid; + + public UnknownPtg(){ + /* For seralization */ + } public UnknownPtg(int sid) { _sid = sid; diff --git a/zpoi/src/org/zkoss/poi/ss/formula/ptg/ValueOperatorPtg.java b/zpoi/src/org/zkoss/poi/ss/formula/ptg/ValueOperatorPtg.java index 3378bb68..8fec63af 100644 --- a/zpoi/src/org/zkoss/poi/ss/formula/ptg/ValueOperatorPtg.java +++ b/zpoi/src/org/zkoss/poi/ss/formula/ptg/ValueOperatorPtg.java @@ -28,6 +28,10 @@ Licensed to the Apache Software Foundation (ASF) under one or more */ public abstract class ValueOperatorPtg extends OperationPtg { + + public ValueOperatorPtg(){ + /* For seralization */ + } /** * All Operator Ptgs are base tokens (i.e. are not RVA classified) */