[gnumeric] TIME <-> ODF.TIME mapping on ODF import/export



commit f07c143d92f4244c924ae35a12a69115202804e7
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Wed May 23 00:06:12 2012 -0600

    TIME <-> ODF.TIME mapping on ODF import/export
    
    2012-05-23  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-read.c (oo_func_map_in): map TIME -> ODF.TIME
    	* openoffice-write.c (odf_expr_func_handler): map ODF.TIME -> TIME

 plugins/fn-date/ChangeLog             |    2 +-
 plugins/openoffice/ChangeLog          |    5 +++++
 plugins/openoffice/openoffice-read.c  |    1 +
 plugins/openoffice/openoffice-write.c |    2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/plugins/fn-date/ChangeLog b/plugins/fn-date/ChangeLog
index 8feed62..5e45e33 100644
--- a/plugins/fn-date/ChangeLog
+++ b/plugins/fn-date/ChangeLog
@@ -1,7 +1,7 @@
 2012-05-22  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* functions.c (help_time): adjust information
-	(gnumeric_time): use teh ECMA 376 description but do not trigger error
+	(gnumeric_time): use the ECMA 376 description but do not trigger error
 	on arguments exceeding 32767
 	(help_odf_time): new
 	(gnumeric_odf_time): formerly gnumeric_time
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 03e7817..a31c0fa 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-23  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* openoffice-read.c (oo_func_map_in): map TIME -> ODF.TIME
+	* openoffice-write.c (odf_expr_func_handler): map ODF.TIME -> TIME
+
 2012-05-22  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* openoffice-write.c (odf_write_content_rows): note that gnm_cell_is_empty
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 4a8bf7c..fa7c353 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -10647,6 +10647,7 @@ oo_func_map_in (GnmConventions const *convs, Workbook *scope,
 		{ "PDURATION","G_DURATION" },
 		{ "PHI","NORMDIST" },              /* see handler */
 		{ "SUMPRODUCT","ODF.SUMPRODUCT" },
+		{ "TIME","ODF.TIME" },
 		{ "TRUE","TRUE" },                 /* see handler */
 		{ "USDOLLAR","DOLLAR" },
 
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 8710085..73f658a 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -2592,7 +2592,7 @@ odf_expr_func_handler (GnmConventionsOut *out, GnmExprFunction const *func)
 		{ "TBILLYIELD","TBILLYIELD" },
 		{ "TDIST","TDIST" },
 		{ "TEXT","TEXT" },
-		{ "TIME","TIME" },
+		{ "ODF.TIME","TIME" },
 		{ "TIMEVALUE","TIMEVALUE" },
 		{ "TINV","TINV" },
 		{ "TODAY","TODAY" },



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]