[gnumeric] Let goffice handle the error selection in oo_warning.
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Let goffice handle the error selection in oo_warning.
- Date: Tue, 24 Aug 2010 18:09:02 +0000 (UTC)
commit e46c31d3ab1e53d18658646e80edf6c19d6931ed
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date: Tue Aug 24 11:58:09 2010 -0600
Let goffice handle the error selection in oo_warning.
2010-08-23 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-read.c (oo_warning): assuming a new goffice, all
errors can be filed
plugins/openoffice/ChangeLog | 5 +++++
plugins/openoffice/openoffice-read.c | 11 +++++------
2 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 1368145..1aec450 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,10 @@
2010-08-23 Andreas J. Guelzow <aguelzow pyrshep ca>
+ * openoffice-read.c (oo_warning): assuming a new goffice, all
+ errors can be filed
+
+2010-08-23 Andreas J. Guelzow <aguelzow pyrshep ca>
+
* openoffice-read.c (od_style_prop_chart): add attributes
* openoffice-write.c (odf_get_gog_style_name): shorten names
(odf_write_plot_style): drop unused argument and add attributes
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 360c4ff..6e1124c 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -326,10 +326,6 @@ oo_warning (GsfXMLIn *xin, char const *fmt, ...)
char *msg;
va_list args;
- if (go_io_error_occurred (state->context) ||
- go_io_warning_occurred (state->context))
- return FALSE;
-
va_start (args, fmt);
msg = g_strdup_vprintf (fmt, args);
va_end (args);
@@ -418,9 +414,12 @@ oo_attr_font_weight (GsfXMLIn *xin, xmlChar const * const *attrs,
if (!gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_FO, "font-weight"))
return FALSE;
if (attr_eq (attrs[1], "bold")) {
- *res = 700;
+ *res = PANGO_WEIGHT_BOLD;
return TRUE;
- }
+ } else if (attr_eq (attrs[1], "normal")) {
+ *res = PANGO_WEIGHT_NORMAL;
+ return TRUE;
+ }
return oo_attr_int_range (xin, attrs, OO_NS_FO, "font-weight",
res, 0, 1000);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]