You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2017/09/20 15:48:47 UTC

svn commit: r1809043 [5/12] - in /poi/site/publish: ./ apidocs/ apidocs/org/apache/poi/ apidocs/org/apache/poi/class-use/ apidocs/org/apache/poi/common/usermodel/ apidocs/org/apache/poi/common/usermodel/class-use/ apidocs/org/apache/poi/hslf/usermodel/...

Modified: poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/Cell.html
URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/Cell.html?rev=1809043&r1=1809042&r2=1809043&view=diff
==============================================================================
--- poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/Cell.html (original)
+++ poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/Cell.html Wed Sep 20 15:48:44 2017
@@ -235,19 +235,16 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static int</code></td>
+<td class="colFirst"><code>static <a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
 <td class="colLast"><span class="typeNameLabel">CellFormat.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/format/CellFormat.html#ultimateType-org.apache.poi.ss.usermodel.Cell-">ultimateType</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">POI 3.15. This will return a CellType enum in the future</span></div>
-</div>
+<div class="block">Returns the ultimate cell type, following the results of formulas.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
 <td class="colLast"><span class="typeNameLabel">CellFormat.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/format/CellFormat.html#ultimateTypeEnum-org.apache.poi.ss.usermodel.Cell-">ultimateTypeEnum</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">POI 3.15 beta 3
- Will be deleted when we make the CellType enum transition. See bug 59791.</span></div>
+<div class="block"><span class="deprecationComment">use <code>ultimateType</code> instead</span></div>
 </div>
 </td>
 </tr>
@@ -312,18 +309,18 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>int</code></td>
+<td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
 <td class="colLast"><span class="typeNameLabel">BaseFormulaEvaluator.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/formula/BaseFormulaEvaluator.html#evaluateFormulaCell-org.apache.poi.ss.usermodel.Cell-">evaluateFormulaCell</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">3.15. Will return a <a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel"><code>CellType</code></a> enum in the future.</span></div>
-</div>
+<div class="block">If cell contains formula, it evaluates the formula,
+  and saves the result of the formula.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
 <td class="colLast"><span class="typeNameLabel">BaseFormulaEvaluator.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/formula/BaseFormulaEvaluator.html#evaluateFormulaCellEnum-org.apache.poi.ss.usermodel.Cell-">evaluateFormulaCellEnum</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>
-<div class="block">If cell contains formula, it evaluates the formula,
-  and saves the result of the formula.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">use <code>evaluateFormulaCell(cell)</code> instead</span></div>
+</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -529,18 +526,18 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>int</code></td>
+<td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
 <td class="colLast"><span class="typeNameLabel">FormulaEvaluator.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/usermodel/FormulaEvaluator.html#evaluateFormulaCell-org.apache.poi.ss.usermodel.Cell-">evaluateFormulaCell</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">3.15. Will return a <a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel"><code>CellType</code></a> enum in the future</span></div>
-</div>
+<div class="block">If cell contains formula, it evaluates the formula,
+  and saves the result of the formula.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
 <td class="colLast"><span class="typeNameLabel">FormulaEvaluator.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/usermodel/FormulaEvaluator.html#evaluateFormulaCellEnum-org.apache.poi.ss.usermodel.Cell-">evaluateFormulaCellEnum</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>
