centering images better

Author: summitt

pom.xml

@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.faction</groupId>
 	<artifactId>faction</artifactId>
@@ -284,6 +286,11 @@
 			<artifactId>docx4j-JAXB-ReferenceImpl</artifactId>
 			<version>11.4.11</version>
 		</dependency>
+		<dependency>
+			<groupId>org.docx4j</groupId>
+			<artifactId>docx4j-JAXB-ReferenceImpl</artifactId>
+			<version>11.4.11</version>
+		</dependency>
 		<dependency>
 			<groupId>com.openhtmltopdf</groupId>
 			<artifactId>openhtmltopdf-pdfbox</artifactId>

src/com/fuse/reporting/DocxUtils.java

@@ -1,5 +1,6 @@
 package com.fuse.reporting;
 
+import java.io.File;
 import java.io.StringWriter;
 import java.math.BigInteger;
 import java.text.SimpleDateFormat;
@@ -19,10 +20,17 @@
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
+import org.docx4j.Docx4J;
 import org.docx4j.TextUtils;
 import org.docx4j.TraversalUtil;
 import org.docx4j.XmlUtils;
 import org.docx4j.convert.in.xhtml.XHTMLImporterImpl;
+import org.docx4j.convert.out.HTMLSettings;
+import org.docx4j.dml.CTShapeProperties;
+import org.docx4j.dml.Graphic;
+import org.docx4j.dml.GraphicData;
+import org.docx4j.dml.picture.Pic;
+import org.docx4j.dml.wordprocessingDrawing.Inline;
 import org.docx4j.jaxb.Context;
 import org.docx4j.jaxb.XPathBinderAssociationIsPartialException;
 import org.docx4j.model.datastorage.migration.VariablePrepare;
@@ -40,6 +48,7 @@
 import org.docx4j.wml.Br;
 import org.docx4j.wml.CTShd;
 import org.docx4j.wml.ContentAccessor;
+import org.docx4j.wml.Drawing;
 import org.docx4j.wml.Ftr;
 import org.docx4j.wml.Hdr;
 import org.docx4j.wml.ObjectFactory;
@@ -55,6 +64,8 @@
 import org.docx4j.wml.Text;
 import org.docx4j.wml.Tr;
 import org.docx4j.wml.CTTxbxContent;
+import org.w3c.dom.*;
+import javax.xml.bind.JAXBElement;
 
 import com.faction.reporting.ReportFeatures;
 import com.fuse.dao.Assessment;
@@ -546,13 +557,14 @@ public WordprocessingMLPackage generateDocx(String customCSS)
 		return mlp;
 
 	}
-	
 
 	private List<Object> wrapHTML(String content, String customCSS,
 			String className) throws Docx4JException {
 		XHTMLImporterImpl xhtml = new XHTMLImporterImpl(mlp);
 		RFonts rfonts = Context.getWmlObjectFactory().createRFonts();
 		rfonts.setAscii(this.FONT);
+		XHTMLImporterImpl.addFontMapping("Arial", rfonts);
+		XHTMLImporterImpl.addFontMapping("arial", rfonts);
 		if(className == null) {
 			className = "";
 		}
@@ -977,6 +989,8 @@ private String replacement(String content) {
 
 
 		//Fix images
+		content = content.replaceAll("<img", "<center><img");
+		content = content.replaceAll("alt=\"image.png\" contenteditable=\"false\"><br></p>", "></center></p>");
 		content = this.replaceImageLinks(content);
 
 		//Run extensions
@@ -1365,7 +1379,6 @@ private int changeColorOfText(Tr row, String variable, String color) {
 		}
 		return -1;
 	}
-
 	/*
 	 * Utility function to find elements in the docx file
 	 */