[gnumeric] suppress warning about undisplayed left header or footer styles.



commit a7a21b1b78a913ca14cecdff23059d9cc7e1ac0e
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Sun Mar 30 20:25:14 2014 -0600

    suppress warning about undisplayed left header or footer styles.
    
    2014-03-30  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * openoffice-read.c (odf_header_footer_left): only warn if the
        provided left header/footer style is intended to be displayed

 plugins/openoffice/ChangeLog         |    5 +++++
 plugins/openoffice/openoffice-read.c |    8 +++++++-
 2 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 819937c..fdd901e 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-30  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+       * openoffice-read.c (odf_header_footer_left): only warn if the
+       provided left header/footer style is intended to be displayed
+
 2014-03-30  Morten Welinder  <terra gnome org>
 
        * openoffice-read.c (odf_number_color): Use new go_format_palette_
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 8ce769e..9a53a04 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -5644,7 +5644,13 @@ static void
 odf_header_footer_left (GsfXMLIn *xin, G_GNUC_UNUSED xmlChar const **attrs)
 {
        OOParseState *state = (OOParseState *)xin->user_state;
-       if (!state->hd_ft_left_warned) {
+       gboolean display = TRUE;
+
+       for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
+               if (oo_attr_bool (xin, attrs, OO_NS_STYLE, "display",
+                                 &display)) ;
+
+       if (display && !state->hd_ft_left_warned) {
                oo_warning (xin, _("Gnumeric does not support having a different "
                                   "style for left pages. This style is ignored."));
                state->hd_ft_left_warned = TRUE;


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