Fix up a few cases where we were using ss.Region but should be using hssf.Region...

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@676211 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/documentation/content/xdocs/spreadsheet/converting.xml b/src/documentation/content/xdocs/spreadsheet/converting.xml
index b54356193473c41cb8ebb32083016063a3202464..2cb8d001e38b925c1a8ebb851ff1a038e744550c 100644 (file)
--- a/src/documentation/content/xdocs/spreadsheet/converting.xml
+++ b/src/documentation/content/xdocs/spreadsheet/converting.xml
@@ -40,6 +40,14 @@
         <em>org.apache.poi.ss.usermodel.FormulaEvaluator.CellValue</em>
        </p>
     </section>
+    <section><title>org.apache.poi.hssf.usermodel.HSSFRow.MissingCellPolicy</title></section>
+       <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>
+        will need to be changed to
+        <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>
 

diff --git a/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java b/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
index 224f5e5c193aea4b002c98d8c6bd19391f27be01..d74d54ab1732d6c82239d8e5db751d252846346c 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
+++ b/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
@@ -18,7 +18,7 @@
 package org.apache.poi.hssf.record;
 
 import org.apache.poi.hssf.record.cf.CellRange;
-import org.apache.poi.ss.util.Region;
+import org.apache.poi.hssf.util.Region;
 import org.apache.poi.util.LittleEndian;
 
 /**

diff --git a/src/java/org/apache/poi/hssf/record/cf/CellRange.java b/src/java/org/apache/poi/hssf/record/cf/CellRange.java
index 41cb4a2a2952a8815da7a0e11013170a16514f00..f45b79b003a88c86a513334731ea2c8f3863ae98 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/cf/CellRange.java
+++ b/src/java/org/apache/poi/hssf/record/cf/CellRange.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.poi.ss.util.Region;
+import org.apache.poi.hssf.util.Region;
 
 /**
  * 

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java b/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java
index 53706b58a66ad40b17d232c25469a59eee9f6ca8..6c798abcf4f93e1314fcc83e2a0dce26459a17ad 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java
@@ -20,7 +20,7 @@ import org.apache.poi.hssf.record.CFHeaderRecord;
 import org.apache.poi.hssf.record.CFRuleRecord;
 import org.apache.poi.hssf.record.aggregates.CFRecordsAggregate;
 import org.apache.poi.hssf.record.cf.CellRange;
-import org.apache.poi.ss.util.Region;
+import org.apache.poi.hssf.util.Region;
 
 /**
  * HSSFConditionalFormatting class encapsulates all settings of Conditional Formatting. 

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java b/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
index 2e93d461298120b146733a856dc1e8a4ab0df3a9..79cbea52c7911ccabeb936ab104d045e14f8a02a 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
@@ -56,7 +56,7 @@ import org.apache.poi.hssf.util.HSSFDataValidation;
 import org.apache.poi.hssf.util.PaneInformation;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.util.Region;
+import org.apache.poi.hssf.util.Region;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;