The DOCX emitter now creates Word 2016 documents by default.

hvbtup · Jul 29, 2020 · 04b152a · 04b152a
1 parent 9dd3de4
commit 04b152a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/....engine.emitter.docx/src/org/eclipse/birt/report/engine/emitter/docx/DocxEmitterImpl.java b/....engine.emitter.docx/src/org/eclipse/birt/report/engine/emitter/docx/DocxEmitterImpl.java
@@ -52,10 +52,8 @@ public void initialize( IEmitterServices service ) throws EngineException
 		Object value = renderOption.getOption( DocxRenderOption.OPTION_WORD_VERSION );
 		if (value instanceof Integer) {
 			setWordVersion((Integer)value);
-			System.out.println("Setting the Word version to " + String.valueOf(value));
 		} else {
 			setWordVersion(2016);
-			System.out.println("Using default Word version "+ String.valueOf(getWordVersion()));
 		}
 		value = renderOption.getOption( DocxRenderOption.OPTION_EMBED_HTML );
 		if ( value instanceof Boolean )

diff --git a/....engine.emitter.docx/src/org/eclipse/birt/report/engine/emitter/docx/writer/Document.java b/....engine.emitter.docx/src/org/eclipse/birt/report/engine/emitter/docx/writer/Document.java
@@ -250,7 +250,7 @@ private void writeSettingsPart( ) throws IOException
 				settingsPartWriter.nameSpace( "w16", NameSpaces.W16 );
 				settingsPartWriter.nameSpace( "w16se", NameSpaces.W16SE );
 				settingsPartWriter.nameSpace( "sl", NameSpaces.SCHEMA_LIBRARY );
-				settingsPartWriter.attribute( "mc:ignorable", "w14 w15 w16se w16cid w16 w16cex" );
+				settingsPartWriter.attribute( "mc:Ignorable", "w14 w15 w16se w16cid w16 w16cex" );
 				settingsPartWriter.openTag( "w:zoom" );
 				settingsPartWriter.attribute( "w:percent", "100" );
 				settingsPartWriter.closeTag( "w:zoom" );
@@ -265,7 +265,7 @@ private void writeSettingsPart( ) throws IOException
 				settingsPartWriter.closeTag( "w:view" );
 				settingsPartWriter.openTag( "w:compat" );
 				settingsPartWriter.openTag( "w:compatSetting" );
-				settingsPartWriter.attribute( "w:name", "w:compatibilityMode" );
+				settingsPartWriter.attribute( "w:name", "compatibilityMode" );
 				settingsPartWriter.attribute( "w:uri", "http://schemas.microsoft.com/office/word" );
 				settingsPartWriter.attribute( "w:val", "15" );
 				settingsPartWriter.closeTag( "w:compatSetting" );