Commit 2e73ff57 authored by Jody Goldberg's avatar Jody Goldberg

retab to avoid <space><tab> warnings from git

svn path=/trunk/; revision=16019
parent 9879b8c3
......@@ -24,7 +24,7 @@
/*
* I do not have much in the way of useful docs.
* This is a guess based on some sample sheets with a few pointers from
* http://www.vistasource.com/products/axware/fileformats/wptchc01.html
* http://www.vistasource.com/products/axware/fileformats/wptchc01.html
*/
#include <gnumeric-config.h>
......
......@@ -44,7 +44,7 @@ typedef struct {
POA_GNOME_Gnumeric_Workbook servant;
gboolean initialized, activated;
CORBA_Object corba_obj; /* local CORBA object */
CORBA_Object corba_obj; /* local CORBA object */
CORBA_Environment *ev; /* exception from the caller */
} WorkbookControlCORBA;
......
......@@ -224,7 +224,7 @@ opt_bs (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
gnm_float b = argv[6] ? value_get_as_float (argv[6]) : 0;
gnm_float gfresult = opt_bs1 (call_put, s, x, t, r, v, b);
if (gnm_isnan (gfresult))
if (gnm_isnan (gfresult))
return value_new_error_NUM (ei->pos);
return value_new_float (gfresult);
}
......@@ -1869,7 +1869,7 @@ opt_2_asset_correlation(GnmFuncEvalInfo *ei, GnmValue const * const *argv)
* cum_biv_norm_dist1 (y2 + v2 * gnm_sqrt (t), y1 + rho * v2 * gnm_sqrt (t), rho)
- x2 * gnm_exp (-r * t) * cum_biv_norm_dist1 (y2, y1, rho));
} else if (call_put == OS_Put) {
return value_new_float (x2 * gnm_exp (-r * t) * cum_biv_norm_dist1 (-y2, -y1, rho)
return value_new_float (x2 * gnm_exp (-r * t) * cum_biv_norm_dist1 (-y2, -y1, rho)
- s2 * gnm_exp ((b2 - r) * t) * cum_biv_norm_dist1 (-y2 - v2 * gnm_sqrt (t), -y1 - rho * v2 * gnm_sqrt (t), rho));
} else
return value_new_error_NUM (ei->pos);
......@@ -1976,7 +1976,7 @@ opt_amer_exchange(GnmFuncEvalInfo *ei, GnmValue const * const *argv)
gnm_float rho = value_get_as_float (argv[10]);
gnm_float v = gnm_sqrt (v1 * v1 + v2 * v2 - 2 * rho * v1 * v2);
return value_new_float (opt_bjer_stens1 (OS_Call, q1 * s1, q2 * s2, t, r - b2, v,b1 - b2));
return value_new_float (opt_bjer_stens1 (OS_Call, q1 * s1, q2 * s2, t, r - b2, v,b1 - b2));
}
static GnmFuncHelp const help_opt_amer_exchange[] = {
......@@ -2063,14 +2063,14 @@ opt_float_strk_lkbk(GnmFuncEvalInfo *ei, GnmValue const * const *argv)
gnm_float a1, a2, m;
if(OS_Call == call_put_flag)
m = s_min;
m = s_min;
else if(OS_Put == call_put_flag)
m = s_max;
m = s_max;
else
return value_new_error_NUM (ei->pos);
a1 = (gnm_log (s / m) + (b + (v * v) / 2.0) * t) / (v * gnm_sqrt (t));
a2 = a1 - v * gnm_sqrt (t);
a2 = a1 - v * gnm_sqrt (t);
if(OS_Call == call_put_flag)
return value_new_float (s * gnm_exp ((b - r) * t) * ncdf (a1) -
......@@ -2209,9 +2209,9 @@ opt_binomial(GnmFuncEvalInfo *ei, GnmValue const * const *argv)
return value_new_error_NUM (ei->pos);
if (OS_Call == call_put_flag)
z = 1;
z = 1;
else if (OS_Put == call_put_flag)
z = -1;
z = -1;
else
return value_new_error_NUM (ei->pos);
......
......@@ -141,9 +141,9 @@ excel_read_metadata (GsfDocMetaData *meta_data, GsfInfile *ole, char const *name
/**
* excel_file_open
* @fo: File opener
* @context: IO context
* @wbv: Workbook view
* @input: Input stream
* @context: IO context
* @wbv: Workbook view
* @input: Input stream
*
* Load en excel workbook.
**/
......
......@@ -61,7 +61,7 @@
typedef struct {
GnumericXMLVersion version;
IOContext *context; /* The IOcontext managing things */
IOContext *context; /* The IOcontext managing things */
WorkbookView *wb_view; /* View for the new workbook */
Workbook *wb; /* The new workbook */
Sheet *sheet; /* The current sheet */
......@@ -609,7 +609,7 @@ xl_xml_border (GsfXMLIn *xin, xmlChar const **attrs)
GnmStyleBorderLocation location = GNM_STYLE_BORDER_EDGE_MAX;
GnmStyleBorderType line_type = GNM_STYLE_BORDER_MAX;
GnmBorder *border;
GnmColor *color = NULL, *new_color;
GnmColor *color = NULL, *new_color;
int weight = 1, tmp;
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
......@@ -667,15 +667,15 @@ xl_xml_num_interior (GsfXMLIn *xin, xmlChar const **attrs)
static EnumVal const patterns[] = {
{ "Solid", 1 },
{ "Gray75", 2 },
{ "Gray50", 3 },
{ "Gray25", 4 },
{ "Gray125", 5 },
{ "Gray0625", 6 },
{ "Gray50", 3 },
{ "Gray25", 4 },
{ "Gray125", 5 },
{ "Gray0625", 6 },
{ "HorzStripe", 7 },
{ "VertStripe", 8 },
{ "ReverseDiagStripe", 9 },
{ "DiagStripe", 10 },
{ "DiagCross", 11 },
{ "DiagCross", 11 },
{ "ThickDiagCross", 12 },
{ "ThinHorzStripe", 13 },
{ "ThinVertStripe", 14 },
......
......@@ -93,7 +93,7 @@ typedef struct {
* and I am too lazy to make the massive edit it would take to
* change it. */
char type;
char const *known_args;
char const *known_args;
} ExcelFuncDesc;
typedef struct {
......
......@@ -371,7 +371,7 @@ ms_biff_query_new (GsfInput *input)
q->opcode = 0;
q->length = 0;
q->data_malloced = q->non_decrypted_data_malloced = FALSE;
q->data = q->non_decrypted_data = NULL;
q->data = q->non_decrypted_data = NULL;
q->input = input;
q->encryption = MS_BIFF_CRYPTO_NONE;
......
......@@ -1643,7 +1643,7 @@ BC_R(scatter)(XLChartHandler const *handle,
g_object_set (G_OBJECT (s->plot),
"in-3d", in_3d,
"show-negatives", show_negatives,
"size-as-area", size_as_area,
"size-as-area", size_as_area,
"bubble-scale", scale,
NULL);
d(1, fprintf (stderr, "bubbles;"););
......@@ -3196,9 +3196,9 @@ ms_excel_chart_read (BiffQuery *q, MSContainer *container,
state.hilo = FALSE;
state.dropbar = FALSE;
state.has_extra_dataformat = FALSE;
state.axis_cross_at_max = FALSE;
state.axis_cross_at_max = FALSE;
state.axis_cross_value = go_nan;
state.xaxis = NULL;
state.xaxis = NULL;
if (NULL != (state.sog = sog)) {
state.graph = sheet_object_graph_get_gog (sog);
......@@ -3621,15 +3621,15 @@ chart_write_LINEFORMAT (XLChartWriteState *s, GogStyleLine const *lstyle,
else
w = 2; /* wide */
if (lstyle->auto_color)
flags |= 9; /* docs only mention 1, but there is an 8 in there too */
flags |= 9; /* docs only mention 1, but there is an 8 in there too */
} else {
color_index = chart_write_color (s, data, 0);
if (clear_lines_for_null) {
pat = 5;
flags = 8; /* docs only mention 1, but there is an 8 in there too */
flags = 8; /* docs only mention 1, but there is an 8 in there too */
} else {
pat = 0;
flags = 9; /* docs only mention 1, but there is an 8 in there too */
flags = 9; /* docs only mention 1, but there is an 8 in there too */
}
w = 0xffff;
}
......@@ -3777,11 +3777,11 @@ chart_write_FBI (XLChartWriteState *s, guint16 i, guint16 n)
{
/* seems to vary from machine to machine */
static guint8 const fbi[] = { 0xe4, 0x1b, 0xd0, 0x11, 0xc8, 0 };
guint8 *data = ms_biff_put_len_next (s->bp, BIFF_CHART_fbi, 10);
guint8 *data = ms_biff_put_len_next (s->bp, BIFF_CHART_fbi, 10);
memcpy (data, fbi, sizeof fbi);
GSF_LE_SET_GUINT16 (data + sizeof fbi + 6, i);
GSF_LE_SET_GUINT16 (data + sizeof fbi + 8, n);
ms_biff_put_commit (s->bp);
ms_biff_put_commit (s->bp);
}
#endif
......@@ -3895,7 +3895,7 @@ chart_write_text (XLChartWriteState *s, GOData const *src, GogStyledObject const
/* biff8 specific */
0, 0, /* index of color */
0x10, 0x3d, /* flags 2 */
0, 0 /* rotation */
0, 0 /* rotation */
};
guint8 *data;
guint16 color_index = 0x4d;
......@@ -4491,10 +4491,10 @@ chart_write_axis (XLChartWriteState *s, GogAxis const *axis,
flags |= 0x100; /* UNDOCUMENTED */
if (axis != NULL) {
flags |= xl_axis_set_elem (axis, GOG_AXIS_ELEM_MIN, 0x01, data+ 0, log_scale);
flags |= xl_axis_set_elem (axis, GOG_AXIS_ELEM_MAX, 0x02, data+ 8, log_scale);
flags |= xl_axis_set_elem (axis, GOG_AXIS_ELEM_MAJOR_TICK, 0x04, data+16, log_scale);
flags |= xl_axis_set_elem (axis, GOG_AXIS_ELEM_MINOR_TICK, 0x08, data+24, log_scale);
flags |= xl_axis_set_elem (axis, GOG_AXIS_ELEM_MIN, 0x01, data+ 0, log_scale);
flags |= xl_axis_set_elem (axis, GOG_AXIS_ELEM_MAX, 0x02, data+ 8, log_scale);
flags |= xl_axis_set_elem (axis, GOG_AXIS_ELEM_MAJOR_TICK, 0x04, data+16, log_scale);
flags |= xl_axis_set_elem (axis, GOG_AXIS_ELEM_MINOR_TICK, 0x08, data+24, log_scale);
if (isnan (cross_at) || (log_scale && cross_at == 1.) || (!log_scale && cross_at == 0.))
/* assume this is the auto case for excel */
flags |= 0x10;
......@@ -4512,8 +4512,8 @@ chart_write_axis (XLChartWriteState *s, GogAxis const *axis,
(s->bp->version >= MS_BIFF_V8) ? 30 : 26);
g_object_get (G_OBJECT (axis),
"major-tick-labeled", &labeled,
"major-tick-in", &in,
"major-tick-out", &out,
"major-tick-in", &in,
"major-tick-out", &out,
/* "major-tick-size-pts", (unsupported in XL) */
/* "minor-tick-size-pts", (unsupported in XL) */
NULL);
......@@ -4523,8 +4523,8 @@ chart_write_axis (XLChartWriteState *s, GogAxis const *axis,
GSF_LE_SET_GUINT8 (data+0, tmp);
g_object_get (G_OBJECT (axis),
"minor-tick-in", &in,
"minor-tick-out", &out,
"minor-tick-in", &in,
"minor-tick-out", &out,
NULL);
tmp = out ? 2 : 0;
if (in)
......@@ -4532,9 +4532,9 @@ chart_write_axis (XLChartWriteState *s, GogAxis const *axis,
GSF_LE_SET_GUINT8 (data+1, tmp);
tmp = labeled ? 3 : 0; /* label : 0 == none
* 1 == low (unsupported in gnumeric)
* 2 == high (unsupported in gnumeric)
* 3 == beside axis */
* 1 == low (unsupported in gnumeric)
* 2 == high (unsupported in gnumeric)
* 3 == beside axis */
GSF_LE_SET_GUINT8 (data+2, tmp);
GSF_LE_SET_GUINT8 (data+3, 1); /* background mode : 1 == transparent
* 2 == opaque */
......
......@@ -2,7 +2,7 @@
/**
* ms-container.c: A meta container to handle object import for charts,
* workbooks and sheets.
* workbooks and sheets.
*
* Author:
* Jody Goldberg (jody@gnome.org)
......
......@@ -4,7 +4,7 @@
/**
* ms-container.h: A meta container to handle object import for charts,
* workbooks and sheets.
* workbooks and sheets.
*
* Author:
* Jody Goldberg (jody@gnome.org)
......
......@@ -1439,7 +1439,7 @@ ms_escher_read_OPT (MSEscherState *state, MSEscherHeader *h)
break;
/* Geometry */
/* 0 : Defines the G (geometry) coordinate space. */
/* 0 : Defines the G (geometry) coordinate space. */
case 320 : name = "long geoLeft"; break;
/* 0 : */
case 321 : name = "long geoTop"; break;
......@@ -2171,19 +2171,19 @@ static guint8 const Sp_header[] = {
/* SpContainer */
0xf, 0, /* ver = f, inst = 0 */
0x04, 0xf0, /* type = SpContainer */
0, 0, 0, 0, /* store total len */
0, 0, 0, 0, /* store total len */
/* Sp */
0, 0, /* store (shape type << 4) | 2 */
0, 0, /* store (shape type << 4) | 2 */
0x0a, 0xf0, /* type = Sp */
8, 0, 0, 0, /* len = 8 */
0, 0, 0, 0, /* store spid */
0, 0, 0, 0, /* store spid */
0, 0xa, 0, 0,
/* OPT */
0, 0, /* store (count << 4) | 0x3) */
0, 0, /* store (count << 4) | 0x3) */
0x0b, 0xf0, /* type = OPT */
0, 0, 0, 0, /* store (count * 6) + complex sizes */
0, 0, 0, 0, /* store (count * 6) + complex sizes */
};
static guint8 const Sp_footer[] = {
......@@ -2271,7 +2271,7 @@ ms_escher_sp_write (MSEscherSp *sp, BiffPut *bp,
memcpy (buf, Sp_header, sizeof Sp_header);
/* SpContainer */
/* 0xf, 0, * ver = f, inst = 0 */
/* 0x04, 0xf0, * type = SpContainer */
/* 0x04, 0xf0, * type = SpContainer */
GSF_LE_SET_GUINT32 (buf + 4, len); /* total len */
/* Sp */
GSF_LE_SET_GUINT16 (buf + 8, (shape << 4) | 2);
......
......@@ -88,7 +88,7 @@ typedef struct {
ExcelReadSheet *esheet;
char *name;
guint32 streamStartPos;
unsigned index;
unsigned index;
MsBiffFileType type;
GnmSheetType gnm_type;
GnmSheetVisibility visibility;
......@@ -493,7 +493,7 @@ ms_sheet_realize_obj (MSContainer *container, MSObj *obj)
blip->needs_free = FALSE; /* image took over managing data */
}
} else if ((attr = ms_obj_attr_bag_lookup (obj->attrs,
MS_OBJ_ATTR_IMDATA)) != NULL) {
MS_OBJ_ATTR_IMDATA)) != NULL) {
GdkPixbuf *pixbuf = GDK_PIXBUF (attr->v.v_object);
if (pixbuf) {
......@@ -624,7 +624,7 @@ ms_sheet_create_obj (MSContainer *container, MSObj *obj)
case 0x0C: so = g_object_new (sheet_widget_radio_button_get_type (), NULL);
break;
case 0x10: so = g_object_new (sheet_widget_spinbutton_get_type (), NULL);
break;
break;
case 0x11: so = g_object_new (sheet_widget_scrollbar_get_type (), NULL);
break;
case 0x12: so = g_object_new (sheet_widget_list_get_type (), NULL);
......@@ -1214,11 +1214,11 @@ excel_read_BOUNDSHEET (BiffQuery *q, GnmXLImporter *importer)
}
/* TODO: find some documentation on this.
* Sample data and OpenCalc imply that the docs are incorrect. It
* seems like the name length is 1 byte. Loading sample sheets in
* other locales universally seem to treat the first byte as a length
* and the second as the unicode flag header.
*/
* Sample data and OpenCalc imply that the docs are incorrect. It
* seems like the name length is 1 byte. Loading sample sheets in
* other locales universally seem to treat the first byte as a length
* and the second as the unicode flag header.
*/
bs->name = excel_get_text (importer, q->data + 7,
GSF_LE_GET_GUINT8 (q->data + 6), NULL);
}
......@@ -1773,16 +1773,16 @@ excel_get_style_from_xf (ExcelReadSheet *esheet, BiffXFData const *xf)
case 64:
color = sheet_style_get_auto_pattern_color
(esheet->sheet);
d (4, fprintf (stderr,"border with color_index=%d\n",
d (4, fprintf (stderr,"border with color_index=%d\n",
color_index););
break;
case 65:
color = style_color_auto_back ();
/* We haven't seen this yet.
We know that 64 and 127 occur in the wild */
d (4, fprintf (stderr,"border with color_index=%d\n",
d (4, fprintf (stderr,"border with color_index=%d\n",
color_index););
break;
break;
case 127:
color = style_color_auto_font ();
break;
......@@ -1983,32 +1983,32 @@ excel_read_XF_OLD (BiffQuery *q, GnmXLImporter *importer)
data = GSF_LE_GET_GUINT8 (q->data + 10);
xf->border_type[STYLE_BOTTOM] = biff_xf_map_border(data & 0x07);
subdata = data >> 3;
xf->border_color[STYLE_BOTTOM] = (subdata==24) ? 64 : subdata;
xf->border_color[STYLE_BOTTOM] = (subdata==24) ? 64 : subdata;
data = GSF_LE_GET_GUINT8 (q->data + 8);
xf->border_type[STYLE_TOP] = biff_xf_map_border(data & 0x07);
subdata = data >> 3;
xf->border_color[STYLE_TOP] = (subdata==24) ? 64 : subdata;
xf->border_color[STYLE_TOP] = (subdata==24) ? 64 : subdata;
data = GSF_LE_GET_GUINT8 (q->data + 9);
xf->border_type[STYLE_LEFT] = biff_xf_map_border(data & 0x07);
subdata = data >> 3;
xf->border_color[STYLE_LEFT] = (subdata==24) ? 64 : subdata;
xf->border_color[STYLE_LEFT] = (subdata==24) ? 64 : subdata;
data = GSF_LE_GET_GUINT8 (q->data + 11);
xf->border_type[STYLE_RIGHT] = biff_xf_map_border (data & 0x07);
subdata = data >> 3;
xf->border_color[STYLE_RIGHT] = (subdata==24) ? 64 : subdata;
xf->border_color[STYLE_RIGHT] = (subdata==24) ? 64 : subdata;
} else /* MS_BIFF_V2 */ {
xf->pat_foregnd_col = 0;
xf->pat_backgnd_col = 1;
data = q->data[3];
xf->border_type[STYLE_LEFT] = (data & 0x08) ? 1 : 0;
xf->border_color[STYLE_LEFT] = 0;
xf->border_color[STYLE_LEFT] = 0;
xf->border_type[STYLE_RIGHT] = (data & 0x10) ? 1: 0;
xf->border_color[STYLE_RIGHT] = 0;
xf->border_color[STYLE_RIGHT] = 0;
xf->border_type[STYLE_TOP] = (data & 0x20) ? 1: 0;
xf->border_color[STYLE_TOP] = 0;
xf->border_color[STYLE_TOP] = 0;
xf->border_type[STYLE_BOTTOM] = (data & 0x40) ? 1: 0;
xf->border_color[STYLE_BOTTOM] = 0;
xf->border_color[STYLE_BOTTOM] = 0;
xf->fill_pattern_idx = (data & 0x80) ? 5: 0;
}
......@@ -2369,7 +2369,7 @@ excel_formula_shared (BiffQuery *q, ExcelReadSheet *esheet, GnmCell *cell)
/*
* NOTE: There must be _no_ path through this function that does not set the
* cell value.
* cell value.
*/
static void
excel_read_FORMULA (BiffQuery *q, ExcelReadSheet *esheet)
......@@ -2397,7 +2397,7 @@ excel_read_FORMULA (BiffQuery *q, ExcelReadSheet *esheet)
/* TODO : it would be nice to figure out how to allocate recalc tags.
* that would avoid the scary
* 'this file was calculated with a different version of XL'
* 'this file was calculated with a different version of XL'
* warning when exiting without changing. */
d (1, fprintf (stderr,"Formula in %s!%s has recalc tag 0x%x;\n",
esheet->sheet->name_quoted, cell_name (cell),
......@@ -3058,7 +3058,7 @@ excel_read_name_str (GnmXLImporter *importer,
* dipsticks put the unicode header _before_ the builtin id
* and stored the id as a character (possibly two byte).
* NOTE : len is in _characters_ (not bytes) does not include
* the header */
* the header */
if (is_builtin) {
guint8 const *str = data;
char const *builtin;
......@@ -3609,8 +3609,8 @@ excel_read_COLINFO (BiffQuery *q, ExcelReadSheet *esheet)
* the Normal Style. The pixel calculation is then reduced to
*
* (default_size + ((quoted_width - baseline) / step))
* * scale : fonts != 10pts
* * 72/96 : value in pts so that zoom is not a factor
* * scale : fonts != 10pts
* * 72/96 : value in pts so that zoom is not a factor
*
* NOTE: These measurements do NOT correspond to what is shown to the
* user */
......@@ -3637,7 +3637,7 @@ excel_read_COLINFO (BiffQuery *q, ExcelReadSheet *esheet)
lastcol = SHEET_MAX_COLS - 1;
for (i = firstcol; i <= lastcol; i++) {
/* Kludge : we should really use
* hard_size == customWidth && !bestFit
* hard_size == customWidth && !bestFit
* but these flags are undocumented and gnumeric < 1.7.5 && OOo
* export them as 0. So we are reduced to using */
sheet_col_set_size_pts (esheet->sheet, i, width, !bestFit);
......@@ -4750,7 +4750,7 @@ excel_read_DV (BiffQuery *q, ExcelReadSheet *esheet)
{
GnmExprTop const *texpr1 = NULL;
GnmExprTop const *texpr2 = NULL;
int expr1_len, expr2_len;
int expr1_len, expr2_len;
char *input_msg, *error_msg, *input_title, *error_title;
guint32 options, len;
guint8 const *data, *expr1_dat, *expr2_dat;
......@@ -5623,7 +5623,7 @@ excel_read_sheet (BiffQuery *q, GnmXLImporter *importer,
GnmRange r;
sheet_style_set_range (esheet->sheet,
range_init_full_sheet (&r), mstyle);
}
}
}
for (; ms_biff_query_next (q) ;
......@@ -5709,7 +5709,7 @@ excel_read_sheet (BiffQuery *q, GnmXLImporter *importer,
case BIFF_VERTICALPAGEBREAKS: excel_read_PAGE_BREAK (q, esheet, TRUE); break;
case BIFF_HORIZONTALPAGEBREAKS: excel_read_PAGE_BREAK (q, esheet, FALSE); break;
case BIFF_NOTE: excel_read_NOTE (q, esheet); break;
case BIFF_NOTE: excel_read_NOTE (q, esheet); break;
case BIFF_SELECTION: excel_read_SELECTION (q, esheet); break;
case BIFF_EXTERNNAME_v0:
case BIFF_EXTERNNAME_v2:
......@@ -5809,8 +5809,8 @@ excel_read_sheet (BiffQuery *q, GnmXLImporter *importer,
case BIFF_GCW: break;
case BIFF_SCENMAN: break;
case BIFF_SCENARIO: break;
case BIFF_MULRK: excel_read_MULRK (q, esheet); break;
case BIFF_MULBLANK: excel_read_MULBLANK (q, esheet); break;
case BIFF_MULRK: excel_read_MULRK (q, esheet); break;
case BIFF_MULBLANK: excel_read_MULBLANK (q, esheet); break;
case BIFF_RSTRING: excel_read_LABEL (q, esheet, TRUE); break;
......@@ -6221,7 +6221,7 @@ excel_read_workbook (IOContext *context, WorkbookView *wb_view, GsfInput *input,
case BIFF_FORMAT_v0:
case BIFF_FORMAT_v4: excel_read_FORMAT (q, importer); break;
case BIFF_BACKUP: break;
case BIFF_BACKUP: break;
case BIFF_CODEPAGE: /* DUPLICATE 42 */
/* This seems to appear within a workbook */
/* MW: And on Excel seems to drive the display
......
......@@ -21,7 +21,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
typedef struct {
Sheet *first, *last;
Sheet *first, *last;
unsigned supbook;
} ExcelExternSheetV8;
typedef enum {
......@@ -41,7 +41,7 @@ typedef struct {
Sheet *sheet;
GHashTable *shared_formulae, *tables;
gboolean freeze_panes;
gboolean freeze_panes;
unsigned active_pane;
GnmFilter *filter;
int biff2_prev_xf_index;
......@@ -140,7 +140,7 @@ char *excel_get_text (GnmXLImporter const *importer,
guint8 const *ptr, guint32 length,
guint32 *byte_length);
GnmColor *excel_palette_get (GnmXLImporter *importer, gint idx);
GnmColor *excel_palette_get (GnmXLImporter *importer, gint idx);
ExcelFont const *excel_font_get (GnmXLImporter const *importer, unsigned idx);
GOFont const *excel_font_get_gofont (ExcelFont const *font);
......
......@@ -223,11 +223,11 @@ init_xl_font_widths (void)
{ "Andy MT", 7, 0x0955, 42.5 },
{ "Arial Baltic", 8, 0x0924, 36.5 },
{ "Arial Black", 10, 0x08E3, 28.5 },
{ "Arial CE", 8, 0x0924, 36.5 },
{ "Arial Cyr", 8, 0x0924, 36.5 },
{ "Arial Greek", 8, 0x0924, 36.5 },
{ "Arial CE", 8, 0x0924, 36.5 },
{ "Arial Cyr", 8, 0x0924, 36.5 },
{ "Arial Greek", 8, 0x0924, 36.5 },
{ "Arial Narrow", 7, 0x0955, 42.5 },
{ "Arial TUR", 8, 0x0924, 36.5 },
{ "Arial TUR", 8, 0x0924, 36.5 },
{ "Arial", 8, 0x0924, 36.5 },
{ "Baekmuk Batang", 8, 0x0924, 36.5 },
{ "Baekmuk Dotum", 8, 0x0924, 36.5 },
......@@ -236,7 +236,7 @@ init_xl_font_widths (void)
{ "Bell MT", 8, 0x0924, 36.5 },
{ "Bitstream Vera Sans Mono", 9, 0x0900, 32.0 },
{ "Bitstream Vera Sans", 8, 0x0924, 36.5 },
{ "Sans", 8, 0x0924, 36.5 },
{ "Sans", 8, 0x0924, 36.5 },
{ "Bitstream Vera Serif", 9, 0x0900, 32.0 },
{ "Book Antiqua", 8, 0x0924, 36.5 },
{ "Bookman Old Style", 9, 0x0900, 32.0 },
......@@ -303,7 +303,7 @@ init_xl_font_widths (void)
{ "OpenSymbol", 8, 0x0924, 36.5 },
{ "OrigGaramond SWC", 7, 0x0955, 42.5 },
{ "Palatino Linotype", 8, 0x0924, 36.5 },
{ "Palatino", 8, 0x0924, 36.5 },
{ "Palatino", 8, 0x0924, 36.5 },
{ "Raavi", 10, 0x08E3, 28.5 },
{ "Roman", 7, 0x0955, 42.5 },
{ "SUSE Sans Mono", 9, 0x0900, 32.0 },
......@@ -330,7 +330,7 @@ init_xl_font_widths (void)
{ "Terminal", 9, 0x0900, 32.0 },
{ "Thorndale AMT", 7, 0x0955, 42.5 },
{ "Times New Roman", 7, 0x0955, 42.5 },
{ "Tms Rmn", 7, 0x0955, 42.5 },
{ "Tms Rmn", 7, 0x0955, 42.5 },
{ "Trebuchet MS", 8, 0x0924, 36.5 },
{ "Tunga", 8, 0x0924, 36.5 },
{ "Verdana", 9, 0x0900, 32.0 },
......
......@@ -450,13 +450,13 @@ excel_write_SETUP (BiffPut *bp, ExcelWriteSheet *esheet)
if (NULL != esheet)
pi = esheet->gnum_sheet->print_info;
if (NULL != pi) {
GtkPageOrientation orient;
GtkPageOrientation orient;
if (pi->print_across_then_down)
flags |= 0x01;
orient = print_info_get_paper_orientation (pi);
if (orient == GTK_PAGE_ORIENTATION_PORTRAIT
|| orient == GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT)
flags |= 0x02;
flags |= 0x02;
if (pi->print_black_and_white)
flags |= 0x08;
if (pi->print_as_draft)
......@@ -2569,7 +2569,7 @@ build_xf_data (XLExportBase *xle, BiffXFData *xfd, GnmStyle *st)
gnm_style_get_back_color (st), PALETTE_AUTO_BACK);
/* Solid patterns seem to reverse the meaning */
if (xfd->fill_pattern_idx == FILL_SOLID) {
if (xfd->fill_pattern_idx == FILL_SOLID) {
guint16 c = xfd->pat_backgnd_col;
xfd->pat_backgnd_col = xfd->pat_foregnd_col;
xfd->pat_foregnd_col = c;
......@@ -3043,7 +3043,7 @@ excel_write_FORMULA (ExcelWriteState *ewb, ExcelWriteSheet *esheet, GnmCell cons
}
GSF_LE_SET_GUINT16 (data + 14, /* alwaysCalc & calcOnLoad */
(cell->base.flags & DEPENDENT_HAS_DYNAMIC_DEPS) ? 1 : 0);
(cell->base.flags & DEPENDENT_HAS_DYNAMIC_DEPS) ? 1 : 0);
/*** This is why XL produces a warning when exiting with files we generate
* and complains about them being from 'older' versions. The numbers
......@@ -4213,7 +4213,7 @@ write_sheet_head (BiffPut *bp, ExcelWriteSheet *esheet)
ms_biff_put_2byte (bp, BIFF_SAVERECALC, 0x0001);
ms_biff_put_2byte (bp, BIFF_PRINTHEADERS, pi->print_titles ? 1 : 0);
ms_biff_put_2byte (bp, BIFF_PRINTGRIDLINES, pi->print_grid_lines ? 1 : 0);
ms_biff_put_2byte (bp, BIFF_GRIDSET, 0x0001);
ms_biff_put_2byte (bp, BIFF_GRIDSET, 0x0001);
excel_write_GUTS (bp, esheet);
excel_write_DEFAULT_ROW_HEIGHT (bp, esheet);
......@@ -5379,7 +5379,7 @@ excel_write_workbook (ExcelWriteState *ewb)
for (i = 0; i < ewb->esheets->len; i++) {
s = g_ptr_array_index (ewb->esheets, i);
s->boundsheetPos = excel_write_BOUNDSHEET (bp, s->gnum_sheet);
s->boundsheetPos = excel_write_BOUNDSHEET (bp, s->gnum_sheet);
}
if (bp->version >= MS_BIFF_V8) {
......@@ -5627,7 +5627,7 @@ excel_write_state_new (IOContext *context, WorkbookView const *wb_view,
ewb->base.wb = wb_view_get_workbook (wb_view);