-<div class="block">If cell contains formula, it evaluates the formula,
-  and saves the result of the formula.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">use <code>evaluateFormulaCell(cell)</code></span></div>
+</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -939,24 +936,36 @@
 <td class="colLast"><span class="typeNameLabel">SXSSFFormulaEvaluator.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.html#evaluateInCell-org.apache.poi.ss.usermodel.Cell-">evaluateInCell</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">SXSSFFormulaEvaluator.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.html#notifyDeleteCell-org.apache.poi.ss.usermodel.Cell-">notifyDeleteCell</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">SXSSFFormulaEvaluator.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.html#notifySetFormula-org.apache.poi.ss.usermodel.Cell-">notifySetFormula</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">SXSSFFormulaEvaluator.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.html#notifyUpdateCell-org.apache.poi.ss.usermodel.Cell-">notifyUpdateCell</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellRange.html" title="interface in org.apache.poi.ss.usermodel">CellRange</a>&lt;? extends <a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&gt;</code></td>
 <td class="colLast"><span class="typeNameLabel">SXSSFSheet.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/streaming/SXSSFSheet.html#removeArrayFormula-org.apache.poi.ss.usermodel.Cell-">removeArrayFormula</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>
 <div class="block">Remove a Array Formula from this sheet.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">SXSSFRow.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/streaming/SXSSFRow.html#removeCell-org.apache.poi.ss.usermodel.Cell-">removeCell</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>
 <div class="block">Remove the Cell from this row.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected <a href="../../../../../../org/apache/poi/ss/formula/EvaluationCell.html" title="interface in org.apache.poi.ss.formula">EvaluationCell</a></code></td>
 <td class="colLast"><span class="typeNameLabel">SXSSFFormulaEvaluator.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.html#toEvaluationCell-org.apache.poi.ss.usermodel.Cell-">toEvaluationCell</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>
 <div class="block">Turns a SXSSFCell into a SXSSFEvaluationCell</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">SheetDataWriter.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/streaming/SheetDataWriter.html#writeCell-int-org.apache.poi.ss.usermodel.Cell-">writeCell</a></span>(int&nbsp;columnIndex,
          <a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>&nbsp;</td>
@@ -1039,15 +1048,15 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">BaseXSSFFormulaEvaluator.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.html#notifyDeleteCell-org.apache.poi.ss.usermodel.Cell-">notifyDeleteCell</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">XSSFFormulaEvaluator.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/usermodel/XSSFFormulaEvaluator.html#notifyDeleteCell-org.apache.poi.ss.usermodel.Cell-">notifyDeleteCell</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">BaseXSSFFormulaEvaluator.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.html#notifySetFormula-org.apache.poi.ss.usermodel.Cell-">notifySetFormula</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">XSSFFormulaEvaluator.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/usermodel/XSSFFormulaEvaluator.html#notifySetFormula-org.apache.poi.ss.usermodel.Cell-">notifySetFormula</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">BaseXSSFFormulaEvaluator.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.html#notifyUpdateCell-org.apache.poi.ss.usermodel.Cell-">notifyUpdateCell</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">XSSFFormulaEvaluator.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/usermodel/XSSFFormulaEvaluator.html#notifyUpdateCell-org.apache.poi.ss.usermodel.Cell-">notifyUpdateCell</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellRange.html" title="interface in org.apache.poi.ss.usermodel">CellRange</a>&lt;<a href="../../../../../../org/apache/poi/xssf/usermodel/XSSFCell.html" title="class in org.apache.poi.xssf.usermodel">XSSFCell</a>&gt;</code></td>

Modified: poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/CellType.html
URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/CellType.html?rev=1809043&r1=1809042&r2=1809043&view=diff
==============================================================================
--- poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/CellType.html (original)
+++ poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/CellType.html Wed Sep 20 15:48:44 2017
@@ -129,16 +129,31 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
-<td class="colLast"><span class="typeNameLabel">HSSFCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/hssf/usermodel/HSSFCell.html#getCachedFormulaResultTypeEnum--">getCachedFormulaResultTypeEnum</a></span>()</code>
+<td class="colLast"><span class="typeNameLabel">HSSFCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/hssf/usermodel/HSSFCell.html#getCachedFormulaResultType--">getCachedFormulaResultType</a></span>()</code>
 <div class="block">Only valid for formula cells</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
-<td class="colLast"><span class="typeNameLabel">HSSFCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/hssf/usermodel/HSSFCell.html#getCellTypeEnum--">getCellTypeEnum</a></span>()</code>
+<td class="colLast"><span class="typeNameLabel">HSSFCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/hssf/usermodel/HSSFCell.html#getCachedFormulaResultTypeEnum--">getCachedFormulaResultTypeEnum</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">use <code>getCachedFormulaResultType</code>
+ Will be deleted when we make the CellType enum transition. See bug 59791.</span></div>
+</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
+<td class="colLast"><span class="typeNameLabel">HSSFCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/hssf/usermodel/HSSFCell.html#getCellType--">getCellType</a></span>()</code>
 <div class="block">get the cells type (numeric, formula or string)</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
+<td class="colLast"><span class="typeNameLabel">HSSFCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/hssf/usermodel/HSSFCell.html#getCellTypeEnum--">getCellTypeEnum</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+</td>
+</tr>
 </tbody>
 </table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
@@ -194,10 +209,15 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>static <a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CellFormat.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/format/CellFormat.html#ultimateType-org.apache.poi.ss.usermodel.Cell-">ultimateType</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>
+<div class="block">Returns the ultimate cell type, following the results of formulas.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
 <td class="colLast"><span class="typeNameLabel">CellFormat.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/format/CellFormat.html#ultimateTypeEnum-org.apache.poi.ss.usermodel.Cell-">ultimateTypeEnum</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">POI 3.15 beta 3
- Will be deleted when we make the CellType enum transition. See bug 59791.</span></div>
+<div class="block"><span class="deprecationComment">use <code>ultimateType</code> instead</span></div>
 </div>
 </td>
 </tr>
@@ -217,13 +237,25 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
-<td class="colLast"><span class="typeNameLabel">BaseFormulaEvaluator.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/formula/BaseFormulaEvaluator.html#evaluateFormulaCellEnum-org.apache.poi.ss.usermodel.Cell-">evaluateFormulaCellEnum</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>
+<td class="colLast"><span class="typeNameLabel">BaseFormulaEvaluator.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/formula/BaseFormulaEvaluator.html#evaluateFormulaCell-org.apache.poi.ss.usermodel.Cell-">evaluateFormulaCell</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>
 <div class="block">If cell contains formula, it evaluates the formula,
   and saves the result of the formula.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
+<td class="colLast"><span class="typeNameLabel">BaseFormulaEvaluator.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/formula/BaseFormulaEvaluator.html#evaluateFormulaCellEnum-org.apache.poi.ss.usermodel.Cell-">evaluateFormulaCellEnum</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">use <code>evaluateFormulaCell(cell)</code> instead</span></div>
+</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
+<td class="colLast"><span class="typeNameLabel">EvaluationCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/formula/EvaluationCell.html#getCachedFormulaResultType--">getCachedFormulaResultType</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
 <td class="colLast"><span class="typeNameLabel">EvaluationCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/formula/EvaluationCell.html#getCachedFormulaResultTypeEnum--">getCachedFormulaResultTypeEnum</a></span>()</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
 <div class="block"><span class="deprecationComment">POI 3.15 beta 3.
@@ -233,10 +265,13 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
+<td class="colLast"><span class="typeNameLabel">EvaluationCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/formula/EvaluationCell.html#getCellType--">getCellType</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
 <td class="colLast"><span class="typeNameLabel">EvaluationCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/formula/EvaluationCell.html#getCellTypeEnum--">getCellTypeEnum</a></span>()</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">POI 3.15 beta 3.
- Will be deleted when we make the CellType enum transition. See bug 59791.</span></div>
+<div class="block"><span class="deprecationComment">POI 3.15 beta 3.</span></div>
 </div>
 </td>
 </tr>
@@ -272,12 +307,20 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
-<td class="colLast"><span class="typeNameLabel">FormulaEvaluator.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/usermodel/FormulaEvaluator.html#evaluateFormulaCellEnum-org.apache.poi.ss.usermodel.Cell-">evaluateFormulaCellEnum</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>
+<td class="colLast"><span class="typeNameLabel">FormulaEvaluator.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/usermodel/FormulaEvaluator.html#evaluateFormulaCell-org.apache.poi.ss.usermodel.Cell-">evaluateFormulaCell</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>
 <div class="block">If cell contains formula, it evaluates the formula,
   and saves the result of the formula.</div>
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
+<td class="colLast"><span class="typeNameLabel">FormulaEvaluator.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/usermodel/FormulaEvaluator.html#evaluateFormulaCellEnum-org.apache.poi.ss.usermodel.Cell-">evaluateFormulaCellEnum</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;cell)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">use <code>evaluateFormulaCell(cell)</code></span></div>
+</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>static <a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
 <td class="colLast"><span class="typeNameLabel">CellType.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html#forInt-int-">forInt</a></span>(int&nbsp;code)</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -285,25 +328,47 @@
 </div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Cell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html#getCachedFormulaResultType--">getCachedFormulaResultType</a></span>()</code>
+<div class="block">Only valid for formula cells
+ 
+ Will return <a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel"><code>CellType</code></a> in a future version of POI.</div>
+</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
 <td class="colLast"><span class="typeNameLabel">Cell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html#getCachedFormulaResultTypeEnum--">getCachedFormulaResultTypeEnum</a></span>()</code>
-<div class="block">Only valid for formula cells</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CellValue.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/usermodel/CellValue.html#getCellTypeEnum--">getCellTypeEnum</a></span>()</code>
+<td class="colLast"><span class="typeNameLabel">CellValue.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/usermodel/CellValue.html#getCellType--">getCellType</a></span>()</code>
 <div class="block">Return the cell type.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Cell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html#getCellTypeEnum--">getCellTypeEnum</a></span>()</code>
+<td class="colLast"><span class="typeNameLabel">Cell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html#getCellType--">getCellType</a></span>()</code>
 <div class="block">Return the cell type.</div>
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CellValue.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/usermodel/CellValue.html#getCellTypeEnum--">getCellTypeEnum</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">use <code>getCellType</code> instead</span></div>
+</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Cell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/usermodel/Cell.html#getCellTypeEnum--">getCellTypeEnum</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>static <a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
 <td class="colLast"><span class="typeNameLabel">CellType.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String&nbsp;name)</code>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
