[gnumeric] In ODF import map TRUE()->TRUE and FALSE()->FALSE



commit cf5024987d90b4deafff663aa4b3059399bd6bd4
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Mon Mar 26 08:51:53 2012 -0600

    In ODF import map TRUE()->TRUE and FALSE()->FALSE
    
    2012-03-26  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-read.c (odf_func_true_handler): new
    	(odf_func_false_handler): new
    	(oo_func_map_in): connect the above

 plugins/openoffice/ChangeLog         |    6 ++++++
 plugins/openoffice/openoffice-read.c |   19 +++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index d7d746a..89d9981 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-26  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* openoffice-read.c (odf_func_true_handler): new
+	(odf_func_false_handler): new
+	(oo_func_map_in): connect the above
+
 2012-03-25  Morten Welinder  <terra gnome org>
 
 	* openoffice-read.c (odf_func_chisqdist_handler): Simplify (at the
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index d6b7325..4d8f148 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -10309,6 +10309,19 @@ odf_func_chisqdist_handler (G_GNUC_UNUSED GnmConventions const *convs, Workbook
 	return NULL;
 }
 
+static GnmExpr const *
+odf_func_true_handler (G_GNUC_UNUSED GnmConventions const *convs,
+		       G_GNUC_UNUSED Workbook *scope, G_GNUC_UNUSED GnmExprList *args)
+{
+	return gnm_expr_new_constant (value_new_bool (TRUE));
+}
+
+static GnmExpr const *
+odf_func_false_handler (G_GNUC_UNUSED GnmConventions const *convs,
+			G_GNUC_UNUSED Workbook *scope, G_GNUC_UNUSED GnmExprList *args)
+{
+	return gnm_expr_new_constant (value_new_bool (FALSE));
+}
 
 static GnmExpr const *
 oo_func_map_in (GnmConventions const *convs, Workbook *scope,
@@ -10324,6 +10337,8 @@ oo_func_map_in (GnmConventions const *convs, Workbook *scope,
 		{"ADDRESS", odf_func_address_handler},
 		{"PHI", odf_func_phi_handler},
 		{"GAUSS", odf_func_gauss_handler},
+		{"TRUE", odf_func_true_handler},
+		{"FALSE", odf_func_false_handler},
 		{NULL, NULL}
 	};
 
@@ -10355,6 +10370,7 @@ oo_func_map_in (GnmConventions const *convs, Workbook *scope,
 		{ "CEILING","ODF.CEILING" },          /* see handler */
 		{ "CHISQINV","R.QCHISQ" },
 		{ "CHISQDIST","ODF.CHISQDIST" },      /* see handler */
+		{ "FALSE","FALSE" },                  /* see handler */
 		{ "FLOOR","ODF.FLOOR" },              /* see handler */
 		{ "FORMULA","GET.FORMULA" },
 		{ "GAUSS","ODF.GAUSS" },              /* see handler */
@@ -10368,6 +10384,7 @@ oo_func_map_in (GnmConventions const *convs, Workbook *scope,
 		{ "PDURATION","G_DURATION" },
 		{ "PHI","NORMDIST" },              /* see handler */
 		{ "SUMPRODUCT","ODF.SUMPRODUCT" },
+		{ "TRUE","TRUE" },                 /* see handler */
 		{ "USDOLLAR","DOLLAR" },
 
 /* { "ADDRESS","ADDRESS" },       also  see handler */
@@ -10489,7 +10506,6 @@ oo_func_map_in (GnmConventions const *convs, Workbook *scope,
 /* { "EXPONDIST","EXPONDIST" }, */
 /* { "FACT","FACT" }, */
 /* { "FACTDOUBLE","FACTDOUBLE" }, */
-/* { "FALSE","FALSE" }, */
 /* { "FDIST","FDIST" }, */
 /* { "FIND","FIND" }, */
 /* { "FINDB","FINDB" }, */
@@ -10716,7 +10732,6 @@ oo_func_map_in (GnmConventions const *convs, Workbook *scope,
 /* { "TREND","TREND" }, */
 /* { "TRIM","TRIM" }, */
 /* { "TRIMMEAN","TRIMMEAN" }, */
-/* { "TRUE","TRUE" }, */
 /* { "TRUNC","TRUNC" }, */
 /* { "TTEST","TTEST" }, */
 /* { "TYPE","TYPE" }, */



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