[gnumeric] ODF handling of PDURATION/G_DURATION

[Andreas J. Guelzow <guelzow src gnome org>]

commit e89990a6a2e391d9a426635c21fbe985a3d1dd65
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Mon Aug 24 11:23:50 2009 -0600

    ODF handling of PDURATION/G_DURATION
    
    2009-08-24  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-read.c (oo_func_map_in): map PDURATION to
    	  G_DURATION
    	* openoffice-write.c (odf_expr_func_handler): map
    	  G_DURATION to PDURATION
    
    2009-08-24  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* functions.c (help_g_duration): add ODF note

 plugins/fn-financial/ChangeLog        |    4 ++++
 plugins/fn-financial/functions.c      |    1 +
 plugins/openoffice/ChangeLog          |    7 +++++++
 plugins/openoffice/openoffice-read.c  |    3 +--
 plugins/openoffice/openoffice-write.c |    2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/plugins/fn-financial/ChangeLog b/plugins/fn-financial/ChangeLog
index 2e3c4c0..991e93c 100644
--- a/plugins/fn-financial/ChangeLog
+++ b/plugins/fn-financial/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-24  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* functions.c (help_g_duration): add ODF note
+
 2009-08-15  Morten Welinder <terra gnome org>
 
 	* Release 1.9.10
diff --git a/plugins/fn-financial/functions.c b/plugins/fn-financial/functions.c
index 1290f79..3c9385d 100644
--- a/plugins/fn-financial/functions.c
+++ b/plugins/fn-financial/functions.c
@@ -1875,6 +1875,7 @@ static GnmFuncHelp const help_g_duration[] = {
         { GNM_FUNC_HELP_ARG, F_("pv:present value")},
         { GNM_FUNC_HELP_ARG, F_("fv:future value")},
 	{ GNM_FUNC_HELP_DESCRIPTION, F_("G_DURATION calculates the number of periods needed for an investment to attain a desired value.") },
+	{ GNM_FUNC_HELP_ODF, F_("G_DURATION is the OpenFormula function PDURATION.") },
         { GNM_FUNC_HELP_SEEALSO, "FV,PV"},
 	{ GNM_FUNC_HELP_END }
 };
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index cbb8c47..d86a1cc 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,12 @@
 2009-08-24  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* openoffice-read.c (oo_func_map_in): map PDURATION to
+	  G_DURATION
+	* openoffice-write.c (odf_expr_func_handler): map
+	  G_DURATION to PDURATION
+
+2009-08-24  Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* openoffice-read.c (odf_func_gauss_handler): use ERF
 	(oo_func_map_in): map GAUSS to ODF.GAUSS if it has more than one
 	  argument
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index ac8f375..ab7361f 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -4618,7 +4618,6 @@ oo_func_map_in (GnmConventions const *convs, Workbook *scope,
 		{ "MULTIPLE.OPERATIONS","ODF.MULTIPLE.OPERATIONS" },
 		{ "MUNIT","ODF.MUNIT" },
 		{ "NUMBERVALUE","ODF.NUMBERVALUE" },
-		{ "PDURATION","ODF.PDURATION" },
 		{ "RRI","ODF.RRI" },
 		{ "SHEET","ODF.SHEET" },
 		{ "SHEETS","ODF.SHEETS" },
@@ -4640,6 +4639,7 @@ oo_func_map_in (GnmConventions const *convs, Workbook *scope,
 		{ "LEGACY.FINV","FINV" },
 		{ "LEGACY.NORMSDIST","NORMSDIST" },
 		{ "LEGACY.NORMSINV","NORMSINV" },
+		{ "PDURATION","G_DURATION" },
 		{ "PHI","NORMDIST" },              /* see handler */
 		{ "USDOLLAR","DOLLAR" },
 
@@ -4901,7 +4901,6 @@ oo_func_map_in (GnmConventions const *convs, Workbook *scope,
 /* { "ODDLYIELD","ODDLYIELD" }, */
 /* { "OFFSET","OFFSET" }, */
 /* { "OR","OR" }, */
-/* { "PDURATION","PDURATION" }, */
 /* { "PEARSON","PEARSON" }, */
 /* { "PERCENTILE","PERCENTILE" }, */
 /* { "PERCENTRANK","PERCENTRANK" }, */
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 102c244..d230287 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -1835,7 +1835,7 @@ odf_expr_func_handler (GnmConventionsOut *out, GnmExprFunction const *func)
 		{ "ODDLYIELD","ODDLYIELD" },
 		{ "OFFSET","OFFSET" },
 		{ "OR","OR" },
-		/* { "PDURATION","PDURATION" },  not implemented */
+		{ "G_DURATION","PDURATION" },
 		{ "PEARSON","PEARSON" },
 		{ "PERCENTILE","PERCENTILE" },
 		{ "PERCENTRANK","PERCENTRANK" },