Commit e852cdc3 authored by Jean Bréfort's avatar Jean Bréfort

Cleaned out extra white spaces.

parent e6634894
......@@ -908,11 +908,11 @@ xl_xml_selection (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
end = rangeref_parse (&rr, ptr, &pp, gnm_conventions_xls_r1c1);
if (end != ptr) {
range_init_rangeref (&r, &rr);
sv_selection_add_full
sv_selection_add_full
(sv,
state->pos.col, state->pos.row,
r.start.col, r.start.row,
r.end.col, r.end.row,
r.end.col, r.end.row,
GNM_SELECTION_MODE_ADD);
if (*end != ',')
......
......@@ -4504,13 +4504,13 @@ excel_read_SELECTION (BiffQuery *q, ExcelReadSheet *esheet)
sv_selection_add_full (sv,
tmp.col, tmp.row,
r.start.col, r.start.row,
r.end.col, r.end.row,
r.end.col, r.end.row,
GNM_SELECTION_MODE_ADD);
}
if (sv->selections == NULL) {
/* See bug 632050 */
sv_selection_add_pos (sv, 0, 0,
sv_selection_add_pos (sv, 0, 0,
GNM_SELECTION_MODE_ADD);
d (5, g_printerr ("No selection\n"););
}
......
......@@ -1193,7 +1193,7 @@ gnumeric_hexrep (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
unsigned char b = data[ui];
res[2 * ui] = hex[b >> 4];
res[2 * ui + 1] = hex[b & 0xf];
}
}
res[2 * ui] = 0;
return value_new_string (res);
......
......@@ -428,8 +428,8 @@ cb_find_font_encodings (GnmCellIter const *iter, gboolean *fonts)
{
GnmCell *cell = iter->cell;
if (cell) {
char const *rs =
gnm_rendered_value_get_text
char const *rs =
gnm_rendered_value_get_text
(gnm_cell_fetch_rendered_value (cell, TRUE));
while (*rs) {
gunichar ch = g_utf8_get_char (rs);
......@@ -766,7 +766,7 @@ latex2e_print_vert_border (GsfOutput *output, GnmStyleBorderType style)
*
*/
static void
latex2e_write_blank_multicolumn_cell (GsfOutput *output, int start_col,
latex2e_write_blank_multicolumn_cell (GsfOutput *output, int start_col,
G_GNUC_UNUSED int start_row,
int num_merged_cols, int num_merged_rows,
gint index,
......@@ -1518,7 +1518,7 @@ latex2e_table_write_file_header(GsfOutput *output)
* We try to avoid all formatting.
*/
void
latex_table_file_save (G_GNUC_UNUSED GOFileSaver const *fs,
latex_table_file_save (G_GNUC_UNUSED GOFileSaver const *fs,
G_GNUC_UNUSED GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)
{
......
......@@ -6083,7 +6083,7 @@ odf_write_interpolation_attribute (GnmOOExport *state,
(state->xml, CHART "interpolation", "none");
else if (0 == strcmp (interpolation, "spline"))
gsf_xml_out_add_cstr
(state->xml, CHART "interpolation",
(state->xml, CHART "interpolation",
"cubic-spline");
else if (state->with_extension) {
char *tag = g_strdup_printf ("gnm:%s", interpolation);
......
......@@ -55,10 +55,10 @@ sv_select_cur_row (SheetView *sv)
if (sel != NULL) {
GnmRange r = *sel;
sv_selection_reset (sv);
sv_selection_add_full
sv_selection_add_full
(sv,
sv->edit_pos.col, sv->edit_pos.row,
0, r.start.row, gnm_sheet_get_last_col (sv->sheet), r.end.row,
0, r.start.row, gnm_sheet_get_last_col (sv->sheet), r.end.row,
GNM_SELECTION_MODE_ADD);
sheet_update (sv->sheet);
}
......@@ -77,10 +77,10 @@ sv_select_cur_col (SheetView *sv)
if (sel != NULL) {
GnmRange r = *sel;
sv_selection_reset (sv);
sv_selection_add_full
sv_selection_add_full
(sv,
sv->edit_pos.col, sv->edit_pos.row,
r.start.col, 0, r.end.col, gnm_sheet_get_last_row (sv->sheet),
r.start.col, 0, r.end.col, gnm_sheet_get_last_row (sv->sheet),
GNM_SELECTION_MODE_ADD);
sheet_update (sv->sheet);
}
......@@ -105,7 +105,7 @@ sv_select_cur_array (SheetView *sv)
/* leave the edit pos where it is, select the entire array. */
sv_selection_reset (sv);
sv_selection_add_full (sv, c, r,
a.start.col, a.start.row, a.end.col, a.end.row,
a.start.col, a.start.row, a.end.col, a.end.row,
GNM_SELECTION_MODE_ADD);
sheet_update (sv->sheet);
}
......@@ -166,7 +166,7 @@ sv_select_cur_depends (SheetView *sv)
/* Short circuit */
if (g_list_length (deps) == 1) {
GnmCell *cell = deps->data;
sv_selection_add_pos (sv, cell->pos.col, cell->pos.row,
sv_selection_add_pos (sv, cell->pos.col, cell->pos.row,
GNM_SELECTION_MODE_ADD);
} else {
GnmRange *cur = NULL;
......@@ -259,15 +259,15 @@ sv_select_cur_inputs (SheetView *sv)
GnmRangeRef const *r = value_get_rangeref (v);
#warning "FIXME: What do we do in these 3D cases?"
if ((r->a.sheet == r->b.sheet) &&
if ((r->a.sheet == r->b.sheet) &&
(r->a.sheet == NULL || r->a.sheet == sv->sheet)) {
gint row, col;
row = gnm_cellref_get_row (&r->a, &ep);
col = gnm_cellref_get_col (&r->a, &ep);
sv_selection_add_full
sv_selection_add_full
(sv, col, row, col, row,
gnm_cellref_get_col (&r->b, &ep),
gnm_cellref_get_row (&r->b, &ep),
gnm_cellref_get_row (&r->b, &ep),
GNM_SELECTION_MODE_ADD);
}
value_release (v);
......
......@@ -2235,11 +2235,11 @@ cmd_colrow_hide_correct_selection (CmdColRowHide *me, WorkbookControl *wbc)
sv_selection_reset (sv);
if (me->is_cols)
sv_selection_add_full (sv, y, x, y, 0,
y, gnm_sheet_get_last_row (sheet),
y, gnm_sheet_get_last_row (sheet),
GNM_SELECTION_MODE_ADD);
else
sv_selection_add_full (sv, y, x, 0, x,
gnm_sheet_get_last_col (sheet), x,
gnm_sheet_get_last_col (sheet), x,
GNM_SELECTION_MODE_ADD);
}
#endif
......
......@@ -86,7 +86,7 @@ complete_sheet_search_iteration (Complete *complete)
CompleteSheet *cs = COMPLETE_SHEET (complete);
int i;
if ((int)strlen (complete->text) <
if ((int)strlen (complete->text) <
gnm_conf_get_core_gui_editing_autocomplete_min_chars ())
return FALSE;
......
......@@ -200,8 +200,8 @@ kaplan_meier_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy,
}
static gboolean
kaplan_meier_tool_get_groups_cb (GtkTreeModel *model,
G_GNUC_UNUSED GtkTreePath *path,
kaplan_meier_tool_get_groups_cb (GtkTreeModel *model,
G_GNUC_UNUSED GtkTreePath *path,
GtkTreeIter *iter,
gpointer data)
{
......
......@@ -538,7 +538,7 @@ static const char *ui_description =
"</ui>";
static gboolean
cb_canvas_focus (GtkWidget *canvas,
cb_canvas_focus (GtkWidget *canvas,
G_GNUC_UNUSED GtkDirectionType direction,
AutoFormatState *state)
{
......
......@@ -597,7 +597,7 @@ c_fmt_dialog_condition_setter (SheetView *sv, GnmRange const *range, CFormatStat
}
static gboolean
c_fmt_dialog_condition_setter_tiled (G_GNUC_UNUSED SheetView *sv, GnmRange const *range,
c_fmt_dialog_condition_setter_tiled (G_GNUC_UNUSED SheetView *sv, GnmRange const *range,
CFormatState *state)
{
GnmStyleList *l, *list;
......
......@@ -123,7 +123,7 @@ typedef struct {
} search_t;
static gboolean
cb_dialog_function_select_search_all (GtkTreeModel *model,
cb_dialog_function_select_search_all (GtkTreeModel *model,
G_GNUC_UNUSED GtkTreePath *path,
GtkTreeIter *iter, gpointer data)
{
......
......@@ -530,7 +530,7 @@ gnumeric_convert_to_tooltip (GtkWidget *ref_widget, GtkWidget *label)
GtkWidget *
gnumeric_create_tooltip (GtkWidget *ref_widget)
{
return gnumeric_convert_to_tooltip (ref_widget, gnumeric_create_tooltip_widget ());
return gnumeric_convert_to_tooltip (ref_widget, gnumeric_create_tooltip_widget ());
}
void
......@@ -991,7 +991,7 @@ gnm_store_text_tag_attr_in_pango (PangoAttrList *list, GtkTextTag *tag, GtkTextI
if (gnm_object_get_bool (tag, "foreground-set")) {
#if GTK_MAJOR_VERSION > 3 || GTK_MINOR_VERSION >= 2
GdkRGBA *color = NULL;
g_object_get (G_OBJECT (tag), "foreground-rgba", &color, NULL);
g_object_get (G_OBJECT (tag), "foreground-rgba", &color, NULL);
#else
GdkColor *color = NULL;
g_object_get (G_OBJECT (tag), "foreground-gdk", &color, NULL);
......@@ -999,9 +999,9 @@ gnm_store_text_tag_attr_in_pango (PangoAttrList *list, GtkTextTag *tag, GtkTextI
if (color) {
#if GTK_MAJOR_VERSION > 3 || GTK_MINOR_VERSION >= 2
/* dividing 0 to 1 into 65536 equal length intervals */
attr = pango_attr_foreground_new
((int)(CLAMP (color->red * 65536, 0., 65535.)),
(int)(CLAMP (color->green * 65536, 0., 65535.)),
attr = pango_attr_foreground_new
((int)(CLAMP (color->red * 65536, 0., 65535.)),
(int)(CLAMP (color->green * 65536, 0., 65535.)),
(int)(CLAMP (color->blue * 65536, 0., 65535.)));
gdk_rgba_free (color);
#else
......
......@@ -43,7 +43,7 @@ void gnumeric_position_tooltip (GtkWidget *tip, int px, int py,
GtkWidget *gnumeric_create_tooltip_widget (void);
GtkWidget *gnumeric_create_tooltip_text_view_widget (void);
GtkWidget *gnumeric_create_tooltip (GtkWidget *ref_widget);
GtkWidget *gnumeric_convert_to_tooltip (GtkWidget *ref_widget,
GtkWidget *gnumeric_convert_to_tooltip (GtkWidget *ref_widget,
GtkWidget *widget);
void gnumeric_tooltip_set_style (GtkWidget *widget);
......
......@@ -124,8 +124,8 @@ item_edit_draw (GocItem const *item, cairo_t *cr)
PangoRectangle pos, weak;
char const *text = gtk_entry_get_text (ie->entry);
PangoDirection dir = pango_find_base_dir (text, -1);
PangoAttrList *entry_attributes
= g_object_get_data(G_OBJECT (ie->entry),
PangoAttrList *entry_attributes
= g_object_get_data(G_OBJECT (ie->entry),
"gnm:range-attributes");
if (entry_attributes != NULL) {
......@@ -378,7 +378,7 @@ item_edit_motion (GocItem *item, double x, double y)
}
static gboolean
item_edit_button_released (GocItem *item, G_GNUC_UNUSED int button,
item_edit_button_released (GocItem *item, G_GNUC_UNUSED int button,
G_GNUC_UNUSED double x, G_GNUC_UNUSED double y)
{
ItemEdit *ie = ITEM_EDIT (item);
......
......@@ -930,8 +930,8 @@ item_grid_button_pressed (GocItem *item, int button, double x_, double y_)
if (event->button != 1 || !(event->state & GDK_SHIFT_MASK) ||
sv->selections == NULL) {
sv_selection_add_pos (sv, pos.col, pos.row,
(already_selected && (event->state & GDK_CONTROL_MASK)) ?
sv_selection_add_pos (sv, pos.col, pos.row,
(already_selected && (event->state & GDK_CONTROL_MASK)) ?
GNM_SELECTION_MODE_REMOVE :
GNM_SELECTION_MODE_ADD);
sv_make_cell_visible (sv, pos.col, pos.row, FALSE);
......
......@@ -87,7 +87,7 @@ print_cell_gtk (GnmCell const *cell,
rv = gnm_cell_fetch_rendered_value (cell, TRUE);
/* Create a rendered value for printing */
if (cell_shows_error &&
if (cell_shows_error &&
(pinfo->error_display == GNM_PRINT_ERRORS_AS_NA
|| pinfo->error_display == GNM_PRINT_ERRORS_AS_DASHES)) {
GnmCell *t_cell = (GnmCell *)cell;
......
......@@ -51,11 +51,11 @@ gnm_print_comment_placement_get_type (void)
{ GNM_PRINT_COMMENTS_NONE, "GNM_PRINT_COMMENTS_NONE", "none"},
{ GNM_PRINT_COMMENTS_IN_PLACE, "GNM_PRINT_COMMENTS_IN_PLACE",
"in-place"},
{ GNM_PRINT_COMMENTS_AT_END, "GNM_PRINT_COMMENTS_AT_END",
{ GNM_PRINT_COMMENTS_AT_END, "GNM_PRINT_COMMENTS_AT_END",
"at-end"},
{ 0, NULL, NULL }
};
etype = g_enum_register_static ("GnmPrintCommentPlacementType",
etype = g_enum_register_static ("GnmPrintCommentPlacementType",
values);
}
return etype;
......@@ -77,7 +77,7 @@ gnm_print_errors_get_type (void)
"GNM_PRINT_ERRORS_AS_NA", "as-na"},
{ 0, NULL, NULL }
};
etype = g_enum_register_static ("GnmPrintErrorsType",
etype = g_enum_register_static ("GnmPrintErrorsType",
values);
}
return etype;
......
......@@ -134,8 +134,8 @@ gnm_print_range_get_type (void)
{ GNM_PRINT_IGNORE_PRINTAREA,
"GNM_PRINT_IGNORE_PRINTAREA",
"ignore-print-area"},
{ GNM_PRINT_SHEET_SELECTION_IGNORE_PRINTAREA,
"GNM_PRINT_SHEET_SELECTION_IGNORE_PRINTAREA",
{ GNM_PRINT_SHEET_SELECTION_IGNORE_PRINTAREA,
"GNM_PRINT_SHEET_SELECTION_IGNORE_PRINTAREA",
"sheet-selection-ignore-printarea"},
{ 0, NULL, NULL }
};
......
......@@ -53,7 +53,7 @@ sv_selection_calc_simplification (SheetView const *sv)
if (sv->selections_simplified != NULL)
return sv->selections_simplified;
g_return_val_if_fail (sv->selections != NULL &&
g_return_val_if_fail (sv->selections != NULL &&
sv->selections->data != NULL,
sv->selections);
......@@ -76,7 +76,7 @@ sv_selection_calc_simplification (SheetView const *sv)
simp = g_slist_prepend (simp, r_new);
}
}
if (simp == NULL) {
GnmRange *r_new = g_new (GnmRange, 1);
range_init_cellpos (r_new, &sv->edit_pos);
......@@ -84,7 +84,7 @@ sv_selection_calc_simplification (SheetView const *sv)
}
sv_mod->selections_simplified = g_slist_reverse (simp);
return sv->selections_simplified;
}
......@@ -99,7 +99,7 @@ sv_selection_calc_simplification (SheetView const *sv)
GnmCellPos const *
sv_is_singleton_selected (SheetView const *sv)
{
#warning FIXME Should we be using the selection rather than the cursor?
#warning FIXME Should we be using the selection rather than the cursor?
if (sv->cursor.move_corner.col == sv->cursor.base_corner.col &&
sv->cursor.move_corner.row == sv->cursor.base_corner.row)
return &sv->cursor.move_corner;
......@@ -682,7 +682,7 @@ void
sv_selection_add_full (SheetView *sv,
int edit_col, int edit_row,
int base_col, int base_row,
int move_col, int move_row,
int move_col, int move_row,
GnmSelectionMode mode)
{
GnmRange *ss;
......@@ -706,7 +706,7 @@ void
sv_selection_add_range (SheetView *sv, GnmRange const *r)
{
sv_selection_add_full (sv, r->start.col, r->start.row,
r->start.col, r->start.row, r->end.col, r->end.row,
r->start.col, r->start.row, r->end.col, r->end.row,
GNM_SELECTION_MODE_ADD);
}
void
......
......@@ -47,7 +47,7 @@ void sv_selection_add_range (SheetView *sv, GnmRange const *range);
void sv_selection_add_full (SheetView *sv,
int edit_col, int edit_row,
int base_col, int base_row,
int move_col, int move_row,
int move_col, int move_row,
GnmSelectionMode mode);
void sv_selection_set (SheetView *sv, GnmCellPos const *edit,
int base_col, int base_row,
......
......@@ -485,8 +485,8 @@ scg_select_all (SheetControlGUI *scg)
wbcg_edit_finish (scg->wbcg, WBC_EDIT_REJECT, NULL);
sv_selection_reset (sv);
sv_selection_add_full (sv, sv->edit_pos.col, sv->edit_pos.row,
0, 0, gnm_sheet_get_last_col (sheet),
gnm_sheet_get_last_row (sheet),
0, 0, gnm_sheet_get_last_col (sheet),
gnm_sheet_get_last_row (sheet),
GNM_SELECTION_MODE_ADD);
}
sheet_update (sheet);
......@@ -532,7 +532,7 @@ scg_colrow_select (SheetControlGUI *scg, gboolean is_cols,
sv_selection_add_full (sv,
index, pane->first.row,
index, 0,
index, gnm_sheet_get_last_row (sv->sheet),
index, gnm_sheet_get_last_row (sv->sheet),
GNM_SELECTION_MODE_ADD);
} else {
GnmPane *pane =
......@@ -540,7 +540,7 @@ scg_colrow_select (SheetControlGUI *scg, gboolean is_cols,
sv_selection_add_full (sv,
pane->first.col, index,
0, index,
gnm_sheet_get_last_col (sv->sheet), index,
gnm_sheet_get_last_col (sv->sheet), index,
GNM_SELECTION_MODE_ADD);
}
}
......
......@@ -159,7 +159,7 @@ static gboolean
comment_view_leave_notify (GocItem *item, double x, double y)
{
scg_comment_unselect (GNM_PANE (item->canvas)->simple.scg,
CELL_COMMENT (sheet_object_view_get_so (SHEET_OBJECT_VIEW (item))));
CELL_COMMENT (sheet_object_view_get_so (SHEET_OBJECT_VIEW (item))));
return TRUE;
}
......
......@@ -1201,7 +1201,7 @@ gnm_sheet_resize_main (Sheet *sheet, int cols, int rows,
}
g_slist_free (sel);
if (!any)
sv_selection_add_pos (sv, 0, 0,
sv_selection_add_pos (sv, 0, 0,
GNM_SELECTION_MODE_ADD);
sv_make_cell_visible (sv, vis.col, vis.row, FALSE);
});
......
......@@ -335,7 +335,7 @@ gnm_align_h_get_type (void)
{GNM_HALIGN_CENTER, "GNM_HALIGN_CENTER", "center"},
{GNM_HALIGN_FILL, "GNM_HALIGN_FILL", "fill"},
{GNM_HALIGN_JUSTIFY, "GNM_HALIGN_JUSTIFY", "justify"},
{GNM_HALIGN_CENTER_ACROSS_SELECTION,
{GNM_HALIGN_CENTER_ACROSS_SELECTION,
"GNM_HALIGN_CENTER_ACROSS_SELECTION",
"across-selection"},
{GNM_HALIGN_DISTRIBUTED,
......@@ -358,7 +358,7 @@ gnm_align_v_get_type (void)
{GNM_VALIGN_BOTTOM, "GNM_VALIGN_BOTTOM", "bottom"},
{GNM_VALIGN_CENTER, "GNM_VALIGN_CENTER", "center"},
{GNM_VALIGN_JUSTIFY, "GNM_VALIGN_JUSTIFY", "justify"},
{GNM_VALIGN_DISTRIBUTED,
{GNM_VALIGN_DISTRIBUTED,
"GNM_VALIGN_DISTRIBUTED", "distributed"},
{ 0, NULL, NULL }
};
......@@ -452,7 +452,7 @@ gnm_font_init (void)
}
static void
delete_neg_font (GnmFont *sf, G_GNUC_UNUSED gpointer value,
delete_neg_font (GnmFont *sf, G_GNUC_UNUSED gpointer value,
G_GNUC_UNUSED gpointer user_data)
{
g_object_unref (sf->context);
......
......@@ -42,7 +42,7 @@ cb_exercise_pango (gpointer data)
if (state == 0) {
sv_selection_reset (sv);
sv_selection_add_full (sv, 0, 0, 0, 0, 40, STEP_SIZE*TEST_STEPS,
sv_selection_add_full (sv, 0, 0, 0, 0, 40, STEP_SIZE*TEST_STEPS,
GNM_SELECTION_MODE_ADD);
cmd_area_set_text (wbc, sv, "=rand()", NULL);
} else if (state < TEST_STEPS) {
......
......@@ -1334,8 +1334,8 @@ cb_darken_foreground_attributes (PangoAttribute *attribute,
static void
darken_foreground_attributes (PangoAttrList *attrs)
{
pango_attr_list_unref
(pango_attr_list_filter
pango_attr_list_unref
(pango_attr_list_filter
(attrs,
cb_darken_foreground_attributes,
NULL));
......@@ -4790,7 +4790,7 @@ wbc_gtk_create_status_area (WBCGtk *wbcg)
gtk_style_context_get_font (gtk_widget_get_style_context (wbcg->status_text), GTK_STATE_NORMAL),
"W") * 5, -1);
ebox = GET_GUI_ITEM ("auto_expr_event_box");
gtk_widget_override_background_color (GTK_WIDGET (ebox),
gtk_widget_override_background_color (GTK_WIDGET (ebox),
GTK_STATE_FLAG_NORMAL,
&white);
g_signal_connect (G_OBJECT (ebox),
......
......@@ -605,9 +605,9 @@ gnm_expr_entry_colour_ranges (GnmExprEntry *gee, int start, int end, GnmRangeRef
gchar const *name;
} colours[] = {{0x0, 0xFFFF, 0x0, "00:ff:00:ff"},
{0x0, 0x0, 0xFFFF, "00:00:ff:ff"},
{0xFFFF, 0x0, 0x0, "ff:00:00:ff"},
{0x0, 0x80FF, 0x80FF, "00:80:80:ff"},
{0xA0FF, 0xA0FF, 0x0, "a0:a0:00:ff"},
{0xFFFF, 0x0, 0x0, "ff:00:00:ff"},
{0x0, 0x80FF, 0x80FF, "00:80:80:ff"},
{0xA0FF, 0xA0FF, 0x0, "a0:a0:00:ff"},
{0xA0FF, 0x0, 0xA0FF, "a0:00:a0:ff"}};
PangoAttribute *at;
GnmRange r;
......@@ -632,22 +632,22 @@ gnm_expr_entry_colour_ranges (GnmExprEntry *gee, int start, int end, GnmRangeRef
NULL != (merge = gnm_sheet_merge_is_corner
(start_sheet, &r.start)))
r = *merge;
if (start_sheet == sheet)
if (start_sheet == sheet)
scg = gee->scg;
else {
WBCGtk *wbcg = scg_wbcg (gee->scg);
scg = wbcg_get_nth_scg (wbcg, start_sheet->index_in_wb);
}
SCG_FOREACH_PANE (scg, pane, gnm_pane_expr_cursor_bound_set
SCG_FOREACH_PANE (scg, pane, gnm_pane_expr_cursor_bound_set
(pane, &r, colours[colour].name););
}
at = pango_attr_foreground_new (colours[colour].red, colours[colour].green,
at = pango_attr_foreground_new (colours[colour].red, colours[colour].green,
colours[colour].blue);
at->start_index = start;
at->end_index = end;
pango_attr_list_change (*attrs, at);
}
......@@ -672,11 +672,11 @@ gee_scan_for_range (GnmExprEntry *gee)
do {
if (gli->token == RANGEREF) {
char const *text = gtk_entry_get_text (gee->entry);
char *rtext = g_strndup (text + gli->start,
char *rtext = g_strndup (text + gli->start,
gli->end - gli->start);
char const *tmp;
GnmRangeRef rr;
tmp = rangeref_parse (&rr, rtext,
tmp = rangeref_parse (&rr, rtext,
&gee->pp, gee_convs (gee));
if (tmp != rtext) {
gpointer val;
......@@ -697,7 +697,7 @@ gee_scan_for_range (GnmExprEntry *gee)
this_colour = GPOINTER_TO_INT (val);
insert_cursor = FALSE;
}
gnm_expr_entry_colour_ranges (gee, gli->start, gli->end, &rr,
gnm_expr_entry_colour_ranges (gee, gli->start, gli->end, &rr,
this_colour, &attrs, insert_cursor);
}
g_free (rtext);
......@@ -706,10 +706,10 @@ gee_scan_for_range (GnmExprEntry *gee)
g_hash_table_destroy (hash);
}
if (attrs)
g_object_set_data_full (G_OBJECT (gee->entry), "gnm:range-attributes", attrs,
g_object_set_data_full (G_OBJECT (gee->entry), "gnm:range-attributes", attrs,
(GDestroyNotify) pango_attr_list_unref);
else
g_object_set_data (G_OBJECT (gee->entry), "gnm:range-attributes", NULL);
g_object_set_data (G_OBJECT (gee->entry), "gnm:range-attributes", NULL);
}
static void
......
......@@ -1055,7 +1055,7 @@ xml_sax_print_print_range (GsfXMLIn *xin, xmlChar const **attrs)
pi = state->sheet->print_info;
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
if (xml_sax_attr_enum (attrs, "value", GNM_PRINT_RANGE_TYPE,
if (xml_sax_attr_enum (attrs, "value", GNM_PRINT_RANGE_TYPE,
&val))
print_info_set_printrange (pi, val);
}
......@@ -1592,16 +1592,16 @@ xml_sax_validation (GsfXMLIn *xin, xmlChar const **attrs)
state->validation.use_dropdown = FALSE;
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2) {
if (xml_sax_attr_enum (attrs, "Style",
GNM_VALIDATION_STYLE_TYPE,
if (xml_sax_attr_enum (attrs, "Style",
GNM_VALIDATION_STYLE_TYPE,
&dummy)) {
state->validation.style = dummy;
} else if (xml_sax_attr_enum (attrs, "Type",
GNM_VALIDATION_TYPE_TYPE,
} else if (xml_sax_attr_enum (attrs, "Type",
GNM_VALIDATION_TYPE_TYPE,
&dummy)) {
state->validation.type = dummy;
} else if (xml_sax_attr_enum (attrs, "Operator",
GNM_VALIDATION_OP_TYPE,
} else if (xml_sax_attr_enum (attrs, "Operator",
GNM_VALIDATION_OP_TYPE,
&dummy)) {
state->validation.op = dummy;
} else if (attr_eq (attrs[0], "Title")) {
......@@ -2738,7 +2738,7 @@ xml_sax_print_comments_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
if (xin->content->str == NULL || *xin->content->str == 0)
/* 1.11.x or later file */
return;
return;
xml_sax_must_have_sheet (state);
......@@ -2775,7 +2775,7 @@ xml_sax_print_errors_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
if (xin->content->str == NULL || *xin->content->str == 0)
/* 1.11.x or later file */
return;
return;
xml_sax_must_have_sheet (state);
......
......@@ -423,13 +423,13 @@ xml_write_print_info (GnmOutputXML *state, PrintInformation *pi)
xml_write_breaks (state, pi->page_breaks.h);
gsf_xml_out_start_element (state->output, GNM "comments");
gsf_xml_out_add_enum (state->output, "placement",
gsf_xml_out_add_enum (state->output, "placement",
GNM_PRINT_COMMENT_PLACEMENT_TYPE,
pi->comment_placement);
gsf_xml_out_end_element (state->output);
gsf_xml_out_start_element (state->output, GNM "errors");
gsf_xml_out_add_enum (state->output, "PrintErrorsAs",
gsf_xml_out_add_enum (state->output, "PrintErrorsAs",
GNM_PRINT_ERRORS_TYPE,
pi->error_display);
gsf_xml_out_end_element (state->output);
......@@ -468,33 +468,33 @@ xml_write_style (GnmOutputXML *state, GnmStyle const *style)
GNM_ALIGN_V_TYPE,
gnm_style_get_align_v (style));
if (gnm_style_is_element_set (style, MSTYLE_WRAP_TEXT))
gsf_xml_out_add_bool (state->output, "WrapText",
gsf_xml_out_add_bool (state->output, "WrapText",
gnm_style_get_wrap_text (style));
if (gnm_style_is_element_set (style, MSTYLE_SHRINK_TO_FIT))
gsf_xml_out_add_bool (state->output, "ShrinkToFit",
gsf_xml_out_add_bool (state->output, "ShrinkToFit",
gnm_style_get_shrink_to_fit (style));
if (gnm_style_is_element_set (style, MSTYLE_ROTATION))
gsf_xml_out_add_int (state->output, "Rotation",
gsf_xml_out_add_int (state->output, "Rotation",
gnm_style_get_rotation (style));
if (gnm_style_is_element_set (style, MSTYLE_PATTERN))
gsf_xml_out_add_int (state->output, "Shade",
gsf_xml_out_add_int (state->output, "Shade",
gnm_style_get_pattern (style));
if (gnm_style_is_element_set (style, MSTYLE_INDENT))
gsf_xml_out_add_int (state->output, "Indent", gnm_style_get_indent (style));
if (gnm_style_is_element_set (style, MSTYLE_CONTENTS_LOCKED))
gsf_xml_out_add_bool (state->output, "Locked",
gsf_xml_out_add_bool (state->output, "Locked",
gnm_style_get_contents_locked (style));
if (gnm_style_is_element_set (style, MSTYLE_CONTENTS_HIDDEN))
gsf_xml_out_add_bool (state->output, "Hidden",
gsf_xml_out_add_bool (state->output, "Hidden",
gnm_style_get_contents_hidden (style));
if (gnm_style_is_element_set (style, MSTYLE_FONT_COLOR))
gnm_xml_out_add_color (state->output, "Fore",
gnm_xml_out_add_color (state->output, "Fore",
gnm_style_get_font_color (style));
if (gnm_style_is_element_set (style, MSTYLE_COLOR_BACK))
gnm_xml_out_add_color (state->output, "Back",
gnm_xml_out_add_color (state->output, "Back",
gnm_style_get_back_color (style));
if (gnm_style_is_element_set (style, MSTYLE_COLOR_PATTERN))
gnm_xml_out_add_color (state->output, "PatternColor",
gnm_xml_out_add_color (state->output, "PatternColor",
gnm_style_get_pattern_color (style));
if (gnm_style_is_element_set (style, MSTYLE_FORMAT)) {
const char *fmt = go_format_as_XL (gnm_style_get_format (style));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment