]> source.dussan.org Git - poi.git/commitdiff
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-63924...
authorNick Burch <nick@apache.org>
Mon, 16 Jun 2008 12:54:12 +0000 (12:54 +0000)
committerNick Burch <nick@apache.org>
Mon, 16 Jun 2008 12:54:12 +0000 (12:54 +0000)
https://svn.apache.org:443/repos/asf/poi/trunk

........
  r668014 | josh | 2008-06-15 23:26:06 +0100 (Sun, 15 Jun 2008) | 1 line

  added extra RVA test case (for bug 45206)
........
  r668143 | nick | 2008-06-16 13:49:55 +0100 (Mon, 16 Jun 2008) | 1 line

  Unit test from bug #45001, and new replaceText method (no test yet)
........

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

src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java
src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java
src/scratchpad/testcases/org/apache/poi/hwpf/data/testRangeInsertion.doc [new file with mode: 0644]
src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java [new file with mode: 0644]
src/testcases/org/apache/poi/hssf/data/testRVA.xls
src/testcases/org/apache/poi/hssf/model/TestRVA.java

index 8a4311dba013b0d4f40eb318fa8e9f660fdccfd9..0ec0645815b74d47f414560d853c9baf083b37b5 100644 (file)
    limitations under the License.
 ==================================================================== */
 
-
 package org.apache.poi.hssf.record.formula;
 
-import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.hssf.record.RecordInputStream;
 import org.apache.poi.hssf.util.RangeAddress;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellReference;
 import org.apache.poi.ss.util.SheetReferences;
 import org.apache.poi.util.BitField;
@@ -69,16 +68,15 @@ public class Ref3DPtg extends OperandPtg {
     }
 
     public String toString() {
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append("Ref3dPtg\n");
-        buffer.append("Index to Extern Sheet = " + getExternSheetIndex()).append("\n");
-        buffer.append("Row = " + getRow()).append("\n");
-        buffer.append("Col  = " + getColumn()).append("\n");
-        buffer.append("ColRowRel= "
-        + isRowRelative()).append("\n");
-        buffer.append("ColRel   = " + isColRelative()).append("\n");
-        return buffer.toString();
+        CellReference cr = new CellReference(getRow(), getColumn(), !isRowRelative(),!isColRelative());
+        StringBuffer sb = new StringBuffer();
+        sb.append(getClass().getName());
+        sb.append(" [");
+        sb.append("sheetIx=").append(getExternSheetIndex());
+        sb.append(" ! ");
+        sb.append(cr.formatAsString());
+        sb.append("]");
+        return sb.toString();
     }
 
     public void writeBytes(byte [] array, int offset) {
index 85592a92a21b8b6e868a502ce234b89cd1c21009..6324cd86a2bf6c1dec60ad5b3bb5a1231738a5ca 100644 (file)
@@ -632,6 +632,50 @@ public class Range
     return (ListEntry)insertAfter(props, styleIndex);
   }
 
