[gnumeric] Simplify export of SEC and SECH to ODF. [#747211]



commit 70c76b9a1d128658c60e50b9fff3deeb066710b5
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Thu Apr 2 19:45:45 2015 -0600

    Simplify export of SEC and SECH to ODF. [#747211]
    
    2015-04-02  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * openoffice-write.c (odf_func_sec_handler): deleted
        (odf_func_sech_handler): deleted
        (odf_expr_func_handler): disconnect the above

 NEWS                                  |    1 +
 plugins/openoffice/ChangeLog          |    8 +++++++-
 plugins/openoffice/openoffice-write.c |   23 -----------------------
 3 files changed, 8 insertions(+), 24 deletions(-)
---
diff --git a/NEWS b/NEWS
index 39d8e64..2a97bd0 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Gnumeric 1.12.22
 Andreas:
        * Improve ODF import/export of additional axes. [#746321]
        * Fix ODF export of styles for additional axes. [#746621]
+       * Simplify export of SEC and SECH to ODF. [#747211]
 
 Jean:
        * Fix signal handling while running Python. [#744638]
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 9423bf4..c32172e 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-02  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+       * openoffice-write.c (odf_func_sec_handler): deleted
+       (odf_func_sech_handler): deleted
+       (odf_expr_func_handler): disconnect the above
+
 2015-03-31  Andreas J. Guelzow <aguelzow pyrshep ca>
 
        * openoffice-read.c: use GSF_XML_2ND throughout
@@ -11,7 +17,7 @@
 
 2015-03-22  Andreas J. Guelzow <aguelzow pyrshep ca>
 
-       * openoffice-write.c (-odf_write_circle_axes_styles): deleted
+       * openoffice-write.c (odf_write_circle_axes_styles): deleted
        (odf_write_radar_axes_styles): deleted
        (odf_write_standard_axes_styles): deleted
        (odf_write_surface_axes_styles): deleted
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index ad6e316..d2735a3 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -2172,27 +2172,6 @@ odf_func_floor_ceiling_handler (GnmConventionsOut *out, GnmExprFunction const *f
 }
 
 static gboolean
-odf_func_sec_handler (GnmConventionsOut *out, GnmExprFunction const *func)
-{
-       GString *target = out->accum;
-       g_string_append (target, "(1/COS");
-       gnm_expr_list_as_string (func->argc, func->argv, out);
-       g_string_append_c (target, ')');
-       return TRUE;
-}
-
-static gboolean
-odf_func_sech_handler (GnmConventionsOut *out, GnmExprFunction const *func)
-{
-       GString *target = out->accum;
-       g_string_append (target, "(1/COSH");
-       gnm_expr_list_as_string (func->argc, func->argv, out);
-       g_string_append_c (target, ')');
-       return TRUE;
-}
-
-
-static gboolean
 odf_func_eastersunday_handler (GnmConventionsOut *out, GnmExprFunction const *func)
 {
        if (func->argc == 1) {
@@ -2219,8 +2198,6 @@ odf_expr_func_handler (GnmConventionsOut *out, GnmExprFunction const *func)
                        {"R.QCHISQ", odf_func_r_qchisq_handler},
                        {"R.DCHISQ", odf_func_r_dchisq_handler},
                        {"R.PCHISQ", odf_func_r_pchisq_handler},
-                       {"SEC",      odf_func_sec_handler},
-                       {"SECH",      odf_func_sech_handler},
                        {"EASTERSUNDAY", odf_func_eastersunday_handler},
                        {NULL, NULL}
        };


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