From bc2efc31117e5c46b848fc3ebae372a75f30d673 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Mon, 16 Jun 2008 12:54:12 +0000 Subject: [PATCH] Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-659571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664219,664221-664489,664494-664514,664516-668143 via svnmerge from 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 --- .../poi/hssf/record/formula/Ref3DPtg.java | 22 ++-- .../org/apache/poi/hwpf/usermodel/Range.java | 44 +++++++ .../poi/hwpf/data/testRangeInsertion.doc | Bin 0 -> 104448 bytes .../hwpf/usermodel/TestRangeInsertion.java | 120 ++++++++++++++++++ .../org/apache/poi/hssf/data/testRVA.xls | Bin 32768 -> 32256 bytes .../org/apache/poi/hssf/model/TestRVA.java | 11 +- 6 files changed, 181 insertions(+), 16 deletions(-) create mode 100644 src/scratchpad/testcases/org/apache/poi/hwpf/data/testRangeInsertion.doc create mode 100644 src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java 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 0000000000000000000000000000000000000000..322431c27b6a1f003993949cbf1cfbabb08e8976 GIT binary patch literal 104448 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 literal 0 HcmV?d00001 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 327edbb4cbf11e7ed0a2e6bf2cafdaa54a041198..f23821117e96c2c5e9649a8c5227748bb519ae5a 100644 GIT binary patch delta 4048 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 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()); } -- 2.39.5