[gnumeric] Remove white spaces
- From: Jean BrÃfort <jbrefort src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Remove white spaces
- Date: Sat, 5 Nov 2011 09:11:44 +0000 (UTC)
commit bf01a770ebcb47735efa0f3e83aece935feff98a
Author: Jean Brefort <jean brefort normalesup org>
Date: Sat Nov 5 10:10:45 2011 +0100
Remove white spaces
plugins/excel/ms-excel-read.c | 32 ++++++++--------
plugins/excel/ms-excel-write.c | 8 ++--
plugins/html/html.c | 4 +-
plugins/html/html_read.c | 2 +-
plugins/openoffice/openoffice-read.c | 64 ++++++++++++++++----------------
plugins/openoffice/openoffice-write.c | 18 +++++-----
src/cell-draw.c | 24 ++++++------
src/dialogs/dialog-define-names.c | 8 ++--
src/dialogs/dialog-stf-csv-page.c | 6 ++--
src/dialogs/dialog-workbook-attr.c | 4 +-
src/gnm-pane.c | 2 +-
src/graph.c | 2 +-
src/item-bar.c | 4 +-
src/mstyle.c | 4 +-
src/print-info.c | 6 ++--
src/print.c | 50 +++++++++++++-------------
src/rendered-value.c | 10 +++---
src/sheet-object-image.c | 2 +-
src/sheet-object.c | 6 ++--
src/sheet-object.h | 2 +-
src/stf-parse.c | 2 +-
src/undo.c | 2 +-
src/wbc-gtk-actions.c | 2 +-
src/wbc-gtk.c | 4 +-
src/widgets/gnm-format-sel.c | 2 +-
src/workbook-view.c | 2 +-
26 files changed, 136 insertions(+), 136 deletions(-)
---
diff --git a/plugins/excel/ms-excel-read.c b/plugins/excel/ms-excel-read.c
index 04c8aa8..dd2a01b 100644
--- a/plugins/excel/ms-excel-read.c
+++ b/plugins/excel/ms-excel-read.c
@@ -384,7 +384,7 @@ ms_sheet_map_color (ExcelReadSheet const *esheet, MSObj const *obj, MSObjAttrID
* preceding.
*/
static gboolean
-ms_sheet_obj_anchor_to_pos (Sheet const * sheet,
+ms_sheet_obj_anchor_to_pos (Sheet const * sheet,
G_GNUC_UNUSED MsBiffVersion const ver,
guint8 const *raw_anchor,
GnmRange *range, double offset[4])
@@ -2189,7 +2189,7 @@ excel_choose_border (GnmBorder *b1, GnmBorder *b2)
/* double > thick > medium > medium-dash > medium-dash-dot > slanted dash-dot >
medium dash-dot-dot > thin > dashed > dotted > dash-dot > dash-dot-dot > hair */
static int choice[GNM_STYLE_BORDER_SLANTED_DASH_DOT + 1]
- [GNM_STYLE_BORDER_SLANTED_DASH_DOT + 1]
+ [GNM_STYLE_BORDER_SLANTED_DASH_DOT + 1]
= { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0 }, /* GNM_STYLE_BORDER_NONE */
{ 1,0,0,1,1,0,0,1,0,1,0,1,0,0 }, /* GNM_STYLE_BORDER_THIN */
{ 1,1,0,1,1,0,0,1,1,1,1,1,1,1 }, /* GNM_STYLE_BORDER_MEDIUM */
@@ -2232,46 +2232,46 @@ excel_set_xf (ExcelReadSheet *esheet, BiffQuery *q)
GnmBorder *top_b, *left_b;
sheet_style_set_pos (sheet, col, row, mstyle);
-
+
/* In Excel & Gnumeric generated xls-files we do not have a conflict */
/* between borders of adjacent cells, but according to bug #660605 */
/* there are xls files in the wild that have a conflict. We need to */
/* resolve these conflicts to ensure consistent behaviour when we edit */
/* borders and to provide the expected border appearance. */
-
+
top_b = gnm_style_get_border (mstyle, MSTYLE_BORDER_TOP);
left_b = gnm_style_get_border (mstyle, MSTYLE_BORDER_LEFT);
- if ((row > 0 && top_b != NULL && top_b->line_type != GNM_STYLE_BORDER_NONE) ||
+ if ((row > 0 && top_b != NULL && top_b->line_type != GNM_STYLE_BORDER_NONE) ||
(col > 0 && left_b != NULL && left_b->line_type != GNM_STYLE_BORDER_NONE)) {
GnmBorder **overlay = g_new0 (GnmBorder *, GNM_STYLE_BORDER_EDGE_MAX);
GnmRange range;
- if (row > 0 &&
+ if (row > 0 &&
top_b != NULL && top_b->line_type != GNM_STYLE_BORDER_NONE) {
GnmStyle const *previous = sheet_style_get (sheet, col, row - 1);
if (previous != NULL) {
- GnmBorder *prev_b = gnm_style_get_border
+ GnmBorder *prev_b = gnm_style_get_border
(previous, MSTYLE_BORDER_BOTTOM);
- if (prev_b != NULL &&
+ if (prev_b != NULL &&
prev_b->line_type != GNM_STYLE_BORDER_NONE &&
prev_b->line_type != top_b->line_type)
- overlay[GNM_STYLE_BORDER_TOP] =
- gnm_style_border_ref
+ overlay[GNM_STYLE_BORDER_TOP] =
+ gnm_style_border_ref
(excel_choose_border (top_b, prev_b));
}
}
- if (col > 0 &&
+ if (col > 0 &&
left_b != NULL && left_b->line_type != GNM_STYLE_BORDER_NONE) {
GnmStyle const *previous = sheet_style_get (sheet, col - 1, row);
if (previous != NULL) {
- GnmBorder *prev_b = gnm_style_get_border
+ GnmBorder *prev_b = gnm_style_get_border
(previous, MSTYLE_BORDER_RIGHT);
- if (prev_b != NULL &&
+ if (prev_b != NULL &&
prev_b->line_type != GNM_STYLE_BORDER_NONE &&
prev_b->line_type != left_b->line_type)
- overlay[GNM_STYLE_BORDER_LEFT] =
- gnm_style_border_ref
+ overlay[GNM_STYLE_BORDER_LEFT] =
+ gnm_style_border_ref
(excel_choose_border (left_b, prev_b));
}
}
@@ -3247,7 +3247,7 @@ ms_wb_get_font_markup (MSContainer const *c, unsigned indx)
add_attr (attrs, go_pango_attr_superscript_new (FALSE));
break;
case GO_FONT_SCRIPT_SUPER:
- add_attr (attrs, go_pango_attr_superscript_new (TRUE));
+ add_attr (attrs, go_pango_attr_superscript_new (TRUE));
break;
}
diff --git a/plugins/excel/ms-excel-write.c b/plugins/excel/ms-excel-write.c
index 8b0f124..0062835 100644
--- a/plugins/excel/ms-excel-write.c
+++ b/plugins/excel/ms-excel-write.c
@@ -2030,13 +2030,13 @@ excel_font_overlay_pango (ExcelWriteFont *efont, GSList *pango)
efont->color = ((c->blue & 0xff00) << 8) + (c->green & 0xff00) + (c->red >> 8);
break;
default :
- if (attr->klass->type ==
+ if (attr->klass->type ==
go_pango_attr_subscript_get_type ())
- efont->script = ((GOPangoAttrSubscript *)attr)->val
+ efont->script = ((GOPangoAttrSubscript *)attr)->val
? 2 : 0;
- else if (attr->klass->type ==
+ else if (attr->klass->type ==
go_pango_attr_superscript_get_type ())
- efont->script = ((GOPangoAttrSuperscript *)attr)->val
+ efont->script = ((GOPangoAttrSuperscript *)attr)->val
? 1 : 0;
break; /* ignored */
}
diff --git a/plugins/html/html.c b/plugins/html/html.c
index ec24b75..e765564 100644
--- a/plugins/html/html.c
+++ b/plugins/html/html.c
@@ -211,13 +211,13 @@ cb_html_attrs_as_string (GsfOutput *output, PangoAttribute *a, html_version_t ve
/* ((c->blue & 0xff00) >> 8)); */
break;/* ignored */
default :
- if (a->klass->type ==
+ if (a->klass->type ==
go_pango_attr_subscript_get_type ()) {
if (((GOPangoAttrSubscript *)a)->val) {
gsf_output_puts (output, "<sub>");
closure = "</sub>";
}
- } else if (a->klass->type ==
+ } else if (a->klass->type ==
go_pango_attr_superscript_get_type ()) {
if (((GOPangoAttrSuperscript *)a)->val) {
gsf_output_puts (output, "<sup>");
diff --git a/plugins/html/html_read.c b/plugins/html/html_read.c
index 4743d68..9472889 100644
--- a/plugins/html/html_read.c
+++ b/plugins/html/html_read.c
@@ -571,7 +571,7 @@ html_file_open (G_GNUC_UNUSED GOFileOpener const *fo, GOIOContext *io_context,
/* Quick and dirty html probe. */
gboolean
-html_file_probe (G_GNUC_UNUSED GOFileOpener const *fo, GsfInput *input,
+html_file_probe (G_GNUC_UNUSED GOFileOpener const *fo, GsfInput *input,
G_GNUC_UNUSED GOFileProbeLevel pl)
{
gsf_off_t size = 200;
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index f48cdcf..fac22d3 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -1024,7 +1024,7 @@ oo_attr_distance (GsfXMLIn *xin, xmlChar const * const *attrs,
static gboolean
oo_attr_percent_or_distance (GsfXMLIn *xin, xmlChar const * const *attrs,
- int ns_id, char const *name, gnm_float *res,
+ int ns_id, char const *name, gnm_float *res,
gboolean *found_percent)
{
char *end;
@@ -3137,8 +3137,8 @@ oo_cell_content_start (GsfXMLIn *xin, xmlChar const **attrs)
if (VALUE_IS_STRING (state->curr_cell->value)) {
/* embedded newlines stored as a series of <p> */
GnmValue *v;
- v = value_new_string_str
- (go_string_new_nocopy
+ v = value_new_string_str
+ (go_string_new_nocopy
(g_strconcat (state->curr_cell->value->v_str.val->str, "\n", NULL)));
gnm_cell_assign_value (state->curr_cell, v);
oo_update_data_extent (state, 1, 1);
@@ -3146,7 +3146,7 @@ oo_cell_content_start (GsfXMLIn *xin, xmlChar const **attrs)
}
}
-static void
+static void
oo_add_text_to_cell (OOParseState *state, char const *str)
{
GnmValue *v = NULL;
@@ -3159,8 +3159,8 @@ oo_add_text_to_cell (OOParseState *state, char const *str)
GOFormat *fmt = state->curr_cell->value->v_str.fmt;
if (fmt != NULL)
go_format_ref (fmt);
- v = value_new_string_str
- (go_string_new_nocopy
+ v = value_new_string_str
+ (go_string_new_nocopy
(g_strconcat (state->curr_cell->value->v_str.val->str,
str, NULL)));
if (fmt != NULL) {
@@ -3184,11 +3184,11 @@ oo_cell_content_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
if (state->curr_cell == NULL) {
int max_cols = gnm_sheet_get_max_cols (state->pos.sheet);
int max_rows = gnm_sheet_get_max_rows (state->pos.sheet);
-
+
if (state->pos.eval.col >= max_cols ||
state->pos.eval.row >= max_rows)
return;
-
+
state->curr_cell = sheet_cell_fetch (state->pos.sheet,
state->pos.eval.col,
state->pos.eval.row);
@@ -3216,7 +3216,7 @@ oo_cell_content_span_start (GsfXMLIn *xin, xmlChar const **attrs)
state->p_content_offset = strlen (xin->content->str);
}
- ssi->start = VALUE_IS_STRING (state->curr_cell->value) ?
+ ssi->start = VALUE_IS_STRING (state->curr_cell->value) ?
strlen (state->curr_cell->value->v_str.val->str) : 0;
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
@@ -3227,7 +3227,7 @@ oo_cell_content_span_start (GsfXMLIn *xin, xmlChar const **attrs)
}
}
-static gboolean
+static gboolean
oo_pango_set_end (PangoAttribute *attribute, gpointer data)
{
attribute->end_index = GPOINTER_TO_INT (data);
@@ -3254,7 +3254,7 @@ oo_apply_character_style (GsfXMLIn *xin, OOParseState *state, char *name, int st
pango_attr_list_filter (attrs, (PangoAttrFilterFunc) oo_pango_set_end, GINT_TO_POINTER (end - start));
if (state->curr_cell->value->v_str.fmt != NULL) {
- old = pango_attr_list_copy
+ old = pango_attr_list_copy
((PangoAttrList *)go_format_get_markup (state->curr_cell->value->v_str.fmt));
} else
old = pango_attr_list_new ();
@@ -3282,7 +3282,7 @@ oo_cell_content_span_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
state->p_content_offset = strlen (xin->content->str);
}
- end = VALUE_IS_STRING (state->curr_cell->value) ?
+ end = VALUE_IS_STRING (state->curr_cell->value) ?
strlen (state->curr_cell->value->v_str.val->str) : 0;
ssi = state->span_style_stack->data;
@@ -3307,8 +3307,8 @@ oo_cell_content_special (GsfXMLIn *xin, int count, char const *sym)
oo_add_text_to_cell (state, xin->content->str + state->p_content_offset);
state->p_content_offset = strlen (xin->content->str);
}
-
- if (count == 1)
+
+ if (count == 1)
oo_add_text_to_cell (state, sym);
else if (count > 0) {
gchar *space = g_strnfill (count, *sym);
@@ -3322,7 +3322,7 @@ static void
oo_cell_content_space (GsfXMLIn *xin, xmlChar const **attrs)
{
int count = 0;
-
+
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
if (oo_attr_int_range (xin, attrs, OO_NS_TEXT, "c", &count, 0, INT_MAX))
;
@@ -3343,13 +3343,13 @@ oo_cell_content_link (GsfXMLIn *xin, xmlChar const **attrs)
char const *tip = _("Left click once to follow this link.\n"
"Middle click once to select this cell");
GnmHLink *hlink = NULL;
-
+
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_XLINK, "href"))
link = CXML2C (attrs[1]);
else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_OFFICE, "title"))
tip = CXML2C (attrs[1]);
-
+
if (link != NULL) {
GnmStyle *style;
GType type;
@@ -3706,7 +3706,7 @@ oo_style (GsfXMLIn *xin, xmlChar const **attrs)
if (name != NULL)
g_hash_table_replace (state->styles.text,
g_strdup (name), pango_attr_list_ref (state->cur_style.text));
-
+
break;
case OO_STYLE_CELL:
style = (parent_name != NULL)
@@ -5842,9 +5842,9 @@ oo_prop_list_apply_to_axis (OOParseState *state, GSList *props, GObject *obj)
else if (0 == strcmp ("interval-major", prop->name))
interval_major = g_value_get_double (&prop->value);
else if (0 == strcmp ("interval-minor-divisor", prop->name))
- interval_minor_divisor
+ interval_minor_divisor
= g_value_get_double (&prop->value);
-
+
}
gog_axis_set_bounds (GOG_AXIS (obj), minimum, maximum);
@@ -5856,8 +5856,8 @@ oo_prop_list_apply_to_axis (OOParseState *state, GSList *props, GObject *obj)
gog_dataset_set_dim (GOG_DATASET (obj), 2, data, NULL);
if (interval_minor_divisor > 0) {
data = gnm_go_data_scalar_new_expr
- (state->chart.src_sheet,
- gnm_expr_top_new_constant
+ (state->chart.src_sheet,
+ gnm_expr_top_new_constant
(value_new_float (interval_major/
interval_minor_divisor)));
gog_dataset_set_dim (GOG_DATASET (obj), 3, data, NULL);
@@ -6030,9 +6030,9 @@ od_style_prop_chart (GsfXMLIn *xin, xmlChar const **attrs)
oo_prop_new_double ("interval-major", ftmp));
} else if (oo_attr_float (xin, attrs, OO_NS_CHART,
"interval-minor-divisor", &ftmp)) {
- style->axis_props = g_slist_prepend
+ style->axis_props = g_slist_prepend
(style->axis_props,
- oo_prop_new_double ("interval-minor-divisor",
+ oo_prop_new_double ("interval-minor-divisor",
ftmp));
} else if (oo_attr_float (xin, attrs, OO_GNUM_NS_EXT,
"radius-ratio", &ftmp)) {
@@ -6387,14 +6387,14 @@ od_style_prop_text (GsfXMLIn *xin, xmlChar const **attrs)
attr->end_index = 0;
pango_attr_list_insert (state->cur_style.text, attr);
}
- } else if (oo_attr_enum (xin, attrs, OO_NS_STYLE, "text-underline-style",
+ } else if (oo_attr_enum (xin, attrs, OO_NS_STYLE, "text-underline-style",
underline_styles, &underline_style)) {
- } else if (oo_attr_enum (xin, attrs, OO_NS_STYLE, "text-underline-type",
+ } else if (oo_attr_enum (xin, attrs, OO_NS_STYLE, "text-underline-type",
underline_types, &underline_type)) {
} else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_STYLE, "text-underline-width"))
underline_bold = attr_eq (attrs[1], "bold");
- else if (oo_attr_enum (xin, attrs, OO_NS_STYLE, "text-line-through-style",
+ else if (oo_attr_enum (xin, attrs, OO_NS_STYLE, "text-line-through-style",
line_through_styles, &tmp)) {
attr = pango_attr_strikethrough_new (tmp > 0);
attr->start_index = 0;
@@ -6415,7 +6415,7 @@ od_style_prop_text (GsfXMLIn *xin, xmlChar const **attrs)
else
underline = PANGO_UNDERLINE_SINGLE;
- attr = pango_attr_underline_new (underline);
+ attr = pango_attr_underline_new (underline);
attr->start_index = 0;
attr->end_index = 0;
pango_attr_list_insert (state->cur_style.text, attr);
@@ -10461,7 +10461,7 @@ identified_google_docs (GsfInfile *zip)
/* As of 2011/10/1 google-docs does not store any generator info so */
/* we cannot use that for identification */
gboolean google_docs = FALSE;
- GsfInput *content = gsf_infile_child_by_name
+ GsfInput *content = gsf_infile_child_by_name
(zip, "content.xml");
if (content) {
/* pick arbitrary size limit of 0.5k for the manifest to avoid
@@ -10469,8 +10469,8 @@ identified_google_docs (GsfInfile *zip)
size_t size = MIN (gsf_input_size (content), 512);
char const *mf = gsf_input_read (content, size, NULL);
if (mf)
- google_docs =
- (NULL != g_strstr_len
+ google_docs =
+ (NULL != g_strstr_len
(mf, -1,
"urn:oasis:names:tc:opendocument:xmlns:office:1.0"));
g_object_unref (content);
@@ -10488,7 +10488,7 @@ determine_oo_version (GsfInfile *zip, OOVer def)
/* Google-docs is the mimetype so we need to check that */
if (identified_google_docs (zip))
return OOO_VER_OPENDOC;
- /* Really old versions also had no mimetype. Allow that,
+ /* Really old versions also had no mimetype. Allow that,
except in the probe. */
return def;
}
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 1354f7b..c3f2c14 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -376,7 +376,7 @@ odf_attrs_as_string (GnmOOExport *state, PangoAttribute *a)
} else
gsf_xml_out_add_cstr (state->xml, TEXT "style-name", "AC-script");
spans += 1;
- break;
+ break;
case PANGO_ATTR_STYLE :
spans += 1;
gsf_xml_out_start_element (state->xml, TEXT "span");
@@ -439,14 +439,14 @@ odf_attrs_as_string (GnmOOExport *state, PangoAttribute *a)
/* ((c->blue & 0xff00) >> 8)); */
break;/* ignored */
default :
- if (a->klass->type ==
+ if (a->klass->type ==
go_pango_attr_subscript_get_type ()) {
gsf_xml_out_start_element (state->xml, TEXT "span");
gsf_xml_out_add_cstr (state->xml, TEXT "style-name",
((GOPangoAttrSubscript *)a)->val ?
"AC-subscript" : "AC-script");
spans += 1;
- } else if (a->klass->type ==
+ } else if (a->klass->type ==
go_pango_attr_superscript_get_type ()) {
gsf_xml_out_start_element (state->xml, TEXT "span");
gsf_xml_out_add_cstr (state->xml, TEXT "style-name",
@@ -6268,10 +6268,10 @@ odf_write_axis_style (GnmOOExport *state, G_GNUC_UNUSED GOStyle const *style,
= gnm_go_data_get_expr (interval);
if (texpr != NULL &&
GNM_EXPR_GET_OPER (texpr->expr) == GNM_EXPR_OP_CONSTANT) {
- double val = value_get_as_float
+ double val = value_get_as_float
(texpr->expr->constant.value);
- gsf_xml_out_add_float
- (state->xml,
+ gsf_xml_out_add_float
+ (state->xml,
CHART "interval-major", val, -1);
interval = gog_dataset_get_dim (GOG_DATASET(axis),3);
@@ -6279,12 +6279,12 @@ odf_write_axis_style (GnmOOExport *state, G_GNUC_UNUSED GOStyle const *style,
texpr = gnm_go_data_get_expr (interval);
if (texpr != NULL &&
GNM_EXPR_GET_OPER (texpr->expr) == GNM_EXPR_OP_CONSTANT) {
- double val_minor = value_get_as_float
+ double val_minor = value_get_as_float
(texpr->expr->constant.value);
if (val_minor > 0)
gsf_xml_out_add_float
- (state->xml,
- CHART "interval-minor-divisor",
+ (state->xml,
+ CHART "interval-minor-divisor",
val/val_minor, 0);
}
}
diff --git a/src/cell-draw.c b/src/cell-draw.c
index 5ca2396..e200d5e 100644
--- a/src/cell-draw.c
+++ b/src/cell-draw.c
@@ -316,7 +316,7 @@ cell_draw_extension_mark_left (cairo_t *cr, int x1, int y1, int height)
cairo_rel_line_to (cr, 3, -3);
cairo_rel_line_to (cr, 0, 6);
cairo_close_path (cr);
- cairo_fill (cr);
+ cairo_fill (cr);
}
static void
@@ -328,14 +328,14 @@ cell_draw_extension_mark_right (cairo_t *cr, int x1, int y1, int width, int heig
cairo_rel_line_to (cr, -3, -3);
cairo_rel_line_to (cr, 0, 6);
cairo_close_path (cr);
- cairo_fill (cr);
-
+ cairo_fill (cr);
+
}
static void
cell_draw_h_extension_markers (cairo_t *cr, GnmRenderedValue *rv,
- int x1, int y1,
+ int x1, int y1,
int width, int height)
{
switch (rv->effective_halign) {
@@ -360,7 +360,7 @@ cell_draw_h_extension_markers (cairo_t *cr, GnmRenderedValue *rv,
static void
cell_draw_v_extension_markers (cairo_t *cr,
- int x1, int y1,
+ int x1, int y1,
int width, int height,
int h_center)
{
@@ -450,23 +450,23 @@ cell_draw (GnmCell const *cell, cairo_t *cr,
pango_cairo_show_layout (cr, rv->layout);
cairo_restore (cr);
- if (show_extension_markers &&
+ if (show_extension_markers &&
width < PANGO_PIXELS (rv->layout_natural_width)) {
cairo_save (cr);
- cell_draw_h_extension_markers
+ cell_draw_h_extension_markers
(cr, rv,
- x1 + 1 + GNM_COL_MARGIN,
+ x1 + 1 + GNM_COL_MARGIN,
y1 + 1 + GNM_ROW_MARGIN,
width, height);
cairo_restore (cr);
}
- if (show_extension_markers &&
+ if (show_extension_markers &&
height < PANGO_PIXELS (rv->layout_natural_height)) {
cairo_save (cr);
- cell_draw_v_extension_markers
- (cr, x1 + 1 + GNM_COL_MARGIN,
- y1 + 1 + GNM_ROW_MARGIN,
+ cell_draw_v_extension_markers
+ (cr, x1 + 1 + GNM_COL_MARGIN,
+ y1 + 1 + GNM_ROW_MARGIN,
width, height, h_center);
cairo_restore (cr);
}
diff --git a/src/dialogs/dialog-define-names.c b/src/dialogs/dialog-define-names.c
index fdd713a..1b5ecad 100644
--- a/src/dialogs/dialog-define-names.c
+++ b/src/dialogs/dialog-define-names.c
@@ -182,7 +182,7 @@ name_guru_warn (NameGuruState *state,
}
static gboolean
-cb_name_guru_show_all (G_GNUC_UNUSED GtkTreeModel *model,
+cb_name_guru_show_all (G_GNUC_UNUSED GtkTreeModel *model,
G_GNUC_UNUSED GtkTreePath *path,
GtkTreeIter *iter, gpointer data)
{
@@ -206,7 +206,7 @@ name_guru_erase_search_entry (GtkEntry *entry,
}
static gboolean
-cb_name_guru_search (GtkTreeModel *model,
+cb_name_guru_search (GtkTreeModel *model,
G_GNUC_UNUSED GtkTreePath *path,
GtkTreeIter *iter, gpointer data)
{
@@ -891,7 +891,7 @@ name_guru_check_expression (NameGuruState *state, gchar *text,
static void
-cb_name_guru_content_edited
+cb_name_guru_content_edited
(G_GNUC_UNUSED GnumericCellRendererExprEntry *cell,
gchar *path_string,
gchar *new_text,
@@ -971,7 +971,7 @@ cb_name_guru_name_edited (G_GNUC_UNUSED GtkCellRendererText *cell,
if ((type == item_type_new_unsaved_wb_name &&
scope == NULL) ||
(type == item_type_new_unsaved_sheet_name)) {
- go_gtk_notice_dialog
+ go_gtk_notice_dialog
(GTK_WINDOW (state->dialog),
GTK_MESSAGE_ERROR,
_("This name is already in use!"));
diff --git a/src/dialogs/dialog-stf-csv-page.c b/src/dialogs/dialog-stf-csv-page.c
index fc14185..b48453b 100644
--- a/src/dialogs/dialog-stf-csv-page.c
+++ b/src/dialogs/dialog-stf-csv-page.c
@@ -132,7 +132,7 @@ csv_page_textindicator_change (G_GNUC_UNUSED GtkWidget *widget,
{
char *textfieldtext = gtk_editable_get_chars (GTK_EDITABLE (data->csv.csv_textfield), 0, -1);
gunichar str_ind = g_utf8_get_char (textfieldtext);
-
+
stf_parse_options_csv_set_stringindicator (data->parseoptions, str_ind);
g_free (textfieldtext);
@@ -187,8 +187,8 @@ csv_page_parseoptions_to_gui (StfDialogData *pagedata)
gint len;
len = g_unichar_to_utf8 (po->stringindicator, buffer);
buffer[len] = 0;
- gtk_combo_box_set_active_id
- (GTK_COMBO_BOX (pagedata->csv.csv_textindicator),
+ gtk_combo_box_set_active_id
+ (GTK_COMBO_BOX (pagedata->csv.csv_textindicator),
buffer);
}
}
diff --git a/src/dialogs/dialog-workbook-attr.c b/src/dialogs/dialog-workbook-attr.c
index 0d964fa..6de2b19 100644
--- a/src/dialogs/dialog-workbook-attr.c
+++ b/src/dialogs/dialog-workbook-attr.c
@@ -143,11 +143,11 @@ attr_dialog_init_cell_marker_page (AttrState *state)
{
attr_dialog_init_toggle
(state,
- "WorkbookView::show_function_cell_markers",
+ "WorkbookView::show_function_cell_markers",
"show_function_cell_markers");
attr_dialog_init_toggle
(state,
- "WorkbookView::show_extension_markers",
+ "WorkbookView::show_extension_markers",
"show_extension_markers");
}
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index 34f80bf..bbc721e 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -2373,7 +2373,7 @@ gnm_pane_display_object_menu (GnmPane *pane, SheetObject *so, GdkEvent *event)
return;
}
- menu = sheet_object_build_menu
+ menu = sheet_object_build_menu
(sheet_object_get_view (so, (SheetObjectViewContainer *) pane),
actions, &i);
g_object_set_data_full (G_OBJECT (menu), "actions", actions,
diff --git a/src/graph.c b/src/graph.c
index 7c29ac4..54ab6a6 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -821,7 +821,7 @@ static void
cond_pango_attr_list_unref (PangoAttrList *al)
{
if (al)
- pango_attr_list_unref (al);
+ pango_attr_list_unref (al);
}
static gpointer
diff --git a/src/item-bar.c b/src/item-bar.c
index 1e585c0..60e3289 100644
--- a/src/item-bar.c
+++ b/src/item-bar.c
@@ -785,11 +785,11 @@ colrow_tip_setlabel (ItemBar *ib, gboolean const is_cols, int size_pixels)
char const *label = is_cols ? _("Width:") : _("Height");
double const scale = 72. / gnm_app_display_dpi_get (!is_cols);
double size_points = scale*size_pixels;
-
+
/* xgettext: This is input to ngettext based on the number of pixels. */
pixels = g_strdup_printf (ngettext ("(%d pixel)", "(%d pixels)", size_pixels),
size_pixels);
-
+
if (size_points == gnm_floor (size_points))
/* xgettext: This is input to ngettext based on the integer number of points. */
points = g_strdup_printf (ngettext (_("%d.00 pt"), _("%d.00 pts"), (int) gnm_floor (size_points)),
diff --git a/src/mstyle.c b/src/mstyle.c
index 0e007f0..7497ac7 100644
--- a/src/mstyle.c
+++ b/src/mstyle.c
@@ -1740,9 +1740,9 @@ gnm_style_get_pango_height (GnmStyle const *style,
if (!go_format_is_general (fmt)) {
GOFormatDetails details;
go_format_get_details (fmt, &details, NULL);
- if (details.family == GO_FORMAT_SCIENTIFIC &&
+ if (details.family == GO_FORMAT_SCIENTIFIC &&
details.use_markup) {
- PangoAttribute *a
+ PangoAttribute *a
= go_pango_attr_superscript_new (TRUE);
/* We want to superscript the "-01" in the */
/* string "+1.23456789E-01" */
diff --git a/src/print-info.c b/src/print-info.c
index b6a91c0..2aa2a63 100644
--- a/src/print-info.c
+++ b/src/print-info.c
@@ -597,7 +597,7 @@ static struct {
*/
static void
render_opcode (GString *target, char /* non-const */ *opcode,
- HFRenderInfo *info,
+ HFRenderInfo *info,
G_GNUC_UNUSED HFRenderType render_type)
{
char *args;
@@ -711,7 +711,7 @@ hf_render_info_destroy (HFRenderInfo *hfi)
}
static void
-pdf_write_workbook (G_GNUC_UNUSED GOFileSaver const *fs,
+pdf_write_workbook (G_GNUC_UNUSED GOFileSaver const *fs,
G_GNUC_UNUSED GOIOContext *context,
WorkbookView const *wbv, GsfOutput *output)
{
@@ -821,7 +821,7 @@ cb_set_pdf_option (const char *key, const char *value,
return FALSE;
}
-
+
if (strcmp (key, "paper") == 0) {
int i;
if (strcmp (value, "fit") == 0) {
diff --git a/src/print.c b/src/print.c
index 58c09c2..216a70f 100644
--- a/src/print.c
+++ b/src/print.c
@@ -830,7 +830,7 @@ compute_scale_fit_to (Sheet const *sheet,
#define ROW_FIT(row) (MIN (row, gnm_sheet_get_last_row (sheet)))
static void
-compute_sheet_pages_add_sheet (PrintingInstance * pi, Sheet const *sheet,
+compute_sheet_pages_add_sheet (PrintingInstance * pi, Sheet const *sheet,
gboolean selection,
gboolean ignore_printarea)
{
@@ -885,7 +885,7 @@ print_get_sheet_page_range (PrintingInstance *pi, guint page_no)
PaginationInfo, col));
r_info = &(g_array_index (spi->row_pagination,
PaginationInfo, row));
- range_init (&gsr->range,
+ range_init (&gsr->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));
@@ -922,9 +922,9 @@ compute_sheet_pages (GtkPrintContext *context,
gdouble top_margin, bottom_margin, edge_to_below_header, edge_to_above_footer;
gdouble px, py;
gdouble usable_x, usable_y;
- GArray *column_pagination = g_array_sized_new
+ GArray *column_pagination = g_array_sized_new
(FALSE, TRUE, sizeof (PaginationInfo), 100);
- GArray *row_pagination = g_array_sized_new
+ GArray *row_pagination = g_array_sized_new
(FALSE, TRUE, sizeof (PaginationInfo), 100);
gboolean repeat_top_use, repeat_left_use;
int repeat_top_start, repeat_top_end, repeat_left_start, repeat_left_end;
@@ -1169,7 +1169,7 @@ gnm_paginate_cb (GtkPrintOperation *operation,
if (g_list_nth_data (pi->gnmSheets, paginate - 1) != NULL) {
GList *l;
gint n_pages = 0;
-
+
for (l = pi->gnmSheets; l != NULL; l = l->next) {
SheetPrintInfo *spi = l->data;
n_pages += spi->pages;
@@ -1178,7 +1178,7 @@ gnm_paginate_cb (GtkPrintOperation *operation,
if (pi->preview && n_pages > 1000) {
int i, count = 0;
- gtk_print_operation_set_n_pages
+ gtk_print_operation_set_n_pages
(operation, n_pages == 0 ? 1 : n_pages);
for (i = 0; i < n_pages; i++) {
if (gtk_print_operation_preview_is_selected
@@ -1188,9 +1188,9 @@ gnm_paginate_cb (GtkPrintOperation *operation,
if (count > 1000)
break;
}
- if (count > 1000 && !go_gtk_query_yes_no
- (pi->progress != NULL ?
- GTK_WINDOW (pi->progress) : wbcg_toplevel (WBC_GTK (pi->wbc)),
+ if (count > 1000 && !go_gtk_query_yes_no
+ (pi->progress != NULL ?
+ GTK_WINDOW (pi->progress) : wbcg_toplevel (WBC_GTK (pi->wbc)),
FALSE, "%s",
_("You have chosen more than 1000 pages to preview. "
"This may take a long time. "
@@ -1216,7 +1216,7 @@ gnm_paginate_cb (GtkPrintOperation *operation,
return FALSE;
}
-static void
+static void
cb_progress_response (G_GNUC_UNUSED GtkDialog *dialog,
G_GNUC_UNUSED gint response_id,
PrintingInstance *pi)
@@ -1236,7 +1236,7 @@ cb_progress_delete (G_GNUC_UNUSED GtkWidget *widget,
static gboolean
gnm_ready_preview_cb (G_GNUC_UNUSED GtkPrintOperation *operation,
G_GNUC_UNUSED GtkPrintOperationPreview *preview,
- G_GNUC_UNUSED GtkPrintContext *context,
+ G_GNUC_UNUSED GtkPrintContext *context,
G_GNUC_UNUSED GtkWindow *parent,
gpointer user_data)
{
@@ -1285,8 +1285,8 @@ gnm_begin_print_cb (GtkPrintOperation *operation,
}
if (NULL != pi->wbc && IS_WBC_GTK(pi->wbc)) {
- pi->progress = gtk_message_dialog_new (wbcg_toplevel (WBC_GTK (pi->wbc)),
- GTK_DIALOG_MODAL |
+ pi->progress = gtk_message_dialog_new (wbcg_toplevel (WBC_GTK (pi->wbc)),
+ GTK_DIALOG_MODAL |
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_INFO,
GTK_BUTTONS_CANCEL,
@@ -1364,7 +1364,7 @@ gnm_draw_page_cb (GtkPrintOperation *operation,
PrintingInstance * pi = (PrintingInstance *) user_data;
SheetPageRange * gsr;
-
+
if (pi->cancel) {
gtk_print_operation_cancel (operation);
g_signal_handlers_disconnect_by_func
@@ -1378,18 +1378,18 @@ gnm_draw_page_cb (GtkPrintOperation *operation,
char *text;
if (pi->hfi->pages == -1)
- text = g_strdup_printf
- (pi->preview ? _("Creating preview of page %3d")
+ text = g_strdup_printf
+ (pi->preview ? _("Creating preview of page %3d")
: _("Printing page %3d"), page_nr);
else
- text = g_strdup_printf
- (pi->preview ?
+ text = g_strdup_printf
+ (pi->preview ?
ngettext("Creating preview of page %3d of %3d page",
"Creating preview of page %3d of %3d pages",
- pi->hfi->pages)
+ pi->hfi->pages)
: ngettext("Printing page %3d of %3d page",
"Printing page %3d of %3d pages",
- pi->hfi->pages),
+ pi->hfi->pages),
page_nr, pi->hfi->pages);
g_object_set (G_OBJECT (pi->progress), "text", text, NULL);
g_free (text);
@@ -1933,7 +1933,7 @@ gnm_draw_so_page_cb (G_GNUC_UNUSED GtkPrintOperation *operation,
cairo_restore (cr);
}
-void
+void
gnm_print_so (WorkbookControl *wbc, GPtrArray *sos,
GsfOutput *export_dst)
{
@@ -1970,7 +1970,7 @@ gnm_print_so (WorkbookControl *wbc, GPtrArray *sos,
gtk_print_operation_set_n_pages (print, 1);
gtk_print_operation_set_embed_page_setup (print, TRUE);
-
+
g_signal_connect (print, "draw-page", G_CALLBACK (gnm_draw_so_page_cb), so);
gtk_print_operation_set_use_full_page (print, FALSE);
@@ -1988,7 +1988,7 @@ gnm_print_so (WorkbookControl *wbc, GPtrArray *sos,
if (tmp_file_fd >= 0)
close (tmp_file_fd);
cb_delete_and_free (tmp_file_name);
-
+
g_object_unref (print);
return;
}
@@ -2009,7 +2009,7 @@ gnm_print_so (WorkbookControl *wbc, GPtrArray *sos,
if (lseek (tmp_file_fd, 0, SEEK_SET) < 0)
bytes_read = -1;
else {
- while ((bytes_read = read
+ while ((bytes_read = read
(tmp_file_fd, buffer, sizeof (buffer))) > 0) {
gsf_output_write (export_dst, bytes_read, buffer);
}
@@ -2025,5 +2025,5 @@ gnm_print_so (WorkbookControl *wbc, GPtrArray *sos,
cb_delete_and_free (tmp_file_name);
}
- g_object_unref (print);
+ g_object_unref (print);
}
diff --git a/src/rendered-value.c b/src/rendered-value.c
index edfdffd..b35b41d 100644
--- a/src/rendered-value.c
+++ b/src/rendered-value.c
@@ -321,27 +321,27 @@ gnm_rendered_value_new (GnmCell const *cell,
&extra_attrs);
font_size = pango_font_description_get_size (desc)/
(double)PANGO_SCALE;
-
+
for (l = extra_attrs; l != NULL; l = l->next) {
PangoAttribute *pa = l->data;
if (pa->klass->type == PANGO_ATTR_RISE) {
PangoAttrInt *pa_rise = l->data;
rise = pa_rise->value;
-
+
}
if (pa->klass->type == PANGO_ATTR_SCALE) {
PangoAttrFloat *pa_scale = l->data;
scale = pa_scale->value;
}
}
- g_slist_free_full (extra_attrs,
+ g_slist_free_full (extra_attrs,
(GFreeFunc) pango_attribute_destroy);
pango_font_description_free (desc);
pango_attr_iterator_destroy (iter);
tscale = font_size/10. * scale;
if (tscale != 1|| rise != 0) {
- markup = c_markup = pango_attr_list_copy
+ markup = c_markup = pango_attr_list_copy
((PangoAttrList *)markup);
rv_adjust_attributes (c_markup, zoom, tscale, rise);
}
@@ -504,7 +504,7 @@ gnm_rendered_value_new (GnmCell const *cell,
g_warning ("Line justification style not supported.");
}
/* ---------------------------------------- */
-
+
go_pango_translate_layout (layout);
gnm_rendered_value_remeasure (res);
diff --git a/src/sheet-object-image.c b/src/sheet-object-image.c
index 22231e1..b9c074e 100644
--- a/src/sheet-object-image.c
+++ b/src/sheet-object-image.c
@@ -318,7 +318,7 @@ gnm_soi_new_view (SheetObject *so, SheetObjectViewContainer *container)
"crop-right", soi->crop_right,
"crop-top", soi->crop_top,
NULL));
-
+
} else {
GdkPixbuf *pixbuf, *placeholder = NULL;
diff --git a/src/sheet-object.c b/src/sheet-object.c
index e779fea..d421356 100644
--- a/src/sheet-object.c
+++ b/src/sheet-object.c
@@ -1279,7 +1279,7 @@ cb_so_menu_activate (GObject *menu, GocItem *view)
if (a->func) {
SheetObject *so = sheet_object_view_get_so (SHEET_OBJECT_VIEW (view));
gpointer data = g_object_get_data (G_OBJECT (view->canvas), "sheet-control");
-
+
if (data == NULL)
data = GNM_SIMPLE_CANVAS (view->canvas)->scg;
@@ -1323,7 +1323,7 @@ sheet_object_build_menu (SheetObjectView *view,
g_object_set_data (G_OBJECT (item), "action", (gpointer)a);
g_signal_connect_object (G_OBJECT (item), "activate",
G_CALLBACK (cb_so_menu_activate), view, 0);
- gtk_widget_set_sensitive (item, a->enable_func == NULL
+ gtk_widget_set_sensitive (item, a->enable_func == NULL
|| a->enable_func (sheet_object_view_get_so (view)));
}
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
@@ -1384,7 +1384,7 @@ sheet_object_view_button_pressed (GocItem *item, int button, double x, double y)
return FALSE;
}
- menu = sheet_object_build_menu
+ menu = sheet_object_build_menu
(sheet_object_get_view (so, (SheetObjectViewContainer *) item->canvas),
actions, &i);
g_object_set_data_full (G_OBJECT (menu), "actions", actions,
diff --git a/src/sheet-object.h b/src/sheet-object.h
index be33615..7cf2514 100644
--- a/src/sheet-object.h
+++ b/src/sheet-object.h
@@ -75,7 +75,7 @@ gboolean sheet_object_can_edit (SheetObject const *so);
void sheet_object_get_editor (SheetObject *so, SheetControl *sc);
void sheet_object_populate_menu (SheetObject *so, GPtrArray *actions);
-GtkWidget * sheet_object_build_menu (SheetObjectView *view,
+GtkWidget * sheet_object_build_menu (SheetObjectView *view,
GPtrArray const *actions,
unsigned *i);
void sheet_object_update_bounds (SheetObject *so, GnmCellPos const *p);
diff --git a/src/stf-parse.c b/src/stf-parse.c
index 67133f4..853d0ec 100644
--- a/src/stf-parse.c
+++ b/src/stf-parse.c
@@ -590,7 +590,7 @@ stf_parse_csv_cell (GString *text, Source_t *src, StfParseOptions_t *parseoption
cur = g_utf8_next_char (cur);
}
- if (parseoptions->stringindicator != 0 &&
+ if (parseoptions->stringindicator != 0 &&
g_utf8_get_char (cur) == parseoptions->stringindicator) {
cur = g_utf8_next_char (cur);
while (*cur) {
diff --git a/src/undo.c b/src/undo.c
index 56383ee..3b59efe 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -253,7 +253,7 @@ gnm_undo_filter_set_condition_undo (GOUndo *u, gpointer data)
/* This is input to ngettext. */
format = ngettext ("%d row matches",
"%d rows match",
- count);
+ count);
text = g_strdup_printf (format, count);
}
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index 397a32b..2b3c798 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -1625,7 +1625,7 @@ toggle_font_attr (WBCGtk *wbcg, GtkToggleAction *act,
switch (val) {
default:
case GO_FONT_SCRIPT_STANDARD:
- wbcg_edit_add_markup
+ wbcg_edit_add_markup
(wbcg, go_pango_attr_superscript_new (FALSE));
attr = go_pango_attr_subscript_new (FALSE);
break;
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 279e864..cdee340 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -4742,10 +4742,10 @@ cb_select_auto_expr (GtkWidget *widget, GdkEventButton *event, WBCGtk *wbcg)
item = gtk_menu_item_new_with_label(cell_item);
g_free (cell_item);
g_object_set_data_full (G_OBJECT (item),
- "descr", (gpointer)g_strdup (rname),
+ "descr", (gpointer)g_strdup (rname),
(GDestroyNotify)g_free);
g_object_set_data_full (G_OBJECT (item),
- "cell", (gpointer)r,
+ "cell", (gpointer)r,
(GDestroyNotify)g_free);
g_object_set_data (G_OBJECT (item),
"sheet", (gpointer)sheet);
diff --git a/src/widgets/gnm-format-sel.c b/src/widgets/gnm-format-sel.c
index 311e861..69f075c 100644
--- a/src/widgets/gnm-format-sel.c
+++ b/src/widgets/gnm-format-sel.c
@@ -46,7 +46,7 @@ cb_generate_preview (GOFormatSel *gfs, PangoAttrList **attrs)
*attrs = NULL;
} else {
str = g_strdup (pango_layout_get_text (layout));
- go_pango_translate_layout (layout);
+ go_pango_translate_layout (layout);
*attrs = pango_attr_list_ref (pango_layout_get_attributes (layout));
}
g_object_unref (layout);
diff --git a/src/workbook-view.c b/src/workbook-view.c
index 4143e4e..c2783b3 100644
--- a/src/workbook-view.c
+++ b/src/workbook-view.c
@@ -526,7 +526,7 @@ wb_view_auto_expr_recalc (WorkbookView *wbv)
range_init_cellpos (&r, &wbv->auto_expr_cell);
v = value_new_cellrange_r (wbv->auto_expr_sheet, &r);
if (strlen (wbv->auto_expr_sheet->name_unquoted) < 8) {
- str = g_string_new
+ str = g_string_new
(wbv->auto_expr_sheet->name_unquoted);
g_string_append_c (str, '!');
} else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