@@ -354,16 +419,32 @@ the order they are declared.</div>
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
-<td class="colLast"><span class="typeNameLabel">SXSSFCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/streaming/SXSSFCell.html#getCachedFormulaResultTypeEnum--">getCachedFormulaResultTypeEnum</a></span>()</code>
+<td class="colLast"><span class="typeNameLabel">SXSSFCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/streaming/SXSSFCell.html#getCachedFormulaResultType--">getCachedFormulaResultType</a></span>()</code>
 <div class="block">Only valid for formula cells</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
-<td class="colLast"><span class="typeNameLabel">SXSSFCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/streaming/SXSSFCell.html#getCellTypeEnum--">getCellTypeEnum</a></span>()</code>
+<td class="colLast"><span class="typeNameLabel">SXSSFCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/streaming/SXSSFCell.html#getCachedFormulaResultTypeEnum--">getCachedFormulaResultTypeEnum</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">use <code>getCachedFormulaResultType</code> instead</span></div>
+</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
+<td class="colLast"><span class="typeNameLabel">SXSSFCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/streaming/SXSSFCell.html#getCellType--">getCellType</a></span>()</code>
 <div class="block">Return the cell type.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
+<td class="colLast"><span class="typeNameLabel">SXSSFCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/streaming/SXSSFCell.html#getCellTypeEnum--">getCellTypeEnum</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">use <code>getCellType</code> instead</span></div>
+</div>
+</td>
+</tr>
 </tbody>
 </table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
