[gnumeric] Fix xlsx export of chart series names. [#778618]



commit c2cfa90cec96e7b862c0ea84e04508ef05cc7408
Author: Jean Brefort <jean brefort normalesup org>
Date:   Wed Feb 15 08:38:11 2017 +0100

    Fix xlsx export of chart series names. [#778618]

 NEWS                               |    3 +++
 plugins/excel/ChangeLog            |    5 +++++
 plugins/excel/xlsx-write-drawing.c |   14 +++++++++-----
 3 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/NEWS b/NEWS
index 237b24d..b181052 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 Gnumeric 1.12.34
 
+Jean:
+       * Fix xlsx export of chart series names. [#778618]
+
 Morten:
        * Doc fixes.
        * Fix xlsx import with missing header/footer. [#778292]
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 4d18e2e..6dc5450 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,8 @@
+2017-02-15  Jean Brefort  <jean brefort normalesup org>
+
+       * xlsx-write-drawing.c (xlsx_write_series_dim): Fix xlsx export of chart
+       series names. [#778618]
+
 2017-02-14  Morten Welinder  <terra gnome org>
 
        * xlsx-read.c (themed_color_from_name): New function to handle
diff --git a/plugins/excel/xlsx-write-drawing.c b/plugins/excel/xlsx-write-drawing.c
index 5163e70..43f37bc 100644
--- a/plugins/excel/xlsx-write-drawing.c
+++ b/plugins/excel/xlsx-write-drawing.c
@@ -90,11 +90,15 @@ xlsx_write_series_dim (XLSXWriteState *state, GsfXMLOut *xml, GogSeries const *s
        int dim;
        GOData const *dat;
 
-       for (dim = 0; dim < (int) desc->num_dim; dim++)
-               if (desc->dim[dim].ms_type == ms_type)
-                       break;
-       if (dim == (int) desc->num_dim)
-               return;
+       if (ms_type == GOG_MS_DIM_LABELS)
+                       dim = -1;
+       else {
+               for (dim = 0; dim < (int) desc->num_dim; dim++)
+                       if (desc->dim[dim].ms_type == ms_type)
+                               break;
+               if (dim == (int) desc->num_dim)
+                       return;
+       }       
        dat = gog_dataset_get_dim (GOG_DATASET (series), dim);
        if (NULL != dat) {
                GnmExprTop const *texpr = gnm_go_data_get_expr (dat);


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