[gnumeric] Fix TDIST Import/Export from/to ODF.



commit 5dac6e3ead41a18871a15de7c3dfd9beef01f409
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Sun Jun 30 12:46:39 2013 -0600

    Fix TDIST Import/Export from/to ODF.
    
    2013-06-30  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * openoffice-read.c (ooo1_content_dtd): add draw:line
        (oo_func_map_in): add LEGACY.TDIST to TDIST translation
        * openoffice-write.c (odf_expr_func_handler): add TDIST
        to LEGACY TDIST translation

 NEWS                                  |    1 +
 plugins/openoffice/ChangeLog          |    7 +++++++
 plugins/openoffice/openoffice-read.c  |    5 ++++-
 plugins/openoffice/openoffice-write.c |    2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index c4ab308..67ee073 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Andreas:
        * Add Excel 2010's BETA.DIST.
        * Fix crash on corrupted files. [#703149] [#703215]
        * Fix import of sxc files. [#703249]
+       * Fix TDIST Import/Export from/to ODF.
 
 Jean:
        * Don't attempt to add a path item when there is no path object. [#703052]
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 71aa851..fe09e0a 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-30  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+       * openoffice-read.c (ooo1_content_dtd): add draw:line
+       (oo_func_map_in): add LEGACY.TDIST to TDIST translation
+       * openoffice-write.c (odf_expr_func_handler): add TDIST
+       to LEGACY TDIST translation
+
 2013-06-28  Andreas J. Guelzow <aguelzow pyrshep ca>
 
        * openoffice-read.c (openoffice_file_open): make sure that the
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index e3c1d80..e9b239f 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -10711,7 +10711,10 @@ GSF_XML_IN_NODE (START, OFFICE, OO_NS_OFFICE, "document-content", GSF_XML_NO_CON
          GSF_XML_IN_NODE (TABLE_CELL, CELL_GRAPHIC, OO_NS_DRAW, "g", GSF_XML_NO_CONTENT, NULL, NULL),        
  /* ignore for now */
            GSF_XML_IN_NODE (CELL_GRAPHIC, CELL_GRAPHIC, OO_NS_DRAW, "g", GSF_XML_NO_CONTENT, NULL, NULL),    
          /* 2nd def */
            GSF_XML_IN_NODE (CELL_GRAPHIC, DRAW_POLYLINE, OO_NS_DRAW, "polyline", GSF_XML_NO_CONTENT, NULL, 
NULL),      /* 2nd def */
+         GSF_XML_IN_NODE (TABLE_CELL, DRAW_LINE, OO_NS_DRAW, "line", GSF_XML_NO_CONTENT, &odf_line, 
&odf_line_end),
+            GSF_XML_IN_NODE (DRAW_LINE, IGNORED_TEXT_CONTENT, OO_NS_TEXT, "p", GSF_XML_NO_CONTENT, NULL, 
NULL), /* ignore for now */
        GSF_XML_IN_NODE (TABLE_ROW, TABLE_COVERED_CELL, OO_NS_TABLE, "covered-table-cell", 
GSF_XML_NO_CONTENT, &oo_covered_cell_start, &oo_covered_cell_end),
+          GSF_XML_IN_NODE (TABLE_COVERED_CELL, DRAW_LINE, OO_NS_DRAW, "line", GSF_XML_NO_CONTENT, NULL, 
NULL),         /* 2nd def */
       GSF_XML_IN_NODE (TABLE, TABLE_COL_GROUP, OO_NS_TABLE, "table-column-group", GSF_XML_NO_CONTENT, NULL, 
NULL),
         GSF_XML_IN_NODE (TABLE_COL_GROUP, TABLE_COL_GROUP, OO_NS_TABLE, "table-column-group", 
GSF_XML_NO_CONTENT, NULL, NULL),
         GSF_XML_IN_NODE (TABLE_COL_GROUP, TABLE_COL, OO_NS_TABLE, "table-column", GSF_XML_NO_CONTENT, NULL, 
NULL), /* 2nd def */
@@ -11366,6 +11369,7 @@ oo_func_map_in (GnmConventions const *convs, Workbook *scope,
                { "LEGACY.FINV","FINV" },
                { "LEGACY.NORMSDIST","NORMSDIST" },
                { "LEGACY.NORMSINV","NORMSINV" },
+               { "LEGACY.TDIST","TDIST" },
                { "PDURATION","G_DURATION" },
                { "PHI","NORMDIST" },              /* see handler */
                { "SUMPRODUCT","ODF.SUMPRODUCT" },
@@ -11708,7 +11712,6 @@ oo_func_map_in (GnmConventions const *convs, Workbook *scope,
 /* { "TBILLEQ","TBILLEQ" }, */
 /* { "TBILLPRICE","TBILLPRICE" }, */
 /* { "TBILLYIELD","TBILLYIELD" }, */
-/* { "TDIST","TDIST" }, */
 /* { "TEXT","TEXT" }, */
 /* { "TIME","TIME" }, */
 /* { "TIMEVALUE","TIMEVALUE" }, */
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 239f921..05654e8 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -2480,6 +2480,7 @@ odf_expr_func_handler (GnmConventionsOut *out, GnmExprFunction const *func)
                { "FINV","LEGACY.FINV" },
                { "NORMSDIST","LEGACY.NORMSDIST" },
                { "NORMSINV","LEGACY.NORMSINV" },
+               { "TDIST","LEGACY.TDIST" },
                { "LEN","LEN" },
                { "LENB","LENB" },
                { "LINEST","LINEST" },
@@ -2615,7 +2616,6 @@ odf_expr_func_handler (GnmConventionsOut *out, GnmExprFunction const *func)
                { "TBILLEQ","TBILLEQ" },
                { "TBILLPRICE","TBILLPRICE" },
                { "TBILLYIELD","TBILLYIELD" },
-               { "TDIST","TDIST" },
                { "TEXT","TEXT" },
                { "ODF.TIME","TIME" },
                { "TIMEVALUE","TIMEVALUE" },


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