read GutsRecord in in the Sheet(RecordStream rs)

constructor (see bugzilla 46186); always call sheet.setAlternativeExpression in conjuction with sheet.setRowSumsBelow, see bugzilla 46714 and 30714

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

diff --git a/src/documentation/content/xdocs/changes.xml b/src/documentation/content/xdocs/changes.xml
index 087588e7e5b126a8a588e8f7a8e44328adde982e..45ca4c6bdf2fa4ec9e79181c46f8fe45eeb9fbe1 100644 (file)
--- a/src/documentation/content/xdocs/changes.xml
+++ b/src/documentation/content/xdocs/changes.xml
@@ -37,6 +37,8 @@
 
                <!-- Don't forget to update status.xml too! -->
         <release version="3.5-beta6" date="2009-??-??">
+           <action dev="POI-DEVELOPERS" type="fix">46186 - Fixed Sheet to read GutsRecord in the Sheet(RecordStream rs)</action>
+           <action dev="POI-DEVELOPERS" type="fix">46714 - Automatically call sheet.setAlternativeExpression when sheet.setRowSumsBelow is called </action>
            <action dev="POI-DEVELOPERS" type="fix">46279 - Allow 255 arguments for excel functions in XSSF </action>
            <action dev="POI-DEVELOPERS" type="fix">47028 - Fixed XSSFCell to preserve cell style when cell value is set to blank</action>
            <action dev="POI-DEVELOPERS" type="fix">47026 - Avoid NPE in XSSFCell.setCellType() when workbook does not have SST</action>

diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 5bccbf28cd8f463931ad58565a317015737eff89..1c50ca1b7e56e49ceffce582eddf99bfc666faa1 100644 (file)
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -34,6 +34,8 @@
        <!-- Don't forget to update changes.xml too! -->
     <changes>
         <release version="3.5-beta6" date="2009-??-??">
+           <action dev="POI-DEVELOPERS" type="fix">46186 - Fixed Sheet to read GutsRecord in the Sheet(RecordStream rs)</action>
+           <action dev="POI-DEVELOPERS" type="fix">46714 - Automatically call sheet.setAlternativeExpression when sheet.setRowSumsBelow is called </action>
            <action dev="POI-DEVELOPERS" type="fix">46279 - Allow 255 arguments for excel functions in XSSF </action>
            <action dev="POI-DEVELOPERS" type="fix">47028 - Fixed XSSFCell to preserve cell style when cell value is set to blank</action>
            <action dev="POI-DEVELOPERS" type="fix">47026 - Avoid NPE in XSSFCell.setCellType() when workbook does not have SST</action>

diff --git a/src/java/org/apache/poi/hssf/model/Sheet.java b/src/java/org/apache/poi/hssf/model/Sheet.java
index 8256556420a786cc724f230ed0e8b3a0324a5325..40a2e1e92d93f53c188b0b5cdf0403f832c15e8a 100644 (file)
--- a/src/java/org/apache/poi/hssf/model/Sheet.java
+++ b/src/java/org/apache/poi/hssf/model/Sheet.java
@@ -337,6 +337,10 @@ public final class Sheet implements Model {
             {
                 password = (PasswordRecord) rec;
             }
+            else if ( recSid == GutsRecord.sid )
+            {
+                _gutsRecord = (GutsRecord) rec;
+            }
 
             records.add(rec);
         }

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java b/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
index cf81a856869217f45c7f65328933786e3a095276..64a5bc19090bb4712eee2f1ac18df293cd833958 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
@@ -774,6 +774,8 @@ public final class HSSFSheet implements org.apache.poi.ss.usermodel.Sheet {
                 (WSBoolRecord) _sheet.findFirstRecordBySid(WSBoolRecord.sid);
 
         record.setRowSumsBelow(b);
+        //setAlternateExpression must be set in conjuction with setRowSumsBelow
+        record.setAlternateExpression(b);
     }
 
     /**

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
index af53957820d4c0ba3830a4e2c81935ec9d872011..abed228deb5ebd28ee5c6d82f84bd0590d1b2570 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
@@ -125,7 +125,7 @@ public final class TestHSSFSheet extends BaseTestSheet {
         s.setRowSumsRight(true);
 
         // Check
-        assertEquals(false, record.getAlternateExpression());
+        assertEquals(true, record.getAlternateExpression()); //sheet.setRowSumsBelow alters this field too 
         assertEquals(false, record.getAlternateFormula());
         assertEquals(true, record.getAutobreaks());
         assertEquals(true, record.getDialog());
@@ -133,7 +133,7 @@ public final class TestHSSFSheet extends BaseTestSheet {
         assertEquals(false, record.getFitToPage());
         assertEquals(true, record.getRowSumsBelow());
         assertEquals(true, record.getRowSumsRight());
-        assertEquals(false, s.getAlternateExpression());
+        assertEquals(true, s.getAlternateExpression());
         assertEquals(false, s.getAlternateFormula());
         assertEquals(true, s.getAutobreaks());
         assertEquals(true, s.getDialog());

diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
index adbcaad9406e632d00e285afc2c1cba953300b72..095456f9678d8f7c8a17b738de1c11a5fe912cea 100755 (executable)
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
+++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
@@ -17,11 +17,9 @@
 package org.apache.poi.ss.usermodel;\r
 \r
 import junit.framework.TestCase;\r
-import junit.framework.AssertionFailedError;\r
 import org.apache.poi.ss.ITestDataProvider;\r
 import org.apache.poi.ss.SpreadsheetVersion;\r
 import org.apache.poi.ss.util.CellRangeAddress;\r
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;\r
 \r
 /**\r
  * A base class for bugzilla issues that can be described in terms of common ss interfaces.\r