@@ -414,16 +495,33 @@ the order they are declared.</div>
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
-<td class="colLast"><span class="typeNameLabel">XSSFCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/usermodel/XSSFCell.html#getCachedFormulaResultTypeEnum--">getCachedFormulaResultTypeEnum</a></span>()</code>
+<td class="colLast"><span class="typeNameLabel">XSSFCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/usermodel/XSSFCell.html#getCachedFormulaResultType--">getCachedFormulaResultType</a></span>()</code>
 <div class="block">Only valid for formula cells</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
-<td class="colLast"><span class="typeNameLabel">XSSFCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/usermodel/XSSFCell.html#getCellTypeEnum--">getCellTypeEnum</a></span>()</code>
+<td class="colLast"><span class="typeNameLabel">XSSFCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/usermodel/XSSFCell.html#getCachedFormulaResultTypeEnum--">getCachedFormulaResultTypeEnum</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">use <code>getCachedFormulaResultType</code> instead
+ Will be deleted when we make the CellType enum transition. See bug 59791.</span></div>
+</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
+<td class="colLast"><span class="typeNameLabel">XSSFCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/usermodel/XSSFCell.html#getCellType--">getCellType</a></span>()</code>
 <div class="block">Return the cell type.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/CellType.html" title="enum in org.apache.poi.ss.usermodel">CellType</a></code></td>
+<td class="colLast"><span class="typeNameLabel">XSSFCell.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/usermodel/XSSFCell.html#getCellTypeEnum--">getCellTypeEnum</a></span>()</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">use <code>getCellType</code> instead</span></div>
+</div>
+</td>
+</tr>
 </tbody>
 </table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">

Modified: poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/DataConsolidateFunction.html
URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/DataConsolidateFunction.html?rev=1809043&r1=1809042&r2=1809043&view=diff
==============================================================================
--- poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/DataConsolidateFunction.html (original)
+++ poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/DataConsolidateFunction.html Wed Sep 20 15:48:44 2017
@@ -147,6 +147,15 @@ the order they are declared.</div>
 <div class="block">Add a column label using data from the given column and specified function</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">XSSFPivotTable.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/xssf/usermodel/XSSFPivotTable.html#addColumnLabel-org.apache.poi.ss.usermodel.DataConsolidateFunction-int-java.lang.String-java.lang.String-">addColumnLabel</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/DataConsolidateFunction.html" title="enum in org.apache.poi.ss.usermodel">DataConsolidateFunction</a>&nbsp;function,
+              int&nbsp;columnIndex,
+              java.lang.String&nbsp;valueFieldName,
+              java.lang.String&nbsp;valueFormat)</code>
+<div class="block">Add a column label using data from the given column and specified function</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>

