Fix DOCX calculation of margin and padding (#1979)

eclipse-birt · Nov 16, 2024 · b95fb42 · b95fb42
1 parent 6608af6
commit b95fb42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...e.emitter.prototype.excel/src/org/eclipse/birt/report/engine/emitter/excel/ExcelUtil.java b/...e.emitter.prototype.excel/src/org/eclipse/birt/report/engine/emitter/excel/ExcelUtil.java
@@ -479,7 +479,7 @@ public static int convertToPt(String size) {
 			} else if (size.endsWith("cm")) {
 				return (int) (s / 2.54 * 72);
 			} else if (size.endsWith("mm")) {
-				return (int) (s * 10 / 2.54 * 72);
+				return (int) (s / 10 / 2.54 * 72);
 			} else if (size.endsWith("pc")) {
 				return s;
 			} else {

diff --git a/....report.engine.emitter.wpml/src/org/eclipse/birt/report/engine/emitter/wpml/WordUtil.java b/....report.engine.emitter.wpml/src/org/eclipse/birt/report/engine/emitter/wpml/WordUtil.java
@@ -414,7 +414,7 @@ public static int convertToPt(String size) {
 			} else if (size.endsWith("cm")) {
 				return (int) (s / 2.54 * 72);
 			} else if (size.endsWith("mm")) {
-				return (int) (s * 10 / 2.54 * 72);
+				return (int) (s / 10 / 2.54 * 72);
 			} else if (size.endsWith("pc")) {
 				return s;
 			} else {