From 6859df7accf0d5ab9b7011e8e241d0b20f8d47d9 Mon Sep 17 00:00:00 2001 From: Vincent Calame Date: Fri, 29 Jul 2022 14:18:11 +0200 Subject: [PATCH] =?UTF-8?q?Mauvais=20nom=20de=20propri=C3=A9t=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demos/dev.html | 8 ++++++-- src/js/Html2Ods.js | 18 ++++++++++++++---- .../opendocument/OpenDocument.StyleManager.js | 2 +- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/demos/dev.html b/demos/dev.html index 4c05478..cdfc34e 100644 --- a/demos/dev.html +++ b/demos/dev.html @@ -37,7 +37,7 @@ function fodsContent() {

Exemple pour le développement

Le contenu du fichier .fods est affiché après la table

-

Version ODS

+

Version ODS

Cellule 3.1 - + + + + +
1100 € -$2500
01/12/202011/01/2021
 
diff --git a/src/js/Html2Ods.js b/src/js/Html2Ods.js
index 6967832..698ad36 100644
--- a/src/js/Html2Ods.js
+++ b/src/js/Html2Ods.js
@@ -1,12 +1,22 @@
 /* global OpenDocument */
 
-var Html2Ods = {};
-
+var Html2Ods = function (output, table, options) {
+//compile target
+	
+    switch(output) {
+        case "blob":
+            return OpenDocument.OdsConverter.convertToBlob(table, options);
+        case "xml":
+            return OpenDocument.OdsConverter.convertToXml(table, options);
+        default:
+            return null;
+    }
+};
 
 Html2Ods.blob = function (table, options) {
-    return OpenDocument.OdsConverter.convertToBlob(table, options);
+    return Html2Ods("blob", table, options);
 };
 
 Html2Ods.xml = function (table, options) {
-    return OpenDocument.OdsConverter.convertToXml(table, options);
+    return Html2Ods("xml", table, options);
 };
diff --git a/src/js/opendocument/OpenDocument.StyleManager.js b/src/js/opendocument/OpenDocument.StyleManager.js
index 0623a19..1fb9fbc 100644
--- a/src/js/opendocument/OpenDocument.StyleManager.js
+++ b/src/js/opendocument/OpenDocument.StyleManager.js
@@ -75,7 +75,7 @@ OpenDocument.StyleManager.prototype.getAutomaticCellStyleName = function (type,
     }
     styleKey += parentStyleName;
     if (this.hasStyle("cell-automatic", styleKey)) {
-        return this.getStyle("cell-automatic", styleKey).name;
+        return this.getStyle("cell-automatic", styleKey).styleName;
     }
     var name = OpenDocument.CELLSTYLE_PREFIX + this.automaticStyleNumber;
     this.automaticStyleNumber++;