diff options
| -rw-r--r-- | legal/NOTICE | 7 | ||||
| -rw-r--r-- | src/java/org/apache/poi/hssf/model/FormulaParser.java | 24 |
2 files changed, 27 insertions, 4 deletions
diff --git a/legal/NOTICE b/legal/NOTICE index 190d974632..b852dd25ef 100644 --- a/legal/NOTICE +++ b/legal/NOTICE @@ -10,7 +10,10 @@ Common Public License Version 1.0: http://www.opensource.org/licenses/cpl.php See http://www.junit.org/ -Small parts of the POI component HDGF are based on VSDump, -and are under the GNU General Public Licence version 3 (GPL v3): +A single data file of the POI component HDGF is based on VSDump, + and is under the GNU General Public Licence version 3 (GPL v3): http://gplv3.fsf.org/ +Since this is a data file, and has no compiled version (the original + file is distributed in both source and binary versions), there should + be little difference in licencing requirements compared to the ASL. See http://www.gnome.ru/projects/vsdump_en.html diff --git a/src/java/org/apache/poi/hssf/model/FormulaParser.java b/src/java/org/apache/poi/hssf/model/FormulaParser.java index 0132945565..9697dadafd 100644 --- a/src/java/org/apache/poi/hssf/model/FormulaParser.java +++ b/src/java/org/apache/poi/hssf/model/FormulaParser.java @@ -889,8 +889,8 @@ end; } } /** - * Convience method which takes in a list then passes it to the other toFormulaString - * signature. + * Convience method which takes in a list then passes it to the + * other toFormulaString signature. * @param book workbook for 3D and named references * @param lptgs list of Ptg, can be null or empty * @return a human readable String @@ -903,6 +903,16 @@ end; retval = toFormulaString(book, ptgs); return retval; } + /** + * Convience method which takes in a list then passes it to the + * other toFormulaString signature. Works on the current + * workbook for 3D and named references + * @param lptgs list of Ptg, can be null or empty + * @return a human readable String + */ + public String toFormulaString(List lptgs) { + return toFormulaString(book, lptgs); + } /** * Static method to convert an array of Ptgs in RPN order @@ -968,6 +978,16 @@ end; // TODO: catch stack underflow and throw parse exception. return (String) stack.pop(); } + /** + * Static method to convert an array of Ptgs in RPN order + * to a human readable string format in infix mode. Works + * on the current workbook for named and 3D references. + * @param ptgs array of Ptg, can be null or empty + * @return a human readable String + */ + public String toFormulaString(Ptg[] ptgs) { + return toFormulaString(book, ptgs); + } /** Create a tree representation of the RPN token array |