Merged revisions 614211 via svnmerge from

https://svn.apache.org/repos/asf/poi/trunk

........
  r614211 | nick | 2008-01-22 15:48:51 +0100 (Tue, 22 Jan 2008) | 1 line

  Fix from bug #41726 - support signed offsets from relative areas and references
........

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

diff --git a/src/documentation/content/xdocs/changes.xml b/src/documentation/content/xdocs/changes.xml
index bc95d9b7a24867a1221064ce1282d7ade4ad50fe..a2bd40d73f72da1be7a5f1d2e16cc282b2101a7f 100644 (file)
--- a/src/documentation/content/xdocs/changes.xml
+++ b/src/documentation/content/xdocs/changes.xml
@@ -36,6 +36,7 @@
 
                <!-- Don't forget to update status.xml too! -->
         <release version="3.0.2-FINAL" date="2008-??-??">
+            <action dev="POI-DEVELOPERS" type="fix">41726 - Fix how we handle signed cell offsets in relative areas and references</action>
             <action dev="POI-DEVELOPERS" type="add">44233 - Support for getting and setting a flag on the sheet, which tells excel to re-calculate all formulas on it at next reload</action>
             <action dev="POI-DEVELOPERS" type="fix">44201 - Enable cloning of sheets with data validation rules</action>
             <action dev="POI-DEVELOPERS" type="fix">44200 - Enable cloning of sheets with notes</action>

diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 122cab85c3f5d62ba54ece013aee971c76f0bf65..56b868b8753c003f225654672e8f39b7d420cca3 100644 (file)
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -33,6 +33,7 @@
        <!-- Don't forget to update changes.xml too! -->
     <changes>
         <release version="3.0.2-FINAL" date="2008-??-??">
+            <action dev="POI-DEVELOPERS" type="fix">41726 - Fix how we handle signed cell offsets in relative areas and references</action>
             <action dev="POI-DEVELOPERS" type="add">44233 - Support for getting and setting a flag on the sheet, which tells excel to re-calculate all formulas on it at next reload</action>
             <action dev="POI-DEVELOPERS" type="fix">44201 - Enable cloning of sheets with data validation rules</action>
             <action dev="POI-DEVELOPERS" type="fix">44200 - Enable cloning of sheets with notes</action>

