From 46b6fef282aa38dff7329280ae8c221e505dce0c Mon Sep 17 00:00:00 2001 From: Jason Harrop Date: Mon, 12 Aug 2013 10:44:18 +1000 Subject: [PATCH] Keep git happy (Inconsequential changes) --- .../convert/out/ConversionSectionWrapper.java | 4 ++++ .../docx4j/model/fields/FldSimpleModel.java | 1 + .../AbstractConversionImageHandler.java | 2 +- .../properties/run/AbstractRunProperty.java | 2 +- .../openpackaging/io3/stores/PartStore.java | 9 ++++++++- .../io3/stores/UnzippedPartStore.java | 1 - .../io3/stores/ZipPartStore.java | 3 +-- .../parts/WordprocessingML/BinaryPart.java | 3 +-- .../StyleDefinitionsPart.java | 12 +++++++++--- src/main/java/org/docx4j/samples/README.md | 3 +++ .../org/opendope/conditions/Xpathref.java | 1 - src/test/resources/MERGEFIELD.docx | Bin 13318 -> 13405 bytes xsd/word2003xmlto2006.xsd | 1 - 13 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 src/main/java/org/docx4j/samples/README.md diff --git a/src/main/java/org/docx4j/convert/out/ConversionSectionWrapper.java b/src/main/java/org/docx4j/convert/out/ConversionSectionWrapper.java index 618e35b9fc..006fafe61a 100644 --- a/src/main/java/org/docx4j/convert/out/ConversionSectionWrapper.java +++ b/src/main/java/org/docx4j/convert/out/ConversionSectionWrapper.java @@ -28,6 +28,10 @@ import org.docx4j.wml.BooleanDefaultTrue; import org.docx4j.wml.SectPr; +/** + * corresponds to a section in the xslt (ie excludes continuous sections). + * + */ public class ConversionSectionWrapper extends SectionWrapper { protected List content = null; protected String id = null; diff --git a/src/main/java/org/docx4j/model/fields/FldSimpleModel.java b/src/main/java/org/docx4j/model/fields/FldSimpleModel.java index c716877fc5..49e5b29d07 100644 --- a/src/main/java/org/docx4j/model/fields/FldSimpleModel.java +++ b/src/main/java/org/docx4j/model/fields/FldSimpleModel.java @@ -74,6 +74,7 @@ protected void setupNameParameterString(String text) { } public static List splitParameters(String text) { + log.debug("splitParameters: " + text); List ret = Collections.EMPTY_LIST; int valStart = -1; diff --git a/src/main/java/org/docx4j/model/images/AbstractConversionImageHandler.java b/src/main/java/org/docx4j/model/images/AbstractConversionImageHandler.java index 1e369ac011..4f7bc8f624 100644 --- a/src/main/java/org/docx4j/model/images/AbstractConversionImageHandler.java +++ b/src/main/java/org/docx4j/model/images/AbstractConversionImageHandler.java @@ -18,7 +18,7 @@ public abstract class AbstractConversionImageHandler implements ConversionImageH protected static Logger log = LoggerFactory.getLogger(AbstractConversionImageHandler.class); protected String uuid = UUID.randomUUID().toString(); protected Map handledImagesMap = new TreeMap(); - protected String imageDirPath = null; + protected String imageDirPath = null; // TODO FIXME should not be here; move to FileConversionImageHandler protected boolean includeUUID = true; /** Creates an AbstractConversionImageHandler diff --git a/src/main/java/org/docx4j/model/properties/run/AbstractRunProperty.java b/src/main/java/org/docx4j/model/properties/run/AbstractRunProperty.java index b0b9a73792..f84c03d7b8 100644 --- a/src/main/java/org/docx4j/model/properties/run/AbstractRunProperty.java +++ b/src/main/java/org/docx4j/model/properties/run/AbstractRunProperty.java @@ -27,6 +27,6 @@ public abstract class AbstractRunProperty extends Property { public abstract void set(RPr rPr); - public abstract void set(CTTextCharacterProperties rPr); + public abstract void set(CTTextCharacterProperties rPr); // DrawingML } diff --git a/src/main/java/org/docx4j/openpackaging/io3/stores/PartStore.java b/src/main/java/org/docx4j/openpackaging/io3/stores/PartStore.java index ca8b819996..47eaa6952e 100644 --- a/src/main/java/org/docx4j/openpackaging/io3/stores/PartStore.java +++ b/src/main/java/org/docx4j/openpackaging/io3/stores/PartStore.java @@ -83,7 +83,14 @@ public interface PartStore { */ public long getPartSize(String partName) throws Docx4JException, java.lang.UnsupportedOperationException; -// public void finishLoad() throws Docx4JException; + /* + * If the implementation closes resources here, + * loadPart, if subsequently called, will need a way to re-open + * them. So its better just to have a notion of package unload, + * at which time resources are closed. + * + * public void finishLoad() throws Docx4JException; + */ public void setOutputStream(OutputStream os) throws Docx4JException; diff --git a/src/main/java/org/docx4j/openpackaging/io3/stores/UnzippedPartStore.java b/src/main/java/org/docx4j/openpackaging/io3/stores/UnzippedPartStore.java index a89dbfbf15..47db592149 100644 --- a/src/main/java/org/docx4j/openpackaging/io3/stores/UnzippedPartStore.java +++ b/src/main/java/org/docx4j/openpackaging/io3/stores/UnzippedPartStore.java @@ -133,7 +133,6 @@ public long getPartSize(String partName) throws Docx4JException { } } - ///// Save methods diff --git a/src/main/java/org/docx4j/openpackaging/io3/stores/ZipPartStore.java b/src/main/java/org/docx4j/openpackaging/io3/stores/ZipPartStore.java index 2a8e3589b6..51500c7013 100644 --- a/src/main/java/org/docx4j/openpackaging/io3/stores/ZipPartStore.java +++ b/src/main/java/org/docx4j/openpackaging/io3/stores/ZipPartStore.java @@ -174,7 +174,7 @@ public InputStream loadPart(String partName) throws Docx4JException { ByteArray bytes = partByteArrays.get(partName); if (bytes == null) { - log.debug("part '" + partName + "' not present in part store"); + log.warn("part '" + partName + "' not present in part store"); return null; //throw new Docx4JException("part '" + partName + "' not found"); } @@ -191,7 +191,6 @@ public long getPartSize(String partName) throws Docx4JException { return bytes.getLength(); } - ///// Save methods diff --git a/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/BinaryPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/BinaryPart.java index d65e7c0e80..ebf3068f42 100644 --- a/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/BinaryPart.java +++ b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/BinaryPart.java @@ -141,8 +141,7 @@ public ByteBuffer getBuffer() { partStore.getPartSize( name.substring(1))); } catch (UnsupportedOperationException uoe) {} - is = partStore.loadPart( - name.substring(1)); + is = partStore.loadPart( name.substring(1)); if (is==null) { log.warn(name + " missing from part store"); } else { diff --git a/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/StyleDefinitionsPart.java b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/StyleDefinitionsPart.java index 8a65879e2d..e7aed9f05d 100644 --- a/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/StyleDefinitionsPart.java +++ b/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/StyleDefinitionsPart.java @@ -177,9 +177,9 @@ public static java.util.Map getKnownStyles() { return knownStyles; } - /* - * Manufacture styles from the following, so they can be used as the - * roots of our style trees. + /** + * Manufacture a paragraph style from the following, so it can be used as the + * root of our paragraph style tree. * * @@ -200,6 +200,12 @@ public static java.util.Map getKnownStyles() { BEWARE: in a table, paragraph style ppr trumps table style ppr. The effect of including w:docDefaults in the style hierarchy is that they trump table style ppr, but they should not! + + * There is no need for a doc defaults character style. + * The reason for this is that Word seems to ignore Default Paragraph Style! + * So the run formatting comes from paragraph style + explicit character style (if any), + * plus direct formatting. + */ public void createVirtualStylesForDocDefaults() throws Docx4JException { diff --git a/src/main/java/org/docx4j/samples/README.md b/src/main/java/org/docx4j/samples/README.md new file mode 100644 index 0000000000..97bed974eb --- /dev/null +++ b/src/main/java/org/docx4j/samples/README.md @@ -0,0 +1,3 @@ +For docx4j v3, the sample code has moved to: + + https://github.com/plutext/docx4j/tree/master/src/samples/docx4j/org/docx4j/samples \ No newline at end of file diff --git a/src/main/java/org/opendope/conditions/Xpathref.java b/src/main/java/org/opendope/conditions/Xpathref.java index 17625e1c1e..ae8e71bb42 100644 --- a/src/main/java/org/opendope/conditions/Xpathref.java +++ b/src/main/java/org/opendope/conditions/Xpathref.java @@ -1,4 +1,3 @@ - package org.opendope.conditions; import static org.docx4j.model.datastorage.XPathEnhancerParser.enhanceXPath; diff --git a/src/test/resources/MERGEFIELD.docx b/src/test/resources/MERGEFIELD.docx index c187ab2bd5a8442d95e62f6409fa487728fe90d0..60cbe6a2624718af74bfb5150207c8e1055fa8be 100644 GIT binary patch delta 929 zcmV;S177@wXx(VAObHIWV$wpc?Kyh}1pok68napn`vHGMpad9$s}-{T$y(`Av&yD~ z$*RtqyuQpoI{NNBZ|8ZP(m&~Wk(aadGAq}4S~Tf2TNQ0q7EL}&t2$j)ZQ9JMbvavp z+@{26ZC;Pl$9D;|?FoO?77hHh`ew&xhqHRw8DAZIz#lEEmvvR0-}M{b4O=pb{@=Hy z+qbi_tVVxnSzQtF;zY0@&db^BVzDZ78dI@sT2iR#7pJd2KYey~`uu5{zFjY8`Er>p z@-+Q@zolP&`Ra?~H>n$Q54Y&3hsNC>xwdVO{*k}-_p<%}BY$r=l-^+OdZRHj`}1X% zmsKz|-|VD6=PrIU-T!Z$?h*cO>x>+#$^P4{Y zUAMQ>wwhIsQu-ctu{lg@3IVDG|B-HQe|;u!lfio6Sy4CbNw)ft75IN0SLlrQX!Eno z9Z&P+iyyfLKNO}AG~bIU%#?qqE%?2@dhzu1#f#%FPI;ogTCKDVE;9=}A7>{d8~dbb~G2ME9d(@;7F*@G!oCx|6DUi?x8)ZC1CS@Qivur!ar+ zpMCWEe_lPwrf+@CheL1#owK5buGz32@qV8@HsKcFU*uio8#h!u#dM|1l9 z(}Q~lVaKbBFIaK56{XjA_jeyKb&895>;9ZnZCfn>>fS#7F7tEm+j*YNa^j!|J8Xr| ztE%<>yjZvVryCA;JFUuwzEw6x+u$T?TF&{rET-WV2> zt}-eDO&XKhGDZSLB9kIBJps>?U^6@dJS>v|EEJP9GZ2%)Ga3ReE|cCfA_hJ&00000 DT`Jj~ delta 829 zcmV-D1H$~>XohI8ObHH@X_P{M>810p1ONb38M9gm`vHHXpaj^<+WyHO)WHY*(Xx73 zSJnAlzv11mCI0q70Z<5+wcVp;l}%}ct2%G;`ZE9M=-XLYR-?46uJW3pv;oWj;(0lH zT`X2*PGc&TO-l+V{o?f1=cmukPM<$b)3@v8EMG3OMV_X=@3-`;FJFCe{3dl{?%@_4 z_0YKcBiDbn?a@E-*Zy9%|9|A~4TsVj%w2CZW@bUcpAWOVto*6@2Iu@ov;6$?N1YUI+8YVXZ2gAF8yA>}v7`1` z)8v0$%?9We*oO^mfNV{^%Id7mqm;W%7q{soU(N<*#&FrK`0TbUWzqS$){HYEY?{Bz zpdUU^D_&RYn!)|Pzi0Xjf6=;X4`=j@(l6*q@yj(m^2HCw9vXzczLNa^=bSIsiwOlt z-`uP#z~A@B)8FmKM?e1K{Qn=`6ie^l^dx_u?0&kpce=qAZle3qF?kv@O1qD5pzfrq z-XatJy3Ohq6rNEJ=oH5NvyXoN&#Ncd^sTR%+&ibsnSH}F=!~ezr|nCt7rkKx?0E6| z2h@bJwY$3yk$=B>G^gJ`J-BxecD%ayf)!_5QF3{AfA;}Xr?{B6?$1fpw$%cl?(IzD z?=nC4zMbdUEGG_nu)|jPysBF7&x>`-f4bptx6`U@=v!rDv<<$d#f;DE0;HhOK7U!X zQ^NkHESV9|4#t3a}Jv$4v%S+LV)R|^REN|08|;195PP`ldv*90>T)R?=nCF_8F5gGe!dLA(MGCJpp)=w=+Bf>Et54gA_nI$ H00000_W{Km diff --git a/xsd/word2003xmlto2006.xsd b/xsd/word2003xmlto2006.xsd index 6a78d1b051..a7ac9ebe07 100644 --- a/xsd/word2003xmlto2006.xsd +++ b/xsd/word2003xmlto2006.xsd @@ -30,7 +30,6 @@ JAXB INSTRUCTIONS xjc word2003xmlto2006.xsd -d temp -no-header -target 2.0 -extension - -->