[gnumeric] compilation: catch up to goffice.
- From: Morten Welinder <mortenw src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnumeric] compilation: catch up to goffice.
- Date: Mon, 30 Nov 2009 02:49:59 +0000 (UTC)
commit 95087b50841f0987ff548350dbb14ac4a62003f0
Author: Morten Welinder <terra gnome org>
Date: Sun Nov 29 21:49:40 2009 -0500
compilation: catch up to goffice.
configure.in | 2 +-
plugins/excel/ms-chart.c | 10 +++++-----
plugins/excel/xlsx-write.c | 4 ++--
plugins/fn-stat/functions.c | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/configure.in b/configure.in
index 3b7b044..889e6d8 100644
--- a/configure.in
+++ b/configure.in
@@ -143,7 +143,7 @@ PKG_PROG_PKG_CONFIG(0.18)
dnl *****************************
libspreadsheet_reqs="
- libgoffice-${GOFFICE_API_VER} >= 0.7.16
+ libgoffice-${GOFFICE_API_VER} >= 0.7.17
libgsf-1 >= 1.14.15
libxml-2.0 >= 2.4.12
"
diff --git a/plugins/excel/ms-chart.c b/plugins/excel/ms-chart.c
index 27165b5..d3f3d1f 100644
--- a/plugins/excel/ms-chart.c
+++ b/plugins/excel/ms-chart.c
@@ -1537,8 +1537,8 @@ static gboolean
BC_R(pie)(XLChartHandler const *handle,
XLChartReadState *s, BiffQuery *q)
{
- float initial_angle = GSF_LE_GET_GUINT16 (q->data);
- float center_size = GSF_LE_GET_GUINT16 (q->data+2); /* 0-100 */
+ double initial_angle = GSF_LE_GET_GUINT16 (q->data);
+ double center_size = GSF_LE_GET_GUINT16 (q->data+2); /* 0-100 */
guint16 const flags = GSF_LE_GET_GUINT16 (q->data+4);
gboolean in_3d = (BC_R(ver)(s) >= MS_BIFF_V8 && (flags & 0x01));
@@ -1741,7 +1741,7 @@ BC_R(scatter)(XLChartHandler const *handle,
gboolean in_3d = (flags & 0x04) != 0;
gboolean show_negatives = (flags & 0x02) != 0;
gboolean size_as_area = (size_type != 2);
- float scale = GSF_LE_GET_GUINT16 (q->data) / 100.;
+ double scale = GSF_LE_GET_GUINT16 (q->data) / 100.;
s->plot = (GogPlot*) gog_plot_new_by_name ("GogBubblePlot");
g_return_val_if_fail (s->plot != NULL, TRUE);
g_object_set (G_OBJECT (s->plot),
@@ -4650,7 +4650,7 @@ chart_write_series (XLChartWriteState *s, GogSeries const *series, unsigned n)
go_line_interpolation_from_str (interpolation));
g_free (interpolation);
for (ptr = gog_series_get_overrides (series); ptr != NULL ; ptr = ptr->next) {
- float sep = 0;
+ double sep = 0;
if (g_object_class_find_property (
G_OBJECT_GET_CLASS (ptr->data), "separation"))
g_object_get (G_OBJECT (ptr->data), "separation", &sep, NULL);
@@ -5016,7 +5016,7 @@ chart_write_plot (XLChartWriteState *s, GogPlot const *plot)
} else if (0 == strcmp (type, "GogPiePlot") ||
0 == strcmp (type, "GogRingPlot")) {
gboolean in_3d = FALSE;
- float initial_angle = 0., center_size = 0., default_separation = 0.;
+ double initial_angle = 0, center_size = 0, default_separation = 0;
gint16 center = 0;
g_object_get (G_OBJECT (plot),
"in-3d", &in_3d,
diff --git a/plugins/excel/xlsx-write.c b/plugins/excel/xlsx-write.c
index eba5fb0..9087bef 100644
--- a/plugins/excel/xlsx-write.c
+++ b/plugins/excel/xlsx-write.c
@@ -1030,7 +1030,7 @@ xlsx_write_chart (XLSXWriteState *state, GsfOutput *chart_part, SheetObject *so)
xlsx_write_plot_1_5_type (xml, plot);
} else if (0 == strcmp (plot_type, "GogPiePlot") ||
0 == strcmp (plot_type, "GogRingPlot")) {
- float initial_angle = 0., center_size = 0.;
+ double initial_angle = 0., center_size = 0.;
gboolean vary;
gint16 center = 0;
if (0 == strcmp (plot_type, "GogRingPlot")) {
@@ -1049,7 +1049,7 @@ xlsx_write_chart (XLSXWriteState *state, GsfOutput *chart_part, SheetObject *so)
xlsx_write_chart_bool (xml, "c:varyColors", vary);
xlsx_write_chart_int (xml, "c:firstSliceAng", 0, (int) initial_angle);
#if 0
- float default_separation = 0.;
+ double default_separation = 0.;
/* handled in series ? */
"default-separation", &default_separation,
xlsx_write_chart_int (xml, "c:explosion", 0, default_separation);
diff --git a/plugins/fn-stat/functions.c b/plugins/fn-stat/functions.c
index d59a1ff..9ab5bba 100644
--- a/plugins/fn-stat/functions.c
+++ b/plugins/fn-stat/functions.c
@@ -5117,7 +5117,7 @@ gnumeric_cvmtest (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
total += (delta * delta);
}
- total += (1 / (12 * (float)n));
+ total += (1 / (12 * (gnm_float)n));
value_array_set (result, 0, 1,
value_new_float (total));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]