Finish region tweaks, and fix up upgrading doc

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@676213 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2008-07-12 18:53:47 +00:00
parent 2fe075305a
commit 2f1ba9f4b5
2 changed files with 8 additions and 9 deletions

View File

@ -21,7 +21,7 @@
<document>
<header>
<title>Converting existing HSSF Usermodel code to SS Usermodel (for XSSF and HSSF)</title>
<title>Upgrading to POI 3.5, including converting existing HSSF Usermodel code to SS Usermodel (for XSSF and HSSF)</title>
<authors>
<person email="nick@apache.org" name="Nick Burch" id="NB"/>
</authors>
@ -40,7 +40,7 @@
<em>org.apache.poi.ss.usermodel.FormulaEvaluator.CellValue</em>
</p>
</section>
<section><title>org.apache.poi.hssf.usermodel.HSSFRow.MissingCellPolicy</title></section>
<section><title>org.apache.poi.hssf.usermodel.HSSFRow.MissingCellPolicy</title>
<p>Annoyingly, java will not let you access a static inner class via
a child of the parent one. So, all references to
<em>org.apache.poi.hssf.usermodel.HSSFRow.MissingCellPolicy</em>
@ -48,8 +48,8 @@
<em>org.apache.poi.ss.usermodel.Row.MissingCellPolicy</em>
</p>
</section>
</section>
<section><title>Converting existing HSSF Usermodel code to SS Usermodel (for XSSF and HSSF)</title>
</section>
<section><title>Converting existing HSSF Usermodel code to SS Usermodel (for XSSF and HSSF)</title>
<section><title>Why change?</title>
<p>If you have existing HSSF usermodel code that works just
@ -86,9 +86,9 @@
otherwise remain the same, and it should all then work for
both XSSF and HSSF.</p>
</section>
</section>
<section><title>Worked Examples</title>
<section><title>Old HSSF Code</title>
</section>
<section><title>Worked Examples</title>
<section><title>Old HSSF Code</title>
<source><![CDATA[
// import org.apache.poi.hssf.usermodel.*;

View File

@ -614,8 +614,7 @@ public class HSSFSheet implements org.apache.poi.ss.usermodel.Sheet
* @param region (rowfrom/colfrom-rowto/colto) to merge
* @return index of this region
*/
public int addMergedRegion(Region region)
public int addMergedRegion(org.apache.poi.ss.util.Region region)
{
//return sheet.addMergedRegion((short) region.getRowFrom(),
return sheet.addMergedRegion( region.getRowFrom(),