Modified: poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/RichTextString.html
URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/RichTextString.html?rev=1809043&r1=1809042&r2=1809043&view=diff
==============================================================================
--- poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/RichTextString.html (original)
+++ poi/site/publish/apidocs/org/apache/poi/ss/usermodel/class-use/RichTextString.html Wed Sep 20 15:48:44 2017
@@ -209,12 +209,6 @@
 <div class="block">Fetches the rich text string of the comment</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../../org/apache/poi/ss/usermodel/RichTextString.html" title="interface in org.apache.poi.ss.usermodel">RichTextString</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Textbox.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/usermodel/Textbox.html#getString--">getString</a></span>()</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-&nbsp;</td>
-</tr>
 </tbody>
 </table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
@@ -236,12 +230,6 @@
 <div class="block">Sets the rich text string used by this comment.</div>
 </td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Textbox.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/ss/usermodel/Textbox.html#setString-org.apache.poi.ss.usermodel.RichTextString-">setString</a></span>(<a href="../../../../../../org/apache/poi/ss/usermodel/RichTextString.html" title="interface in org.apache.poi.ss.usermodel">RichTextString</a>&nbsp;string)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-&nbsp;</td>
-</tr>
 </tbody>
 </table>
 </li>

Modified: poi/site/publish/apidocs/org/apache/poi/ss/usermodel/package-frame.html
URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/ss/usermodel/package-frame.html?rev=1809043&r1=1809042&r2=1809043&view=diff
==============================================================================
--- poi/site/publish/apidocs/org/apache/poi/ss/usermodel/package-frame.html (original)
+++ poi/site/publish/apidocs/org/apache/poi/ss/usermodel/package-frame.html Wed Sep 20 15:48:44 2017
@@ -59,7 +59,6 @@
 <li><a href="Table.html" title="interface in org.apache.poi.ss.usermodel" target="classFrame"><span class="interfaceName">Table</span></a></li>
 <li><a href="TableStyle.html" title="interface in org.apache.poi.ss.usermodel" target="classFrame"><span class="interfaceName">TableStyle</span></a></li>
 <li><a href="TableStyleInfo.html" title="interface in org.apache.poi.ss.usermodel" target="classFrame"><span class="interfaceName">TableStyleInfo</span></a></li>
-<li><a href="Textbox.html" title="interface in org.apache.poi.ss.usermodel" target="classFrame"><span class="interfaceName">Textbox</span></a></li>
 <li><a href="Workbook.html" title="interface in org.apache.poi.ss.usermodel" target="classFrame"><span class="interfaceName">Workbook</span></a></li>
 </ul>
 <h2 title="Classes">Classes</h2>

Modified: poi/site/publish/apidocs/org/apache/poi/ss/usermodel/package-summary.html
URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/ss/usermodel/package-summary.html?rev=1809043&r1=1809042&r2=1809043&view=diff
==============================================================================
--- poi/site/publish/apidocs/org/apache/poi/ss/usermodel/package-summary.html (original)
+++ poi/site/publish/apidocs/org/apache/poi/ss/usermodel/package-summary.html Wed Sep 20 15:48:44 2017
@@ -353,12 +353,6 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../../org/apache/poi/ss/usermodel/Textbox.html" title="interface in org.apache.poi.ss.usermodel">Textbox</a></td>
-<td class="colLast">Deprecated
-<div class="block"><span class="deprecationComment">3.16 beta1.</span></div>
-</td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/poi/ss/usermodel/Workbook.html" title="interface in org.apache.poi.ss.usermodel">Workbook</a></td>
 <td class="colLast">
 <div class="block">High level representation of a Excel workbook.</div>

Modified: poi/site/publish/apidocs/org/apache/poi/ss/usermodel/package-tree.html
URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/ss/usermodel/package-tree.html?rev=1809043&r1=1809042&r2=1809043&view=diff
==============================================================================
--- poi/site/publish/apidocs/org/apache/poi/ss/usermodel/package-tree.html (original)
+++ poi/site/publish/apidocs/org/apache/poi/ss/usermodel/package-tree.html Wed Sep 20 15:48:44 2017
@@ -199,7 +199,6 @@
 <li type="circle">org.apache.poi.ss.usermodel.<a href="../../../../../org/apache/poi/ss/usermodel/Table.html" title="interface in org.apache.poi.ss.usermodel"><span class="typeNameLink">Table</span></a></li>
 <li type="circle">org.apache.poi.ss.usermodel.<a href="../../../../../org/apache/poi/ss/usermodel/TableStyle.html" title="interface in org.apache.poi.ss.usermodel"><span class="typeNameLink">TableStyle</span></a></li>
 <li type="circle">org.apache.poi.ss.usermodel.<a href="../../../../../org/apache/poi/ss/usermodel/TableStyleInfo.html" title="interface in org.apache.poi.ss.usermodel"><span class="typeNameLink">TableStyleInfo</span></a></li>
