Commit f84a08c5 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg
Browse files

We can now make distcheck

Requires a GAL update, and a gtk+ update

2002-02-15  Jody Goldberg <jody@gnome.org>

	* src/item-cursor.c (item_cursor_tip_setlabel) : enable now that the
	  canvas bug is fixed.

	* src/sheet-control-gui.c (cb_hscrollbar_adjust_bounds) : new.
	(cb_vscrollbar_adjust_bounds) : new.

	* src/gui-util.c (gtk_button_stock_alignment_set) : new.
	(gnumeric_init_help_button) : new.

	* src/gnumeric-canvas.h : Move declaration of
	  GnumericCanvasSlideHandler here.

	* src/gnumeric-canvas.c (gnm_canvas_guru_key) : forward to the entry,
	  not the GnumericExprEntry wrapper.
	(gnm_canvas_key_mode_sheet) : ditto.

	* src/formats.c (cell_format_classify) : handle general.

	* src/file-priv.h : Inherit from GObject.

	* src/complete-sheet.c (complete_sheet_finalize) : call class_peek
	  here to avoid potential reference problems.

	* src/commands.c (cmd_set_text) : doh!  fix multi-line text.
	(cmd_autoformat) : const.

	* src/cell.c (cell_relocate) : const.
	* src/clipboard.c (paste_cell_with_operation) : const.
	(paste_cell) : ditto.

	* src/application.c (application_init) : add jimmac's expr-entry icon.

	* src/Makefile.am : distribute the marshaller.list

	s/GtkType/GType/
	s/GtkSignalFunc/GCallback/
	s/gtk_signal_connect/g_signal_connect/  + reformating.
	s/GTK_CHECK_CAST/G_TYPE_CHECK_INSTANCE_CAST/
	s/GTK_CHECK_TYPE/G_TYPE_CHECK_CLASS_CAST/
	s/GTK_CHECK_CLASS_CAST/G_TYPE_CHECK_INSTANCE_TYPE/
	s/GTK_CHECK_CLASS_TYPE/G_TYPE_CHECK_CLASS_TYPE/

2002-02-11  Jody Goldberg <jody@gnome.org>

	* src/stf.c (stf_init) : Make the names of the text import/export
	  clearer.