+  /**
+   * Replace (one instance of) a piece of text with another...
+   *
+   * @param pPlaceHolder    The text to be replaced (e.g., "${company}")
+   * @param pValue          The replacement text (e.g., "Cognocys, Inc.")
+   * @param pDocument       The <code>HWPFDocument</code> in which the placeholder was found
+   * @param pStartOffset    The offset or index where the <code>CharacterRun</code> begins
+   * @param pPlaceHolderIndex   The offset or index of the placeholder, 
+   *  relative to the <code>CharacterRun</code> where 
+   *  <code>pPlaceHolder</code> was found
+   */
+  protected void replaceText(String pPlaceHolder, String pValue, 
+        int pStartOffset, int pPlaceHolderIndex, HWPFDocument pDocument) {
+    int absPlaceHolderIndex = pStartOffset + pPlaceHolderIndex;
+    Range subRange = new Range(
+                absPlaceHolderIndex, 
+                (absPlaceHolderIndex + pPlaceHolder.length()), pDocument
+    );
+    if (subRange.usesUnicode()) {
+            absPlaceHolderIndex = pStartOffset + (pPlaceHolderIndex * 2);
+            subRange = new Range(
+                      absPlaceHolderIndex, 
+                      (absPlaceHolderIndex + (pPlaceHolder.length() * 2)), 
+                      pDocument
+            );
+    }
+
+    subRange.insertBefore(pValue);
+
+    // re-create the sub-range so we can delete it
+    subRange = new Range(
+            (absPlaceHolderIndex + pValue.length()),
+            (absPlaceHolderIndex + pPlaceHolder.length() + pValue.length()), 
+            pDocument
+    );
+    if (subRange.usesUnicode())
+            subRange = new Range(
+                      (absPlaceHolderIndex + (pValue.length() * 2)),
+                      (absPlaceHolderIndex + (pPlaceHolder.length() * 2) + 
+                      (pValue.length() * 2)), pDocument
+            );
+
+    subRange.delete();
+  }
 
   /**
    * Gets the character run at index. The index is relative to this range.
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/testRangeInsertion.doc b/src/scratchpad/testcases/org/apache/poi/hwpf/data/testRangeInsertion.doc
new file mode 100644 (file)
index 0000000..322431c
Binary files /dev/null and b/src/scratchpad/testcases/org/apache/poi/hwpf/data/testRangeInsertion.doc differ
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java
new file mode 100644 (file)
index 0000000..0ac3ff0
--- /dev/null
@@ -0,0 +1,120 @@
+
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.hwpf.usermodel;
+
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.util.List;
+
+import org.apache.poi.hwpf.HWPFDocument;
+import org.apache.poi.hwpf.model.PicturesTable;
+import org.apache.poi.hwpf.usermodel.Picture;
+
+import junit.framework.TestCase;
+
+/**
+ *     Test to see if Range.insertBefore() works even if the Range contains a
+ *     CharacterRun that uses Unicode characters.
+ */
+public class TestRangeInsertion extends TestCase {
+
+       // u201c and u201d are "smart-quotes"
+       private String originalText =
+               "It is used to confirm that text insertion works even if Unicode characters (such as \u201c\u2014\u201d (U+2014), \u201c\u2e8e\u201d (U+2E8E), or \u201c\u2714\u201d (U+2714)) are present.\r";
+       private String textToInsert = "Look at me!  I'm cool!  ";
+       private int insertionPoint = 244;
+
+       private String illustrativeDocFile;
+
+       protected void setUp() throws Exception {
+
+               String dirname = System.getProperty("HWPF.testdata.path");
+
+               illustrativeDocFile = dirname + "/testRangeInsertion.doc";
+       }
+
+       /**
+        * Test just opening the files
+        */
+       public void testOpen() throws Exception {
+
+               HWPFDocument docA = new HWPFDocument(new FileInputStream(illustrativeDocFile));
+       }
+
+       /**
+        * Test (more "confirm" than test) that we have the general structure that we expect to have.
+        */
+       public void testDocStructure() throws Exception {
+
+               HWPFDocument daDoc = new HWPFDocument(new FileInputStream(illustrativeDocFile));
+
+               Range range = daDoc.getRange();
+
+               assertEquals(1, range.numSections());
+               Section section = range.getSection(0);
+
+               assertEquals(3, section.numParagraphs());
+               Paragraph para = section.getParagraph(2);
+
+               assertEquals(3, para.numCharacterRuns());
+               String text = para.getCharacterRun(0).text() + para.getCharacterRun(1).text() +
+                       para.getCharacterRun(2).text();
+
+               assertEquals(originalText, text);
+       }
+
+       /**
+        * Test that we can insert text in our CharacterRun with Unicode text.
+        */
+       public void testRangeInsertion() throws Exception {
+
+               HWPFDocument daDoc = new HWPFDocument(new FileInputStream(illustrativeDocFile));
+
+               /*
+                       Range range = daDoc.getRange();
+                       Section section = range.getSection(0);
+                       Paragraph para = section.getParagraph(2);
+                       String text = para.getCharacterRun(0).text() + para.getCharacterRun(1).text() +
+                       para.getCharacterRun(2).text();
+
+                       System.out.println(text);
+               */
+
+               Range range = new Range(insertionPoint, (insertionPoint + 2), daDoc);
+               range.insertBefore(textToInsert);
+
+               // we need to let the model re-calculate the Range before we evaluate it
+               range = daDoc.getRange();
+
+               assertEquals(1, range.numSections());
+               Section section = range.getSection(0);
+
+               assertEquals(3, section.numParagraphs());
+               Paragraph para = section.getParagraph(2);
+
+               assertEquals(3, para.numCharacterRuns());
+               String text = para.getCharacterRun(0).text() + para.getCharacterRun(1).text() +
+                       para.getCharacterRun(2).text();
+
+               // System.out.println(text);
+
+               assertEquals((textToInsert + originalText), text);
+
+       }
+}
index 327edbb4cbf11e7ed0a2e6bf2cafdaa54a041198..f23821117e96c2c5e9649a8c5227748bb519ae5a 100644 (file)
Binary files a/src/testcases/org/apache/poi/hssf/data/testRVA.xls and b/src/testcases/org/apache/poi/hssf/data/testRVA.xls differ
index f8c70eb7b836df346d539b8fd6cfffeb07122969..ca74c6e2dbaf279d28a2db2aba8f947597273e01 100644 (file)
@@ -23,7 +23,6 @@ import junit.framework.TestCase;
 import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.hssf.record.formula.AttrPtg;
 import org.apache.poi.hssf.record.formula.Ptg;
-import org.apache.poi.hssf.record.formula.RefPtgBase;
 import org.apache.poi.hssf.usermodel.FormulaExtractor;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
@@ -60,7 +59,7 @@ public final class TestRVA extends TestCase {
                        }
                        String formula = cell.getCellFormula();
                        try {
-                               confirmCell(cell, formula);
+                               confirmCell(cell, formula, wb);
                        } catch (AssertionFailedError e) {
                                System.err.println("Problem with row[" + rowIx + "] formula '" + formula + "'");
                                System.err.println(e.getMessage());
@@ -79,9 +78,9 @@ public final class TestRVA extends TestCase {
                }
        }
 
-       private void confirmCell(HSSFCell formulaCell, String formula) {
+       private void confirmCell(HSSFCell formulaCell, String formula, HSSFWorkbook wb) {
                Ptg[] excelPtgs = FormulaExtractor.getPtgs(formulaCell);
-               Ptg[] poiPtgs = FormulaParser.parse(formula, null);
+               Ptg[] poiPtgs = FormulaParser.parse(formula, wb);
                int nExcelTokens = excelPtgs.length;
                int nPoiTokens = poiPtgs.length;
                if (nExcelTokens != nPoiTokens) {
@@ -122,6 +121,10 @@ public final class TestRVA extends TestCase {
                        }
                        sb.append(NEW_LINE);
                }
+               if (false) { // set 'true' to see trace of RVA values
+                       System.out.println(formula);
+                       System.out.println(sb.toString());
+               }
                if (hasMismatch) {
                        throw new AssertionFailedError(sb.toString());
                }