diff --git a/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java b/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
index e2871ac5cff0da1c3ea55a96d721e9266861e629..ae250246d3a4e7b5141a366c3b1ffffa4886c43e 100755 (executable)
--- a/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
+++ b/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
@@ -156,8 +156,8 @@ public class SharedFormulaRecord
 
     protected void fillFields(RecordInputStream in)
     {
-      field_1_first_row       = in.readShort();
-      field_2_last_row        = in.readShort();
+      field_1_first_row       = in.readUShort();
+      field_2_last_row        = in.readUShort();
       field_3_first_column    = in.readUByte();
       field_4_last_column     = in.readUByte();
       field_5_reserved        = in.readShort();
@@ -200,48 +200,48 @@ public class SharedFormulaRecord
             Ptg ptg = (Ptg) field_7_parsed_expr.get(k);
             if (ptg instanceof RefNPtg) {
               RefNPtg refNPtg = (RefNPtg)ptg;
-              ptg = new ReferencePtg( (short)(formulaRow + refNPtg.getRow()),
-                                      (byte)(formulaColumn + refNPtg.getColumn()),
+              ptg = new ReferencePtg(fixupRelativeRow(formulaRow,refNPtg.getRow(),refNPtg.isRowRelative()),
+                                     fixupRelativeColumn(formulaColumn,refNPtg.getColumn(),refNPtg.isColRelative()),
                                      refNPtg.isRowRelative(),
                                      refNPtg.isColRelative());
             } else if (ptg instanceof RefNVPtg) {
               RefNVPtg refNVPtg = (RefNVPtg)ptg;
-              ptg = new RefVPtg( (short)(formulaRow + refNVPtg.getRow()),
-                                 (byte)(formulaColumn + refNVPtg.getColumn()),
-                                 refNVPtg.isRowRelative(),
-                                 refNVPtg.isColRelative());
+              ptg = new RefVPtg(fixupRelativeRow(formulaRow,refNVPtg.getRow(),refNVPtg.isRowRelative()),
+                                fixupRelativeColumn(formulaColumn,refNVPtg.getColumn(),refNVPtg.isColRelative()),
+                                refNVPtg.isRowRelative(),
+                                refNVPtg.isColRelative());
             } else if (ptg instanceof RefNAPtg) {
               RefNAPtg refNAPtg = (RefNAPtg)ptg;
-              ptg = new RefAPtg( (short)(formulaRow + refNAPtg.getRow()),
-                                 (byte)(formulaColumn + refNAPtg.getColumn()),
+              ptg = new RefAPtg( fixupRelativeRow(formulaRow,refNAPtg.getRow(),refNAPtg.isRowRelative()),
+                                 fixupRelativeColumn(formulaColumn,refNAPtg.getColumn(),refNAPtg.isColRelative()),
                                  refNAPtg.isRowRelative(),
                                  refNAPtg.isColRelative());
             } else if (ptg instanceof AreaNPtg) {
               AreaNPtg areaNPtg = (AreaNPtg)ptg;
-              ptg = new AreaPtg((short)(formulaRow + areaNPtg.getFirstRow()),
-                                (short)(formulaRow + areaNPtg.getLastRow()),
-                                (short)(formulaColumn + areaNPtg.getFirstColumn()),
-                                (short)(formulaColumn + areaNPtg.getLastColumn()),
+              ptg = new AreaPtg(fixupRelativeRow(formulaRow,areaNPtg.getFirstRow(),areaNPtg.isFirstRowRelative()),
+                                fixupRelativeRow(formulaRow,areaNPtg.getLastRow(),areaNPtg.isLastRowRelative()),
+                                fixupRelativeColumn(formulaColumn,areaNPtg.getFirstColumn(),areaNPtg.isFirstColRelative()),
+                                fixupRelativeColumn(formulaColumn,areaNPtg.getLastColumn(),areaNPtg.isLastColRelative()),
                                 areaNPtg.isFirstRowRelative(),
                                 areaNPtg.isLastRowRelative(),
                                 areaNPtg.isFirstColRelative(),
                                 areaNPtg.isLastColRelative());
             } else if (ptg instanceof AreaNVPtg) {
               AreaNVPtg areaNVPtg = (AreaNVPtg)ptg;
-              ptg = new AreaVPtg((short)(formulaRow + areaNVPtg.getFirstRow()),
-                                (short)(formulaRow + areaNVPtg.getLastRow()),
-                                (short)(formulaColumn + areaNVPtg.getFirstColumn()),
-                                (short)(formulaColumn + areaNVPtg.getLastColumn()),
+              ptg = new AreaVPtg(fixupRelativeRow(formulaRow,areaNVPtg.getFirstRow(),areaNVPtg.isFirstRowRelative()),
+                                fixupRelativeRow(formulaRow,areaNVPtg.getLastRow(),areaNVPtg.isLastRowRelative()),
+                                fixupRelativeColumn(formulaColumn,areaNVPtg.getFirstColumn(),areaNVPtg.isFirstColRelative()),
+                                fixupRelativeColumn(formulaColumn,areaNVPtg.getLastColumn(),areaNVPtg.isLastColRelative()),
                                 areaNVPtg.isFirstRowRelative(),
                                 areaNVPtg.isLastRowRelative(),
                                 areaNVPtg.isFirstColRelative(),
                                 areaNVPtg.isLastColRelative());
             } else if (ptg instanceof AreaNAPtg) {
               AreaNAPtg areaNAPtg = (AreaNAPtg)ptg;
-              ptg = new AreaAPtg((short)(formulaRow + areaNAPtg.getFirstRow()),
-                                (short)(formulaRow + areaNAPtg.getLastRow()),
-                                (short)(formulaColumn + areaNAPtg.getFirstColumn()),
-                                (short)(formulaColumn + areaNAPtg.getLastColumn()),
+              ptg = new AreaAPtg(fixupRelativeRow(formulaRow,areaNAPtg.getFirstRow(),areaNAPtg.isFirstRowRelative()),
+                                fixupRelativeRow(formulaRow,areaNAPtg.getLastRow(),areaNAPtg.isLastRowRelative()),
+                                fixupRelativeColumn(formulaColumn,areaNAPtg.getFirstColumn(),areaNAPtg.isFirstColRelative()),
+                                fixupRelativeColumn(formulaColumn,areaNAPtg.getLastColumn(),areaNAPtg.isLastColRelative()),
                                 areaNAPtg.isFirstRowRelative(),
                                 areaNAPtg.isLastRowRelative(),
                                 areaNAPtg.isFirstColRelative(),
@@ -256,6 +256,21 @@ public class SharedFormulaRecord
         throw new RuntimeException("Shared Formula Conversion: Coding Error");
       }
     }
+    
+    private short fixupRelativeColumn(int currentcolumn, short column, boolean relative) {
+       if(relative) {
+               if((column&128)!=0) column=(short)(column-256);
+               column+=currentcolumn;
+       }
+       return column;
+       }
+
+       private short fixupRelativeRow(int currentrow, short row, boolean relative) {
+               if(relative) {
+                       row+=currentrow;
+               }
+               return row;
+       }
 
        /**
         * Mirroring formula records so it is registered in the ValueRecordsAggregate

diff --git a/src/testcases/org/apache/poi/hssf/data/SharedFormulaTest.xls b/src/testcases/org/apache/poi/hssf/data/SharedFormulaTest.xls
new file mode 100644 (file)
index 0000000..8db77d9
Binary files /dev/null and b/src/testcases/org/apache/poi/hssf/data/SharedFormulaTest.xls differ

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java b/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java
index e6ee73f22dbf82a2ad5829e8f932021e4c398aee..f1e8f497773350e24e788fc74a469072b8f00629 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java
@@ -1127,6 +1127,17 @@ extends TestCase {
                cell.setCellFormula("IF(A1=\"A\",1,)");
        }
     
+       public void testSharedFormula() throws Exception {
+               String readFilename = System.getProperty("HSSF.testdata.path"); 
+               File inFile = new File(readFilename+"/SharedFormulaTest.xls");
+               FileInputStream fis = new FileInputStream(inFile);
+               HSSFWorkbook wb = new HSSFWorkbook(fis);
+               
+               assertEquals("A$1*2", wb.getSheetAt(0).getRow(1).getCell((short)1).toString());
+               assertEquals("$A11*2", wb.getSheetAt(0).getRow(11).getCell((short)1).toString());
+               assertEquals("DZ2*2", wb.getSheetAt(0).getRow(1).getCell((short)128).toString());
+               assertEquals("B32770*2", wb.getSheetAt(0).getRow(32768).getCell((short)1).toString());
+       }
     
     public static void main(String [] args) {
         System.out