[gnumeric] Compilation: kill more warnings.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Compilation: kill more warnings.
- Date: Wed, 2 Jan 2013 00:35:38 +0000 (UTC)
commit a4c6e2b1701fb9d6ad456437a2171d61abbc4e4c
Author: Morten Welinder <terra gnome org>
Date: Tue Jan 1 19:35:16 2013 -0500
Compilation: kill more warnings.
ChangeLog | 3 +++
plugins/excel/ChangeLog | 5 +++++
plugins/excel/ms-excel-write.c | 6 +++---
plugins/html/ChangeLog | 5 +++++
plugins/html/html.c | 5 +++--
plugins/openoffice/ChangeLog | 5 +++++
plugins/openoffice/openoffice-write.c | 4 ++--
src/dialogs/ChangeLog | 2 ++
src/dialogs/dialog-data-slicer.c | 4 +++-
src/mstyle.c | 4 ++--
10 files changed, 33 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6c6612d..af0d24d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2013-01-01 Morten Welinder <terra gnome org>
+ * src/mstyle.c (gnm_style_set_from_pango_attribute): Don't use
+ deprecated goffice stuff.
+
* src/cellspan.c (cell_register_span, cell_calc_span): Remove
unused variable.
* src/gnm-pane.c (control_point_leave_notify): Ditto.
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 064136f..d0fcbc7 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-01 Morten Welinder <terra gnome org>
+
+ * ms-excel-write.c (excel_font_overlay_pango): Don't use
+ deprecated goffice stuff.
+
2012-12-24 Morten Welinder <terra gnome org>
* xlsx-write-drawing.c (xlsx_write_one_plot): Silence warning.
diff --git a/plugins/excel/ms-excel-write.c b/plugins/excel/ms-excel-write.c
index 9df6968..881436c 100644
--- a/plugins/excel/ms-excel-write.c
+++ b/plugins/excel/ms-excel-write.c
@@ -8,7 +8,7 @@
* Jody Goldberg (jody gnome org)
* Morten Welinder (terra gnome org)
*
- * (C) 1998-2008 Michael Meeks, Jon K Hellan, Jody Goldberg, Morten Welinder
+ * (C) 1998-2013 Michael Meeks, Jon K Hellan, Jody Goldberg, Morten Welinder
**/
/*
@@ -2042,11 +2042,11 @@ excel_font_overlay_pango (ExcelWriteFont *efont, GSList *pango)
break;
default :
if (attr->klass->type ==
- go_pango_attr_subscript_get_type ())
+ go_pango_attr_subscript_get_attr_type ())
efont->script = ((GOPangoAttrSubscript *)attr)->val
? 2 : 0;
else if (attr->klass->type ==
- go_pango_attr_superscript_get_type ())
+ go_pango_attr_superscript_get_attr_type ())
efont->script = ((GOPangoAttrSuperscript *)attr)->val
? 1 : 0;
break; /* ignored */
diff --git a/plugins/html/ChangeLog b/plugins/html/ChangeLog
index 71cc882..f2d4797 100644
--- a/plugins/html/ChangeLog
+++ b/plugins/html/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-01 Morten Welinder <terra gnome org>
+
+ * html.c (cb_html_attrs_as_string): Don't use deprecated goffice
+ stuff.
+
2012-12-18 Morten Welinder <terra gnome org>
* Release 1.12.0
diff --git a/plugins/html/html.c b/plugins/html/html.c
index 0210cc0..0407274 100644
--- a/plugins/html/html.c
+++ b/plugins/html/html.c
@@ -6,6 +6,7 @@
* EMail: thron gmx de
* Copyright (c) 2001 Andreas J. Guelzow
* EMail: aguelzow taliesin ca
+ * Copyright 2013 Morten Welinder <terra gnone org>
*
* Contributors :
* Almer. S. Tigelaar <almer1 dds nl>
@@ -212,13 +213,13 @@ cb_html_attrs_as_string (GsfOutput *output, PangoAttribute *a, html_version_t ve
break;/* ignored */
default :
if (a->klass->type ==
- go_pango_attr_subscript_get_type ()) {
+ go_pango_attr_subscript_get_attr_type ()) {
if (((GOPangoAttrSubscript *)a)->val) {
gsf_output_puts (output, "<sub>");
closure = "</sub>";
}
} else if (a->klass->type ==
- go_pango_attr_superscript_get_type ()) {
+ go_pango_attr_superscript_get_attr_type ()) {
if (((GOPangoAttrSuperscript *)a)->val) {
gsf_output_puts (output, "<sup>");
closure = "</sup>";
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index b853987..0cb07a6 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-01 Morten Welinder <terra gnome org>
+
+ * openoffice-write.c (odf_attrs_as_string): Don't use deprecated
+ goffice stuff.
+
2012-12-31 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-read.c (odf_fix_expr_names_t): new fields
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 6766b3f..11085ca 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -456,14 +456,14 @@ odf_attrs_as_string (GnmOOExport *state, PangoAttribute *a)
break;
default :
if (a->klass->type ==
- go_pango_attr_subscript_get_type ()) {
+ go_pango_attr_subscript_get_attr_type ()) {
gsf_xml_out_start_element (state->xml, TEXT "span");
gsf_xml_out_add_cstr (state->xml, TEXT "style-name",
((GOPangoAttrSubscript *)a)->val ?
"AC-subscript" : "AC-script");
spans += 1;
} else if (a->klass->type ==
- go_pango_attr_superscript_get_type ()) {
+ go_pango_attr_superscript_get_attr_type ()) {
gsf_xml_out_start_element (state->xml, TEXT "span");
gsf_xml_out_add_cstr (state->xml, TEXT "style-name",
((GOPangoAttrSuperscript *)a)->val ?
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index 4a5cd45..7a6cd21 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,5 +1,7 @@
2013-01-01 Morten Welinder <terra gnome org>
+ * dialog-data-slicer.c (cb_source_expr_changed): Kill warning.
+
* dialog-about.c (dialog_about): Update copyright year.
* dialog-plugin-manager.c (dialog_plugin_manager): Remove unused
diff --git a/src/dialogs/dialog-data-slicer.c b/src/dialogs/dialog-data-slicer.c
index b4aab56..e8883f6 100644
--- a/src/dialogs/dialog-data-slicer.c
+++ b/src/dialogs/dialog-data-slicer.c
@@ -208,10 +208,12 @@ cb_source_expr_changed (DialogDataSlicer *state)
GnmValue *range;
range = gnm_expr_entry_parse_as_value
(GNM_EXPR_ENTRY (state->source_expr), sv_sheet (state->sv));
+#warning "FIXME: Now what?"
+ value_release (range);
}
/* Menus */
-static GtkActionEntry entries[] = {
+static const GtkActionEntry entries[] = {
{ "format", NULL, N_("_Format"), NULL, NULL, NULL },
{ "style", NULL, N_("_Style"), NULL, NULL, NULL },
{ "aggregation", NULL, N_("_Aggregation"), NULL, NULL, NULL },
diff --git a/src/mstyle.c b/src/mstyle.c
index 2d1fdff..a134f9d 100644
--- a/src/mstyle.c
+++ b/src/mstyle.c
@@ -1937,14 +1937,14 @@ gnm_style_set_from_pango_attribute (GnmStyle *style, PangoAttribute const *attr)
break;
default : {
gboolean script_seen = FALSE, script_set = FALSE;
- if (attr->klass->type == go_pango_attr_superscript_get_type ()) {
+ if (attr->klass->type == go_pango_attr_superscript_get_attr_type ()) {
script_seen = TRUE;
if (((GOPangoAttrSuperscript *)attr)->val == 1) {
script_set = TRUE;
gnm_style_set_font_script
(style, GO_FONT_SCRIPT_SUPER);
}
- } else if (attr->klass->type == go_pango_attr_subscript_get_type ()) {
+ } else if (attr->klass->type == go_pango_attr_subscript_get_attr_type ()) {
script_seen = TRUE;
if (((GOPangoAttrSubscript *)attr)->val == 1) {
script_set = TRUE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]