Author: fanningpj
Date: Sun Aug 28 13:12:31 2022
New Revision: 1903733
URL: http://svn.apache.org/viewvc?rev=1903733&view=rev
Log:
reuse code
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLTypeLoader.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShape.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSignatureLine.java
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLTypeLoader.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLTypeLoader.java?rev=1903733&r1=1903732&r2=1903733&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLTypeLoader.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLTypeLoader.java
Sun Aug 28 13:12:31 2022
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.poi.openxml4j.opc.PackageNamespaces;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.poi.xssf.usermodel.XSSFRelation;
import org.apache.xmlbeans.XmlOptions;
public class POIXMLTypeLoader {
@@ -61,8 +61,8 @@ public class POIXMLTypeLoader {
map.put("http://schemas.openxmlformats.org/officeDocument/2006/math";,
"m");
map.put("http://schemas.openxmlformats.org/officeDocument/2006/relationships";,
"r");
map.put("http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes";,
"vt");
- map.put("http://schemas.openxmlformats.org/presentationml/2006/main";,
"p");
- map.put(XWPFDocument.NS_OOXML_WP_MAIN, "w");
+ map.put(XSSFRelation.NS_PRESENTATIONML, "p");
+ map.put(XSSFRelation.NS_WORDPROCESSINGML, "w");
map.put("http://schemas.microsoft.com/office/word/2006/wordml";, "wne");
map.put(MS_OFFICE_URN, "o");
map.put(MS_EXCEL_URN, "x");
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java?rev=1903733&r1=1903732&r2=1903733&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java
Sun Aug 28 13:12:31 2022
@@ -20,6 +20,7 @@
package org.apache.poi.xslf.model;
import static org.apache.poi.ooxml.util.XPathHelper.selectProperty;
+import static org.apache.poi.xssf.usermodel.XSSFRelation.NS_PRESENTATIONML;
import java.util.function.Consumer;
@@ -44,7 +45,7 @@ public final class ParagraphPropertyFetc
}
- static final String PML_NS =
"http://schemas.openxmlformats.org/presentationml/2006/main";;
+ static final String PML_NS = NS_PRESENTATIONML;
static final String DML_NS =
"http://schemas.openxmlformats.org/drawingml/2006/main";;
private static final QName[] TX_BODY = { new QName(PML_NS, "txBody") };
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java?rev=1903733&r1=1903732&r2=1903733&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java
Sun Aug 28 13:12:31 2022
@@ -28,6 +28,7 @@ import org.openxmlformats.schemas.presen
import org.openxmlformats.schemas.presentationml.x2006.main.CTPicture;
import org.openxmlformats.schemas.presentationml.x2006.main.CTShape;
+import static org.apache.poi.xssf.usermodel.XSSFRelation.NS_PRESENTATIONML;
@Beta
public class XSLFDrawing {
@@ -38,7 +39,7 @@ public class XSLFDrawing {
_sheet = sheet;
_spTree = spTree;
XmlObject[] cNvPr = sheet.getSpTree().selectPath(
- "declare namespace
p='http://schemas.openxmlformats.org/presentationml/2006/main' .//*/p:cNvPr");
+ "declare namespace p='" + NS_PRESENTATIONML + "'
.//*/p:cNvPr");
for(XmlObject o : cNvPr) {
// powerpoint generates AlternateContent elements which cNvPr
elements aren't recognized
// ignore them for now
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java?rev=1903733&r1=1903732&r2=1903733&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java
Sun Aug 28 13:12:31 2022
@@ -20,6 +20,7 @@
package org.apache.poi.xslf.usermodel;
import static
org.apache.poi.openxml4j.opc.PackageRelationshipTypes.CORE_PROPERTIES_ECMA376_NS;
+import static org.apache.poi.xssf.usermodel.XSSFRelation.NS_WORDPROCESSINGML;
import java.awt.geom.Rectangle2D;
import java.io.IOException;
@@ -291,7 +292,7 @@ public class XSLFGraphicFrame extends XS
@Override
public XSLFPictureShape getFallbackPicture() {
String xquery =
- "declare namespace
p='http://schemas.openxmlformats.org/presentationml/2006/main'; "
+ "declare namespace p='" + NS_WORDPROCESSINGML + "'; "
+ "declare namespace
mc='http://schemas.openxmlformats.org/markup-compatibility/2006' "
+ ".//mc:Fallback/*/p:pic"
;
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShape.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShape.java?rev=1903733&r1=1903732&r2=1903733&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShape.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShape.java
Sun Aug 28 13:12:31 2022
@@ -60,6 +60,8 @@ import org.openxmlformats.schemas.presen
import org.openxmlformats.schemas.presentationml.x2006.main.CTShape;
import org.openxmlformats.schemas.presentationml.x2006.main.STPlaceholderType;
+import static org.apache.poi.xssf.usermodel.XSSFRelation.NS_PRESENTATIONML;
+
/**
* Base super-class class for all shapes in PresentationML
*/
@@ -72,7 +74,7 @@ public abstract class XSLFShape implemen
}
static final String DML_NS =
"http://schemas.openxmlformats.org/drawingml/2006/main";;
- static final String PML_NS =
"http://schemas.openxmlformats.org/presentationml/2006/main";;
+ static final String PML_NS = NS_PRESENTATIONML;
private static final QName[] NV_CONTAINER = {
new QName(PML_NS, "nvSpPr"),
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java?rev=1903733&r1=1903732&r2=1903733&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
Sun Aug 28 13:12:31 2022
@@ -18,6 +18,7 @@ package org.apache.poi.xslf.usermodel;
import static org.apache.logging.log4j.util.Unbox.box;
import static org.apache.poi.ooxml.POIXMLTypeLoader.DEFAULT_XML_OPTIONS;
+import static org.apache.poi.xssf.usermodel.XSSFRelation.NS_PRESENTATIONML;
import java.awt.*;
import java.awt.geom.Rectangle2D;
@@ -390,7 +391,7 @@ implements XSLFShapeContainer, Sheet<XSL
if(_spTree == null) {
XmlObject root = getXmlObject();
XmlObject[] sp = root.selectPath(
- "declare namespace
p='http://schemas.openxmlformats.org/presentationml/2006/main' .//*/p:spTree");
+ "declare namespace p='" + NS_PRESENTATIONML + "'
.//*/p:spTree");
if(sp.length == 0) {
throw new IllegalStateException("CTGroupShape was not found");
}
@@ -404,8 +405,7 @@ implements XSLFShapeContainer, Sheet<XSL
XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
String docName = getRootElementName();
if(docName != null) {
- xmlOptions.setSaveSyntheticDocumentElement(
- new
QName("http://schemas.openxmlformats.org/presentationml/2006/main";, docName));
+ xmlOptions.setSaveSyntheticDocumentElement(new
QName(NS_PRESENTATIONML, docName));
}
PackagePart part = getPackagePart();
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java?rev=1903733&r1=1903732&r2=1903733&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
Sun Aug 28 13:12:31 2022
@@ -44,6 +44,8 @@ import org.openxmlformats.schemas.drawin
import org.openxmlformats.schemas.presentationml.x2006.main.CTPlaceholder;
import org.openxmlformats.schemas.presentationml.x2006.main.STPlaceholderType;
+import static org.apache.poi.xssf.usermodel.XSSFRelation.NS_PRESENTATIONML;
+
/**
* Represents a paragraph of text within the containing text body.
* The paragraph is the highest level text separation mechanism.
@@ -743,7 +745,7 @@ public class XSLFTextParagraph implement
int level = getIndentLevel();
// wind up and find the root master sheet which must be slide master
- final String nsPML =
"http://schemas.openxmlformats.org/presentationml/2006/main";;
+ final String nsPML = NS_PRESENTATIONML;
XSLFSheet masterSheet = _shape.getSheet();
for (XSLFSheet m = masterSheet; m != null; m =
(XSLFSheet)m.getMasterSheet()) {
masterSheet = m;
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRelation.java?rev=1903733&r1=1903732&r2=1903733&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
Sun Aug 28 13:12:31 2022
@@ -360,6 +360,8 @@ public final class XSSFRelation extends
"/xl/customProperty#.bin"
);
+ public static final String NS_PRESENTATIONML =
"http://schemas.openxmlformats.org/presentationml/2006/main";;
+ public static final String NS_WORDPROCESSINGML =
"http://schemas.openxmlformats.org/wordprocessingml/2006/main";;
public static final String NS_SPREADSHEETML =
"http://schemas.openxmlformats.org/spreadsheetml/2006/main";;
public static final String NS_DRAWINGML =
"http://schemas.openxmlformats.org/drawingml/2006/main";;
public static final String NS_CHART =
"http://schemas.openxmlformats.org/drawingml/2006/chart";;
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java?rev=1903733&r1=1903732&r2=1903733&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
Sun Aug 28 13:12:31 2022
@@ -101,7 +101,6 @@ import org.openxmlformats.schemas.wordpr
*/
@SuppressWarnings("unused")
public class XWPFDocument extends POIXMLDocument implements Document, IBody {
- public static final String NS_OOXML_WP_MAIN =
"http://schemas.openxmlformats.org/wordprocessingml/2006/main";;
private static final Logger LOG = LogManager.getLogger(XWPFDocument.class);
protected List<XWPFFooter> footers = new ArrayList<>();
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java?rev=1903733&r1=1903732&r2=1903733&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
Sun Aug 28 13:12:31 2022
@@ -27,7 +27,6 @@ import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.Locale;
import javax.xml.namespace.QName;
@@ -38,6 +37,7 @@ import org.apache.poi.ooxml.util.POIXMLU
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.util.*;
import org.apache.poi.wp.usermodel.CharacterRun;
+import org.apache.poi.xssf.usermodel.XSSFRelation;
import org.apache.xmlbeans.*;
import org.apache.xmlbeans.impl.values.XmlAnyTypeImpl;
import org.openxmlformats.schemas.drawingml.x2006.chart.CTChart;
@@ -107,7 +107,7 @@ public class XWPFRun implements ISDTCont
pictTextObjs.addAll(Arrays.asList(r.getPictArray()));
pictTextObjs.addAll(Arrays.asList(r.getDrawingArray()));
for (XmlObject o : pictTextObjs) {
- XmlObject[] ts = o.selectPath("declare namespace w='" +
XWPFDocument.NS_OOXML_WP_MAIN + "' .//w:t");
+ XmlObject[] ts = o.selectPath("declare namespace w='" +
XSSFRelation.NS_WORDPROCESSINGML + "' .//w:t");
for (XmlObject t : ts) {
NodeList kids = t.getDomNode().getChildNodes();
for (int n = 0; n < kids.getLength(); n++) {
@@ -1351,7 +1351,7 @@ public class XWPFRun implements ISDTCont
XmlObject o = c.getObject();
if (o instanceof CTRubyContent) {
final Node node = o.getDomNode();
- if
(XWPFDocument.NS_OOXML_WP_MAIN.equals(node.getNamespaceURI())) {
+ if
(XSSFRelation.NS_WORDPROCESSINGML.equals(node.getNamespaceURI())) {
final String tagName = node.getLocalName();
if ("rt".equals(tagName)) {
inRT = true;
@@ -1378,7 +1378,7 @@ public class XWPFRun implements ISDTCont
// Field Codes (w:instrText, defined in spec sec. 17.16.23)
// come up as instances of CTText, but we don't want them
// in the normal text output
- if (!("instrText".equals(node.getLocalName()) &&
XWPFDocument.NS_OOXML_WP_MAIN.equals(node.getNamespaceURI()))) {
+ if (!("instrText".equals(node.getLocalName()) &&
XSSFRelation.NS_WORDPROCESSINGML.equals(node.getNamespaceURI()))) {
String textValue = ((CTText) o).getStringValue();
if (textValue != null) {
if (isCapitalized() || isSmallCaps()) {
@@ -1416,7 +1416,7 @@ public class XWPFRun implements ISDTCont
// This bit works around it, and replicates the above
// rules for that case
final Node node = o.getDomNode();
- if (XWPFDocument.NS_OOXML_WP_MAIN.equals(node.getNamespaceURI())) {
+ if
(XSSFRelation.NS_WORDPROCESSINGML.equals(node.getNamespaceURI())) {
switch (node.getLocalName()) {
case "tab":
text.append('\t');
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSignatureLine.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSignatureLine.java?rev=1903733&r1=1903732&r2=1903733&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSignatureLine.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSignatureLine.java
Sun Aug 28 13:12:31 2022
@@ -29,7 +29,7 @@ import org.apache.poi.poifs.crypt.dsig.S
import org.apache.xmlbeans.XmlException;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPicture;
-import static org.apache.poi.xwpf.usermodel.XWPFDocument.NS_OOXML_WP_MAIN;
+import static org.apache.poi.xssf.usermodel.XSSFRelation.NS_WORDPROCESSINGML;
public class XWPFSignatureLine extends SignatureLine {
private static final String MS_VML_URN = "urn:schemas-microsoft-com:vml";
@@ -38,10 +38,10 @@ public class XWPFSignatureLine extends S
public void parse(XWPFDocument doc) throws XmlException {
line = XPathHelper.selectProperty(doc.getDocument(),
CTSignatureLine.class, null,
- new QName[]{new QName(NS_OOXML_WP_MAIN, "body")},
- new QName[]{new QName(NS_OOXML_WP_MAIN, "p")},
- new QName[]{new QName(NS_OOXML_WP_MAIN, "r")},
- new QName[]{new QName(NS_OOXML_WP_MAIN, "pict")},
+ new QName[]{new QName(NS_WORDPROCESSINGML, "body")},
+ new QName[]{new QName(NS_WORDPROCESSINGML, "p")},
+ new QName[]{new QName(NS_WORDPROCESSINGML, "r")},
+ new QName[]{new QName(NS_WORDPROCESSINGML, "pict")},
new QName[]{new QName(MS_VML_URN, "shape")},
new QName[]{QNAME_SIGNATURE_LINE});
if (line != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
