Little tweak to the imports to keep things more consistent with 3.1

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

diff --git a/src/java/org/apache/poi/hssf/model/Sheet.java b/src/java/org/apache/poi/hssf/model/Sheet.java
index 750dbca238cd4203c47f1bffa9d6ae39f7bdfba3..710d57118db21265172686388392c1d5128348a7 100644 (file)
--- a/src/java/org/apache/poi/hssf/model/Sheet.java
+++ b/src/java/org/apache/poi/hssf/model/Sheet.java
@@ -69,7 +69,7 @@ import org.apache.poi.hssf.record.aggregates.PageSettingsBlock;
 import org.apache.poi.hssf.record.aggregates.RecordAggregate;
 import org.apache.poi.hssf.record.aggregates.RowRecordsAggregate;
 import org.apache.poi.hssf.record.aggregates.RecordAggregate.RecordVisitor;
-import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.hssf.util.CellRangeAddress;
 import org.apache.poi.hssf.util.PaneInformation;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java b/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
index 72c95159afae95aa35573fe77603ede71b1848ad..e61d7a1cc84b1b1396d65928a4cc35ba4b8e006a 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
@@ -641,8 +641,8 @@ public class HSSFSheet implements org.apache.poi.ss.usermodel.Sheet
     /**
      * @return the merged region at the specified index
      */
-    public CellRangeAddress getMergedRegion(int index) {
-        return (CellRangeAddress)sheet.getMergedRegionAt(index);
+    public org.apache.poi.hssf.util.CellRangeAddress getMergedRegion(int index) {
+        return sheet.getMergedRegionAt(index);
     }
 
     /**