Changeset 357 for trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java

Timestamp:

05/03/08 08:22:12 (4 years ago)

Author:

jharrop

Message:

transform output - write to existing MainDocumentPart? and StyleDefinitionsPart?. (If you create new ones without deleting existing ones, you get duplicate entries in the relationships, which eventually causes the document to fail to save).

File:

• trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java (modified) (3 diffs)

trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java

@@ -199 +199 @@
                 MainDocumentPart documentPart = getMainDocumentPart(); 
                 
-        pkgPartDocument.setName(documentPart.getPartName().getName());
-        pkgPartDocument.setContentType(documentPart.getContentType() );
-                
-        org.docx4j.wml.Package.Part.XmlData XmlDataDoc = factory.createPackagePartXmlData();
-        
-                org.docx4j.wml.Document wmlDocumentEl = (org.docx4j.wml.Document)documentPart.getJaxbElement();
-                
-                XmlDataDoc.setDocument(wmlDocumentEl);
-                pkgPartDocument.setXmlData(XmlDataDoc);
-                pkg.getPart().add(pkgPartDocument);
+                if (documentPart==null) {
+                        log.warn("Main document part missing!");
+                } else {
+                
+                pkgPartDocument.setName(documentPart.getPartName().getName());
+                pkgPartDocument.setContentType(documentPart.getContentType() );
+                        
+                org.docx4j.wml.Package.Part.XmlData XmlDataDoc = factory.createPackagePartXmlData();
+                
+                        org.docx4j.wml.Document wmlDocumentEl = (org.docx4j.wml.Document)documentPart.getJaxbElement();
+                        
+                        XmlDataDoc.setDocument(wmlDocumentEl);
+                        pkgPartDocument.setXmlData(XmlDataDoc);
+                        pkg.getPart().add(pkgPartDocument);
+                }
                                 
         // .. the style part
@@ -214 +219 @@
 
         org.docx4j.openpackaging.parts.WordprocessingML.StyleDefinitionsPart stylesPart = documentPart.getStyleDefinitionsPart();
-        
-        pkgPartStyles.setName(stylesPart.getPartName().getName());
-        pkgPartStyles.setContentType(stylesPart.getContentType() );
-        
-        org.docx4j.wml.Package.Part.XmlData XmlDataStyles = factory.createPackagePartXmlData();
-        
-        org.docx4j.wml.Styles styles = (org.docx4j.wml.Styles)stylesPart.getJaxbElement();
-        
-                XmlDataStyles.setStyles(styles);
-                pkgPartStyles.setXmlData(XmlDataStyles);
-                pkg.getPart().add(pkgPartStyles);
+
+                if (stylesPart==null) {
+                        log.warn("Style definitions part missing!");
+                } else {
+        
+                pkgPartStyles.setName(stylesPart.getPartName().getName());
+                pkgPartStyles.setContentType(stylesPart.getContentType() );
+                
+                org.docx4j.wml.Package.Part.XmlData XmlDataStyles = factory.createPackagePartXmlData();
+                
+                org.docx4j.wml.Styles styles = (org.docx4j.wml.Styles)stylesPart.getJaxbElement();
+                
+                        XmlDataStyles.setStyles(styles);
+                        pkgPartStyles.setXmlData(XmlDataStyles);
+                        pkg.getPart().add(pkgPartStyles);
+                }
                 
                 return pkg;
@@ -270 +280 @@
                 }
 
-                // TODO - delete existing main document part
-                
-                // Create main document part
-                MainDocumentPart wordDocumentPart = new MainDocumentPart();             
-                // Put the content in the part                          
-                wordDocumentPart.setJaxbElement(wmlDocument);
-                // Add the main document part to the package relationships
-                // (creating it if necessary)
-                this.addTargetPart(wordDocumentPart);
-                
-
-                // TODO - delete existing style part
-                
-                
-                // That handled the Main Document Part; now set the Style part.
-                StyleDefinitionsPart stylesPart = new StyleDefinitionsPart(); 
-                stylesPart.setJaxbElement(wmlStyles);
-                // Add the styles part to the main document part relationships
-                // (creating it if necessary)
-                wordDocumentPart.addTargetPart(stylesPart); // NB - add it to main doc part, not package!
-                
+                // This code assumes all the existing rels etc of 
+                // the existing main document part are still relevant.
+                if (wmlDocument==null) {
+                        log.warn("Couldn't get main document part from package transform result!");                     
+                } else {
+                        this.getMainDocumentPart().setJaxbElement(wmlDocument);
+                }       
+                                
+                if (wmlStyles==null) {
+                        log.warn("Couldn't get style definitions part from package transform result!");                 
+                } else {
+                        this.getMainDocumentPart().getStyleDefinitionsPart().setJaxbElement(wmlStyles);
+                }
         
     }