Push the fix for bug #55248 up to the Sheet interface (was XSSF only before)

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

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java b/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
index 76008ddab3e1da6d40d2aa440a6698d040e438c9..c99a843e34bd7a3d22a8c0100366f13d42d2ef04 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
@@ -1242,6 +1242,19 @@ public final class HSSFSheet implements org.apache.poi.ss.usermodel.Sheet {
         return _sheet.getLeftCol();
     }
 
+    /**
+     * Sets desktop window pane display area, when the
+     * file is first opened in a viewer.
+     *
+     * @param toprow  the top row to show in desktop window pane
+     * @param leftcol the left column to show in desktop window pane
+     */
+    public void showInPane(int toprow, int leftcol) {
+        int maxrow = SpreadsheetVersion.EXCEL97.getLastRowIndex();
+        if (toprow > maxrow) throw new IllegalArgumentException("Maximum row number is " + maxrow);
+        
+        showInPane((short)toprow, (short)leftcol);
+    }
     /**
      * Sets desktop window pane display area, when the
      * file is first opened in a viewer.

diff --git a/src/java/org/apache/poi/ss/usermodel/Sheet.java b/src/java/org/apache/poi/ss/usermodel/Sheet.java
index 91caad02ff323598aa904f5e1b5893cd196551be..62d2e04ef27276c18d4732bc6b40a80f7c062387 100644 (file)
--- a/src/java/org/apache/poi/ss/usermodel/Sheet.java
+++ b/src/java/org/apache/poi/ss/usermodel/Sheet.java
@@ -582,6 +582,16 @@ public interface Sheet extends Iterable<Row> {
      * @param toprow the top row to show in desktop window pane
      * @param leftcol the left column to show in desktop window pane
      */
+    void showInPane(int toprow, int leftcol);
+
+    /**
+     * Sets desktop window pane display area, when the
+     * file is first opened in a viewer.
+     *
+     * @param toprow the top row to show in desktop window pane
+     * @param leftcol the left column to show in desktop window pane
+     * @deprecated Use {@link #showInPane(int, int)} as there can be more than 32767 rows.
+     */
     void showInPane(short toprow, short leftcol);
 
     /**

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
index 0af15ead35f2b5a107d79c48d9c826f968d11f4b..37ce7fba2cb100838d97efaefbd61c1e6a4ce3b3 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
@@ -2411,7 +2411,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
      * @param toprow the top row to show in desktop window pane
      * @param leftcol the left column to show in desktop window pane
      *
-     * @deprecated Use the version of showInPane() with ints as there can be more than 32767 rows.
+     * @deprecated Use {@link #showInPane(int, int)} as there can be more than 32767 rows.
      */
     @Deprecated
        public void showInPane(short toprow, short leftcol) {