Changeset 1096 for trunk/docx4j/src/main/java/org/docx4j/convert/out/html/HtmlExporterNG.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/html/HtmlExporterNG.java (modified) (3 diffs)

trunk/docx4j/src/main/java/org/docx4j/convert/out/html/HtmlExporterNG.java

@@ -243 +243 @@
 
                 if ( pStyleVal ==null || pStyleVal.equals("") ) {
-                        pStyleVal = "Normal";
+//                      pStyleVal = "Normal";
+                        pStyleVal = wmlPackage.getMainDocumentPart().getStyleDefinitionsPart().getDefaultParagraphStyle().getStyleId();
+
                 }
         log.debug("style '" + pStyleVal );              
@@ -389 +391 @@
                                 
                                 if (pStyleVal==null || pStyleVal.equals("")) {
-                                        pStyleVal = "Normal";
+//                                      pStyleVal = "Normal";
+                                        pStyleVal = wmlPackage.getMainDocumentPart().getStyleDefinitionsPart().getDefaultParagraphStyle().getStyleId();
                                 }
 
@@ -438 +441 @@
         
         Map stylesInUse = wmlPackage.getMainDocumentPart().getStylesInUse();
-        if (stylesInUse.get("Normal")==null) {
-                stylesInUse.put("Normal", "Normal");
+        String defaultParagraphStyleId = wmlPackage.getMainDocumentPart().getStyleDefinitionsPart().getDefaultParagraphStyle().getStyleId();
+        if (stylesInUse.get(defaultParagraphStyleId)==null) {
+                stylesInUse.put(defaultParagraphStyleId, defaultParagraphStyleId);
         }