parent e4029a66
...@@ -7,18 +7,17 @@ release, and longer term bugs. ...@@ -7,18 +7,17 @@ release, and longer term bugs.
Release Critical Release Critical
---------------- ----------------
1.2 Targets
-----------
Pending Patches Pending Patches
--------------- ---------------
Yukihiro's IM support Yukihiro's IM support (broken in the context of gnome2)
Long term breakage Long term breakage
------------------ ------------------
- gnumeric_editable_enters the arguments are backwards. This is being called
on the editable, not the dialog.
- Auto-format (the "style on a range" kind) assumes a certain data layout, - Auto-format (the "style on a range" kind) assumes a certain data layout,
such as a final "Total" row. I would like an extension that would allow such as a final "Total" row. I would like an extension that would allow
me to ignore the final line of the template. This could probably be me to ignore the final line of the template. This could probably be
...@@ -36,9 +35,6 @@ Long term breakage ...@@ -36,9 +35,6 @@ Long term breakage
- Audit all fixed-length buffers. Most non-time-critical can be replaced - Audit all fixed-length buffers. Most non-time-critical can be replaced
by proper usage of g_strdup_printf. by proper usage of g_strdup_printf.
- Fix user visible strings "Foo :" to be "Foo:". (The former is a French
habit that we should let the French l10n team handle.)
- Fix "-geometry" handling: - Fix "-geometry" handling:
: When an anchor is specified (e.g., "+0+0"), the window manager should : When an anchor is specified (e.g., "+0+0"), the window manager should
not be asked to place the window. (Under twx, for example, the user not be asked to place the window. (Under twx, for example, the user
......
2002-02-15 Jody Goldberg <jody@gnome.org>
* src/item-cursor.c (item_cursor_tip_setlabel) : enable now that the
canvas bug is fixed.
* src/sheet-control-gui.c (cb_hscrollbar_adjust_bounds) : new.
(cb_vscrollbar_adjust_bounds) : new.
* src/gui-util.c (gtk_button_stock_alignment_set) : new.
(gnumeric_init_help_button) : new.
* src/gnumeric-canvas.h : Move declaration of
GnumericCanvasSlideHandler here.
* src/gnumeric-canvas.c (gnm_canvas_guru_key) : forward to the entry,
not the GnumericExprEntry wrapper.
(gnm_canvas_key_mode_sheet) : ditto.
* src/formats.c (cell_format_classify) : handle general.
* src/file-priv.h : Inherit from GObject.
* src/complete-sheet.c (complete_sheet_finalize) : call class_peek
here to avoid potential reference problems.
* src/commands.c (cmd_set_text) : doh! fix multi-line text.
(cmd_autoformat) : const.
* src/cell.c (cell_relocate) : const.
* src/clipboard.c (paste_cell_with_operation) : const.
(paste_cell) : ditto.
* src/application.c (application_init) : add jimmac's expr-entry icon.
* src/Makefile.am : distribute the marshaller.list
s/GtkType/GType/
s/GtkSignalFunc/GCallback/
s/gtk_signal_connect/g_signal_connect/ + reformating.
s/GTK_CHECK_CAST/G_TYPE_CHECK_INSTANCE_CAST/
s/GTK_CHECK_TYPE/G_TYPE_CHECK_CLASS_CAST/
s/GTK_CHECK_CLASS_CAST/G_TYPE_CHECK_INSTANCE_TYPE/
s/GTK_CHECK_CLASS_TYPE/G_TYPE_CHECK_CLASS_TYPE/
2002-02-11 Jody Goldberg <jody@gnome.org>
* src/stf.c (stf_init) : Make the names of the text import/export
clearer.
2002-02-12 Morten Welinder <terra@diku.dk> 2002-02-12 Morten Welinder <terra@diku.dk>
* src/io-context.c (value_io_progress_update): Correct assertion. * src/io-context.c (value_io_progress_update): Correct assertion.
......
...@@ -31,6 +31,7 @@ Jody: ...@@ -31,6 +31,7 @@ Jody:
* move libole2 req into excel plugin, and make it optional. * move libole2 req into excel plugin, and make it optional.
* guruify autoformat dialog, and update autoformat code. * guruify autoformat dialog, and update autoformat code.
* move format from cell -> value. * move format from cell -> value.
* add an icon to the expr-entry (thanks Jacub)
Jon Kåre: Jon Kåre:
* More correct import of "automatic" colors from Excel * More correct import of "automatic" colors from Excel
......
2002-02-15 Jody Goldberg <jody@gnome.org>
* src/item-cursor.c (item_cursor_tip_setlabel) : enable now that the
canvas bug is fixed.
* src/sheet-control-gui.c (cb_hscrollbar_adjust_bounds) : new.
(cb_vscrollbar_adjust_bounds) : new.
* src/gui-util.c (gtk_button_stock_alignment_set) : new.
(gnumeric_init_help_button) : new.
* src/gnumeric-canvas.h : Move declaration of
GnumericCanvasSlideHandler here.
* src/gnumeric-canvas.c (gnm_canvas_guru_key) : forward to the entry,
not the GnumericExprEntry wrapper.
(gnm_canvas_key_mode_sheet) : ditto.
* src/formats.c (cell_format_classify) : handle general.
* src/file-priv.h : Inherit from GObject.
* src/complete-sheet.c (complete_sheet_finalize) : call class_peek
here to avoid potential reference problems.
* src/commands.c (cmd_set_text) : doh! fix multi-line text.
(cmd_autoformat) : const.
* src/cell.c (cell_relocate) : const.
* src/clipboard.c (paste_cell_with_operation) : const.
(paste_cell) : ditto.
* src/application.c (application_init) : add jimmac's expr-entry icon.
* src/Makefile.am : distribute the marshaller.list
s/GtkType/GType/
s/GtkSignalFunc/GCallback/
s/gtk_signal_connect/g_signal_connect/ + reformating.
s/GTK_CHECK_CAST/G_TYPE_CHECK_INSTANCE_CAST/
s/GTK_CHECK_TYPE/G_TYPE_CHECK_CLASS_CAST/
s/GTK_CHECK_CLASS_CAST/G_TYPE_CHECK_INSTANCE_TYPE/
s/GTK_CHECK_CLASS_TYPE/G_TYPE_CHECK_CLASS_TYPE/
2002-02-11 Jody Goldberg <jody@gnome.org>
* src/stf.c (stf_init) : Make the names of the text import/export
clearer.
2002-02-12 Morten Welinder <terra@diku.dk> 2002-02-12 Morten Welinder <terra@diku.dk>
* src/io-context.c (value_io_progress_update): Correct assertion. * src/io-context.c (value_io_progress_update): Correct assertion.
......
2002-02-15 Jody Goldberg <jody@gnome.org>
* src/item-cursor.c (item_cursor_tip_setlabel) : enable now that the
canvas bug is fixed.
* src/sheet-control-gui.c (cb_hscrollbar_adjust_bounds) : new.
(cb_vscrollbar_adjust_bounds) : new.
* src/gui-util.c (gtk_button_stock_alignment_set) : new.
(gnumeric_init_help_button) : new.
* src/gnumeric-canvas.h : Move declaration of
GnumericCanvasSlideHandler here.
* src/gnumeric-canvas.c (gnm_canvas_guru_key) : forward to the entry,
not the GnumericExprEntry wrapper.
(gnm_canvas_key_mode_sheet) : ditto.
* src/formats.c (cell_format_classify) : handle general.
* src/file-priv.h : Inherit from GObject.
* src/complete-sheet.c (complete_sheet_finalize) : call class_peek
here to avoid potential reference problems.
* src/commands.c (cmd_set_text) : doh! fix multi-line text.
(cmd_autoformat) : const.
* src/cell.c (cell_relocate) : const.
* src/clipboard.c (paste_cell_with_operation) : const.
(paste_cell) : ditto.
* src/application.c (application_init) : add jimmac's expr-entry icon.
* src/Makefile.am : distribute the marshaller.list
s/GtkType/GType/
s/GtkSignalFunc/GCallback/
s/gtk_signal_connect/g_signal_connect/ + reformating.
s/GTK_CHECK_CAST/G_TYPE_CHECK_INSTANCE_CAST/
s/GTK_CHECK_TYPE/G_TYPE_CHECK_CLASS_CAST/
s/GTK_CHECK_CLASS_CAST/G_TYPE_CHECK_INSTANCE_TYPE/
s/GTK_CHECK_CLASS_TYPE/G_TYPE_CHECK_CLASS_TYPE/
2002-02-11 Jody Goldberg <jody@gnome.org>
* src/stf.c (stf_init) : Make the names of the text import/export
clearer.
2002-02-12 Morten Welinder <terra@diku.dk> 2002-02-12 Morten Welinder <terra@diku.dk>
* src/io-context.c (value_io_progress_update): Correct assertion. * src/io-context.c (value_io_progress_update): Correct assertion.
......
...@@ -31,6 +31,7 @@ libbonoboui-2.0 >= 1.106.0 ...@@ -31,6 +31,7 @@ libbonoboui-2.0 >= 1.106.0
libgnomeprint-2.0 >= 1.106.0 libgnomeprint-2.0 >= 1.106.0
libgnomeprintui-2.0 >= 1.106.0 libgnomeprintui-2.0 >= 1.106.0
libglade-2.0 >= 1.99.4 libglade-2.0 >= 1.99.4
libgnomecanvas-2.0 >= 1.110.0
libxml-2.0 >= 2.4.12 libxml-2.0 >= 2.4.12
]) ])
AC_SUBST(GNUMERIC_LIBS) AC_SUBST(GNUMERIC_LIBS)
...@@ -395,6 +396,8 @@ gnumeric_datadir="${datadir}/gnumeric/${gnumeric_version}" ...@@ -395,6 +396,8 @@ gnumeric_datadir="${datadir}/gnumeric/${gnumeric_version}"
gnumeric_libdir="${libdir}/gnumeric/${gnumeric_version}" gnumeric_libdir="${libdir}/gnumeric/${gnumeric_version}"
gnumeric_plugindir="${gnumeric_libdir}/plugins" gnumeric_plugindir="${gnumeric_libdir}/plugins"
gnumeric_gladedir="${gnumeric_datadir}/glade" gnumeric_gladedir="${gnumeric_datadir}/glade"
gnumeric_icondir="${datadir}/pixmaps/gnumeric"
gnumeric_autoformatdir="${gnumeric_datadir}/autoformat-templates" gnumeric_autoformatdir="${gnumeric_datadir}/autoformat-templates"
dnl Export to gnumeric-config.h dnl Export to gnumeric-config.h
...@@ -408,6 +411,7 @@ AC_SUBST(gnumeric_version) ...@@ -408,6 +411,7 @@ AC_SUBST(gnumeric_version)
AC_SUBST(gnumeric_libdir) AC_SUBST(gnumeric_libdir)
AC_SUBST(gnumeric_plugindir) AC_SUBST(gnumeric_plugindir)
AC_SUBST(gnumeric_gladedir) AC_SUBST(gnumeric_gladedir)
AC_SUBST(gnumeric_icondir)
AC_SUBST(gnumeric_autoformatdir) AC_SUBST(gnumeric_autoformatdir)
AC_SUBST(gnumeric_bonobo_enabled) AC_SUBST(gnumeric_bonobo_enabled)
......
...@@ -7,7 +7,7 @@ gnumeric_plugin_applixdir = $(gnumeric_plugindir)/applix ...@@ -7,7 +7,7 @@ gnumeric_plugin_applixdir = $(gnumeric_plugindir)/applix
xmldir = $(gnumeric_plugin_applixdir) xmldir = $(gnumeric_plugin_applixdir)
gnumeric_plugin_applix_LTLIBRARIES = applix.la gnumeric_plugin_applix_LTLIBRARIES = applix.la
applix_la_LDFLAGS = -module -avoid-version applix_la_LDFLAGS = -module -avoid-version
applix_la_SOURCES = boot.c applix.h applix-read.c applix_la_SOURCES = boot.c applix.h applix-read.c applix-write.c
xml_in_files = plugin.xml.in xml_in_files = plugin.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml) xml_DATA = $(xml_in_files:.xml.in=.xml)
......
/* vim: set sw=8: */ /* vim: set sw=8: */
/* /*
* applix.c : Routines to read applix version 4 spreadsheets. * applix-read.c : Routines to read applix version 4 spreadsheets.
* *
* I have no docs or specs for this format that are useful. * I have no docs or specs for this format that are useful.
* This is a guess based on some sample sheets. * This is a guess based on some sample sheets.
* *
* Copyright (C) 2000-2001 Jody Goldberg (jody@gnome.org) * Copyright (C) 2000-2002 Jody Goldberg (jody@gnome.org)
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
*/ */
#include <gnumeric-config.h> #include <gnumeric-config.h>
#include <gnumeric.h> #include <gnumeric.h>
#include <libgnome/libgnome.h>
#include "applix.h" #include "applix.h"
#include "application.h" #include "application.h"
#include "expr.h" #include "expr.h"
...@@ -49,8 +48,7 @@ ...@@ -49,8 +48,7 @@
#include <ctype.h> #include <ctype.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <libgnome/gnome-i18n.h>
static int debug_applix_read = 1;
typedef struct { typedef struct {
FILE *file; FILE *file;
...@@ -68,11 +66,19 @@ typedef struct { ...@@ -68,11 +66,19 @@ typedef struct {
int zoom; int zoom;
} ApplixReadState; } ApplixReadState;
/* #define NO_DEBUG_APPLIX */
#ifndef NO_DEBUG_APPLIX
#define d(level, code) do { if (debug_applix_read > level) { code } } while (0)
static int debug_applix_read = 0;
#else
#define d(level, code)
#endif
/* The maximum numer of character potentially involved in a new line */ /* The maximum numer of character potentially involved in a new line */
#define MAX_END_OF_LINE_SLOP 16 #define MAX_END_OF_LINE_SLOP 16
static int applix_parse_error (ApplixReadState *, static int applix_parse_error (ApplixReadState *, char const *format, ...)
char const *format, ...) G_GNUC_PRINTF (2, 3); G_GNUC_PRINTF (2, 3);
static int static int
applix_parse_error (ApplixReadState *state, char const *format, ...) applix_parse_error (ApplixReadState *state, char const *format, ...)
...@@ -82,7 +88,7 @@ applix_parse_error (ApplixReadState *state, char const *format, ...) ...@@ -82,7 +88,7 @@ applix_parse_error (ApplixReadState *state, char const *format, ...)
if (state->parse_error == NULL) if (state->parse_error == NULL)
state->parse_error = error_info_new_str ( state->parse_error = error_info_new_str (
_("Parse error while reading Applix file.")); _("Parse error while reading Applix file."));
va_start (args, format); va_start (args, format);
err = g_strdup_vprintf (format, args); err = g_strdup_vprintf (format, args);
...@@ -1131,11 +1137,9 @@ applix_read_impl (ApplixReadState *state) ...@@ -1131,11 +1137,9 @@ applix_read_impl (ApplixReadState *state)
ungetc ((unsigned char)'C', state->file); /* restore the leading 'C' */ ungetc ((unsigned char)'C', state->file); /* restore the leading 'C' */
} }
#ifndef NO_APPLIX_DEBUG d (0, printf ("Applix load '%s' : Saved with revision %d.%d\n",
if (debug_applix_read > 0) real_name, major_rev, minor_rev););
printf ("Applix load '%s' : Saved with revision %d.%d\n",
real_name, major_rev, minor_rev);
#endif
if (applix_read_colormap (state)) if (applix_read_colormap (state))
return applix_parse_error (state, "invalid colormap"); return applix_parse_error (state, "invalid colormap");
if (applix_read_typefaces (state)) if (applix_read_typefaces (state))
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <stdio.h> #include <stdio.h>
gboolean applix_read_header (FILE *file); gboolean applix_read_header (FILE *file);
void applix_read (IOContext *io_context, WorkbookView *wb_view, FILE *file); void applix_read (IOContext *io_context, WorkbookView *wb_view, FILE *file);
void applix_write (IOContext *io_context, WorkbookView *wb_view, FILE *file);
#endif /* PLUGIN_APPLIX_H */ #endif /* PLUGIN_APPLIX_H */
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* boot.c : Installation and bootstraping routines to * boot.c : Installation and bootstraping routines to
* register the applix plugin. * register the applix plugin.
* *
* Copyright (C) 2000-2001 Jody Goldberg (jody@gnome.org) * Copyright (C) 2000-2002 Jody Goldberg (jody@gnome.org)
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
...@@ -33,45 +33,48 @@ ...@@ -33,45 +33,48 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <gnome.h>
GNUMERIC_MODULE_PLUGIN_INFO_DECL; GNUMERIC_MODULE_PLUGIN_INFO_DECL;
gboolean applix_file_probe (GnumFileOpener const *fo, const gchar *file_name, gboolean applix_file_probe (GnumFileOpener const *fo, char const *file_name,
FileProbeLevel pl); FileProbeLevel pl);
void applix_file_open (GnumFileOpener const *fo, IOContext *io_context, void applix_file_open (GnumFileOpener const *fo, IOContext *io_context,
WorkbookView *wb_view, const char *filename); WorkbookView *wb_view, char const *filename);
gboolean gboolean
applix_file_probe (GnumFileOpener const *fo, const gchar *file_name, FileProbeLevel pl) applix_file_probe (GnumFileOpener const *fo, char const *file_name, FileProbeLevel pl)
{ {
FILE *file; gboolean res = FALSE;
gboolean res; FILE *file = fopen (file_name, "r");
file = fopen (file_name, "r");
if (file == NULL) { if (file == NULL) {
res = FALSE;
} else {
res = applix_read_header (file); res = applix_read_header (file);
fclose (file); fclose (file);
} }
return res; return res;
} }
void void
applix_file_open (GnumFileOpener const *fo, IOContext *io_context, applix_file_open (GnumFileOpener const *fo, IOContext *io_context,
WorkbookView *wb_view, const char *filename) WorkbookView *wb_view, char const *filename)
{ {
FILE *file;
ErrorInfo *error; ErrorInfo *error;
FILE *file = gnumeric_fopen_error_info (filename, "r", &error);
file = gnumeric_fopen_error_info (filename, "r", &error); if (file != NULL) {
if (file == NULL) {
gnumeric_io_error_info_set (io_context, error);
} else {
applix_read (io_context, wb_view, file); applix_read (io_context, wb_view, file);
fclose (file); fclose (file);
} } else
gnumeric_io_error_info_set (io_context, error);
}
void
applix_file_save (GnumFileSaver const *fs, IOContext *io_context,
WorkbookView *wb_view, char const *filename)
{
ErrorInfo *error;
FILE *file = gnumeric_fopen_error_info (filename, "w", &error);
if (file != NULL) {
applix_write (io_context, wb_view, file);
fclose (file);
} else
gnumeric_io_error_info_set (io_context, error);
} }
...@@ -57,7 +57,7 @@ static Value * ...@@ -57,7 +57,7 @@ static Value *
func_opt_bs_call (FunctionEvalInfo *ei, Value *argv []) func_opt_bs_call (FunctionEvalInfo *ei, Value *argv [])
{ {
gnum_float S, X, stddev, t, r; gnum_float S, X, stddev, t, r;
gnum_float d1, d2, C; gnum_float d1, d2, C;
X = value_get_as_float (argv[0]); X = value_get_as_float (argv[0]);
...@@ -147,7 +147,7 @@ func_opt_bs_call_theta (FunctionEvalInfo *ei, Value *argv[]) ...@@ -147,7 +147,7 @@ func_opt_bs_call_theta (FunctionEvalInfo *ei, Value *argv[])
d2 = calc_d2 (X, S, stddev, t, r); d2 = calc_d2 (X, S, stddev, t, r);
theta = -(S * stddev * calc_Np (d1)) / (2.0 * sqrt (t)) theta = -(S * stddev * calc_Np (d1)) / (2.0 * sqrt (t))
-(r * X * calc_N (d2) * exp (-r * t)); -(r * X * calc_N (d2) * exp (-r * t));
return value_new_float (theta); return value_new_float (theta);
} }
......
...@@ -43,7 +43,7 @@ typedef struct { ...@@ -43,7 +43,7 @@ typedef struct {
gint line_no; gint line_no;
gchar *line; gchar *line;
gint line_len, alloc_line_len; gint line_len, alloc_line_len;
Sheet *sheet; Sheet *sheet;
} DifInputContext; } DifInputContext;
......
...@@ -204,7 +204,7 @@ ms_biff_put_len_next (BiffPut *bp, guint16 opcode, guint32 len) ...@@ -204,7 +204,7 @@ ms_biff_put_len_next (BiffPut *bp, guint16 opcode, guint32 len)
bp->data = g_new (guint8, len); bp->data = g_new (guint8, len);
bp->data_malloced = 1; bp->data_malloced = 1;
} }
return bp->data; return bp->data;
} }
void void
......
...@@ -300,7 +300,7 @@ BC_R(ai)(ExcelChartHandler const *handle, ...@@ -300,7 +300,7 @@ BC_R(ai)(ExcelChartHandler const *handle,
/* Rest are 0 */ /* Rest are 0 */
if (flags&0x01) { if (flags&0x01) {
StyleFormat *fmt = ms_container_get_fmt (&s->container, StyleFormat *fmt = ms_container_get_fmt (&s->container,
MS_OLE_GET_GUINT16 (q->data + 4)); MS_OLE_GET_GUINT16 (q->data + 4));
d (2, puts ("Has Custom number format");); d (2, puts ("Has Custom number format"););
if (fmt != NULL) { if (fmt != NULL) {
...@@ -986,7 +986,7 @@ BC_R(defaulttext)(ExcelChartHandler const *handle, ...@@ -986,7 +986,7 @@ BC_R(defaulttext)(ExcelChartHandler const *handle,
ExcelChartReadState *s, BiffQuery *q) ExcelChartReadState *s, BiffQuery *q)
{ {
guint16 const tmp = MS_OLE_GET_GUINT16 (q->data); guint16 const tmp = MS_OLE_GET_GUINT16 (q->data);
d (2, printf ("applicability = %hd\n", tmp);); d (2, printf ("applicability = %hd\n", tmp););
/* /*
...@@ -1123,7 +1123,7 @@ static gboolean ...@@ -1123,7 +1123,7 @@ static gboolean
BC_R(ifmt)(ExcelChartHandler const *handle, BC_R(ifmt)(ExcelChartHandler const *handle,
ExcelChartReadState *s, BiffQuery *q) ExcelChartReadState *s, BiffQuery *q)
{ {
StyleFormat *fmt = ms_container_get_fmt (&s->container, StyleFormat *fmt = ms_container_get_fmt (&s->container,
MS_OLE_GET_GUINT16 (q->data)); MS_OLE_GET_GUINT16 (q->data));
if (fmt != NULL) { if (fmt != NULL) {
...@@ -1468,7 +1468,7 @@ BC_R(pie)(ExcelChartHandler const *handle, ...@@ -1468,7 +1468,7 @@ BC_R(pie)(ExcelChartHandler const *handle,
radians = MS_OLE_GET_GUINT16 (q->data); radians = MS_OLE_GET_GUINT16 (q->data);
radians = (radians * 2. * M_PI / 360.); radians = (radians * 2. * M_PI / 360.);
tmp = xmlNewChild (fmt, fmt->ns, (xmlChar *)"radians_of_first_pie", NULL); tmp = xmlNewChild (fmt, fmt->ns, (xmlChar *)"radians_of_first_pie", NULL);
xml_node_set_double (fmt, NULL, radians, -1); xml_node_set_double (fmt, NULL, radians, -1