-<li type="circle">org.apache.poi.ss.usermodel.<a href="../../../../../org/apache/poi/ss/usermodel/Textbox.html" title="interface in org.apache.poi.ss.usermodel"><span class="typeNameLink">Textbox</span></a></li>
 </ul>
 <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
 <ul>

Modified: poi/site/publish/apidocs/org/apache/poi/ss/util/class-use/CellReference.html
URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/ss/util/class-use/CellReference.html?rev=1809043&r1=1809042&r2=1809043&view=diff
==============================================================================
--- poi/site/publish/apidocs/org/apache/poi/ss/util/class-use/CellReference.html (original)
+++ poi/site/publish/apidocs/org/apache/poi/ss/util/class-use/CellReference.html Wed Sep 20 15:48:44 2017
@@ -207,9 +207,11 @@ HSSF concepts.</div>
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/poi/hssf/util/CellReference.html" title="class in org.apache.poi.hssf.util">CellReference</a></span></code>
-<div class="block">Common conversion functions between Excel style A1, C27 style
-  cell references, and POI usermodel style row=0, column=0
-  style references.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">POI 4.0.0-SNAPSHOT. Use <a href="../../../../../../org/apache/poi/ss/util/CellReference.html" title="class in org.apache.poi.ss.util"><code>CellReference</code></a> instead.
+          Actually the replacement CellReference was added earlier, but the deprecation notice
+          was added only in 4.0.0-SNAPSHOT.</span></div>
+</div>
 </td>
 </tr>
 </tbody>

Modified: poi/site/publish/apidocs/org/apache/poi/util/class-use/Beta.html
URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/util/class-use/Beta.html?rev=1809043&r1=1809042&r2=1809043&view=diff
==============================================================================
--- poi/site/publish/apidocs/org/apache/poi/util/class-use/Beta.html (original)
+++ poi/site/publish/apidocs/org/apache/poi/util/class-use/Beta.html Wed Sep 20 15:48:44 2017
@@ -636,6 +636,19 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">XSSFPivotTable.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFPivotTable.html#addColLabel-int-">addColLabel</a></span>(int&nbsp;columnIndex)</code>
+<div class="block">Add a col label using data from the given column.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">XSSFPivotTable.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFPivotTable.html#addColLabel-int-java.lang.String-">addColLabel</a></span>(int&nbsp;columnIndex,
+           java.lang.String&nbsp;valueFormat)</code>
+<div class="block">Add a col label using data from the given column.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">XSSFPivotTable.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFPivotTable.html#addColumnLabel-org.apache.poi.ss.usermodel.DataConsolidateFunction-int-">addColumnLabel</a></span>(<a href="../../../../../org/apache/poi/ss/usermodel/DataConsolidateFunction.html" title="enum in org.apache.poi.ss.usermodel">DataConsolidateFunction</a>&nbsp;function,
               int&nbsp;columnIndex)</code>
 <div class="block">Add a column label using data from the given column and specified function</div>
