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