Changeset 1096 for trunk/docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/Conversion.java

Timestamp:

02/27/10 06:52:46 (2 years ago)

Author:

jharrop

Message:

Moved jcPML to org.pptx4j.jaxb.Context

Don't assume default paragraph,character styles are Normal,Default.. respectively.

File:

• trunk/docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/Conversion.java (modified) (2 diffs)

trunk/docx4j/src/main/java/org/docx4j/convert/out/pdf/viaXSLFO/Conversion.java

@@ -353 +353 @@
         // which implements org.w3c.dom.traversal.NodeIterator
         
+        String defaultParagraphStyleId = wmlPackage.getMainDocumentPart().getStyleDefinitionsPart().getDefaultParagraphStyle().getStyleId(); 
+        
                 if ( pStyleVal ==null || pStyleVal.equals("") ) {
-                        pStyleVal = "Normal";
+//                      pStyleVal = "Normal";
+                        pStyleVal = defaultParagraphStyleId;
                 }
         log.debug("style '" + pStyleVal );              
@@ -375 +378 @@
                 if (pPrNodeIt==null) {  // Never happens?                       
                         log.debug("Here after all!!");                  
-                        pPr = propertyResolver.getEffectivePPr("Normal");
-                        rPr = propertyResolver.getEffectiveRPr("Normal");
+                        pPr = propertyResolver.getEffectivePPr(defaultParagraphStyleId);
+                        rPr = propertyResolver.getEffectiveRPr(defaultParagraphStyleId);
                 } else {
                         Node n = pPrNodeIt.nextNode();
                         if (n==null) {
                                 log.warn("pPrNodeIt.nextNode() was null.");
-                        pPr = propertyResolver.getEffectivePPr("Normal");
-                        rPr = propertyResolver.getEffectiveRPr("Normal");
+                        pPr = propertyResolver.getEffectivePPr(defaultParagraphStyleId);
+                        rPr = propertyResolver.getEffectiveRPr(defaultParagraphStyleId);
                         // TODO - in this case, we should be able to compute once,
                         // and on subsequent calls, just return pre computed value