@@ -651,42 +664,51 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">XSSFPivotTable.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFPivotTable.html#addColumnLabel-org.apache.poi.ss.usermodel.DataConsolidateFunction-int-java.lang.String-java.lang.String-">addColumnLabel</a></span>(<a href="../../../../../org/apache/poi/ss/usermodel/DataConsolidateFunction.html" title="enum in org.apache.poi.ss.usermodel">DataConsolidateFunction</a>&nbsp;function,
+              int&nbsp;columnIndex,
+              java.lang.String&nbsp;valueFieldName,
+              java.lang.String&nbsp;valueFormat)</code>
+<div class="block">Add a column label using data from the given column and specified function</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">XSSFPivotTable.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFPivotTable.html#addDataColumn-int-boolean-">addDataColumn</a></span>(int&nbsp;columnIndex,
              boolean&nbsp;isDataField)</code>
 <div class="block">Add column containing data from the referenced area.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPivotCache</code></td>
 <td class="colLast"><span class="typeNameLabel">XSSFWorkbook.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFWorkbook.html#addPivotCache-java.lang.String-">addPivotCache</a></span>(java.lang.String&nbsp;rId)</code>
 <div class="block">Add pivotCache to the workbook</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">XSSFPivotTable.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFPivotTable.html#addReportFilter-int-">addReportFilter</a></span>(int&nbsp;columnIndex)</code>
 <div class="block">Add filter for the column with the corresponding index and cell value</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">XSSFPivotTable.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFPivotTable.html#addRowLabel-int-">addRowLabel</a></span>(int&nbsp;columnIndex)</code>
 <div class="block">Add a row label using data from the given column.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><span class="typeNameLabel">XSSFPivotCacheDefinition.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.html#commit--">commit</a></span>()</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><span class="typeNameLabel">XSSFPivotTable.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFPivotTable.html#commit--">commit</a></span>()</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><span class="typeNameLabel">XSSFPivotCacheRecords.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.html#commit--">commit</a></span>()</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">XSSFCell.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFCell.html#copyCellFrom-org.apache.poi.ss.usermodel.Cell-org.apache.poi.ss.usermodel.CellCopyPolicy-">copyCellFrom</a></span>(<a href="../../../../../org/apache/poi/ss/usermodel/Cell.html" title="interface in org.apache.poi.ss.usermodel">Cell</a>&nbsp;srcCell,
             <a href="../../../../../org/apache/poi/ss/usermodel/CellCopyPolicy.html" title="class in org.apache.poi.ss.usermodel">CellCopyPolicy</a>&nbsp;policy)</code>
@@ -696,7 +718,7 @@
  This does not shift references in formulas.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">XSSFRow.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFRow.html#copyRowFrom-org.apache.poi.ss.usermodel.Row-org.apache.poi.ss.usermodel.CellCopyPolicy-">copyRowFrom</a></span>(<a href="../../../../../org/apache/poi/ss/usermodel/Row.html" title="interface in org.apache.poi.ss.usermodel">Row</a>&nbsp;srcRow,
            <a href="../../../../../org/apache/poi/ss/usermodel/CellCopyPolicy.html" title="class in org.apache.poi.ss.usermodel">CellCopyPolicy</a>&nbsp;policy)</code>
