--- abiword-plugins/tools/abigochart/plugin.m4.goffice04 2006-10-31 16:25:11.000000000 -0500
+++ abiword-plugins/tools/abigochart/plugin.m4 2008-01-29 01:24:13.000000000 -0500
@@ -21,9 +21,9 @@
# Checks for GOfficeCharts
-LIBGOffice_REQUIRED_VERSION=0.2.1
+LIBGOffice_REQUIRED_VERSION=0.4.0
-PKG_CHECK_MODULES(GOFFICE, [libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION],[
+PKG_CHECK_MODULES(GOFFICE, [libgoffice-0.4 >= $LIBGOffice_REQUIRED_VERSION],[
ABI_PLUGIN_REPORT([abigochart: okay])
],[ ABI_PLUGIN_REPORT([abigochart: error libgoffice >= $LIBGOffice_REQUIRED_VERSION required])
abi_plugin_disable=yes
--- abiword-plugins/tools/abigochart/unix/AbiGOChart.cpp.goffice04 2006-10-31 16:25:12.000000000 -0500
+++ abiword-plugins/tools/abigochart/unix/AbiGOChart.cpp 2008-01-29 01:48:06.000000000 -0500
@@ -72,12 +72,13 @@
#include <goffice/graph/gog-data-allocator.h>
#include <goffice/graph/gog-series.h>
#include <goffice/graph/gog-guru.h>
-#include <goffice/graph/gog-renderer-pixbuf.h>
+#include <goffice/graph/gog-renderer-cairo.h>
#include <goffice/graph/gog-data-set.h>
#include <goffice/graph/gog-object-xml.h>
#include <goffice/data/go-data-simple.h>
#include <goffice/graph/gog-renderer-gnome-print.h>
#include <goffice/utils/go-format.h>
+#include <goffice/utils/go-locale.h>
#include <gsf/gsf-impl-utils.h>
#include <gsf/gsf-output-memory.h>
#include <gsf/gsf-libxml.h>
@@ -190,8 +191,8 @@
GOData *data = NULL;
double val;
char sep[2], col_sep[2], *end;
- sep[0] = format_get_arg_sep ();
- col_sep[0] = format_get_col_sep ();
+ sep[0] = go_locale_get_arg_sep ();
+ col_sep[0] = go_locale_get_col_sep ();
sep[1] = col_sep[1]= 0;
char const* str = gtk_entry_get_text (gee);
if (str == NULL)
@@ -1119,7 +1120,7 @@
{
m_Graph = NULL;
m_Image = NULL;
- m_Renderer = GOG_RENDERER (g_object_new (GOG_RENDERER_PIXBUF_TYPE, NULL));
+ m_Renderer = GOG_RENDERER (g_object_new (GOG_RENDERER_CAIRO_TYPE, NULL));
pix_width = pix_height = 0;
width = height = 0;
m_Guru = NULL;
@@ -1189,10 +1190,10 @@
GdkPixbuf *pixbuf;
pix_width = _width;
pix_height = _height;
- gog_renderer_pixbuf_update (GOG_RENDERER_PIXBUF (m_Renderer), _width, _height, 1.0);
+ gog_renderer_cairo_update (GOG_RENDERER_CAIRO (m_Renderer), _width, _height, 1.0);
if (m_Image)
delete m_Image;
- pixbuf = gog_renderer_pixbuf_get (GOG_RENDERER_PIXBUF (m_Renderer));
+ pixbuf = gog_renderer_cairo_get_pixbuf (GOG_RENDERER_CAIRO (m_Renderer));
m_Image = new GR_UnixImage(NULL, pixbuf);
g_object_ref(pixbuf);
m_Image->scaleImageTo(m_pGOMan->getGraphics(),rec);