From c2912a8a68ac2b9a31cf9c1d1d5af32ce74aa5e2 Mon Sep 17 00:00:00 2001
From: Glen Stampoultzis <glens@apache.org>
Date: Sun, 28 Apr 2002 04:51:34 +0000
Subject: [PATCH] Fix for reading row with no cells

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/branches/REL_1_5_BRANCH@352512 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/poi/hssf/usermodel/HSSFRow.java    | 22 ++++++++-----
 .../poi/hssf/usermodel/TestHSSFRow.java       | 33 ++++++++++++-------
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java b/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
index e2e77dc94..e9209800e 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
@@ -126,8 +126,8 @@ public class HSSFRow
         this.sheet = sheet;
         row = new RowRecord();
         row.setHeight((short) 0xff);
-        row.setLastCol((short)-1);
-        row.setFirstCol((short)-1);
+        row.setLastCol((short) -1);
+        row.setFirstCol((short) -1);
 
         // row.setRowNumber(rowNum);
         setRowNum(rowNum);
@@ -213,11 +213,11 @@ public class HSSFRow
 
         if (cell.getCellNum() == row.getLastCol())
         {
-            row.setLastCol( findLastCell(row.getLastCol()) );
+            row.setLastCol(findLastCell(row.getLastCol()));
         }
         if (cell.getCellNum() == row.getFirstCol())
         {
-            row.setFirstCol( findFirstCell(row.getFirstCol()) );
+            row.setFirstCol(findFirstCell(row.getFirstCol()));
         }
     }
 
@@ -270,11 +270,11 @@ public class HSSFRow
     {
         if (row.getFirstCol() == -1)
         {
-            row.setFirstCol( cell.getCellNum() );
+            row.setFirstCol(cell.getCellNum());
         }
         if (row.getLastCol() == -1)
         {
-            row.setLastCol( cell.getCellNum() );
+            row.setLastCol(cell.getCellNum());
         }
         cells.put(new Integer(cell.getCellNum()), cell);
 
@@ -318,7 +318,10 @@ public class HSSFRow
 
     public short getFirstCellNum()
     {
-        return row.getFirstCol();
+        if (getPhysicalNumberOfCells() == 0)
+            return -1;
+        else
+            return row.getFirstCol();
     }
 
     /**
@@ -328,7 +331,10 @@ public class HSSFRow
 
     public short getLastCellNum()
     {
-        return row.getLastCol();
+        if (getPhysicalNumberOfCells() == 0)
+            return -1;
+        else
+            return row.getLastCol();
     }
 
 
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
index fe3414d1f..3c7fb5163 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
@@ -55,7 +55,10 @@
 package org.apache.poi.hssf.usermodel;
 
 import junit.framework.TestCase;
-import org.apache.poi.hssf.record.RowRecord;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 
 /**
  * Test HSSFRow is okay.
@@ -87,31 +90,26 @@ public class TestHSSFRow
         assertEquals(1, row.getFirstCellNum());
         assertEquals(2, row.getLastCellNum());
 
-        RowRecord rowRecord = new RowRecord();
-        rowRecord.setFirstCol((short) 2);
-        rowRecord.setLastCol((short) 5);
-        row = new HSSFRow(workbook.getWorkbook(), sheet.getSheet(), rowRecord);
-        assertEquals(2, row.getFirstCellNum());
-        assertEquals(5, row.getLastCellNum());
     }
 
     public void testRemoveCell()
+            throws Exception
     {
         HSSFWorkbook workbook = new HSSFWorkbook();
         HSSFSheet sheet = workbook.createSheet();
         HSSFRow row = sheet.createRow((short) 0);
         assertEquals(-1, row.getLastCellNum());
         assertEquals(-1, row.getFirstCellNum());
-        row.createCell((short)1);
+        row.createCell((short) 1);
         assertEquals(1, row.getLastCellNum());
         assertEquals(1, row.getFirstCellNum());
-        row.createCell((short)3);
+        row.createCell((short) 3);
         assertEquals(3, row.getLastCellNum());
         assertEquals(1, row.getFirstCellNum());
-        row.removeCell(row.getCell((short)3));
+        row.removeCell(row.getCell((short) 3));
         assertEquals(1, row.getLastCellNum());
         assertEquals(1, row.getFirstCellNum());
-        row.removeCell(row.getCell((short)1));
+        row.removeCell(row.getCell((short) 1));
         assertEquals(-1, row.getLastCellNum());
         assertEquals(-1, row.getFirstCellNum());
 
@@ -121,5 +119,18 @@ public class TestHSSFRow
         assertEquals(0, data[6]);
         assertEquals(0, data[8]);
 
+        File file = File.createTempFile("XXX", "XLS");
+        FileOutputStream stream = new FileOutputStream(file);
+        workbook.write(stream);
+        stream.close();
+        FileInputStream inputStream = new FileInputStream(file);
+        workbook = new HSSFWorkbook(inputStream);
+        sheet = workbook.getSheetAt(0);
+        stream.close();
+        file.delete();
+        assertEquals(-1, sheet.getRow((short) 0).getLastCellNum());
+        assertEquals(-1, sheet.getRow((short) 0).getFirstCellNum());
+
+
     }
 }