Skip to content
Snippets Groups Projects
Commit cb662033 authored by srosse's avatar srosse
Browse files

OO-1389: escape & in docx header and copy the header with UTF-8 charset

parent 3249537c
No related branches found
No related tags found
No related merge requests found
......@@ -102,6 +102,9 @@ public class OpenXMLDocument {
public void setDocumentHeader(String header) {
documentHeader = header;
if(StringHelper.containsNonWhitespace(documentHeader)) {
documentHeader = documentHeader.replace("&", "&");
}
}
public VFSContainer getMediaContainer() {
......
......@@ -23,6 +23,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.Charset;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
......@@ -110,7 +111,7 @@ public class OpenXMLDocumentWriter {
for(HeaderReference headerRef:document.getHeaders()) {
ZipEntry headerDocument = new ZipEntry("word/" + headerRef.getFilename());
out.putNextEntry(headerDocument);
IOUtils.write(headerRef.getHeader(), out);
IOUtils.write(headerRef.getHeader(), out, Charset.forName("UTF-8"));
out.closeEntry();
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment