From: Nick Burch Date: Tue, 15 Jun 2010 11:41:06 +0000 (+0000) Subject: Temporary switch back to using only ooxml-schemas-1.0 (no lists). Revert this commit... X-Git-Tag: REL_3_7_BETA1^2~1 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2b5d3fcbfd55b8ddd276dd41516af07d8100542e;p=poi.git Temporary switch back to using only ooxml-schemas-1.0 (no lists). Revert this commit once 3.7 beta1 is out, so we can continue testing the new ooxml-schemas-1.1 (java 1.5) stuff git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@954835 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/build.xml b/build.xml index cf73e62752..18984f8cab 100644 --- a/build.xml +++ b/build.xml @@ -135,9 +135,9 @@ under the License. - + + value="${repository.m2}/maven2/org/apache/poi/ooxml-schemas/1.0/ooxml-schemas-1.0.jar"/> @@ -146,8 +146,8 @@ under the License. - - + + @@ -397,7 +397,7 @@ under the License. srcgendir="${ooxml.xsds.src.dir}" optimize="yes" destfile="${ooxml.xsds.jar}" - javasource="1.5" + javasource="1.4" failonerror="true" fork="true" memoryMaximumSize="512m" diff --git a/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java b/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java index f443be4837..3e35db871e 100644 --- a/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java +++ b/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java @@ -116,7 +116,7 @@ public class CommentsTable extends POIXMLDocumentPart { // Create the cache if needed if(commentRefs == null) { commentRefs = new HashMap(); - for (CTComment comment : comments.getCommentList().getCommentList()) { + for (CTComment comment : comments.getCommentList().getCommentArray()) { commentRefs.put(comment.getRef(), comment); } } diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java index 6aabadef95..e771424170 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java @@ -93,8 +93,8 @@ public class XWPFParagraph implements IBodyElement{ } runs = new ArrayList(); - if (prgrph.getRList().size() > 0) { - for(CTR ctRun : prgrph.getRList()) { + if (prgrph.getRArray().length > 0) { + for(CTR ctRun : prgrph.getRArray()) { runs.add(new XWPFRun(ctRun, this)); } } @@ -111,17 +111,17 @@ public class XWPFParagraph implements IBodyElement{ // TODO - replace this with some sort of XPath expression // to directly find all the CTRs, in the right order ArrayList rs = new ArrayList(); - rs.addAll( paragraph.getRList() ); + rs.addAll( Arrays.asList(paragraph.getRArray()) ); - for (CTSdtRun sdt : paragraph.getSdtList()) { + for (CTSdtRun sdt : paragraph.getSdtArray()) { CTSdtContentRun run = sdt.getSdtContent(); - rs.addAll( run.getRList() ); + rs.addAll( Arrays.asList(run.getRArray()) ); } - for (CTRunTrackChange c : paragraph.getDelList()) { - rs.addAll( c.getRList() ); + for (CTRunTrackChange c : paragraph.getDelArray()) { + rs.addAll( Arrays.asList(c.getRArray()) ); } - for (CTRunTrackChange c : paragraph.getInsList()) { - rs.addAll( c.getRList() ); + for (CTRunTrackChange c : paragraph.getInsArray()) { + rs.addAll( Arrays.asList(c.getRArray()) ); } // Get text of the paragraph @@ -179,7 +179,7 @@ public class XWPFParagraph implements IBodyElement{ // Loop over pictures inside our // paragraph, looking for text in them - for(CTPicture pict : rs.get(j).getPictList()) { + for(CTPicture pict : rs.get(j).getPictArray()) { XmlObject[] t = pict .selectPath("declare namespace w='http://schemas.openxmlformats.org/wordprocessingml/2006/main' .//w:t"); for (int m = 0; m < t.length; m++) {