[gnumeric] Whitespace fixes.
- From: Morten Welinder <mortenw src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnumeric] Whitespace fixes.
- Date: Tue, 12 May 2009 09:12:20 -0400 (EDT)
commit 3fd0b9fe2d0769b939249d5f4cb8c6537fef8a61
Author: Morten Welinder <terra gnome org>
Date: Tue May 12 09:12:04 2009 -0400
Whitespace fixes.
---
src/commands.c | 58 ++++++++++++------------
src/commands.h | 12 +++---
src/expr.c | 4 +-
src/func.c | 2 +-
src/gnm-so-filled.c | 14 +++---
src/gui-clipboard.c | 14 +++---
src/gui-util.c | 60 ++++++++++++------------
src/mathfunc.c | 2 +-
src/parser.y | 2 +-
src/print-cell.c | 6 +-
src/print-info.c | 12 +++---
src/print.c | 96 +++++++++++++++++++-------------------
src/sheet-control-gui.c | 8 ++--
src/sheet-object-cell-comment.c | 8 ++--
src/sheet-object-widget.c | 14 +++---
src/stf.c | 2 +-
16 files changed, 157 insertions(+), 157 deletions(-)
diff --git a/src/commands.c b/src/commands.c
index e48688c..d6a7b58 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -1338,7 +1338,7 @@ cmd_ins_del_colrow_redo (GnmCommand *cmd, WorkbookControl *wbc)
/* Trouble. */
return TRUE;
}
-
+
/* Ins/Del Row/Col re-ants things completely to account
* for the shift of col/rows. */
if (me->cutcopied != NULL && me->cut_copy_view != NULL) {
@@ -4622,7 +4622,7 @@ cmd_object_format_redo (GnmCommand *cmd, G_GNUC_UNUSED WorkbookControl *wbc)
me->first_time = FALSE;
else {
GObject *prev;
-
+
g_object_get (me->so, "style", &prev, NULL);
g_object_set (me->so, "style", me->style, NULL);
g_object_unref (me->style);
@@ -4919,7 +4919,7 @@ typedef struct {
MAKE_GNM_COMMAND (CmdSetComment, cmd_set_comment, NULL)
static gboolean
-cmd_set_comment_apply (Sheet *sheet, GnmCellPos *pos,
+cmd_set_comment_apply (Sheet *sheet, GnmCellPos *pos,
char const *text, PangoAttrList *attributes,
char const *author)
{
@@ -4957,7 +4957,7 @@ cmd_set_comment_undo (GnmCommand *cmd,
{
CmdSetComment *me = CMD_SET_COMMENT (cmd);
- return cmd_set_comment_apply (me->sheet, &me->pos,
+ return cmd_set_comment_apply (me->sheet, &me->pos,
me->old_text, me->old_attributes,
me->old_author);
}
@@ -4968,7 +4968,7 @@ cmd_set_comment_redo (GnmCommand *cmd,
{
CmdSetComment *me = CMD_SET_COMMENT (cmd);
- return cmd_set_comment_apply (me->sheet, &me->pos,
+ return cmd_set_comment_apply (me->sheet, &me->pos,
me->new_text, me->new_attributes,
me->new_author);
}
@@ -5007,7 +5007,7 @@ gboolean
cmd_set_comment (WorkbookControl *wbc,
Sheet *sheet, GnmCellPos const *pos,
char const *new_text,
- PangoAttrList *attr,
+ PangoAttrList *attr,
char const *new_author)
{
CmdSetComment *me;
@@ -5046,9 +5046,9 @@ cmd_set_comment (WorkbookControl *wbc,
me->sheet = sheet;
comment = sheet_get_comment (sheet, pos);
if (comment) {
- g_object_get (G_OBJECT (comment),
+ g_object_get (G_OBJECT (comment),
"text", &(me->old_text),
- "author", &(me->old_author),
+ "author", &(me->old_author),
"markup", &(me->old_attributes), NULL);
if (me->old_attributes != NULL)
pango_attr_list_ref (me->old_attributes);
@@ -5193,12 +5193,12 @@ cmd_analysis_tool_redo (GnmCommand *cmd, WorkbookControl *wbc)
}
if (me->newSheetObjects != NULL)
{
- GSList *l = g_slist_reverse
+ GSList *l = g_slist_reverse
(g_slist_copy (me->newSheetObjects));
dao_set_omit_so (me->dao, FALSE);
g_slist_foreach (l,
- (GFunc) cmd_analysis_tool_draw_old_so,
+ (GFunc) cmd_analysis_tool_draw_old_so,
me->dao);
g_slist_free (l);
}
@@ -6986,7 +6986,7 @@ cmd_hyperlink_redo (GnmCommand *cmd, WorkbookControl *wbc)
sheet_cell_set_value (cell, value_new_string (me->opt_content));
}
-
+
sheet_redraw_all (me->cmd.sheet, FALSE);
sheet_mark_dirty (me->cmd.sheet);
@@ -7035,11 +7035,11 @@ cb_cmd_hyperlink_find_cells (GnmCellIter const *iter, gpointer user)
GnmCell *cell = iter->cell;
if (cell == NULL)
- cell = sheet_cell_fetch (iter->pp.sheet,
- iter->pp.eval.col,
+ cell = sheet_cell_fetch (iter->pp.sheet,
+ iter->pp.eval.col,
iter->pp.eval.row);
- if (gnm_cell_is_empty (cell) &&
+ if (gnm_cell_is_empty (cell) &&
!gnm_cell_is_nonsingleton_array (cell))
*list = g_slist_prepend (*list, cell);
return NULL;
@@ -7097,9 +7097,9 @@ cmd_selection_hyperlink (WorkbookControl *wbc,
if (opt_content != NULL)
sheet_foreach_cell_in_range (me->cmd.sheet, CELL_ITER_ALL,
- r.start.col, r.start.row,
+ r.start.col, r.start.row,
r.end.col, r.end.row,
- cb_cmd_hyperlink_find_cells,
+ cb_cmd_hyperlink_find_cells,
&me->cells);
me->cmd.size += g_slist_length (me->cells)/2;
}
@@ -7111,7 +7111,7 @@ cmd_selection_hyperlink (WorkbookControl *wbc,
g_free (names);
} else
me->cmd.cmd_descriptor = g_strdup (opt_translated_name);
-
+
return command_push_undo (wbc, G_OBJECT (me));
}
@@ -7167,7 +7167,7 @@ static void
cmd_so_set_links_finalize (GObject *cmd)
{
CmdSOSetLink *me = CMD_SO_SET_LINKS (cmd);
-
+
if (me->output)
gnm_expr_top_unref (me->output);
if (me->content)
@@ -7177,8 +7177,8 @@ cmd_so_set_links_finalize (GObject *cmd)
gboolean
cmd_so_set_links (WorkbookControl *wbc,
- SheetObject *so,
- GnmExprTop const *output,
+ SheetObject *so,
+ GnmExprTop const *output,
GnmExprTop const *content)
{
CmdSOSetLink *me;
@@ -7217,7 +7217,7 @@ cmd_so_set_frame_label_redo (GnmCommand *cmd, G_GNUC_UNUSED WorkbookControl *wbc
{
CmdSOSetFrameLabel *me = CMD_SO_SET_FRAME_LABEL (cmd);
- sheet_widget_frame_set_label (me->so, me->new_label);
+ sheet_widget_frame_set_label (me->so, me->new_label);
return FALSE;
}
@@ -7236,7 +7236,7 @@ static void
cmd_so_set_frame_label_finalize (GObject *cmd)
{
CmdSOSetFrameLabel *me = CMD_SO_SET_FRAME_LABEL (cmd);
-
+
g_free (me->old_label);
me->old_label = NULL;
@@ -7248,7 +7248,7 @@ cmd_so_set_frame_label_finalize (GObject *cmd)
gboolean
cmd_so_set_frame_label (WorkbookControl *wbc,
- SheetObject *so,
+ SheetObject *so,
char *old_label, char *new_label )
{
CmdSOSetFrameLabel *me;
@@ -7307,7 +7307,7 @@ static void
cmd_so_set_checkbox_finalize (GObject *cmd)
{
CmdSOSetCheckbox *me = CMD_SO_SET_CHECKBOX (cmd);
-
+
if (me->new_link)
gnm_expr_top_unref (me->new_link);
if (me->old_link)
@@ -7319,7 +7319,7 @@ cmd_so_set_checkbox_finalize (GObject *cmd)
gboolean
cmd_so_set_checkbox (WorkbookControl *wbc,
- SheetObject *so, GnmExprTop const *link,
+ SheetObject *so, GnmExprTop const *link,
char *old_label, char *new_label)
{
CmdSOSetCheckbox *me;
@@ -7381,7 +7381,7 @@ cmd_so_set_adjustment_adj (CmdSOSetAdjustment *me)
double old_step = gtk_adjustment_get_step_increment (adj);
double old_page = gtk_adjustment_get_page_increment (adj);
- gtk_adjustment_configure (adj,
+ gtk_adjustment_configure (adj,
gtk_adjustment_get_value (adj),
me->old_lower,
me->old_upper,
@@ -7420,7 +7420,7 @@ static void
cmd_so_set_adjustment_finalize (GObject *cmd)
{
CmdSOSetAdjustment *me = CMD_SO_SET_ADJUSTMENT (cmd);
-
+
if (me->new_link)
gnm_expr_top_unref (me->new_link);
if (me->old_link)
@@ -7430,7 +7430,7 @@ cmd_so_set_adjustment_finalize (GObject *cmd)
gboolean
cmd_so_set_adjustment (WorkbookControl *wbc,
- SheetObject *so, GnmExprTop const *link,
+ SheetObject *so, GnmExprTop const *link,
int lower, int upper,
int step, int page,
char const *undo_label)
@@ -7442,7 +7442,7 @@ cmd_so_set_adjustment (WorkbookControl *wbc,
me = g_object_new (CMD_SO_SET_ADJUSTMENT_TYPE, NULL);
me->cmd.sheet = sheet_object_get_sheet (so);
me->cmd.size = 1;
- me->cmd.cmd_descriptor = g_strdup ((undo_label == NULL) ?
+ me->cmd.cmd_descriptor = g_strdup ((undo_label == NULL) ?
_("Configure Adjustment") : _(undo_label));
me->so = so;
me->new_link = link;
diff --git a/src/commands.h b/src/commands.h
index fea4b1b..16eac0d 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -174,18 +174,18 @@ gboolean cmd_so_set_value (WorkbookControl *wbc,
GnmValue *new_val,
Sheet *sheet);
-gboolean cmd_so_set_links (WorkbookControl *wbc, SheetObject *so,
+gboolean cmd_so_set_links (WorkbookControl *wbc, SheetObject *so,
GnmExprTop const *output, GnmExprTop const *content);
-gboolean cmd_so_set_frame_label (WorkbookControl *wbc, SheetObject *so,
+gboolean cmd_so_set_frame_label (WorkbookControl *wbc, SheetObject *so,
char *old_label, char *new_label);
-gboolean cmd_so_set_checkbox (WorkbookControl *wbc, SheetObject *so,
- GnmExprTop const *link,
+gboolean cmd_so_set_checkbox (WorkbookControl *wbc, SheetObject *so,
+ GnmExprTop const *link,
char *old_label, char *new_label);
-gboolean cmd_so_set_adjustment (WorkbookControl *wbc, SheetObject *so,
- GnmExprTop const *link,
+gboolean cmd_so_set_adjustment (WorkbookControl *wbc, SheetObject *so,
+ GnmExprTop const *link,
int lower, int upper,
int step, int page,
char const *undo_label);
diff --git a/src/expr.c b/src/expr.c
index e3e8e6b..017260c 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -324,7 +324,7 @@ gnm_expr_new_set (GnmExprList *set)
* @r: end range
*
* This function builds a range constructor or something simpler,
- * but equivalent, if the arguments allow it.
+ * but equivalent, if the arguments allow it.
*
* Note: this takes ownership of @l and @r and may delete them.
**/
@@ -1126,7 +1126,7 @@ gnm_expr_range_op (GnmExpr const *expr, GnmEvalPos const *ep,
switch (GNM_EXPR_GET_OPER (expr)) {
case GNM_EXPR_OP_RANGE_CTOR:
res_range = range_union (&a_range, &b_range);
- break;
+ break;
case GNM_EXPR_OP_INTERSECT:
/* 3D references not allowed. */
if (a_start != a_end || b_start != b_end)
diff --git a/src/func.c b/src/func.c
index 7c803e6..4d623b7 100644
--- a/src/func.c
+++ b/src/func.c
@@ -978,7 +978,7 @@ function_def_get_arg_name (GnmFunc const *fn_def, int arg_idx)
if (!fn_def->arg_names)
return NULL;
- translated_arguments = (strlen (fn_def->arg_names)>0
+ translated_arguments = (strlen (fn_def->arg_names)>0
? _(fn_def->arg_names)
: fn_def->arg_names);
uc = (strcmp (translated_arguments, fn_def->arg_names) == 0)
diff --git a/src/gnm-so-filled.c b/src/gnm-so-filled.c
index f6c2fa0..e2f9880 100644
--- a/src/gnm-so-filled.c
+++ b/src/gnm-so-filled.c
@@ -291,11 +291,11 @@ gnm_so_filled_draw_cairo (SheetObject const *so, cairo_t *cr,
/* Draw the text. */
if (sof->text != NULL && !sof->is_oval) {
PangoLayout *pl = pango_cairo_create_layout (cr);
- double pl_height = (height - sof->margin_pts.top
+ double pl_height = (height - sof->margin_pts.top
- sof->margin_pts.bottom) * PANGO_SCALE;
- double pl_width = (width - sof->margin_pts.left
+ double pl_width = (width - sof->margin_pts.left
- sof->margin_pts.right) * PANGO_SCALE;
- cairo_move_to (cr, sof->margin_pts.left,
+ cairo_move_to (cr, sof->margin_pts.left,
sof->margin_pts.top);
pango_layout_set_text (pl, sof->text, -1);
pango_layout_set_attributes (pl, sof->markup);
@@ -352,7 +352,7 @@ gnm_so_filled_write_xml_sax (SheetObject const *so, GsfXMLOut *output,
gsf_xml_out_add_cstr (output, "Label", sof->text);
if (sof->markup != NULL) {
GOFormat *fmt = go_format_new_markup (sof->markup, TRUE);
- gsf_xml_out_add_cstr (output, "LabelFormat",
+ gsf_xml_out_add_cstr (output, "LabelFormat",
go_format_as_XL (fmt));
go_format_unref (fmt);
}
@@ -393,9 +393,9 @@ gnm_so_filled_prep_sax_parser (SheetObject *so, GsfXMLIn *xin,
if (attr_eq (attrs[0], "Label"))
g_object_set (G_OBJECT (sof), "text", attrs[1], NULL);
else if (attr_eq (attrs[0], "LabelFormat")) {
- GOFormat * fmt = go_format_new_from_XL (attrs[1]);
- g_object_set (G_OBJECT (sof),
- "markup", go_format_get_markup (fmt),
+ GOFormat * fmt = go_format_new_from_XL (attrs[1]);
+ g_object_set (G_OBJECT (sof),
+ "markup", go_format_get_markup (fmt),
NULL);
go_format_unref (fmt);
} else if (gnm_xml_attr_int (attrs, "Type", &type))
diff --git a/src/gui-clipboard.c b/src/gui-clipboard.c
index 906d227..15c16bd 100644
--- a/src/gui-clipboard.c
+++ b/src/gui-clipboard.c
@@ -238,7 +238,7 @@ utf8_content_received (GtkClipboard *clipboard, const gchar *text,
;
} else {
content = text_to_cell_region (wbcg, text, strlen(text), "UTF-8", TRUE);
- }
+ }
if (content) {
/*
* if the conversion from the X selection -> a cellregion
@@ -553,8 +553,8 @@ table_cellregion_write (GOCmdContext *ctx, GnmCellRegion *cr,
r.end.col = cr->cols - 1;
r.end.row = cr->rows - 1;
- paste_target_init (&pt, sheet, &r,
- PASTE_AS_VALUES | PASTE_FORMATS |
+ paste_target_init (&pt, sheet, &r,
+ PASTE_AS_VALUES | PASTE_FORMATS |
PASTE_COMMENTS | PASTE_OBJECTS);
if (clipboard_paste_region (cr, &pt, ctx) == FALSE) {
go_file_saver_save (saver, ioc, wb_view, output);
@@ -884,7 +884,7 @@ target_list_to_entries (GtkTargetList *target_list, int *n_entries)
}
/* Restrict the set of formats offered to clipboard manager. */
-/* We include bmp in the whitelist because that's the only image format
+/* We include bmp in the whitelist because that's the only image format
* we share with OOo over clipboard (!) */
static void
set_clipman_targets (GdkDisplay *disp, GtkTargetEntry *targets, int n_targets)
@@ -907,11 +907,11 @@ set_clipman_targets (GdkDisplay *disp, GtkTargetEntry *targets, int n_targets)
GtkTargetEntry *t, *wt, *t_allowed;
for (t = targets; t - targets < n_targets; t++) {
- for (wt = clipman_whitelist;
+ for (wt = clipman_whitelist;
wt - clipman_whitelist < n_whitelist; wt++) {
if (strcmp(t->target, wt->target) == 0) {
- gtk_target_list_add
- (tl, gdk_atom_intern (t->target, FALSE),
+ gtk_target_list_add
+ (tl, gdk_atom_intern (t->target, FALSE),
t->flags, t->info);
break;
}
diff --git a/src/gui-util.c b/src/gui-util.c
index c65c1a4..c92464f 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -259,7 +259,7 @@ gnumeric_keyed_dialog (WBCGtk *wbcg, GtkWindow *dialog, char const *key)
allocation = h ? g_hash_table_lookup (h, key) : NULL;
/* TECHOLOGY PREVIEW -- ZOOM & COMMENT DIALOG ONLY. */
- if ((strcmp (key, "zoom-dialog") == 0) ||
+ if ((strcmp (key, "zoom-dialog") == 0) ||
(strcmp (key, "cell-comment-dialog") == 0)) {
if (allocation) {
#if 0
@@ -651,7 +651,7 @@ gnumeric_textbuffer_get_text (GtkTextBuffer *buf)
char *
gnumeric_textview_get_text (GtkTextView *text_view)
{
- return gnumeric_textbuffer_get_text
+ return gnumeric_textbuffer_get_text
(gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view)));
}
@@ -664,7 +664,7 @@ gnumeric_textview_set_text (GtkTextView *text_view, char const *txt)
}
static gboolean
-gnm_load_pango_attributes_into_buffer_filter (PangoAttribute *attribute,
+gnm_load_pango_attributes_into_buffer_filter (PangoAttribute *attribute,
G_GNUC_UNUSED gpointer data)
{
return ((PANGO_ATTR_FOREGROUND == attribute->klass->type) ||
@@ -672,7 +672,7 @@ gnm_load_pango_attributes_into_buffer_filter (PangoAttribute *attribute,
(PANGO_ATTR_RISE == attribute->klass->type));
}
static gboolean
-gnm_load_pango_attributes_into_buffer_named_filter (PangoAttribute *attribute,
+gnm_load_pango_attributes_into_buffer_named_filter (PangoAttribute *attribute,
G_GNUC_UNUSED gpointer data)
{
return ((PANGO_ATTR_STYLE == attribute->klass->type) ||
@@ -687,7 +687,7 @@ gnm_load_pango_attributes_into_buffer_named_filter (PangoAttribute *attribute,
#define PANGO_WEIGHT_ULTRAHEAVY 1000
#endif
-void
+void
gnm_create_std_tags_for_buffer (GtkTextBuffer *buffer)
{
gtk_text_buffer_create_tag (buffer, "PANGO_STYLE_NORMAL", "style", PANGO_STYLE_NORMAL,
@@ -723,26 +723,26 @@ gnm_create_std_tags_for_buffer (GtkTextBuffer *buffer)
}
-void
-gnm_load_pango_attributes_into_buffer (PangoAttrList *markup, GtkTextBuffer *buffer)
+void
+gnm_load_pango_attributes_into_buffer (PangoAttrList *markup, GtkTextBuffer *buffer)
{
PangoAttrIterator * iter;
PangoAttrList *copied_markup;
PangoAttrList *our_markup;
if (markup == NULL)
- return;
+ return;
/* For some styles we create named tags. The names are taken from the Pango enums */
copied_markup = pango_attr_list_copy (markup);
- our_markup = pango_attr_list_filter (copied_markup,
- gnm_load_pango_attributes_into_buffer_named_filter,
+ our_markup = pango_attr_list_filter (copied_markup,
+ gnm_load_pango_attributes_into_buffer_named_filter,
NULL);
pango_attr_list_unref (copied_markup);
if (our_markup != NULL) {
iter = pango_attr_list_get_iterator (our_markup);
-
+
do {
GSList *attr = pango_attr_iterator_get_attrs (iter);
if (attr != NULL) {
@@ -762,24 +762,24 @@ gnm_load_pango_attributes_into_buffer (PangoAttrList *markup, GtkTextBuffer *bu
switch (attribute->klass->type) {
case PANGO_ATTR_STYLE:
- name = (((PangoAttrInt *)attribute)->value
- == PANGO_STYLE_NORMAL)
+ name = (((PangoAttrInt *)attribute)->value
+ == PANGO_STYLE_NORMAL)
? "PANGO_STYLE_NORMAL" :
"PANGO_STYLE_ITALIC";
- tag = gtk_text_tag_table_lookup
- (gtk_text_buffer_get_tag_table (buffer),
+ tag = gtk_text_tag_table_lookup
+ (gtk_text_buffer_get_tag_table (buffer),
name);
- gtk_text_buffer_apply_tag (buffer, tag,
+ gtk_text_buffer_apply_tag (buffer, tag,
&start_iter, &end_iter);
break;
case PANGO_ATTR_STRIKETHROUGH:
name = (((PangoAttrInt *)attribute)->value) ?
"PANGO_STRIKETHROUGH_TRUE" :
"PANGO_STRIKETHROUGH_FALSE";
- tag = gtk_text_tag_table_lookup
- (gtk_text_buffer_get_tag_table (buffer),
+ tag = gtk_text_tag_table_lookup
+ (gtk_text_buffer_get_tag_table (buffer),
name);
- gtk_text_buffer_apply_tag (buffer, tag,
+ gtk_text_buffer_apply_tag (buffer, tag,
&start_iter, &end_iter);
break;
case PANGO_ATTR_WEIGHT:
@@ -831,13 +831,13 @@ gnm_load_pango_attributes_into_buffer (PangoAttrList *markup, GtkTextBuffer *bu
/* For other styles (that are not at true/false type styles) we use unnamed styles */
copied_markup = pango_attr_list_copy (markup);
- our_markup = pango_attr_list_filter (copied_markup,
- gnm_load_pango_attributes_into_buffer_filter,
+ our_markup = pango_attr_list_filter (copied_markup,
+ gnm_load_pango_attributes_into_buffer_filter,
NULL);
pango_attr_list_unref (copied_markup);
if (our_markup != NULL) {
iter = pango_attr_list_get_iterator (our_markup);
-
+
do {
GSList *attr = pango_attr_iterator_get_attrs (iter);
if (attr != NULL) {
@@ -850,24 +850,24 @@ gnm_load_pango_attributes_into_buffer (PangoAttrList *markup, GtkTextBuffer *bu
PangoAttribute *attribute = ptr->data;
switch (attribute->klass->type) {
case PANGO_ATTR_FOREGROUND:
- string = pango_color_to_string
+ string = pango_color_to_string
(&((PangoAttrColor *)attribute)->color);
- g_object_set (G_OBJECT (tag),
+ g_object_set (G_OBJECT (tag),
"foreground", string,
"foreground-set", TRUE,
NULL);
g_free (string);
break;
case PANGO_ATTR_UNDERLINE:
- g_object_set (G_OBJECT (tag),
- "underline",
+ g_object_set (G_OBJECT (tag),
+ "underline",
((PangoAttrInt *)attribute)->value,
"underline-set", TRUE,
NULL);
break;
case PANGO_ATTR_RISE:
- g_object_set (G_OBJECT (tag),
- "rise",
+ g_object_set (G_OBJECT (tag),
+ "rise",
((PangoAttrInt *)attribute)->value,
"rise-set", TRUE,
NULL);
@@ -939,8 +939,8 @@ gnm_get_pango_attributes_from_buffer (GtkTextBuffer *buffer)
GtkTextIter start;
gchar *text = gnumeric_textbuffer_get_text (buffer);
- gtk_text_buffer_get_start_iter (buffer, &start);
-
+ gtk_text_buffer_get_start_iter (buffer, &start);
+
while (!gtk_text_iter_is_end (&start)) {
if (gtk_text_iter_begins_tag (&start, NULL)) {
GSList *ptr, *l = gtk_text_iter_get_toggled_tags (&start, TRUE);
diff --git a/src/mathfunc.c b/src/mathfunc.c
index 2a93624..623c0ba 100644
--- a/src/mathfunc.c
+++ b/src/mathfunc.c
@@ -7335,7 +7335,7 @@ random_landau (void)
{
static gnm_float F[983] = {
0.0000000, /*
- * Add empty element [0] to account for difference
+ * Add empty element [0] to account for difference
* between C and Fortran convention for lower bound.
*/
00.000000, 00.000000, 00.000000, 00.000000, 00.000000,
diff --git a/src/parser.y b/src/parser.y
index c76828c..7e11a79 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -253,7 +253,7 @@ fold_negative_constant (GnmExpr *expr)
{
if (expr && GNM_EXPR_GET_OPER (expr) == GNM_EXPR_OP_CONSTANT) {
GnmValue *v = (GnmValue *)expr->constant.value;
-
+
if (VALUE_IS_FLOAT (v)) {
gnm_float f = value_get_as_float (v);
expr->constant.value = value_new_float (0 - f);
diff --git a/src/print-cell.c b/src/print-cell.c
index 95bcfe6..f02c383 100644
--- a/src/print-cell.c
+++ b/src/print-cell.c
@@ -128,8 +128,8 @@ print_cell_gtk (GnmCell const *cell, GnmStyle const *mstyle,
lines;
lines = lines->next, li++) {
cairo_save (context);
- cairo_move_to (context,
- PANGO_PIXELS (x + li->dx),
+ cairo_move_to (context,
+ PANGO_PIXELS (x + li->dx),
PANGO_PIXELS (- y + li->dy));
cairo_rotate (context, rv->rotation * (-M_PI / 180));
pango_cairo_show_layout_line (context, lines->data);
@@ -265,7 +265,7 @@ gnm_gtk_print_cell_range (cairo_t *context,
{
ColRowInfo const *ri = NULL, *next_ri = NULL;
int const dir = sheet->text_is_rtl ? -1 : 1;
- float const hscale = sheet->display_formulas ? 2 : 1;
+ float const hscale = sheet->display_formulas ? 2 : 1;
int start_row, start_col, end_col, end_row;
GnmStyleRow sr, next_sr;
diff --git a/src/print-info.c b/src/print-info.c
index eeb5554..cb08b84 100644
--- a/src/print-info.c
+++ b/src/print-info.c
@@ -51,7 +51,7 @@ print_hf_new (char const *left_side_format,
char const *right_side_format)
{
PrintHF *hf = g_new0 (PrintHF, 1);
- hf->left_format = g_strdup (left_side_format ?
+ hf->left_format = g_strdup (left_side_format ?
left_side_format : "");
hf->middle_format = g_strdup (middle_format ?
middle_format : "");
@@ -444,21 +444,21 @@ render_cell (GString *target, HFRenderInfo *info, char const *args)
GnmParsePos ppos;
parse_pos_init (&ppos, info->sheet->workbook, (Sheet *)info->sheet, 0, 0);
- tmp = rangeref_parse
+ tmp = rangeref_parse
(&ref, args, &ppos, sheet_get_conventions (info->sheet));
if (tmp == NULL || tmp == args) {
gnm_cellref_init (&ref.a, (Sheet *)(info->sheet), 0, 0, FALSE);
}
if (ref.a.row_relative)
- ref.a.row += (use_repeating ?
+ ref.a.row += (use_repeating ?
info->top_repeating.row : info->page_area.start.row);
if (ref.a.col_relative)
- ref.a.col += (use_repeating ?
+ ref.a.col += (use_repeating ?
info->top_repeating.col : info->page_area.start.col);
- val = sheet_cell_get_value
- (ref.a.sheet ? ref.a.sheet : (Sheet *)(info->sheet),
+ val = sheet_cell_get_value
+ (ref.a.sheet ? ref.a.sheet : (Sheet *)(info->sheet),
ref.a.col, ref.a.row);
if (val != NULL) {
char const *value;
diff --git a/src/print.c b/src/print.c
index a716169..e34ff19 100644
--- a/src/print.c
+++ b/src/print.c
@@ -342,13 +342,13 @@ ensure_decoration_layout (GtkPrintContext *context)
* the rectangle.
*/
static void
-print_hf_element (GtkPrintContext *context, cairo_t *cr, Sheet const *sheet,
+print_hf_element (GtkPrintContext *context, cairo_t *cr, Sheet const *sheet,
char const *format,
- PangoAlignment side, gdouble width, gboolean align_bottom,
+ PangoAlignment side, gdouble width, gboolean align_bottom,
HFRenderInfo *hfi)
{
PangoLayout *layout;
-
+
gdouble text_height = 0.;
char *text;
@@ -356,25 +356,25 @@ print_hf_element (GtkPrintContext *context, cairo_t *cr, Sheet const *sheet,
return;
text = hf_format_render (format, hfi, HF_RENDER_PRINT);
-
+
if (text == NULL)
return;
layout = ensure_decoration_layout (context);
-
+
pango_layout_set_text (layout, text, -1);
pango_layout_set_width (layout, width * PANGO_SCALE);
pango_layout_set_alignment (layout, side);
-
+
if (align_bottom) {
gint layout_height = 0;
pango_layout_get_size (layout, NULL, &layout_height);
text_height = (gdouble)layout_height / PANGO_SCALE;
}
-
+
cairo_move_to (cr, 0., - text_height);
pango_cairo_show_layout (cr, layout);
-
+
g_object_unref (layout);
g_free(text);
}
@@ -389,7 +389,7 @@ print_hf_element (GtkPrintContext *context, cairo_t *cr, Sheet const *sheet,
*
*/
static void
-print_hf_line (GtkPrintContext *context, cairo_t *cr, Sheet const *sheet,
+print_hf_line (GtkPrintContext *context, cairo_t *cr, Sheet const *sheet,
PrintHF const *hf, gboolean align_bottom, gdouble width, HFRenderInfo *hfi)
{
print_hf_element (context, cr, sheet, hf->left_format, PANGO_ALIGN_LEFT, width, align_bottom, hfi);
@@ -458,11 +458,11 @@ print_page (GtkPrintOperation *operation,
main_width = sheet_col_get_distance_pts (sheet, gsr->range.start.col,
gsr->range.end.col + 1);
if (gsr->n_rep_rows > 0)
- rep_row_height = sheet_row_get_distance_pts
+ rep_row_height = sheet_row_get_distance_pts
(sheet, gsr->first_rep_rows,
gsr->first_rep_rows + gsr->n_rep_rows);
if (gsr->n_rep_cols > 0)
- rep_col_width = sheet_col_get_distance_pts
+ rep_col_width = sheet_col_get_distance_pts
(sheet, gsr->first_rep_cols,
gsr->first_rep_cols + gsr->n_rep_cols);
if ((gsr->n_rep_rows > 0) || (gsr->n_rep_cols > 0)) {
@@ -475,20 +475,20 @@ print_page (GtkPrintOperation *operation,
print_width = main_width + row_header_width + rep_col_width;
/* printing header */
-
+
if (edge_to_below_header > header) {
cairo_save (cr);
- print_hf_line (context, cr, sheet, pinfo->header,
+ print_hf_line (context, cr, sheet, pinfo->header,
FALSE, width, pi->hfi);
cairo_restore (cr);
}
-
+
/* printing footer */
-
+
if (edge_to_above_footer > footer) {
cairo_save (cr);
cairo_translate (cr, 0, height + (edge_to_below_header - header) + (edge_to_above_footer - footer));
- print_hf_line (context, cr, sheet, pinfo->footer, TRUE, width,
+ print_hf_line (context, cr, sheet, pinfo->footer, TRUE, width,
pi->hfi);
cairo_restore (cr);
}
@@ -513,22 +513,22 @@ print_page (GtkPrintOperation *operation,
if (sheet->print_info->print_titles) {
cairo_save (cr);
if (gsr->n_rep_cols > 0) {
- print_page_col_headers (context, pi, cr, sheet,
- &r_repeating_intersect,
+ print_page_col_headers (context, pi, cr, sheet,
+ &r_repeating_intersect,
row_header_width, col_header_height);
cairo_translate (cr, dir * rep_col_width, 0 );
}
- print_page_col_headers (context, pi, cr, sheet, &gsr->range,
+ print_page_col_headers (context, pi, cr, sheet, &gsr->range,
row_header_width, col_header_height);
cairo_restore (cr);
cairo_save (cr);
if (gsr->n_rep_rows > 0) {
- print_page_row_headers (context, pi, cr, sheet,
- &r_repeating_intersect,
+ print_page_row_headers (context, pi, cr, sheet,
+ &r_repeating_intersect,
row_header_width, col_header_height);
cairo_translate (cr, 0, rep_row_height);
}
- print_page_row_headers (context, pi, cr, sheet, &gsr->range,
+ print_page_row_headers (context, pi, cr, sheet, &gsr->range,
row_header_width, col_header_height);
cairo_restore (cr);
cairo_translate (cr, dir * row_header_width, col_header_height);
@@ -537,8 +537,8 @@ print_page (GtkPrintOperation *operation,
/* printing repeated row/col intersect */
if ((gsr->n_rep_rows > 0) && (gsr->n_rep_cols > 0)) {
- print_page_cells (context, pi, cr, sheet,
- &r_repeating_intersect,
+ print_page_cells (context, pi, cr, sheet,
+ &r_repeating_intersect,
dir * GNM_COL_MARGIN, -GNM_ROW_MARGIN);
}
@@ -551,7 +551,7 @@ print_page (GtkPrintOperation *operation,
cairo_save (cr);
if (gsr->n_rep_cols > 0)
cairo_translate (cr, dir * rep_col_width, 0 );
- print_page_cells (context, pi, cr, sheet, &r,
+ print_page_cells (context, pi, cr, sheet, &r,
dir * GNM_COL_MARGIN, -GNM_ROW_MARGIN);
cairo_restore (cr);
cairo_translate (cr, 0, rep_row_height );
@@ -563,14 +563,14 @@ print_page (GtkPrintOperation *operation,
GnmRange r;
range_init (&r, gsr->first_rep_cols, gsr->range.start.row,
gsr->first_rep_cols + gsr->n_rep_cols - 1, gsr->range.end.row);
- print_page_cells (context, pi, cr, sheet, &r,
+ print_page_cells (context, pi, cr, sheet, &r,
dir * GNM_COL_MARGIN, -GNM_ROW_MARGIN);
cairo_translate (cr, dir * rep_col_width, 0 );
}
/* printing page content */
- print_page_cells (context, pi, cr, sheet, &gsr->range,
+ print_page_cells (context, pi, cr, sheet, &gsr->range,
dir * GNM_COL_MARGIN, -GNM_ROW_MARGIN);
cairo_restore (cr);
@@ -627,7 +627,7 @@ adjust_repetition (Sheet const *sheet,
*first_rep_used = first_rep;
if (i - first_rep < n_rep) {
*n_rep_used = i - first_rep;
- *repeating_used = sheet_get_distance_pts
+ *repeating_used = sheet_get_distance_pts
(sheet, first_rep, first_rep + *n_rep_used);
} else {
*repeating_used = repeating;
@@ -636,7 +636,7 @@ adjust_repetition (Sheet const *sheet,
}
}
-static gint
+static gint
paginate (GSList **paginationInfo,
Sheet const *sheet,
gint start, gint end,
@@ -654,12 +654,12 @@ paginate (GSList **paginationInfo,
first_rep = repeat_start;
n_rep = repeat_end - first_rep + 1;
repeating = sheet_get_distance_pts (sheet, first_rep, first_rep + n_rep);
- }
+ }
while (rc <= end) {
int count;
PaginationInfo *item;
-
+
gdouble repeating_used = 0.;
gint n_rep_used = 0, first_rep_used = 0;
@@ -671,9 +671,9 @@ paginate (GSList **paginationInfo,
sheet_get_distance_pts);
count = compute_group (sheet, rc, end,
- usable - repeating_used,
+ usable - repeating_used,
get_info);
-
+
if (paginationInfo) {
item = g_new (PaginationInfo,1);
item->rc = rc;
@@ -721,7 +721,7 @@ compute_scale_fit_to (Sheet const *sheet,
/* If the repeating columns are not included we should add them */
if (repeat && (repeat_start < start))
- extent += get_distance_pts (sheet, repeat_start,
+ extent += get_distance_pts (sheet, repeat_start,
(repeat_end < start) ? (repeat_end + 1) : start);
/* This means to take whatever space is needed. */
@@ -830,11 +830,11 @@ compute_sheet_pages_down_then_across (PrintingInstance * pi,
while (r_list) {
PaginationInfo *r_info = r_list->data;
-
+
range_init (&range, COL_FIT (c_info->rc), ROW_FIT (r_info->rc),
COL_FIT (c_info->rc + c_info->count - 1),
ROW_FIT (r_info->rc + r_info->count - 1));
- compute_sheet_pages_add_range (pi, sheet, &range,
+ compute_sheet_pages_add_range (pi, sheet, &range,
c_info->n_rep, r_info->n_rep,
c_info->first_rep, r_info->first_rep);
r_list = r_list->next;
@@ -858,11 +858,11 @@ compute_sheet_pages_across_then_down (PrintingInstance * pi,
while (c_list) {
PaginationInfo *c_info = c_list->data;
-
+
range_init (&range, COL_FIT (c_info->rc), ROW_FIT (r_info->rc),
COL_FIT (c_info->rc + c_info->count - 1),
ROW_FIT (r_info->rc + r_info->count - 1));
- compute_sheet_pages_add_range (pi, sheet, &range,
+ compute_sheet_pages_add_range (pi, sheet, &range,
c_info->n_rep, r_info->n_rep,
c_info->first_rep, r_info->first_rep);
c_list = c_list->next;
@@ -976,17 +976,17 @@ compute_sheet_pages (GtkPrintContext *context,
usable_x = page_width / px;
usable_y = page_height / py;
- paginate (&column_pagination, sheet, r.start.col, r.end.col,
+ paginate (&column_pagination, sheet, r.start.col, r.end.col,
usable_x - row_header_width,
repeat_left_use, repeat_left_start, repeat_left_end,
sheet_col_get_distance_pts, sheet_col_get_info);
- paginate (&row_pagination, sheet, r.start.row, r.end.row,
+ paginate (&row_pagination, sheet, r.start.row, r.end.row,
usable_y - col_header_height,
repeat_top_use, repeat_top_start, repeat_top_end,
sheet_row_get_distance_pts, sheet_row_get_info);
if (sheet->print_info->print_across_then_down)
- compute_sheet_pages_across_then_down (pi, sheet,
+ compute_sheet_pages_across_then_down (pi, sheet,
column_pagination,row_pagination);
else
compute_sheet_pages_down_then_across (pi, sheet,
@@ -994,7 +994,7 @@ compute_sheet_pages (GtkPrintContext *context,
go_slist_free_custom (column_pagination, g_free);
go_slist_free_custom (row_pagination, g_free);
-
+
return FALSE;
}
@@ -1025,7 +1025,7 @@ compute_pages (GtkPrintOperation *operation,
if (sheet->print_info->do_not_print)
continue;
if (!sheet_is_visible(sheet))
- continue;
+ continue;
compute_sheet_pages_add_sheet (pi, sheet,
FALSE, FALSE);
}
@@ -1138,7 +1138,7 @@ gnm_paginate_cb (GtkPrintOperation *operation,
if (compute_sheet_pages (context, pi, spi)) {
gtk_print_operation_cancel (operation);
- return TRUE;
+ return TRUE;
}
return FALSE;
@@ -1266,13 +1266,13 @@ workbook_visible_sheet_count (Workbook *wb)
guint i;
guint n = workbook_sheet_count (wb);
guint count = 0;
-
+
for (i = 0; i < n; i++) {
Sheet *sheet = workbook_sheet_by_index (wb, i);
if (sheet_is_visible(sheet))
- count++;
- }
- return count;
+ count++;
+ }
+ return count;
}
static GObject*
diff --git a/src/sheet-control-gui.c b/src/sheet-control-gui.c
index 49ddfad..870b35f 100644
--- a/src/sheet-control-gui.c
+++ b/src/sheet-control-gui.c
@@ -862,9 +862,9 @@ gnm_pane_set_top_left (GnmPane *pane,
gboolean changed = FALSE;
int col_offset, row_offset;
- g_return_if_fail (0 <= col &&
+ g_return_if_fail (0 <= col &&
col < gnm_sheet_get_max_cols (scg_sheet (pane->simple.scg)));
- g_return_if_fail (0 <= row &&
+ g_return_if_fail (0 <= row &&
row < gnm_sheet_get_max_rows (scg_sheet (pane->simple.scg)));
if (pane->first.col != col || force_scroll) {
@@ -2520,10 +2520,10 @@ scg_comment_display (SheetControlGUI *scg, GnmComment *cc)
if (comment_author != NULL) {
GtkTextIter iter;
gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
- gtk_text_buffer_insert_with_tags_by_name
+ gtk_text_buffer_insert_with_tags_by_name
(buffer, &iter, comment_author, -1,
"PANGO_WEIGHT_BOLD", NULL);
- gtk_text_buffer_insert_with_tags_by_name
+ gtk_text_buffer_insert_with_tags_by_name
(buffer, &iter, ":\n", -1, "PANGO_WEIGHT_BOLD", NULL);
}
diff --git a/src/sheet-object-cell-comment.c b/src/sheet-object-cell-comment.c
index 8efa495..a6e5056 100644
--- a/src/sheet-object-cell-comment.c
+++ b/src/sheet-object-cell-comment.c
@@ -295,7 +295,7 @@ cell_comment_write_xml_sax (SheetObject const *so, GsfXMLOut *output,
gsf_xml_out_add_cstr (output, "Text", cc->text);
if (NULL != cc->markup) {
GOFormat *fmt = go_format_new_markup (cc->markup, TRUE);
- gsf_xml_out_add_cstr (output, "TextFormat",
+ gsf_xml_out_add_cstr (output, "TextFormat",
go_format_as_XL (fmt));
go_format_unref (fmt);
}
@@ -315,9 +315,9 @@ cell_comment_prep_sax_parser (SheetObject *so, GsfXMLIn *xin,
else if (!strcmp (attrs[0], "Author"))
cc->author = g_strdup (attrs[1]);
else if (!strcmp (attrs[0], "TextFormat")) {
- GOFormat * fmt = go_format_new_from_XL (attrs[1]);
- g_object_set (G_OBJECT (cc),
- "markup", go_format_get_markup (fmt),
+ GOFormat * fmt = go_format_new_from_XL (attrs[1]);
+ g_object_set (G_OBJECT (cc),
+ "markup", go_format_get_markup (fmt),
NULL);
go_format_unref (fmt);
}
diff --git a/src/sheet-object-widget.c b/src/sheet-object-widget.c
index b8493a6..6b3be07 100644
--- a/src/sheet-object-widget.c
+++ b/src/sheet-object-widget.c
@@ -447,7 +447,7 @@ cb_frame_config_ok_clicked (GtkWidget *button, FrameConfigState *state)
gchar const *text = gtk_entry_get_text(GTK_ENTRY(state->label));
cmd_so_set_frame_label (WORKBOOK_CONTROL (state->wbcg),
- SHEET_OBJECT (state->swf),
+ SHEET_OBJECT (state->swf),
g_strdup (state->old_label), g_strdup (text));
gtk_widget_destroy (state->dialog);
}
@@ -818,7 +818,7 @@ sheet_widget_adjustment_get_link (SheetObject *so)
{
SheetWidgetAdjustment *swa = SHEET_WIDGET_ADJUSTMENT (so);
GnmExprTop const *texpr = swa->dep.texpr;
-
+
if (texpr)
gnm_expr_top_ref (texpr);
@@ -945,7 +945,7 @@ typedef struct {
GtkWidget *max;
GtkWidget *inc;
GtkWidget *page;
-
+
char *undo_label;
GtkWidget *old_focus;
@@ -1000,7 +1000,7 @@ cb_adjustment_config_ok_clicked (GtkWidget *button, AdjustmentConfigState *state
parse_pos_init_sheet (&pp, so->sheet),
NULL, FALSE, GNM_EXPR_PARSE_DEFAULT);
- cmd_so_set_adjustment (WORKBOOK_CONTROL (state->wbcg), so,
+ cmd_so_set_adjustment (WORKBOOK_CONTROL (state->wbcg), so,
texpr,
gtk_spin_button_get_value_as_int (
GTK_SPIN_BUTTON (state->min)),
@@ -1644,7 +1644,7 @@ cb_checkbox_config_ok_clicked (GtkWidget *button, CheckboxConfigState *state)
NULL, FALSE, GNM_EXPR_PARSE_DEFAULT);
gchar const *text = gtk_entry_get_text(GTK_ENTRY(state->label));
- cmd_so_set_checkbox (WORKBOOK_CONTROL (state->wbcg), so,
+ cmd_so_set_checkbox (WORKBOOK_CONTROL (state->wbcg), so,
texpr, g_strdup (state->old_label), g_strdup (text));
gtk_widget_destroy (state->dialog);
@@ -1826,7 +1826,7 @@ sheet_widget_checkbox_get_link (SheetObject *so)
{
SheetWidgetCheckbox *swc = SHEET_WIDGET_CHECKBOX (so);
GnmExprTop const *texpr = swc->dep.texpr;
-
+
if (texpr)
gnm_expr_top_ref (texpr);
@@ -2211,7 +2211,7 @@ list_content_eval (GnmDependent *dep)
if (dep->texpr != NULL) {
v = gnm_expr_top_eval (dep->texpr,
eval_pos_init_dep (&ep, dep),
- GNM_EXPR_EVAL_PERMIT_NON_SCALAR |
+ GNM_EXPR_EVAL_PERMIT_NON_SCALAR |
GNM_EXPR_EVAL_PERMIT_EMPTY);
}
model = gtk_list_store_new (1, G_TYPE_STRING);
diff --git a/src/stf.c b/src/stf.c
index c9852d2..955acff 100644
--- a/src/stf.c
+++ b/src/stf.c
@@ -522,7 +522,7 @@ csv_tsv_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
/* Also, ignore a byte-order mark which may be used to
* indicate UTF-8; see
* http://en.wikipedia.org/wiki/Byte_Order_Mark for
- * background.
+ * background.
*/
if (p == header_utf8 && uc == 0x0000FEFF) {
continue;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]