Author: centic
Date: Fri Sep 22 21:19:39 2017
New Revision: 1809357

URL: http://svn.apache.org/viewvc?rev=1809357&view=rev
Log:
Bug 59747: Adjust order of first two entries in the resulting Zip to try to 
enable some external tools to auto-detect the file-type

Modified:
    poi/site/src/documentation/content/xdocs/status.xml
    poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java

Modified: poi/site/src/documentation/content/xdocs/status.xml
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/status.xml?rev=1809357&r1=1809356&r2=1809357&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/status.xml (original)
+++ poi/site/src/documentation/content/xdocs/status.xml Fri Sep 22 21:19:39 2017
@@ -65,6 +65,7 @@
         <summary-item>Removal of deprecated classes and methods that were 
marked for removal in v3.18</summary-item>
       </summary>
       <actions>
+        <action dev="PD" type="fix" fixes-bug="59747" module="OPC">Exchange 
order of writing parts into Zip to allow some tools to handle files 
better</action>
         <action dev="PD" type="add" fixes-bug="github-69" module="SS 
Common">Support matrix functions</action>
         <action dev="PD" type="fix" fixes-bug="60499" module="OPC">Deleting a 
picture that is used twice on a slide corrupt the slide</action>
         <action dev="PD" type="fix" fixes-bug="60279" module="POI">Back-off to 
brute-force search for macro content if macro offset is incorrect.</action>

Modified: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java?rev=1809357&r1=1809356&r2=1809357&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java 
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java Fri 
Sep 22 21:19:39 2017
@@ -554,16 +554,16 @@ public final class ZipPackage extends OP
                                }
                        }
 
+            // Save content type part.
+            LOG.log(POILogger.DEBUG,"Save content types part");
+            this.contentTypeManager.save(zos);
+
                        // Save package relationships part.
                        LOG.log(POILogger.DEBUG,"Save package relationships");
                        
ZipPartMarshaller.marshallRelationshipPart(this.getRelationships(),
                                        
PackagingURIHelper.PACKAGE_RELATIONSHIPS_ROOT_PART_NAME,
                                        zos);
 
-                       // Save content type part.
-                       LOG.log(POILogger.DEBUG,"Save content types part");
-                       this.contentTypeManager.save(zos);
-
                        // Save parts.
                        for (PackagePart part : getParts()) {
                                // If the part is a relationship part, we don't 
save it, it's



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to