@@ -707,7 +729,7 @@
  srcRow may be from a different sheet in the same workbook</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">XSSFSheet.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFSheet.html#copyRows-int-int-int-org.apache.poi.ss.usermodel.CellCopyPolicy-">copyRows</a></span>(int&nbsp;srcStartRow,
         int&nbsp;srcEndRow,
@@ -719,7 +741,7 @@
  Equivalent to copyRows(getRows(srcStartRow, srcEndRow, false), destStartRow, cellCopyPolicy)</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">XSSFSheet.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFSheet.html#copyRows-java.util.List-int-org.apache.poi.ss.usermodel.CellCopyPolicy-">copyRows</a></span>(java.util.List&lt;? extends <a href="../../../../../org/apache/poi/ss/usermodel/Row.html" title="interface in org.apache.poi.ss.usermodel">Row</a>&gt;&nbsp;srcRows,
         int&nbsp;destStartRow,
@@ -730,24 +752,24 @@
  rows (ie.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><span class="typeNameLabel">XSSFPivotCacheDefinition.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.html#createCacheFields-org.apache.poi.ss.usermodel.Sheet-">createCacheFields</a></span>(<a href="../../../../../org/apache/poi/ss/usermodel/Sheet.html" title="interface in org.apache.poi.ss.usermodel">Sheet</a>&nbsp;sheet)</code>
 <div class="block">Generates a cache field for each column in the reference area for the pivot table.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><span class="typeNameLabel">XSSFPivotTable.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFPivotTable.html#createDefaultDataColumns--">createDefaultDataColumns</a></span>()</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFPivotTable.html" title="class in org.apache.poi.xssf.usermodel">XSSFPivotTable</a></code></td>
 <td class="colLast"><span class="typeNameLabel">XSSFSheet.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFSheet.html#createPivotTable-org.apache.poi.ss.util.AreaReference-org.apache.poi.ss.util.CellReference-">createPivotTable</a></span>(<a href="../../../../../org/apache/poi/ss/util/AreaReference.html" title="class in org.apache.poi.ss.util">AreaReference</a>&nbsp;source,
                 <a href="../../../../../org/apache/poi/ss/util/CellReference.html" title="class in org.apache.poi.ss.util">CellReference</a>&nbsp;position)</code>
 <div class="block">Create a pivot table using the AreaReference range, at the given position.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFPivotTable.html" title="class in org.apache.poi.xssf.usermodel">XSSFPivotTable</a></code></td>
 <td class="colLast"><span class="typeNameLabel">XSSFSheet.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFSheet.html#createPivotTable-org.apache.poi.ss.util.AreaReference-org.apache.poi.ss.util.CellReference-org.apache.poi.ss.usermodel.Sheet-">createPivotTable</a></span>(<a href="../../../../../org/apache/poi/ss/util/AreaReference.html" title="class in org.apache.poi.ss.util">AreaReference</a>&nbsp;source,
                 <a href="../../../../../org/apache/poi/ss/util/CellReference.html" title="class in org.apache.poi.ss.util">CellReference</a>&nbsp;position,
@@ -755,14 +777,14 @@
 <div class="block">Create a pivot table using the AreaReference range on sourceSheet, at the given position.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFPivotTable.html" title="class in org.apache.poi.xssf.usermodel">XSSFPivotTable</a></code></td>
 <td class="colLast"><span class="typeNameLabel">XSSFSheet.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFSheet.html#createPivotTable-org.apache.poi.ss.usermodel.Name-org.apache.poi.ss.util.CellReference-">createPivotTable</a></span>(<a href="../../../../../org/apache/poi/ss/usermodel/Name.html" title="interface in org.apache.poi.ss.usermodel">Name</a>&nbsp;source,
                 <a href="../../../../../org/apache/poi/ss/util/CellReference.html" title="class in org.apache.poi.ss.util">CellReference</a>&nbsp;position)</code>
 <div class="block">Create a pivot table using the Name range, at the given position.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFPivotTable.html" title="class in org.apache.poi.xssf.usermodel">XSSFPivotTable</a></code></td>
 <td class="colLast"><span class="typeNameLabel">XSSFSheet.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFSheet.html#createPivotTable-org.apache.poi.ss.usermodel.Name-org.apache.poi.ss.util.CellReference-org.apache.poi.ss.usermodel.Sheet-">createPivotTable</a></span>(<a href="../../../../../org/apache/poi/ss/usermodel/Name.html" title="interface in org.apache.poi.ss.usermodel">Name</a>&nbsp;source,
                 <a href="../../../../../org/apache/poi/ss/util/CellReference.html" title="class in org.apache.poi.ss.util">CellReference</a>&nbsp;position,
@@ -770,14 +792,14 @@
 <div class="block">Create a pivot table using the Name range reference on sourceSheet, at the given position.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFPivotTable.html" title="class in org.apache.poi.xssf.usermodel">XSSFPivotTable</a></code></td>
 <td class="colLast"><span class="typeNameLabel">XSSFSheet.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFSheet.html#createPivotTable-org.apache.poi.ss.usermodel.Table-org.apache.poi.ss.util.CellReference-">createPivotTable</a></span>(<a href="../../../../../org/apache/poi/ss/usermodel/Table.html" title="interface in org.apache.poi.ss.usermodel">Table</a>&nbsp;source,
                 <a href="../../../../../org/apache/poi/ss/util/CellReference.html" title="class in org.apache.poi.ss.util">CellReference</a>&nbsp;position)</code>
 <div class="block">Create a pivot table using the Table, at the given position.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><span class="typeNameLabel">XSSFPivotTable.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFPivotTable.html#createSourceReferences-org.apache.poi.ss.util.CellReference-org.apache.poi.ss.usermodel.Sheet-org.apache.poi.xssf.usermodel.XSSFPivotTable.PivotTableReferenceConfigurator-">createSourceReferences</a></span>(<a href="../../../../../org/apache/poi/ss/util/CellReference.html" title="class in org.apache.poi.ss.util">CellReference</a>&nbsp;position,
                       <a href="../../../../../org/apache/poi/ss/usermodel/Sheet.html" title="interface in org.apache.poi.ss.usermodel">Sheet</a>&nbsp;sourceSheet,
@@ -785,6 +807,10 @@
 <div class="block">Creates cacheSource and workSheetSource for pivot table and sets the source reference as well assets the location of the pivot table</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>java.util.List&lt;java.lang.Integer&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">XSSFPivotTable.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFPivotTable.html#getColLabelColumns--">getColLabelColumns</a></span>()</code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPivotCache</code></td>
 <td class="colLast"><span class="typeNameLabel">XSSFPivotCache.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/poi/xssf/usermodel/XSSFPivotCache.html#getCTPivotCache--">getCTPivotCache</a></span>()</code>&nbsp;</td>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org