From 802f50a7842ff3afb69bb461b0819760f866893b Mon Sep 17 00:00:00 2001
From: Glen Stampoultzis <glens@apache.org>
Date: Sun, 21 Sep 2003 09:58:24 +0000
Subject: [PATCH] Fixed bug relating to rewriting empty workbooks.  The
 aggregates were not being added to the records in this case.

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/branches/REL_2_BRANCH@353363 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/poi/hssf/model/Sheet.java |  29 +++++++++---------
 .../apache/poi/hssf/data/blankworkbook.xls    | Bin 0 -> 13824 bytes
 2 files changed, 14 insertions(+), 15 deletions(-)
 create mode 100644 src/testcases/org/apache/poi/hssf/data/blankworkbook.xls

diff --git a/src/java/org/apache/poi/hssf/model/Sheet.java b/src/java/org/apache/poi/hssf/model/Sheet.java
index 93eb1cd28d..c0f07b829a 100644
--- a/src/java/org/apache/poi/hssf/model/Sheet.java
+++ b/src/java/org/apache/poi/hssf/model/Sheet.java
@@ -235,9 +235,9 @@ public class Sheet implements Model
             }
             else if ( rec.getSid() == RowRecord.sid )
             {
-            	 RowRecord row = (RowRecord)rec;
-            	 if (!isfirstrow) rec = null; //only add the aggregate once
-            	 
+                RowRecord row = (RowRecord)rec;
+                if (!isfirstrow) rec = null; //only add the aggregate once
+
                 if ( isfirstrow )
                 {
                     retval.rows = new RowRecordsAggregate();
@@ -297,14 +297,16 @@ public class Sheet implements Model
             }
         }
         retval.records = records;
-        if (retval.rows == null)
-        {
-            retval.rows = new RowRecordsAggregate();
-        }
-        if (retval.cells == null)
-        {
-            retval.cells = new ValueRecordsAggregate();
-        }
+//        if (retval.rows == null)
+//        {
+//            retval.rows = new RowRecordsAggregate();
+//        }
+        retval.checkCells();
+        retval.checkRows();
+//        if (retval.cells == null)
+//        {
+//            retval.cells = new ValueRecordsAggregate();
+//        }
         log.log(log.DEBUG, "sheet createSheet (existing file) exited");
         return retval;
     }
@@ -1002,10 +1004,7 @@ public class Sheet implements Model
     {
         checkCells();
         log.logFormatted(log.DEBUG, "remove value record row,dimsloc %,%",
-                         new int[]
-        {
-            row, dimsloc
-        });
+                         new int[]{row, dimsloc} );
         loc = dimsloc;
         cells.removeCell(col);
 
diff --git a/src/testcases/org/apache/poi/hssf/data/blankworkbook.xls b/src/testcases/org/apache/poi/hssf/data/blankworkbook.xls
new file mode 100644
index 0000000000000000000000000000000000000000..fcf734d6a8b9cef07d1e51f3eca7c9567d1da1f5
GIT binary patch
literal 13824
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
B?Kl7c

literal 0
HcmV?d00001

-- 
2.39.5