diff --git a/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java b/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java
index 8a4311dba0..0ec0645815 100644
--- a/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java
+++ b/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java
@@ -15,12 +15,11 @@
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) {
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java
index 85592a92a2..6324cd86a2 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java
@@ -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 HWPFDocument in which the placeholder was found
+ * @param pStartOffset The offset or index where the CharacterRun begins
+ * @param pPlaceHolderIndex The offset or index of the placeholder,
+ * relative to the CharacterRun where
+ * pPlaceHolder 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
index 0000000000..322431c27b
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
index 0000000000..0ac3ff0aa9
--- /dev/null
+++ b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java
@@ -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);
+
+ }
+}
diff --git a/src/testcases/org/apache/poi/hssf/data/testRVA.xls b/src/testcases/org/apache/poi/hssf/data/testRVA.xls
index 327edbb4cb..f23821117e 100644
Binary files a/src/testcases/org/apache/poi/hssf/data/testRVA.xls and b/src/testcases/org/apache/poi/hssf/data/testRVA.xls differ
diff --git a/src/testcases/org/apache/poi/hssf/model/TestRVA.java b/src/testcases/org/apache/poi/hssf/model/TestRVA.java
index f8c70eb7b8..ca74c6e2db 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestRVA.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestRVA.java
@@ -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());
}