[gnumeric] Suppress spurious warning on input-message only validations in ODF import



commit 5b087c769e17fb3a027c66b37a74616778dd936b
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Sat Aug 3 10:12:22 2013 -0600

    Suppress spurious warning on input-message only validations in ODF import
    
    2013-08-03  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * openoffice-read.c (odf_validations_translate): NULL validation
        conditions are expected for input-message only situations

 plugins/openoffice/ChangeLog         |    5 +++++
 plugins/openoffice/openoffice-read.c |   10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 2c1261a..0a85985 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,10 @@
 2013-08-03  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+       * openoffice-read.c (odf_validations_translate): NULL validation
+       conditions are expected for input-message only situations
+
+2013-08-03  Andreas J. Guelzow <aguelzow pyrshep ca>
+
        * openoffice-write.c (odf_write_style_cell_properties): write
        input messages as part of the validations
        (odf_write_empty_cell): correctly write the name of an input-message
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 7ef7c4a..0e19c78 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -2611,11 +2611,11 @@ odf_validations_translate (GsfXMLIn *xin, char const *name)
                        }
                }
        }
-
-       oo_warning (xin, _("Unsupported validation condition "
-                          "encountered: \"%s\" with base address: \"%s\""),
-                   val->condition, val->base_cell_address);
-
+       if (val->condition != NULL)
+               oo_warning (xin, _("Unsupported validation condition "
+                                  "encountered: \"%s\" with base address: \"%s\""),
+                           val->condition, val->base_cell_address);
+       
        return NULL;
 }
 


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