[gnumeric] Fix handling of dashes on ODF import. [#719509]



commit 10eea7e5b7f3fda3462ccbf8ee3ef96764867493
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Thu Nov 28 20:25:42 2013 -0700

    Fix handling of dashes on ODF import. [#719509]
    
    2013-11-28  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * openoffice-read.c (oo_dash): fix typo

 NEWS                                 |    5 ++++-
 plugins/openoffice/ChangeLog         |    4 ++++
 plugins/openoffice/openoffice-read.c |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index 3880a6a..67c9f37 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,12 @@
 Gnumeric 1.12.10
 
+Andreas:
+       * Fix handling of dashes on ODF import. [#719509]
+
 --------------------------------------------------------------------------
 Gnumeric 1.12.9
 
-Jean
+Jean:
        * Implement double click for graph sheets. [#712216]
 
 Morten:
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index be2f35e..826fbfe 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-28  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+       * openoffice-read.c (oo_dash): fix typo
+
 2013-11-28  Morten Welinder <terra gnome org>
 
        * Release 1.12.9
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 1705567..306be29 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -4159,7 +4159,7 @@ oo_dash (GsfXMLIn *xin, xmlChar const **attrs)
                        t = GO_LINE_LONG_DASH;
        } else if (n_dots2 > 1 && n_dots1 > 1 )
                t = GO_LINE_DASH_DOT_DOT_DOT; /* no matching dashing available */
-       else if ( n_dots2 == 1 && n_dots2 == 1) {
+       else if ( n_dots2 == 1 && n_dots1 == 1) {
                gnm_float max = (len_dot1 < len_dot2) ? len_dot2 : len_dot1;
                if (max > 7.5)
                        t = GO_LINE_DASH_DOT;


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