[gnumeric] whitespace
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] whitespace
- Date: Wed, 20 Oct 2010 20:46:39 +0000 (UTC)
commit 9d2259fe7c5d3033b0461968fde134b0b6585459
Author: Morten Welinder <terra gnome org>
Date: Wed Oct 20 16:46:25 2010 -0400
whitespace
doc/C/ChangeLog | 54 +-
doc/ChangeLog | 6 +-
plugins/applix/ChangeLog | 2 +-
plugins/excel/ChangeLog | 44 +-
plugins/excel/ms-chart.c | 4 +-
plugins/excel/ms-excel-read.c | 16 +-
plugins/excel/ms-excel-write.c | 2 +-
plugins/excel/xlsx-read.c | 20 +-
plugins/excel/xlsx-write.c | 6 +-
plugins/excelplugins/excelplugins.c | 2 +-
plugins/fn-christian-date/functions.c | 2 +-
plugins/fn-database/ChangeLog | 2 +-
plugins/fn-date/ChangeLog | 2 +-
plugins/fn-date/functions.c | 4 +-
plugins/fn-financial/ChangeLog | 8 +-
plugins/fn-financial/functions.c | 8 +-
plugins/fn-hebrew-date/functions.c | 2 +-
plugins/fn-hebrew-date/hdate.h | 8 +-
plugins/fn-hebrew-date/hdate_hdate.c | 6 +-
plugins/fn-hebrew-date/hdate_strings.c | 8 +-
plugins/fn-info/ChangeLog | 2 +-
plugins/fn-logical/ChangeLog | 2 +-
plugins/fn-logical/functions.c | 2 +-
plugins/fn-lookup/ChangeLog | 4 +-
plugins/fn-lookup/functions.c | 26 +-
plugins/fn-math/ChangeLog | 6 +-
plugins/fn-numtheory/ChangeLog | 2 +-
plugins/fn-r/extra.c | 30 +-
plugins/fn-random/ChangeLog | 4 +-
plugins/fn-stat/functions.c | 8 +-
plugins/fn-string/ChangeLog | 4 +-
plugins/fn-string/functions.c | 4 +-
plugins/fn-tsa/ChangeLog | 2 +-
plugins/fn-tsa/functions.c | 6 +-
plugins/guile/ChangeLog | 32 +-
plugins/html/ChangeLog | 78 +-
plugins/html/html.c | 6 +-
plugins/html/html_read.c | 4 +-
plugins/html/latex.c | 4 +-
plugins/lotus-123/ChangeLog | 8 +-
plugins/lpsolve/gnm-lpsolve.c | 2 +-
plugins/mps/mps.c | 2 +-
plugins/oleo/ChangeLog | 2 +-
plugins/openoffice/openoffice-read.c | 792 ++++++++++----------
plugins/openoffice/openoffice-write.c | 710 +++++++++---------
plugins/plan-perfect/ChangeLog | 2 +-
plugins/psiconv/ChangeLog | 4 +-
plugins/python-loader/ChangeLog | 14 +-
plugins/sc/sc.c | 36 +-
plugins/sylk/ChangeLog | 2 +-
plugins/xbase/ChangeLog | 4 +-
po-functions/ChangeLog | 10 +-
po/ChangeLog | 124 ++--
src/cell-draw.c | 4 +-
src/cell.c | 10 +-
src/cell.h | 2 +-
src/clipboard.c | 16 +-
src/cmd-edit.c | 4 +-
src/colrow.c | 10 +-
src/colrow.h | 2 +-
src/commands.c | 308 ++++----
src/commands.h | 14 +-
src/dead-kittens.h | 2 +-
src/dialogs/ChangeLog | 10 +-
src/dialogs/dialog-advanced-filter.c | 2 +-
src/dialogs/dialog-analysis-tool-chi-squared.c | 8 +-
src/dialogs/dialog-analysis-tool-frequency.c | 12 +-
src/dialogs/dialog-analysis-tool-normality.c | 4 +-
.../dialog-analysis-tool-principal-components.c | 2 +-
src/dialogs/dialog-analysis-tool-sign-test.c | 56 +-
.../dialog-analysis-tool-wilcoxon-mann-whitney.c | 8 +-
src/dialogs/dialog-analysis-tools.c | 54 +-
src/dialogs/dialog-autofilter.c | 16 +-
src/dialogs/dialog-cell-format.c | 2 +-
src/dialogs/dialog-cell-sort.c | 10 +-
src/dialogs/dialog-data-table.c | 2 +-
src/dialogs/dialog-define-names.c | 250 +++---
src/dialogs/dialog-doc-metadata.c | 6 +-
src/dialogs/dialog-formula-guru.c | 20 +-
src/dialogs/dialog-function-select.c | 132 ++--
src/dialogs/dialog-goto-cell.c | 4 +-
src/dialogs/dialog-hyperlink.c | 6 +-
src/dialogs/dialog-paste-special.c | 16 +-
src/dialogs/dialog-preferences.c | 30 +-
src/dialogs/dialog-random-generator-cor.c | 4 +-
src/dialogs/dialog-search-replace.c | 38 +-
src/dialogs/dialog-search.c | 26 +-
src/dialogs/dialog-sheet-order.c | 38 +-
src/dialogs/dialog-sheetobject-size.c | 40 +-
src/dialogs/dialog-so-list.c | 4 +-
src/dialogs/dialog-solver.c | 2 +-
src/dialogs/dialog-stf-export.c | 4 +-
src/dialogs/dialog-stf-format-page.c | 10 +-
src/dialogs/dialog-workbook-attr.c | 22 +-
src/dialogs/dialogs.h | 4 +-
src/expr-name.c | 12 +-
src/expr.c | 4 +-
src/func.c | 2 +-
src/gnm-format.c | 8 +-
src/gnm-pane.c | 12 +-
src/gnm-random.c | 14 +-
src/gnm-so-filled.c | 4 +-
src/gui-util.c | 4 +-
src/gutils.c | 6 +-
src/gutils.h | 2 +-
src/io-context-gtk.c | 2 +-
src/item-edit.c | 2 +-
src/item-grid.c | 18 +-
src/libgnumeric.c | 2 +-
src/mathfunc.c | 10 +-
src/mstyle.c | 12 +-
src/number-match.c | 4 +-
src/number-match.h | 4 +-
src/print-info.c | 2 +-
src/print.c | 4 +-
src/ranges.c | 2 +-
src/rendered-value.c | 2 +-
src/sheet-control-gui.c | 54 +-
src/sheet-control-gui.h | 4 +-
src/sheet-filter.c | 2 +-
src/sheet-filter.h | 2 +-
src/sheet-object-graph.c | 16 +-
src/sheet-object-widget.c | 74 +-
src/sheet-object.c | 32 +-
src/sheet-object.h | 2 +-
src/sheet-style.c | 4 +-
src/sheet-style.h | 8 +-
src/sheet-view.c | 14 +-
src/sheet-view.h | 2 +-
src/sheet.c | 78 +-
src/sheet.h | 12 +-
src/sort.c | 2 +-
src/stf-parse.c | 4 +-
src/style.c | 10 +-
src/tools/ChangeLog | 6 +-
src/tools/analysis-auto-expression.c | 2 +-
src/tools/analysis-normality.c | 26 +-
src/tools/analysis-principal-components.c | 64 +-
src/tools/analysis-sign-test.c | 48 +-
src/tools/analysis-signed-rank-test.c | 144 ++--
src/tools/analysis-signed-rank-test.h | 8 +-
src/tools/analysis-tools.c | 16 +-
src/tools/analysis-tools.h | 10 +-
src/tools/analysis-wilcoxon-mann-whitney.c | 50 +-
src/tools/analysis-wilcoxon-mann-whitney.h | 2 +-
src/tools/auto-correct.c | 6 +-
src/tools/filter.c | 6 +-
src/tools/gnm-solver.h | 2 +-
src/tools/random-generator-cor.c | 26 +-
src/tools/random-generator-cor.h | 8 +-
src/tools/simulation.c | 2 +-
src/undo.c | 22 +-
src/undo.h | 6 +-
src/validation.c | 8 +-
src/wbc-gtk-actions.c | 50 +-
src/wbc-gtk-edit.c | 10 +-
src/wbc-gtk.c | 122 ++--
src/widgets/gnm-filter-combo-view.c | 4 +-
src/widgets/gnumeric-expr-entry.c | 120 ++--
src/workbook-cmd-format.c | 30 +-
src/workbook-cmd-format.h | 2 +-
src/workbook-control.c | 2 +-
src/workbook-view.c | 2 +-
src/xml-sax-write.c | 6 +-
164 files changed, 2310 insertions(+), 2310 deletions(-)
---
diff --git a/doc/C/ChangeLog b/doc/C/ChangeLog
index 73b6f3e..d97eecb 100644
--- a/doc/C/ChangeLog
+++ b/doc/C/ChangeLog
@@ -19,7 +19,7 @@
2010-08-29 Andreas J. Guelzow <aguelzow pyrshep ca>
* gnumeric.xml: update the statistical analysis tools intro
- * analysis-statistical.xml: restructure to match the new menu
+ * analysis-statistical.xml: restructure to match the new menu
structure
* doc/C/figures/analysistools-tools.png: updated to show the
new menu structure
@@ -106,9 +106,9 @@
2010-01-24 Andreas J. Guelzow <aguelzow pyrshep>
- * func.defs: propagate changes and additions in
+ * func.defs: propagate changes and additions in
the function descriptions (due to the changes in func.c)
- * functions.xml: propagate changes and additions in
+ * functions.xml: propagate changes and additions in
the function descriptions (make-func-list.pl and func.c)
* gnumeric.xml: bump manual version number to 1.10
@@ -118,7 +118,7 @@
2010-01-09 Andreas J. Guelzow <aguelzow pyrshep>
- * func.defs: propagate changes and additions in
+ * func.defs: propagate changes and additions in
the function descriptions (due to the changes in func.c)
* functions.xml: ditto
@@ -128,13 +128,13 @@
2010-01-08 Andreas J. Guelzow <aguelzow pyrshep>
- * func.defs: propagate changes and additions in
+ * func.defs: propagate changes and additions in
the function descriptions (due to the changes in func.c)
* functions.xml: ditto
2010-01-07 Andreas J. Guelzow <aguelzow pyrshep>
- * func.defs: propagate changes and additions in
+ * func.defs: propagate changes and additions in
the function descriptions
* functions.xml: ditto
@@ -490,7 +490,7 @@
2007-09-04 Jody Goldberg <jody gnome org>
- * quick-start.xml : validate
+ * quick-start.xml : validate
2007-09-02 J.H.M. Dassen (Ray) <jdassen debian org>
@@ -499,7 +499,7 @@
and using an authorial "we".
* data-entry.xml, data-types.xml, extending-python.xml,
files-formats.xml, gnumeric.xml, gui-overview.xml, morehelp.xml,
- quick-start.xml, welcome.xml:
+ quick-start.xml, welcome.xml:
* When referring to the desktop environment as a whole, capitalise
"GNOME" consistently.
* Removed spaces before colons.
@@ -718,7 +718,7 @@
* worksheet.xml: minor tweaks.
* workbook.xml: minor tweaks.
* graphics-overview.xml: Change the context menu shot, edit the
- text.
+ text.
* figures/menu-context-object-order.png: Added.
* figures/menu-context-graph-order.png: Added.
@@ -762,11 +762,11 @@
2004-11-19 Adrian Custer <acuster gnome org>
- * NEWS Bump version to 1.4. Start edits of worksheet
+ * NEWS Bump version to 1.4. Start edits of worksheet
chapter. Minor Edits.
- * gnumeric.xml: Change title, edit paragraph.
- Change guilabel -> emphasis.
+ * gnumeric.xml: Change title, edit paragraph.
+ Change guilabel -> emphasis.
* manual-usage.xml: Change title, edit paragraph.
* worksheets.xml: Major edits.
* welcome.xml: Edit for 1.4. Change guilabel -> emphasis.
@@ -807,7 +807,7 @@
* files-saving.xml: remove valign from <tgroup>. Add a link.
* bugs.xml: remove valign from <tgroup>.
* gui-toolbars.xml: rm discussion of "tearing off" since it broke
- a ref.
+ a ref.
* graphics-widgets.xml: added a link.
* graphics-drawings.xml: added a link.
@@ -827,9 +827,9 @@
* NEWS Updated the 'Elements' chapter.
- * gnumeric.xml: Revert to Docbook 4.2. We actually need to back
- down to 4.1.2 or clear this with the GDP. For the moment, I
- only have 4.2 so we can change this when I get closer to a
+ * gnumeric.xml: Revert to Docbook 4.2. We actually need to back
+ down to 4.1.2 or clear this with the GDP. For the moment, I
+ only have 4.2 so we can change this when I get closer to a
real network. Bump this up to validate and back down to commit.
* figures/gnumeric-labelled.png: changed.
@@ -870,8 +870,8 @@
* figures/textguru-export-panel1-withTags.png: Added.
* figures/textguru-export-panel2-withTags.png: Added.
- * figures/files-csv-export-ex1.png
- * figures/files-csv-export-ex2.png
+ * figures/files-csv-export-ex1.png
+ * figures/files-csv-export-ex2.png
* figures/Makefile.am: Add and delete files above.
* gnumeric.xml: Disable the "About" chapter.
@@ -887,7 +887,7 @@
intro paragraph for components section.
* files-saving.xml: Edits to make parallel to files-opening.
* files-textsave.xml: Edits to update, add figures.
- * files-email.xml:
+ * files-email.xml:
* files-ssconvert.xml: Edits.
2004-10-02 J.H.M. Dassen (Ray) <jdassen debian org>
@@ -930,7 +930,7 @@
2004-10-01 Adrian Custer <acuster gnome org>
- * NEWS
+ * NEWS
* README: Tweak.
* data-types.xml: add TODO comment.
@@ -995,9 +995,9 @@
2004-09-30 Adrian Custer <acuster gnome org>
* NEWS: Rewrite of the 'Text Import' section of the 'Working with
- Files' chapter.
+ Files' chapter.
* NEWS: Cleaned up the figures/ dir. Now only images in the text
- are present.
+ are present.
* gnumeric.xml: Add explicit encoding.
@@ -1280,9 +1280,9 @@
started" section, moved to chapter header in gnumeric.xml. Added
section: "Parts of Gnm". Placed text correctly in <para> to
validate.
- * data-selections.xml: Edit the multiple cell selection text, closes
+ * data-selections.xml: Edit the multiple cell selection text, closes
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=256777.
-
+
2004-05-15 Adrian Custer <acuster gnome org>
@@ -1306,7 +1306,7 @@
2004-01-14 J.H.M. Dassen (Ray) <jdassen debian org>
- * gui-other-elements.xml, gui-overview.xml, gui-toolbars.xml,
+ * gui-other-elements.xml, gui-overview.xml, gui-toolbars.xml,
printing.xml: Added missing '.png' suffix to figure filerefs.
* figures/Makefile.am: Added missing figures to EXTRA_DIST.
@@ -1391,7 +1391,7 @@
* figures/analysistools-ztest-ex2.png: updated
* figures/analysistools-ztest.png: updated
* figures/analysistools-descstats-ex1-options.png: new
- * gnumeric_doc_analysistools.gnumeric: data for analysis tools
+ * gnumeric_doc_analysistools.gnumeric: data for analysis tools
screen shots
2003-11-11 J.H.M. Dassen (Ray) <jdassen debian org>
@@ -1556,4 +1556,4 @@
2003-06-01 Adrian Custer <acuster nature berkeley edu>
- * New ChangeLog
+ * New ChangeLog
diff --git a/doc/ChangeLog b/doc/ChangeLog
index fb62e69..f2a28ed 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -88,7 +88,7 @@
2010-01-07 Andreas J. Guelzow <aguelzow pyrshep>
- * make-func-list.pl: also include the short
+ * make-func-list.pl: also include the short
description
2009-12-15 Morten Welinder <terra gnome org>
@@ -149,7 +149,7 @@
2009-04-29 Andreas J. Guelzow <aguelzow pyrshep ca>
- * C/.gitignore: add files created when building the gnumeric
+ * C/.gitignore: add files created when building the gnumeric
documentation
2009-04-06 Jody Goldberg <jody gnome org>
@@ -251,7 +251,7 @@
* C/figures/analysistools-exp-smoothing-roberts-stderr.png: new
* C/figures/analysistools-exp-smoothing-holt-stderr.png: new
* C/figures/Makefile.am: add above files
- * C/analysis-statistical.xml: Add info on standard error for
+ * C/analysis-statistical.xml: Add info on standard error for
exponential smoothing
2008-10-07 Andreas J. Guelzow <aguelzow pyrshep ca>
diff --git a/plugins/applix/ChangeLog b/plugins/applix/ChangeLog
index 227a9c6..3d66894 100644
--- a/plugins/applix/ChangeLog
+++ b/plugins/applix/ChangeLog
@@ -362,7 +362,7 @@
2003-07-31 Andreas J. Guelzow <aguelzow taliesin ca>
- * applix-read.c (applix_read): remove last argument
+ * applix-read.c (applix_read): remove last argument
in workbook_sheet_reorder, replace workbook_sheet_reorganize
with workbook_sheet_rename
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index f35694e..250243d 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -62,7 +62,7 @@
2010-07-27 Andreas J. Guelzow <aguelzow pyrshep ca>
- * ms-excel-read.h (ExcelFont): change underline field from PangoUnderline
+ * ms-excel-read.h (ExcelFont): change underline field from PangoUnderline
to MsBiffFontUnderline
* ms-excel-read.c (excel_read_FONT): underline field of ExcelFont is not
a GnmUnderline but (now) a MsBiffFontUnderline
@@ -707,7 +707,7 @@
2009-01-15 Jean Brefort <jean brefort normalesup org>
* ms-chart.c: (axesused): Don't use g_return_val_if_fail for data
- dependent errors.
+ dependent errors.
2009-01-11 Morten Welinder <terra gnome org>
@@ -773,7 +773,7 @@
* xlsx-read.c (indexed_color) : return a GOColor.
(themed_color) : new. Has some magic to use the theme indicies as
- lookups into a hard coded map.d
+ lookups into a hard coded map.d
(xlsx_draw_color_themed) : simplified, the theme_colors_by_name is always defined.
(hue_to_color) : new.
(apply_tint) : new. Could be moved into goffice.
@@ -1139,7 +1139,7 @@
(end): a better auto marker test for #344950,
(ms_excel_chart_read), reparent invisible axis children before
deleting the axis.
- (chart_write_axis_sets): write radar plots axes.
+ (chart_write_axis_sets): write radar plots axes.
* ms-excel-read.c: (excel_read_BOF): reverse objects stack order.
2007-11-23 Jody Goldberg <jody gnome org>
@@ -1371,7 +1371,7 @@
* ms-chart.c: (end): use "Backplane" instead of "Grid" when goffice is 0.5,
(chart_write_text), (ms_excel_chart_write): made some work on titles
- position export.
+ position export.
2007-09-13 Jean Brefort <jean brefort normalesup org>
@@ -1632,7 +1632,7 @@
* ms-excel-write.c (excel_write_SETUP): use
print_info_get_paper_orientation
(write_sheet_head): print_info might be modified
- * ms-excel-read.c (excel_read_SETUP): use
+ * ms-excel-read.c (excel_read_SETUP): use
print_info_set_paper_orientation
2007-04-21 Morten Welinder <terra gnome org>
@@ -1667,7 +1667,7 @@
(xlsx_write_workbook) : ditto.
(xlsx_write_col) : up the accuracy of width export to match XL 2007.
put hidden before other flags to ease visual inspection of xml.
- (xlsx_write_cols) : skip initial empty cols, and include the last col.
+ (xlsx_write_cols) : skip initial empty cols, and include the last col.
2007-03-16 Morten Welinder <terra gnome org>
@@ -1834,7 +1834,7 @@
2005-07-06 Jon K Hellan <hellan acm org>
- * ms-excel-read.c (ms_sheet_realize_obj): Realize Excel 95 images
+ * ms-excel-read.c (ms_sheet_realize_obj): Realize Excel 95 images
[#155696].
* ms-obj.h: Add MS_OBJ_ATTR_IS_GOBJECT_MASK and
@@ -1922,7 +1922,7 @@
* boot.c: replaced gi18n.h by gi18n-lib.h.
* excel-xml-read.c: ditto.
* ms-excel-read.c: ditto.
- * ms-excel-write.c: ditto.
+ * ms-excel-write.c: ditto.
* ms-formula-read.c: ditto.
* ms-formula-write.c: ditto.
* xlsx-read.c: ditto.
@@ -2908,7 +2908,7 @@
* ms-excel-read.h (ms_biff_get_chars): Give g_iconv the right kind
of pointer.
- * ms-excel-write.h (excel_write_string_len): Change second
+ * ms-excel-write.h (excel_write_string_len): Change second
argument to be size_t*.
* ms-escher.c (ms_escher_get_data): Fix confusion between
@@ -3022,7 +3022,7 @@
2004-09-18 J.H.M. Dassen (Ray) <jdassen debian org>
* ms-excel-read.c: Added comments on how the paper size information can
- be used once gnome-print's API has been extended.
+ be used once gnome-print's API has been extended.
2004-09-17 Jody Goldberg <jody gnome org>
@@ -3038,7 +3038,7 @@
2004-09-15 Jon K Hellan <hellan acm org>
* ms-excel-write.c (txomarkup_new): New. Factored out of
- cb_cell_pre_pass.
+ cb_cell_pre_pass.
(cb_cell_pre_pass): See above.
(excel_write_ClientTextbox): Change first parameter to
ExcelWriteState. Save markup.
@@ -3217,7 +3217,7 @@
* crypt-md4.[ch]. New files. MD4 checksum to use as BLIP
id. Grabbed from Ethereal, originally from Samba.
- * ms-excel-write.c:
+ * ms-excel-write.c:
(blipinf_new): New function. Initialize a record for image data.
(blipinf_free): New function. Free an image data record.
(excel_write_image): New function. Write an image Sp record
@@ -3666,7 +3666,7 @@
2004-01-28 Andreas J. Guelzow <aguelzow taliesin ca>
* ms-excel-read.c (excel_read_SETUP): use print_info_set_orientation
- * ms-excel-write.c (excel_write_SETUP): ditto
+ * ms-excel-write.c (excel_write_SETUP): ditto
2004-01-16 Jody Goldberg <jody gnome org>
@@ -3755,7 +3755,7 @@
(cb_enumerate_macros) : new.
(cb_write_macro_NAME) : new.
(excel_write_names) : new.
-
+
* ms-excel-read.c (get_xtn_lens) : add a limiter on the rich text
warning.
(excel_formula_shared) : add some debug.
@@ -3764,7 +3764,7 @@
(excel_read_CF) : ditto.
(excel_read_DIMENSIONS) : ditto.
(excel_read_GUTS) : ditto.
- (excel_read_HLINK) : target frame is first (according to
+ (excel_read_HLINK) : target frame is first (according to
xls-export-crash.xls) and the docs.
(excel_read_SUPBOOK) : handle external workbooks with unicode names.
@@ -4205,7 +4205,7 @@
* boot.c (excel_file_probe): Guard against gsf read error.
(excel_file_open): Ditto.
- (excel_file_open):
+ (excel_file_open):
2003-03-26 Jody Goldberg <jody gnome org>
@@ -4809,7 +4809,7 @@
like XL2k generates different indicies when exporting as XL95 than
XL95 did. So have a fall back. If the theory that
a+1 == -ixals, a, b are 0 based
- fails. Go back to
+ fails. Go back to
a == ixals, and a, b are 1 based
2002-10-21 Jody Goldberg <jody gnome org>
@@ -4930,7 +4930,7 @@
2002-09-26 Jody Goldberg <jody gnome org>
- * ms-formula-read.c (ms_excel_parse_formula) : fix handling of 26 & 27.
+ * ms-formula-read.c (ms_excel_parse_formula) : fix handling of 26 & 27.
The docs are confusing. The cached data is appended not to the the
subexpression but to the entire string. While we're here add a stub
for tables.
@@ -5151,7 +5151,7 @@
* ms-excel-write.c (init_base_char_width_for_write) : delete.
(style_get_char_width) : renamed from get_base_char_width as it is now
- just a wrapper around the
+ just a wrapper around the
(ms_excel_write_DEFCOLWIDTH) : renamed from write_default_col_width
and use the right font in the width calculations.
(ms_excel_write_COLINFO) : renamed from write_colinfo and use the
@@ -5326,8 +5326,8 @@
2002-05-15 Andreas J. Guelzow <aguelzow taliesin ca>
- * ms-excel-read.c (ms_excel_init_margins) : margins are now in
- print_config
+ * ms-excel-read.c (ms_excel_init_margins) : margins are now in
+ print_config
(ms_excel_read_setup) : ditto
(ms_excel_read_sheet) : ditto
* ms-excel-write.c (margin_write) : ditto
diff --git a/plugins/excel/ms-chart.c b/plugins/excel/ms-chart.c
index a7ca8f1..caba046 100644
--- a/plugins/excel/ms-chart.c
+++ b/plugins/excel/ms-chart.c
@@ -1355,7 +1355,7 @@ BC_R(lineformat)(XLChartHandler const *handle,
ms_line_pattern [pattern]););
switch (pattern) {
- default:
+ default:
case 0:
s->style->line.dash_type = GO_LINE_SOLID;
break;
@@ -2275,7 +2275,7 @@ BC_R(tick)(XLChartHandler const *handle,
else
; // FIXME: not supported for now
}
-
+
d (1, {
switch (major) {
case 0: g_printerr ("no major tick;\n"); break;
diff --git a/plugins/excel/ms-excel-read.c b/plugins/excel/ms-excel-read.c
index 7f04e6f..361e7f8 100644
--- a/plugins/excel/ms-excel-read.c
+++ b/plugins/excel/ms-excel-read.c
@@ -1619,7 +1619,7 @@ excel_read_FONT (BiffQuery *q, GnmXLImporter *importer)
case 0x22: fd->underline = XLS_ULINE_DOUBLE_ACC; break; /* double accounting */
default:
g_printerr ("Unknown uline %#x\n", (int)data1);
- break;
+ break;
}
fd->fontname = excel_biff_text_1 (importer, q, 14);
}
@@ -1933,7 +1933,7 @@ xls_uline_to_gnm_underline (MsBiffFontUnderline mul)
{
g_return_val_if_fail (mul >= XLS_ULINE_NONE, UNDERLINE_NONE);
g_return_val_if_fail (mul <= XLS_ULINE_DOUBLE_ACC, UNDERLINE_NONE);
-
+
switch (mul) {
case XLS_ULINE_SINGLE:
return UNDERLINE_SINGLE;
@@ -1947,7 +1947,7 @@ xls_uline_to_gnm_underline (MsBiffFontUnderline mul)
default:
return UNDERLINE_NONE;
}
-
+
}
/* Adds a ref the result */
@@ -1998,7 +1998,7 @@ excel_get_style_from_xf (ExcelReadSheet *esheet, BiffXFData const *xf)
gnm_style_set_font_italic (mstyle, fd->italic);
gnm_style_set_font_strike (mstyle, fd->struck_out);
gnm_style_set_font_script (mstyle, fd->script);
- gnm_style_set_font_uline
+ gnm_style_set_font_uline
(mstyle, xls_uline_to_gnm_underline (fd->underline));
font_index = fd->color_idx;
} else
@@ -3069,7 +3069,7 @@ ms_wb_get_font_markup (MSContainer const *c, unsigned indx)
if (fd->attrs == NULL) {
PangoAttrList *attrs;
- PangoUnderline underline = gnm_translate_underline_to_pango
+ PangoUnderline underline = gnm_translate_underline_to_pango
(xls_uline_to_gnm_underline (fd->underline));
attrs = pango_attr_list_new ();
@@ -3390,9 +3390,9 @@ excel_parse_name (GnmXLImporter *importer, Sheet *sheet, char *name,
name for the sheet it specifies. This
triggers on the file from 632050. */
gnm_rangeref_normalize_pp (value_get_rangeref (val),
-
+
&pp,
-
+
&start_sheet,
&end_sheet,
&dest);
@@ -5105,7 +5105,7 @@ excel_read_CF (BiffQuery *q, ExcelReadSheet *esheet, GnmStyleConditions *sc)
mul = XLS_ULINE_DOUBLE_ACC;
break;
}
- gnm_style_set_font_uline
+ gnm_style_set_font_uline
(cond.overlay,
xls_uline_to_gnm_underline (mul));
}
diff --git a/plugins/excel/ms-excel-write.c b/plugins/excel/ms-excel-write.c
index 1aa9d46..c68cfec 100644
--- a/plugins/excel/ms-excel-write.c
+++ b/plugins/excel/ms-excel-write.c
@@ -2017,7 +2017,7 @@ excel_font_overlay_pango (ExcelWriteFont *efont, GSList *pango)
break;
case PANGO_ATTR_UNDERLINE :
- efont->underline = gnm_translate_underline_from_pango
+ efont->underline = gnm_translate_underline_from_pango
(((PangoAttrInt *)attr)->value);
break;
diff --git a/plugins/excel/xlsx-read.c b/plugins/excel/xlsx-read.c
index 23976a5..3befdf0 100644
--- a/plugins/excel/xlsx-read.c
+++ b/plugins/excel/xlsx-read.c
@@ -4278,7 +4278,7 @@ xlsx_run_weight (GsfXMLIn *xin, xmlChar const **attrs)
if (state->run_attrs == NULL)
state->run_attrs = pango_attr_list_new ();
pango_attr_list_insert (state->run_attrs, attr);
-
+
}
}
@@ -4292,7 +4292,7 @@ xlsx_run_style (GsfXMLIn *xin, xmlChar const **attrs)
if (state->run_attrs == NULL)
state->run_attrs = pango_attr_list_new ();
pango_attr_list_insert (state->run_attrs, attr);
-
+
}
}
@@ -4306,7 +4306,7 @@ xlsx_run_family (GsfXMLIn *xin, xmlChar const **attrs)
if (state->run_attrs == NULL)
state->run_attrs = pango_attr_list_new ();
pango_attr_list_insert (state->run_attrs, attr);
-
+
}
}
@@ -4320,7 +4320,7 @@ xlsx_run_size (GsfXMLIn *xin, xmlChar const **attrs)
if (state->run_attrs == NULL)
state->run_attrs = pango_attr_list_new ();
pango_attr_list_insert (state->run_attrs, attr);
-
+
}
}
@@ -4334,7 +4334,7 @@ xlsx_run_strikethrough (GsfXMLIn *xin, xmlChar const **attrs)
if (state->run_attrs == NULL)
state->run_attrs = pango_attr_list_new ();
pango_attr_list_insert (state->run_attrs, attr);
-
+
}
}
@@ -4356,7 +4356,7 @@ xlsx_run_underline (GsfXMLIn *xin, xmlChar const **attrs)
if (state->run_attrs == NULL)
state->run_attrs = pango_attr_list_new ();
pango_attr_list_insert (state->run_attrs, attr);
-
+
}
}
@@ -4377,7 +4377,7 @@ xlsx_run_color (GsfXMLIn *xin, xmlChar const **attrs)
if (state->run_attrs == NULL)
state->run_attrs = pango_attr_list_new ();
pango_attr_list_insert (state->run_attrs, attr);
-
+
}
}
@@ -4457,7 +4457,7 @@ xlsx_comment_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
}
sheet_object_set_sheet (SHEET_OBJECT (state->comment), state->sheet);
state->comment = NULL;
-
+
}
static void
@@ -4520,7 +4520,7 @@ GSF_XML_IN_NODE_FULL (START, COMMENTS, XL_NS_SS, "comments", GSF_XML_NO_CONTENT,
GSF_XML_IN_NODE (TEXTITEM, ITEM_PHONETIC_RUN, XL_NS_SS, "rPh", GSF_XML_NO_CONTENT, NULL, NULL),
GSF_XML_IN_NODE (ITEM_PHONETIC_RUN, PHONETIC_TEXT, XL_NS_SS, "t", GSF_XML_CONTENT, NULL, NULL),
GSF_XML_IN_NODE (TEXTITEM, ITEM_PHONETIC, XL_NS_SS, "phoneticPr", GSF_XML_NO_CONTENT, NULL, NULL),
-
+
GSF_XML_IN_NODE_END
};
@@ -4564,7 +4564,7 @@ xlsx_wb_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
continue;
}
/* load comments */
-
+
cin = gsf_open_pkg_open_rel_by_type (sin,
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments";, NULL);
xlsx_parse_stream (state, sin, xlsx_sheet_dtd);
diff --git a/plugins/excel/xlsx-write.c b/plugins/excel/xlsx-write.c
index cb23e33..c589a72 100644
--- a/plugins/excel/xlsx-write.c
+++ b/plugins/excel/xlsx-write.c
@@ -1413,7 +1413,7 @@ xlsx_write_sheet (XLSXWriteState *state, GsfOutfile *dir, GsfOutfile *wb_part, u
xlsx_write_comments (state, sheet_part, charts);
g_slist_free (charts);
}
-
+
/* charts */
charts = sheet_objects_get (state->sheet, NULL, SHEET_OBJECT_GRAPH_TYPE);
if (NULL != charts) {
@@ -1583,8 +1583,8 @@ xlsx_write_workbook (XLSXWriteState *state, GsfOutfile *root_part)
gsf_xml_out_end_element (xml);
gsf_xml_out_start_element (xml, "workbookPr");
- gsf_xml_out_add_int (xml, "date1904",
- workbook_date_conv (state->base.wb)->use_1904
+ gsf_xml_out_add_int (xml, "date1904",
+ workbook_date_conv (state->base.wb)->use_1904
? 1 : 0);
gsf_xml_out_end_element (xml);
diff --git a/plugins/excelplugins/excelplugins.c b/plugins/excelplugins/excelplugins.c
index a93f9a1..249d29c 100644
--- a/plugins/excelplugins/excelplugins.c
+++ b/plugins/excelplugins/excelplugins.c
@@ -1,7 +1,7 @@
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* excelplugins.c:
- *
+ *
* Adapter interface to load worksheet functions defined in Excel
* plugins (also known as XLLs). Note that this adapter interface
* only works for XLL worksheet functions that expect all their
diff --git a/plugins/fn-christian-date/functions.c b/plugins/fn-christian-date/functions.c
index d3cea4d..9725692 100644
--- a/plugins/fn-christian-date/functions.c
+++ b/plugins/fn-christian-date/functions.c
@@ -96,7 +96,7 @@ adjust_year (int year, GODateConventions const *conv)
return 2000 + year;
else if (year <= 99)
return 1900 + year;
- else if (year < (gnm_datetime_allow_negative () ? 1582
+ else if (year < (gnm_datetime_allow_negative () ? 1582
: go_date_convention_base (conv)))
return -1;
else if (year > 9956)
diff --git a/plugins/fn-database/ChangeLog b/plugins/fn-database/ChangeLog
index 78f8ef0..71f4737 100644
--- a/plugins/fn-database/ChangeLog
+++ b/plugins/fn-database/ChangeLog
@@ -334,7 +334,7 @@
2003-06-30 Andreas J. Guelzow <aguelzow taliesin ca>
- * functions.c: Do not use preprocessor macros in
+ * functions.c: Do not use preprocessor macros in
translatable text
2003-06-21 Andreas J. Guelzow <aguelzow taliesin ca>
diff --git a/plugins/fn-date/ChangeLog b/plugins/fn-date/ChangeLog
index a2fde55..3017ab9 100644
--- a/plugins/fn-date/ChangeLog
+++ b/plugins/fn-date/ChangeLog
@@ -14,7 +14,7 @@
* functions.c (help_networkdays): fix argument description according
to the changes in the OpenFormula draft, correct the situation with
- respect to only weekend days
+ respect to only weekend days
(help_workday): ditto
2010-07-30 Morten Welinder <terra gnome org>
diff --git a/plugins/fn-date/functions.c b/plugins/fn-date/functions.c
index f2693dd..8aa0cd8 100644
--- a/plugins/fn-date/functions.c
+++ b/plugins/fn-date/functions.c
@@ -807,7 +807,7 @@ gnumeric_workday (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
if (weekends != default_weekends)
g_free (weekends);
return make_date (value_new_int (go_date_g_to_serial (&date, conv)));
- }
+ }
if (argv[2]) {
int j;
@@ -910,7 +910,7 @@ gnumeric_workday (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
while (dm_part_week) {
g_date_subtract_days (&date, 1);
- weekday = (weekday > 0) ? (weekday - 1)
+ weekday = (weekday > 0) ? (weekday - 1)
: G_DATE_SATURDAY;
if (!weekends[weekday])
dm_part_week--;
diff --git a/plugins/fn-financial/ChangeLog b/plugins/fn-financial/ChangeLog
index 99ce935..79973c4 100644
--- a/plugins/fn-financial/ChangeLog
+++ b/plugins/fn-financial/ChangeLog
@@ -64,8 +64,8 @@
2010-05-05 Andreas J. Guelzow <aguelzow pyrshep ca>
* functions.c (gnumeric_accrint): make @{par} optional
- (help_accrint): update
- (financial_functions): update
+ (help_accrint): update
+ (financial_functions): update
2010-04-16 Morten Welinder <terra gnome org>
@@ -85,7 +85,7 @@
2010-01-04 Andreas J. Guelzow <aguelzow pyrshep ca>
- * functions.c (help_npv): there does not seem to be
+ * functions.c (help_npv): there does not seem to be
a type argument
2010-01-02 Andreas J. Guelzow <aguelzow pyrshep ca>
@@ -107,7 +107,7 @@
2009-12-03 Andreas J. Guelzow <aguelzow pyrshep ca>
- * functions.c (help_euro): add currencies added to
+ * functions.c (help_euro): add currencies added to
the euro in 2007 to 2009
(one_euro): ditto
diff --git a/plugins/fn-financial/functions.c b/plugins/fn-financial/functions.c
index bac5064..c4516ae 100644
--- a/plugins/fn-financial/functions.c
+++ b/plugins/fn-financial/functions.c
@@ -368,17 +368,17 @@ static GnmFuncHelp const help_accrint[] = {
{ GNM_FUNC_HELP_ARG, F_("frequency:number of interest payments per year")},
{ GNM_FUNC_HELP_ARG, F_("basis:calendar basis, defaults to 0")},
{ GNM_FUNC_HELP_ARG, F_("calc_method:calculation method, defaults to TRUE")},
- { GNM_FUNC_HELP_DESCRIPTION,
+ { GNM_FUNC_HELP_DESCRIPTION,
F_("If @{first_interest} < @{settlement} and @{calc_method} is "
"TRUE, then ACCRINT returns the sum of the"
" interest accrued in all coupon periods from @{issue} "
" date until @{settlement} date.") },
- { GNM_FUNC_HELP_DESCRIPTION,
+ { GNM_FUNC_HELP_DESCRIPTION,
F_("If @{first_interest} < @{settlement} and @{calc_method} is "
"FALSE, then ACCRINT returns the sum of the"
" interest accrued in all coupon periods from @{first_interest} "
" date until @{settlement} date.") },
- { GNM_FUNC_HELP_DESCRIPTION,
+ { GNM_FUNC_HELP_DESCRIPTION,
F_("Otherwise ACCRINT returns the sum of the"
" interest accrued in all coupon periods from @{issue} "
" date until @{settlement} date.") },
@@ -2907,7 +2907,7 @@ static GnmFuncHelp const help_amordegrc[] = {
"2.0 for an expected lifetime of at least 5 years but at most 6 years,\n"
"2.5 for an expected lifetime of more than 6 years.") },
{ GNM_FUNC_HELP_NOTE, F_("Special depreciation rules are applied for the last two periods resulting in a possible total "
- "depreciation exceeding the difference of @{cost} - @{salvage}.") },
+ "depreciation exceeding the difference of @{cost} - @{salvage}.") },
{ GNM_FUNC_HELP_NOTE, F_("Named for AMORtissement DEGRessif Comptabilite.") },
GNM_DATE_BASIS_HELP
{ GNM_FUNC_HELP_EXAMPLES, "=AMORDEGRC(2400,DATE(1998,8,19),DATE(1998,12,30),300,1,0.14,1)" },
diff --git a/plugins/fn-hebrew-date/functions.c b/plugins/fn-hebrew-date/functions.c
index f141eef..c737749 100644
--- a/plugins/fn-hebrew-date/functions.c
+++ b/plugins/fn-hebrew-date/functions.c
@@ -69,7 +69,7 @@ gnumeric_hdate_get_date (GnmValue const * const *arg, int *year, int *month, int
}
static GnmValue *
-gnumeric_date_get_date (GnmFuncEvalInfo * ei, GnmValue const * const val,
+gnumeric_date_get_date (GnmFuncEvalInfo * ei, GnmValue const * const val,
int *year, int *month, int *day)
{
GDate date;
diff --git a/plugins/fn-hebrew-date/hdate.h b/plugins/fn-hebrew-date/hdate.h
index a9adb73..d5a90c9 100644
--- a/plugins/fn-hebrew-date/hdate.h
+++ b/plugins/fn-hebrew-date/hdate.h
@@ -31,7 +31,7 @@ extern "C"
/**
@brief Return the days from the start
-
+
@param y The years
@warning internal function.
*/
@@ -62,7 +62,7 @@ hdate_hdate_to_gdate (int d, int m, int y, int *gd, int *gm, int *gy);
/**
@brief Compute Julian day (jd from Gregorian day, month and year (d, m, y)
- Algorithm from 'Julian and Gregorian Day Numbers' by Peter Meyer
+ Algorithm from 'Julian and Gregorian Day Numbers' by Peter Meyer
@author Yaacov Zamir ( algorithm from Henry F. Fliegel and Thomas C. Van Flandern ,1968)
@param d Day of month 1..31
@@ -74,7 +74,7 @@ hdate_gdate_to_jd (int d, int m, int y);
/**
@brief Converting from the Julian day to the Gregorian day
- Algorithm from 'Julian and Gregorian Day Numbers' by Peter Meyer
+ Algorithm from 'Julian and Gregorian Day Numbers' by Peter Meyer
@author Yaacov Zamir ( Algorithm, Henry F. Fliegel and Thomas C. Van Flandern ,1968)
@param jd Julian day
@@ -112,7 +112,7 @@ hdate_hdate_to_jd (int d, int m, int y);
/**
@brief convert an integer to hebrew string UTF-8 (logical)
-
+
@param n The int to convert
@attention ( 0 < n < 10000)
@warning uses a static string, so output should be copied away.
diff --git a/plugins/fn-hebrew-date/hdate_hdate.c b/plugins/fn-hebrew-date/hdate_hdate.c
index 8486e2a..c6b6236 100644
--- a/plugins/fn-hebrew-date/hdate_hdate.c
+++ b/plugins/fn-hebrew-date/hdate_hdate.c
@@ -35,7 +35,7 @@
/**
@brief Return the days from the start
-
+
@param y The years
@warning internal function.
*/
@@ -125,7 +125,7 @@ hdate_hdate_to_gdate (int d, int m, int y, int *gd, int *gm, int *gy)
/**
@brief Compute Julian day (jd from Gregorian day, month and year (d, m, y)
- Algorithm from 'Julian and Gregorian Day Numbers' by Peter Meyer
+ Algorithm from 'Julian and Gregorian Day Numbers' by Peter Meyer
@author Yaacov Zamir ( algorithm from Henry F. Fliegel and Thomas C. Van Flandern ,1968)
@param d Day of month 1..31
@@ -146,7 +146,7 @@ hdate_gdate_to_jd (int d, int m, int y)
/**
@brief Converting from the Julian day to the Gregorian day
- Algorithm from 'Julian and Gregorian Day Numbers' by Peter Meyer
+ Algorithm from 'Julian and Gregorian Day Numbers' by Peter Meyer
@author Yaacov Zamir ( Algorithm, Henry F. Fliegel and Thomas C. Van Flandern ,1968)
@param jd Julian day
diff --git a/plugins/fn-hebrew-date/hdate_strings.c b/plugins/fn-hebrew-date/hdate_strings.c
index caf91f6..d50cbae 100644
--- a/plugins/fn-hebrew-date/hdate_strings.c
+++ b/plugins/fn-hebrew-date/hdate_strings.c
@@ -35,7 +35,7 @@
/**
@brief convert an integer to hebrew string UTF-8 (logical)
-
+
@param n The int to convert
@attention ( 0 < n < 10000)
@warning uses a static string, so output should be copied away.
@@ -91,9 +91,9 @@ hdate_int_to_hebrew (GString *res, int n)
g_string_append (res, UNICODE_GERESH);
else
g_string_insert
- (res,
+ (res,
g_utf8_offset_to_pointer (res->str + oldlen,
- length - 1) - res->str,
+ length - 1) - res->str,
UNICODE_GERSHAYIM);
}
@@ -134,7 +134,7 @@ hdate_get_hebrew_month_name_heb (int month)
{
static const char *h_heb_months[] = {
"ת\xd6\xbc\xd6\xb4ש\xd7\x81\xd6\xb0ר\xd6\xb5×?", /* Tishri */
- "×?\xd6\xb6ש\xd7\x81\xd6\xb0×?\xd7\x87×?", /* Heshwan */
+ "×?\xd6\xb6ש\xd7\x81\xd6\xb0×?\xd7\x87×?", /* Heshwan */
"×?\xd6\xbc\xd6\xb4ס\xd6\xb0×?\xd6\xb5×?", /* Kislev */
"×?\xd6\xb5×?\xd6\xb5ת", /* Tebet */
"ש\xd7\x81\xd6\xb0×?\xd7\x87×?", /* Shebat */
diff --git a/plugins/fn-info/ChangeLog b/plugins/fn-info/ChangeLog
index 5c4a3cf..4aa310f 100644
--- a/plugins/fn-info/ChangeLog
+++ b/plugins/fn-info/ChangeLog
@@ -563,5 +563,5 @@
2002-05-03 Andreas J. Guelzow <aguelzow taliesin ca>
- * functions.c : mark argument names for translation and adjust
+ * functions.c : mark argument names for translation and adjust
them for use by the formula guru.
diff --git a/plugins/fn-logical/ChangeLog b/plugins/fn-logical/ChangeLog
index 7983165..578ab66 100644
--- a/plugins/fn-logical/ChangeLog
+++ b/plugins/fn-logical/ChangeLog
@@ -425,5 +425,5 @@
2002-05-03 Andreas J. Guelzow <aguelzow taliesin ca>
- * functions.c : mark argument names for translation and adjust
+ * functions.c : mark argument names for translation and adjust
them for use by the formula guru.
diff --git a/plugins/fn-logical/functions.c b/plugins/fn-logical/functions.c
index 1a780a2..02bc364 100644
--- a/plugins/fn-logical/functions.c
+++ b/plugins/fn-logical/functions.c
@@ -317,7 +317,7 @@ GnmFuncDescriptor const logical_functions[] = {
GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE },
{ "ifna", "EE", help_ifna,
gnumeric_ifna, NULL, NULL, NULL, NULL,
- GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_UNIQUE_TO_GNUMERIC,
+ GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_UNIQUE_TO_GNUMERIC,
GNM_FUNC_TEST_STATUS_NO_TESTSUITE},
{ "true", "", help_true, gnumeric_true,
NULL, NULL, NULL, NULL,
diff --git a/plugins/fn-lookup/ChangeLog b/plugins/fn-lookup/ChangeLog
index 06d38f9..f7b10fa 100644
--- a/plugins/fn-lookup/ChangeLog
+++ b/plugins/fn-lookup/ChangeLog
@@ -656,10 +656,10 @@
2002-05-09 Andreas J. Guelzow <aguelzow taliesin ca>
* functions.c (find_index_bisection) : use value_area_get_x_y rather
- than value_area_fetch_x_y
+ than value_area_fetch_x_y
http://bugzilla.gnome.org/show_bug.cgi?id=80126
2002-05-03 Andreas J. Guelzow <aguelzow taliesin ca>
- * functions.c : mark argument names for translation and adjust
+ * functions.c : mark argument names for translation and adjust
them for use by the formula guru.
diff --git a/plugins/fn-lookup/functions.c b/plugins/fn-lookup/functions.c
index 276092b..34b1c57 100644
--- a/plugins/fn-lookup/functions.c
+++ b/plugins/fn-lookup/functions.c
@@ -1581,7 +1581,7 @@ gnumeric_sheets (GnmFuncEvalInfo *ei, GnmValue const * const *args)
return value_new_int (1);
return value_new_int (ans_max - ans_min + 1);
- } else
+ } else
return value_new_int (1);
} else
return value_new_int (workbook_sheet_count (wb));
@@ -1615,26 +1615,26 @@ gnumeric_sheet (GnmFuncEvalInfo *ei, GnmValue const * const *args)
b = g_slist_index (workbook_sheets (wb), r->b.sheet);
if (a == -1 && b == -1)
- return value_new_int (1 + g_slist_index
- (workbook_sheets (wb),
+ return value_new_int (1 + g_slist_index
+ (workbook_sheets (wb),
ei->pos->sheet));
else if (a == b || (a * b) < 0)
return value_new_int (1 + ((a < b) ? b : a));
else
return value_new_error_NUM (ei->pos);
} else if (v->type == VALUE_STRING) {
- Sheet *sheet = workbook_sheet_by_name
+ Sheet *sheet = workbook_sheet_by_name
(wb, value_peek_string (v));
if (sheet == NULL)
return value_new_error_NUM (ei->pos);
else
- return value_new_int
- (1 + g_slist_index (workbook_sheets (wb),
+ return value_new_int
+ (1 + g_slist_index (workbook_sheets (wb),
sheet));
} else
return value_new_error_VALUE (ei->pos);
} else
- return value_new_int (1 + g_slist_index (workbook_sheets (wb),
+ return value_new_int (1 + g_slist_index (workbook_sheets (wb),
ei->pos->sheet));
}
/***************************************************************************/
@@ -1711,7 +1711,7 @@ callback_function_array (GnmEvalPos const *ep, GnmValue const *value, void *clos
{
GSList **list = closure;
- *list = g_slist_prepend
+ *list = g_slist_prepend
(*list, value ? value_dup (value) : value_new_empty ());
return NULL;
}
@@ -1721,7 +1721,7 @@ gnumeric_array (GnmFuncEvalInfo *ei, int argc, GnmExprConstPtr const *argv)
{
GSList *list = NULL, *l;
int len, i;
- GnmValue *val = function_iterate_argument_values
+ GnmValue *val = function_iterate_argument_values
(ei->pos, callback_function_array, &list,
argc, argv, FALSE, CELL_ITER_ALL);
@@ -1736,7 +1736,7 @@ gnumeric_array (GnmFuncEvalInfo *ei, int argc, GnmExprConstPtr const *argv)
go_slist_free_custom (list, (GFreeFunc) value_release);
return value_new_error_VALUE (ei->pos);
}
-
+
if (len == 1) {
val = list->data;
g_slist_free (list);
@@ -1744,7 +1744,7 @@ gnumeric_array (GnmFuncEvalInfo *ei, int argc, GnmExprConstPtr const *argv)
}
val = value_new_array_empty (1, len);
-
+
for (l = list, i = 0; l != NULL; l = l->next, i++)
val->v_array.vals[0][i] = l->data;
@@ -1784,13 +1784,13 @@ gnumeric_sort (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
switch (argv[1] ? value_get_as_int (argv[1]) : 0) {
case 0:
result = value_new_array_empty (1, n);
-
+
for (i = 0, j = n - 1; i < n; i++, j--)
result->v_array.vals[0][i] = value_new_float (xs[j]);
break;
case 1:
result = value_new_array_empty (1, n);
-
+
for (i = 0; i < n; i++)
result->v_array.vals[0][i] = value_new_float (xs[i]);
break;
diff --git a/plugins/fn-math/ChangeLog b/plugins/fn-math/ChangeLog
index 661acf0..2602241 100644
--- a/plugins/fn-math/ChangeLog
+++ b/plugins/fn-math/ChangeLog
@@ -78,7 +78,7 @@
2009-12-23 Andreas J. Guelzow <aguelzow pyrshep ca>
- * functions.c (compare_doubles): rename to
+ * functions.c (compare_doubles): rename to
compare_gnumeric_eigen_ev and change all callers
(compare_gnumeric_eigen_ev): use the true type
@@ -88,7 +88,7 @@
2009-12-23 Andreas J. Guelzow <aguelzow pyrshep ca>
- * functions.c (compare_doubles): rename to
+ * functions.c (compare_doubles): rename to
compare_gnumeric_eigen_ev and change all callers
(compare_gnumeric_eigen_ev): use the true type
@@ -805,5 +805,5 @@
2002-05-03 Andreas J. Guelzow <aguelzow taliesin ca>
- * functions.c : mark argument names for translation and adjust
+ * functions.c : mark argument names for translation and adjust
them for use by the formula guru.
diff --git a/plugins/fn-numtheory/ChangeLog b/plugins/fn-numtheory/ChangeLog
index 27ed840..1f492c9 100644
--- a/plugins/fn-numtheory/ChangeLog
+++ b/plugins/fn-numtheory/ChangeLog
@@ -448,7 +448,7 @@
* doc/C/: Added this tree structure. This is now the test bed for
the new Gnumeric documentation platform for Gnome 2.
-
+
2002-02-01 Jody Goldberg <jody gnome org>
* numtheory.c (gnumeric_phi) : Use UTF-8.
diff --git a/plugins/fn-r/extra.c b/plugins/fn-r/extra.c
index 3bf04c6..ffc28ce 100644
--- a/plugins/fn-r/extra.c
+++ b/plugins/fn-r/extra.c
@@ -60,7 +60,7 @@ qcauchy (gnm_float p, gnm_float location, gnm_float scale,
#define LIM2 15.0
#define LIM3 15.0
#define LIM4 1E-5
-
+
#define TWOPI_INVERSE 1/(2*M_PIgnum)
static gnm_float
@@ -103,7 +103,7 @@ gnm_owent (gnm_float h, gnm_float a)
for (;;)
{
gnm_float rt = as + 1.0;
- h2 = h1 + (hs * as + LIM3 - log(rt))
+ h2 = h1 + (hs * as + LIM3 - log(rt))
/ (2.0 * h1 * (1.0 / rt - hs));
as = h2 * h2;
if (fabs(h2 - h1) < LIM4) break;
@@ -131,10 +131,10 @@ gnm_owent (gnm_float h, gnm_float a)
/* The skew-normal distribution. */
-gnm_float
+gnm_float
dsnorm (gnm_float x, gnm_float shape, gnm_float location, gnm_float scale, gboolean give_log)
{
- if (shape == 0.)
+ if (shape == 0.)
return dnorm (x, location, scale, give_log);
else if (give_log)
return gnm_log (2.) + dnorm (x, location, scale, TRUE) + pnorm (shape * x, shape * location, scale, TRUE, TRUE);
@@ -142,12 +142,12 @@ dsnorm (gnm_float x, gnm_float shape, gnm_float location, gnm_float scale, gbool
return 2 * dnorm (x, location, scale, FALSE) * pnorm (shape * x, location/shape, scale, TRUE, FALSE);
}
-gnm_float
+gnm_float
psnorm (gnm_float x, gnm_float shape, gnm_float location, gnm_float scale, gboolean lower_tail, gboolean log_p)
{
gnm_float result;
- if (shape == 0.)
+ if (shape == 0.)
return pnorm (x, location, scale, lower_tail, log_p);
result = pnorm (x, location, scale, TRUE, FALSE) - 2 * gnm_owent ((x - location)/scale, shape);
@@ -162,10 +162,10 @@ psnorm (gnm_float x, gnm_float shape, gnm_float location, gnm_float scale, gbool
}
-gnm_float
+gnm_float
qsnorm (gnm_float p, gnm_float shape, gnm_float location, gnm_float scale, gboolean lower_tail, gboolean log_p)
{
- if (shape == 0.)
+ if (shape == 0.)
return qnorm (p, location, scale, lower_tail, log_p);
else if (log_p)
return 0.;
@@ -177,24 +177,24 @@ qsnorm (gnm_float p, gnm_float shape, gnm_float location, gnm_float scale, gbool
/* The skew-t distribution. */
-gnm_float
+gnm_float
dst (gnm_float x, gnm_float n, gnm_float shape, gboolean give_log)
{
- if (shape == 0.)
+ if (shape == 0.)
return dt (x, n, give_log);
else {
gnm_float pdf = dt (x, n, give_log);
- gnm_float cdf = pt (shape * x * gnm_sqrt ((n + 1)/(x * x + n)),
+ gnm_float cdf = pt (shape * x * gnm_sqrt ((n + 1)/(x * x + n)),
n + 1, TRUE, give_log);
return ((give_log) ? (gnm_log (2.) + pdf + cdf) : (2. * pdf * cdf));
}
}
-gnm_float
+gnm_float
pst (gnm_float x, gnm_float n, gnm_float shape, gboolean lower_tail, gboolean log_p)
{
- if (shape == 0.)
+ if (shape == 0.)
return pt (x, n, lower_tail, log_p);
else if (log_p)
return 0.;
@@ -203,10 +203,10 @@ pst (gnm_float x, gnm_float n, gnm_float shape, gboolean lower_tail, gboolean lo
}
-gnm_float
+gnm_float
qst (gnm_float p, gnm_float n, gnm_float shape, gboolean lower_tail, gboolean log_p)
{
- if (shape == 0.)
+ if (shape == 0.)
return qt (p, n, lower_tail, log_p);
else if (log_p)
return 0.;
diff --git a/plugins/fn-random/ChangeLog b/plugins/fn-random/ChangeLog
index 79066bf..81bff18 100644
--- a/plugins/fn-random/ChangeLog
+++ b/plugins/fn-random/ChangeLog
@@ -500,7 +500,7 @@
2002-07-22 Jukka Pekka <jiivonen hutcs cs hut fi>
- * gsl-pdf.c (random_gamma_pdf, random_beta_pdf,
+ * gsl-pdf.c (random_gamma_pdf, random_beta_pdf,
random_exponential_pdf): Imported from GSL.
* functions.c: Added PDFBETA(), PDFEXP(), PDFEXPPOW(), PDFGAMMA(),
@@ -537,7 +537,7 @@
2002-07-18 Jukka Pekka <jiivonen hutcs cs hut fi>
- * functions.c: Added RANDBETA(), RANDCHISQ(), RANDFDIST(), RANDGEOM(),
+ * functions.c: Added RANDBETA(), RANDCHISQ(), RANDFDIST(), RANDGEOM(),
RANDHYPERG(), RANDLOG(), and RANDLOGISTIC().
2002-07-18 Jukka Pekka <jiivonen hutcs cs hut fi>
diff --git a/plugins/fn-stat/functions.c b/plugins/fn-stat/functions.c
index 6673530..2d4c805 100644
--- a/plugins/fn-stat/functions.c
+++ b/plugins/fn-stat/functions.c
@@ -3637,7 +3637,7 @@ gnumeric_trend (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
value_array_set (result, 0, i,
value_new_float (res));
}
- } else
+ } else
switch (data.type) {
case gnm_reg_type_rect:
new_x_n = value_area_get_height (new_x, ei->pos);
@@ -3650,12 +3650,12 @@ gnumeric_trend (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
(new_x, j, i, 0, 0, 1, ei->pos);
if (new_x_val != NULL) {
res += new_x_val[0] * linres[1];
- value_array_set
+ value_array_set
(result, j, i,
value_new_float (res));
g_free (new_x_val);
} else
- value_array_set
+ value_array_set
(result, j, i,
value_new_error_NA (ei->pos));
}
@@ -3705,7 +3705,7 @@ gnumeric_trend (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
value_new_error_NA (ei->pos));
}
break;
- }
+ }
out:
diff --git a/plugins/fn-string/ChangeLog b/plugins/fn-string/ChangeLog
index 41a6675..6df87a8 100644
--- a/plugins/fn-string/ChangeLog
+++ b/plugins/fn-string/ChangeLog
@@ -17,11 +17,11 @@
2010-07-23 Andreas J. Guelzow <aguelzow pyrshep ca>
* functions.c (help_searchb): fix description
-
+
2010-07-16 Andreas J. Guelzow <aguelzow pyrshep ca>
* functions.c (help_char): fix description
-
+
2010-07-08 Morten Welinder <terra gnome org>
* functions.c (gnumeric_fixed): Use go_format_details_new and
diff --git a/plugins/fn-string/functions.c b/plugins/fn-string/functions.c
index 6be45a4..c659409 100644
--- a/plugins/fn-string/functions.c
+++ b/plugins/fn-string/functions.c
@@ -1087,7 +1087,7 @@ gnumeric_numbervalue (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
while (*p && g_unichar_isspace (g_utf8_get_char (p)))
p = g_utf8_next_char (p);
- v = format_match_decimal_number_with_locale
+ v = format_match_decimal_number_with_locale
(p, &family, curr, thousand, decimal);
g_string_free (decimal, TRUE);
@@ -1095,7 +1095,7 @@ gnumeric_numbervalue (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
g_string_free (curr, TRUE);
if (v == NULL)
- v = format_match_number
+ v = format_match_number
(p, NULL,
workbook_date_conv (ei->pos->sheet->workbook));
diff --git a/plugins/fn-tsa/ChangeLog b/plugins/fn-tsa/ChangeLog
index defef4a..46b88ba 100644
--- a/plugins/fn-tsa/ChangeLog
+++ b/plugins/fn-tsa/ChangeLog
@@ -148,7 +148,7 @@
2009-06-05 Andreas J. Guelzow <aguelzow pyrshep ca>
- * functions.c (gnm_fourier_fft): moved here from
+ * functions.c (gnm_fourier_fft): moved here from
src/tools/analysis-tools.c
(help_interpolation): changed to new form of desription
(help_periodogram): ditto
diff --git a/plugins/fn-tsa/functions.c b/plugins/fn-tsa/functions.c
index bcbfd32..c4a0117 100644
--- a/plugins/fn-tsa/functions.c
+++ b/plugins/fn-tsa/functions.c
@@ -436,7 +436,7 @@ gnumeric_interpolation (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
/* start collecting targets */
vals2 = collect_floats_value_with_info (argv[2], ei->pos, flags,
&n2, &missing2, &error);
-
+
if (argv[3]) {
interp = (int) gnm_floor (value_get_as_float (argv[3]));
if (interp < 0 || interp > INTERPOLATION_SPLINE_AVG) {
@@ -848,7 +848,7 @@ gnumeric_fourier (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
if (argv[1]) {
inverse = 0 != (int) gnm_floor (value_get_as_float (argv[1]));
if (argv[2]) {
- sep_columns = (0 != (int)
+ sep_columns = (0 != (int)
gnm_floor (value_get_as_float (argv[2])));
}
}
@@ -882,7 +882,7 @@ gnumeric_fourier (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
for (i = 0; i < nb; i++) {
res->v_array.vals[0][i] = value_new_float (out[i].re);
res->v_array.vals[1][i] = value_new_float (out[i].im);
- }
+ }
g_free (out);
} else
res = value_new_error_std (ei->pos, GNM_ERROR_VALUE);
diff --git a/plugins/guile/ChangeLog b/plugins/guile/ChangeLog
index 33be425..496b069 100644
--- a/plugins/guile/ChangeLog
+++ b/plugins/guile/ChangeLog
@@ -421,7 +421,7 @@
2002-03-28 Jon K Hellan <hellan acm org>
* plugin.c (gnm_guile_helper): New function. Helper to call
- scm_apply_0.
+ scm_apply_0.
(gnm_guile_catcher): New function. Receives error info from Guile
if Guile throws an error.
(func_marshal_func): Handle errors from Guile gracefully. The old
@@ -572,7 +572,7 @@
2001-08-11 Ariel Rios <ariel linuxppc org>
- * plugin.c (func_scm_apply): Use scm_c_eval_string instead of
+ * plugin.c (func_scm_apply): Use scm_c_eval_string instead of
scm_eval_0str which is now deprecated.
(plugin_init_general): Ditto.
@@ -685,7 +685,7 @@
* guile-support.c : Ditto for the functions removed on header file.
(scm_to_value): We now only call get_value_from_smob and things are
way easier and cleaner now.
- * guile-support.h: (list_to_scm): Removed function.
+ * guile-support.h: (list_to_scm): Removed function.
(cell_ref_to_scm): Ditto
(scm_to_cell_ref): Ditto
(scm_symbolfrom0str): Ditto
@@ -698,7 +698,7 @@
2000-11-12 Ariel Rios <ariel arcavia com>
* functions.scm (fibo): Use value-get-as-int for getting the integer value.
- * guile-support.c (value_to_scm): We now create a new smob value instead of dealing
+ * guile-support.c (value_to_scm): We now create a new smob value instead of dealing
with a case per case basis.
2000-11-11 Ariel Rios <ariel arcavia com>
@@ -759,16 +759,16 @@
2000-11-05 Ariel Rios <ariel arcavia com>
- * guile-support.c (value_to_scm): Use value_get_as functions as per Jody
+ * guile-support.c (value_to_scm): Use value_get_as functions as per Jody
recommendation.
2000-11-04 Ariel Rios <ariel arcavia com>
- * plugin.c (scm_cell_expr): Return SCM_EOL instead of expr_to_scm.
+ * plugin.c (scm_cell_expr): Return SCM_EOL instead of expr_to_scm.
* guile-support.c (value_to_scm): Correctly create the list unto the guile interpreter.
Greatest PBB ever! In the VALUE_EMPTY case we now return SCM_EOL instead of SCM_UNSPECIFIED.
Clean some comments.
- (expr_to_scm): Comment this function that it is not needed
+ (expr_to_scm): Comment this function that it is not needed
2000-11-01 Ariel Rios <ariel arcavia com>
@@ -776,7 +776,7 @@
2000-10-30 Ariel Rios <ariel arcavia com>
- * guile-support.c (value_to_scm): Correct the VALUE_ARRAY case.
+ * guile-support.c (value_to_scm): Correct the VALUE_ARRAY case.
We now correctly create the list, finish it and reverse it.
2000-10-27 Ariel Rios <ariel arcavia com>
@@ -786,7 +786,7 @@
(value_to_scm): Moved here from plugin.c
(scm_to_value): Ditto.
(expr_to_scm): Ditto.
- (list_to_scm): Ditto.
+ (list_to_scm): Ditto.
(cell_ref_to_scm): Ditto.
(scm_to_cell_ref): Ditto.
* guile-support.h (gnumeric_list2scm): Add prototype.
@@ -806,7 +806,7 @@
2000-09-25 Ariel Rios <ariel arcavia com>
* functions.scm: Create the ggtest formula. Handle with care.
- Shows possible use of guile-gtk inside gnumeric. It is commented.
+ Shows possible use of guile-gtk inside gnumeric. It is commented.
2000-09-09 Jon K Hellan <hellan acm org>
@@ -893,7 +893,7 @@
* functions.scm: All the functions now use the scm_category argument.
- * plugin.c (scm_register_function): Added the scm_category argument. From now on the user we'll be able to
+ * plugin.c (scm_register_function): Added the scm_category argument. From now on the user we'll be able to
give the category his formula want's to be added upon.
2000-02-10 Michael Meeks <michael helixcode com>
@@ -956,7 +956,7 @@
1999-12-30 Ariel Rios <jarios usa net>
* plugin.c (init_plugin): Removed registration of func_scm_eval.
- (func_scm_eval): Removed. This function was not really used
+ (func_scm_eval): Removed. This function was not really used
or needed so I chose to remove possible security hazard.
1999-12-29 Ariel Rios <jarios usa net>
@@ -969,7 +969,7 @@
* functions.scm: THe formula redefinitions for sign, lcm and gcd were commented.
It is almost useless to redefine them on Scheme since C version are faster.
However, for example purposes I leave them commented.
-
+
1999-12-18 Ariel Rios <jarios usa net>
@@ -999,8 +999,8 @@
1999-12-08 Ariel Rios <jarios usa net>
- * plugin.c: (func_marshal_func) We now use func_def_count_arg to get the count
- number. Count variable was replaced with min and max int vars.
+ * plugin.c: (func_marshal_func) We now use func_def_count_arg to get the count
+ number. Count variable was replaced with min and max int vars.
(scm_to_value): The float cast when returning a number was replaced
with a float_t cast as per Michael's recomendation.
@@ -1019,7 +1019,7 @@
* gnumeric_startup.scm: We now load the scheme
functions from the new file functions.scm
- * functions.scm: The guile functions and their
+ * functions.scm: The guile functions and their
registration are now located in this file.
(=FIBO(num)): Added fibonacci formula.
diff --git a/plugins/html/ChangeLog b/plugins/html/ChangeLog
index 756254a..b532a46 100644
--- a/plugins/html/ChangeLog
+++ b/plugins/html/ChangeLog
@@ -21,8 +21,8 @@
2010-06-28 Andreas J. Guelzow <aguelzow pyrshep ca>
* html_read.c (GnmHtmlTableCtxt): Add wb_view field.
- (html_read_content): Add GnmHtmlTableCtxt argument and
- change all callers. Recurse into html_read_table as
+ (html_read_content): Add GnmHtmlTableCtxt argument and
+ change all callers. Recurse into html_read_table as
required.
(html_file_open): Initialize wb_view field
@@ -69,7 +69,7 @@
2010-03-03 Andreas J. Guelzow <aguelzow pyrshep ca>
* latex.c (latex2e_write_file_header): add new length
- (latex2e_write_blank_multicolumn_cell): use different setup
+ (latex2e_write_blank_multicolumn_cell): use different setup
for multirow cells
(latex2e_write_multicolumn_cell): ditto
(latex_file_save): use lengths for column widths.
@@ -96,7 +96,7 @@
2009-10-31 Andreas J. Guelzow <aguelzow pyrshep ca>
- * html.c (html_write_cell_content): handle strikethrough
+ * html.c (html_write_cell_content): handle strikethrough
(and fix handling of superscript/suscript)
(cb_html_attrs_as_string): write valid HTML4 strict.
@@ -153,12 +153,12 @@
2009-05-17 Andreas J. Guelzow <aguelzow pyrshep ca>
- * html.c (html_write_cell_content): make sure there is
+ * html.c (html_write_cell_content): make sure there is
markup before asking for it.
2009-05-13 Andreas J. Guelzow <aguelzow pyrshep ca>
- * html.c (html_write_cell_content): remember that not
+ * html.c (html_write_cell_content): remember that not
every string has markup
2009-05-12 Andreas J. Guelzow <aguelzow pyrshep ca>
@@ -166,7 +166,7 @@
* html.c (cb_html_add_chars): new
(cb_html_attrs_as_string): new
(html_new_markup): new
- (html_write_cell_content): use html_new_markup if
+ (html_write_cell_content): use html_new_markup if
appropriate
(write_cell): don't collapse XHTML and HTML4
(html_file_save): update DOCTYPEs
@@ -185,12 +185,12 @@
2009-03-04 Andreas J. Guelzow <aguelzow pyrshep ca>
- * latex.c (latex_file_save): the previous correction used an
+ * latex.c (latex_file_save): the previous correction used an
inverted comparison.
2009-03-04 Andreas J. Guelzow <aguelzow pyrshep ca>
- * latex.c (latex_file_save): don't access styles for cells
+ * latex.c (latex_file_save): don't access styles for cells
beyond the sheet! Fixes 574125
2009-02-22 Morten Welinder <terra gnome org>
@@ -250,7 +250,7 @@
2007-10-15 Jody Goldberg <jody gnome org>
- Patch from editgrid.
+ Patch from editgrid.
* latex.c (latex2e_find_vline) : Don't look for borders past max col.
2007-10-21 Morten Welinder <terra gnome org>
@@ -311,9 +311,9 @@
* Release 1.7.1
2006-08-11 Andreas J. Guelzow <aguelzow pyrshep ca>
- * latex.c (latex_file_save): use \linewidth rather
+ * latex.c (latex_file_save): use \linewidth rather
than \textwidth
-
+
2006-07-10 Andreas J. Guelzow <aguelzow pyrshep ca>
* latex.h (latex_table_file_save): new
@@ -462,7 +462,7 @@
http://bugzilla.gnome.org/show_bug.cgi?id=157047
* latex.c (latex2e_write_multicolumn_cell): cells can extend to
the right. So if we see a span it may start earlier than the
- cell creating it. Add an argument specifying the column we
+ cell creating it. Add an argument specifying the column we
are working in.
(latex_file_save): add argument to latex2e_write_multicolumn_cell
call
@@ -592,7 +592,7 @@
2003-06-11 Andreas J. Guelzow <aguelzow taliesin ca>
- * latex.c (latex_fputs): convert cell content to latin1
+ * latex.c (latex_fputs): convert cell content to latin1
before exporting
(latex_math_fputs): ditto
(latex2e_write_file_header): add fullpage package
@@ -705,11 +705,11 @@
2002-11-28 Jon K Hellan <hellan acm org>
- * html.[ch] (html40_file_save, html32_file_save)
+ * html.[ch] (html40_file_save, html32_file_save)
(html40frag_file_save, xhtml_file_save): Port to gsf output.
- * html.c (html_print_encoded, html_write_cell_content)
- (html_write_one_border_style_40, html_write_border_style_40)
+ * html.c (html_print_encoded, html_write_cell_content)
+ (html_write_one_border_style_40, html_write_border_style_40)
(write_cell, write_row, write_sheet, html_file_save): Ditto.
* latex.[ch] (latex_file_save): Ditto.
@@ -735,7 +735,7 @@
2002-10-30 Andreas J. Guelzow <aguelzow taliesin ca> for
- * plugin.xml.in : all file_savers in this plugin are lossy
+ * plugin.xml.in : all file_savers in this plugin are lossy
(write_only)
2002-10-30 Andreas J. Guelzow <aguelzow taliesin ca> for
@@ -759,12 +759,12 @@
Dustin T. Mudryk <mordak hotmail com>
* latex.c (latex2e_write_multicolumn_cell) modified to exclude hidden
- cells in latex
+ cells in latex
-2002-10-30 Andreas J. Guelzow <aguelzow taliesin ca> for
+2002-10-30 Andreas J. Guelzow <aguelzow taliesin ca> for
Adrian V. Custer <acuster nature berkeley edu>
- * latex.c (latex2e_write_file_header): make
+ * latex.c (latex2e_write_file_header): make
\def\gnumericTableWidthDefined a \global.
(latex_file_save): add some linebreaks.
@@ -774,7 +774,7 @@
2002-10-30 Andreas J. Guelzow <aguelzow taliesin ca>
- * latex.c (latex2e_write_multicolumn_cell): fix a silly
+ * latex.c (latex2e_write_multicolumn_cell): fix a silly
mistake (97246)
(latex_math_fputs) : latex_fputs for math mode
@@ -794,12 +794,12 @@
2002-10-10 Tim A. Garner <garnertim hotmail com>
- * latex.c (latex2e_write_multicolumn_cell): set up a switch for
- displaying numbers in italics
+ * latex.c (latex2e_write_multicolumn_cell): set up a switch for
+ displaying numbers in italics
2002-10-09 Tim A. Garner <garnertim hotmail com>
- * html.c (html_write_cell_content): modified to exclude hidden
+ * html.c (html_write_cell_content): modified to exclude hidden
cells in HTML32
(write_cell): modified to exclude hidden cells in HTML40, XHTML
and HTML40F
@@ -901,7 +901,7 @@
2002-06-12 Andreas J. Guelzow <aguelzow taliesin ca>
- * html.h (html_file_open) : fix prototype
+ * html.h (html_file_open) : fix prototype
* html_read.c (html_read_buffer) : disable
(html_get_sheet) : new
(html_read_row) : new
@@ -1025,7 +1025,7 @@
2001-12-26 Andreas J. Guelzow <aguelzow taliesin ca>
http://bugzilla.gnome.org/show_bug.cgi?id=67550
- * html.c (html_get_text_color) : fix text colours determined
+ * html.c (html_get_text_color) : fix text colours determined
by number formatting
* latex.c (latex2e_write_multicolumn_cell) : ditto
@@ -1037,7 +1037,7 @@
* html.h : Add html40frag_file_save
* plugin.xml.in : ditto
- * html.c (html_print_encoded) : changed from
+ * html.c (html_print_encoded) : changed from
(html_write_cell_content) : changed from html_write_cell_str
(write_row) : new procedure figuring out merges and spans
(write_cell) : formerly html_write_cell40 and html_write_cell32
@@ -1055,8 +1055,8 @@
2001-12-10 Andreas J. Guelzow <aguelzow taliesin ca>
- * latex.c (latex2e_write_multicolumn_cell) : implement
- spans and scale tables to width of page,
+ * latex.c (latex2e_write_multicolumn_cell) : implement
+ spans and scale tables to width of page,
some minor fixes
(latex_file_save) : ditto
@@ -1072,7 +1072,7 @@
* latex.c : combine border data structures plus some
cleanup
(latex2e_find_vline) : new function
- (latex2e_write_blank_cell) : new short extract of
+ (latex2e_write_blank_cell) : new short extract of
latex2e_write_multicolumn_cell
(latex2e_file_save) : setup info for connection markers in
\hhline
@@ -1090,7 +1090,7 @@
2001-12-04 Andreas J. Guelzow <aguelzow taliesin ca>
- * latex.c (latex2e_write_multicolumn_cell) wrap text
+ * latex.c (latex2e_write_multicolumn_cell) wrap text
(http://bugzilla.gnome.org/show_bug.cgi?id=20898)
use math mode for mathematical formats
(http://bugzilla.gnome.org/show_bug.cgi?id=63395)
@@ -1121,7 +1121,7 @@
* latex.c : split the LaTeX2e exporter into four functions. The base
function writes the headers and checks for merges.
Add latex2e_write_file_header() which sets up the LaTeX file with user
- preferences and allows the file to be \input -able (fixes
+ preferences and allows the file to be \input -able (fixes
http://bugzilla.gnome.org/show_bug.cgi?id=29506
suggestion of Han-Wen Nienhuys).
Add latex2e_write_table_header() allows control of the headers and
@@ -1132,7 +1132,7 @@
THE LaTeX2e EXPORTER NOW ONLY EXPORTS THE TOP SHEET!
The LaTeX file can be modified to print in landscape mode.
The file can be now be longer than a single page (uses \longtable,
- suggestion of Jacek Pilszka on gnome-list).
+ suggestion of Jacek Pilszka on gnome-list).
Preliminary support for merges: single row, horizontal merges that do
not span past the last column of the table are supported.
@@ -1313,7 +1313,7 @@
2000-11-12 Almer S. Tigelaar <almer1 dds nl>
- * html.c
+ * html.c
(html_write_wb_html32): Use sheet_get_extent instead
of sheet->rows and sheet->cols.
(html_write_wb_html40): Idem.
@@ -1436,10 +1436,10 @@
2000-02-26 Almer. S. Tigelaar. <almer1 dds nl>
- * html.c
+ * html.c
* (html_write_cell_str, html_write_cell32, html_write_cell40) :
* (html_write_wb_html32, html_write_wb_html40) :
- Adjusted so it now uses sheet_style_computer and puts <BR>
+ Adjusted so it now uses sheet_style_computer and puts <BR>
tags in empty cells, this way the cells will _always_ render
in a browser so the 'style' information is not lost for
empty cells.
@@ -1507,7 +1507,7 @@
* html.c (html_write_cell32, html_write_cell40): fix stupid bug.
1999-11-21 Jeff Garzik <jgarzik mandrakesoft com>
-
+
* html.c (html_cleanup_plugin): free pd->title
1999-10-30 Michael Meeks <mmeeks gnu org>
@@ -1558,7 +1558,7 @@
* html.c (html_write_cell32): Update style api.
(html_cell_bold, html_read, html_write_cell40): ditto.
- * latex.c (html_write_wb_latex2e, html_write_wb_latex):
+ * latex.c (html_write_wb_latex2e, html_write_wb_latex):
ditto.
* roff.c (write_wb_roff): ditto.
diff --git a/plugins/html/html.c b/plugins/html/html.c
index 9573c14..82a5a0c 100644
--- a/plugins/html/html.c
+++ b/plugins/html/html.c
@@ -188,8 +188,8 @@ cb_html_attrs_as_string (GsfOutput *output, PangoAttribute *a, html_version_t ve
gsf_output_puts (output, "<strike>");
closure = "</strike>";
} else {
- gsf_output_puts
- (output,
+ gsf_output_puts
+ (output,
"<span style=\"text-decoration: "
"line-through;\">");
closure = "</span>";
@@ -291,7 +291,7 @@ html_write_cell_content (GsfOutput *output, GnmCell *cell, GnmStyle const *style
if (version == HTML32)
gsf_output_puts (output, "<strike>");
else
- gsf_output_puts (output,
+ gsf_output_puts (output,
"<span style=\"text-decoration: line-through;\">");
}
switch (gnm_style_get_font_script (style)) {
diff --git a/plugins/html/html_read.c b/plugins/html/html_read.c
index e46b122..0d45bf6 100644
--- a/plugins/html/html_read.c
+++ b/plugins/html/html_read.c
@@ -62,7 +62,7 @@ typedef struct {
WorkbookView *wb_view;
} GnmHtmlTableCtxt;
-static void html_read_table (htmlNodePtr cur, htmlDocPtr doc,
+static void html_read_table (htmlNodePtr cur, htmlDocPtr doc,
WorkbookView *wb_view,
GnmHtmlTableCtxt *tc);
@@ -158,7 +158,7 @@ html_read_content (htmlNodePtr cur, GString *buf, GnmStyle *mstyle,
tc->sheet = last_sheet;
tc->row = last_row;
} else
- html_read_content
+ html_read_content
(ptr, buf, mstyle, a_buf, hrefs, first, doc, tc);
}
first = FALSE;
diff --git a/plugins/html/latex.c b/plugins/html/latex.c
index 2435fef..7af386e 100644
--- a/plugins/html/latex.c
+++ b/plugins/html/latex.c
@@ -921,9 +921,9 @@ latex2e_write_multicolumn_cell (GsfOutput *output, GnmCell *cell, int start_col,
if (i>0)
gsf_output_printf (output, "\t \\addtolength{\\gnumericMultiRowLength}{\\tabcolsep}%%\n");
}
- gsf_output_printf (output,
+ gsf_output_printf (output,
"\t \\multirow{%i}[%i]{\\gnumericMultiRowLength}"
- "{\\parbox{\\gnumericMultiRowLength}{%%\n\t ",
+ "{\\parbox{\\gnumericMultiRowLength}{%%\n\t ",
num_merged_rows, num_merged_rows/2);
}
diff --git a/plugins/lotus-123/ChangeLog b/plugins/lotus-123/ChangeLog
index 9769ab7..97888e3 100644
--- a/plugins/lotus-123/ChangeLog
+++ b/plugins/lotus-123/ChangeLog
@@ -961,11 +961,11 @@
(lotus_read) : Ditto.
1999-12-21 Jon K Hellan <hellan acm org>
-
+
* README: I was credited for this, but I did not write it.
-
+
1999-11-21 Jeff Garzik <jgarzik mandrakesoft com>
-
+
* boot.c (lotus_cleanup_plugin): free pd->title
1999-10-13 Michael Meeks <mmeeks gnu org>
@@ -985,7 +985,7 @@
1999-08-09 <miguel gnu org>
* boot.c (lotus_cleanup_plugin): Change to new file open
- conventions.
+ conventions.
1999-08-02 Michael Meeks <michael imaginator com>
diff --git a/plugins/lpsolve/gnm-lpsolve.c b/plugins/lpsolve/gnm-lpsolve.c
index 2f7757b..d93e4f4 100644
--- a/plugins/lpsolve/gnm-lpsolve.c
+++ b/plugins/lpsolve/gnm-lpsolve.c
@@ -52,7 +52,7 @@ write_program (GnmSolver *sol, WorkbookControl *wbc, GError **err)
return FALSE;
}
- return gnm_solver_saveas (sol, wbc, fs,
+ return gnm_solver_saveas (sol, wbc, fs,
"program-XXXXXX.lp",
&subsol->program_filename,
err);
diff --git a/plugins/mps/mps.c b/plugins/mps/mps.c
index 2c1b3ee..55d5ede 100644
--- a/plugins/mps/mps.c
+++ b/plugins/mps/mps.c
@@ -576,7 +576,7 @@ make_constraint (MpsState *state, int x, int y, MpsRow *row,
param->constraints = g_slist_append (param->constraints, c);
}
-
+
static void
diff --git a/plugins/oleo/ChangeLog b/plugins/oleo/ChangeLog
index 968a64a..339cffb 100644
--- a/plugins/oleo/ChangeLog
+++ b/plugins/oleo/ChangeLog
@@ -656,7 +656,7 @@
* oleo.c (oleo_read) : Ditto.
1999-11-21 Jeff Garzik <jgarzik mandrakesoft com>
-
+
* boot.c (oleo_cleanup_plugin): free pd->title
1999-11-08 Robert Brady <rwb197 ecs soton ac uk>
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 78497f8..0eaff9a 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -97,7 +97,7 @@ enum {
enum {
OO_CHART_STYLE_PLOTAREA = 0,
OO_CHART_STYLE_SERIES = 1,
- OO_CHART_STYLE_INHERITANCE = 2
+ OO_CHART_STYLE_INHERITANCE = 2
};
enum {
@@ -241,20 +241,20 @@ typedef struct {
OOChartStyle *cur_graph_style; /* for reading of styles */
- GSList *saved_graph_styles;
- GSList *saved_hatches;
- GSList *saved_dash_styles;
- GSList *saved_fill_image_styles;
+ GSList *saved_graph_styles;
+ GSList *saved_hatches;
+ GSList *saved_dash_styles;
+ GSList *saved_fill_image_styles;
GSList *saved_gradient_styles;
-
+
GHashTable *graph_styles;
GHashTable *hatches;
GHashTable *dash_styles;
GHashTable *fill_image_styles;
GHashTable *gradient_styles;
GHashTable *arrow_markers;
-
- OOChartStyle *i_plot_styles[OO_CHART_STYLE_INHERITANCE];
+
+ OOChartStyle *i_plot_styles[OO_CHART_STYLE_INHERITANCE];
/* currently active styles at plot-area, */
/* series level*/
OOPlotType plot_type;
@@ -450,14 +450,14 @@ oo_warning (GsfXMLIn *xin, char const *fmt, ...)
if (0 != go_str_compare (msg, state->last_error)) {
GOErrorInfo *ei = oo_go_error_info_new_vprintf
(GO_WARNING, "%s", msg);
-
+
go_io_error_info_set (state->context, ei);
g_free (state->last_error);
state->last_error = msg;
} else
g_free (msg);
- go_error_info_add_details
+ go_error_info_add_details
(state->context->info->data,
oo_go_error_info_new_vprintf (GO_WARNING, "%s", detail));
@@ -536,8 +536,8 @@ oo_attr_font_weight (GsfXMLIn *xin, xmlChar const * const *attrs,
} else if (attr_eq (attrs[1], "normal")) {
*res = PANGO_WEIGHT_NORMAL;
return TRUE;
- }
- return oo_attr_int_range (xin, attrs, OO_NS_FO, "font-weight",
+ }
+ return oo_attr_int_range (xin, attrs, OO_NS_FO, "font-weight",
res, 0, 1000);
}
@@ -580,7 +580,7 @@ oo_attr_percent (GsfXMLIn *xin, xmlChar const * const *attrs,
tmp = gnm_strto (CXML2C (attrs[1]), &end);
if (*end != '%' || *(end + 1))
- return oo_warning (xin,
+ return oo_warning (xin,
_("Invalid attribute '%s', expected percentage,"
" received '%s'"),
name, attrs[1]);
@@ -623,7 +623,7 @@ odf_match_dash_type (OOParseState *state, gchar const *dash_style)
{
GOLineDashType t = go_line_dash_from_str (dash_style);
if (t == GO_LINE_NONE) {
- gpointer res = g_hash_table_lookup
+ gpointer res = g_hash_table_lookup
(state->chart.dash_styles, dash_style);
if (res != NULL)
t = GPOINTER_TO_UINT(res);
@@ -707,24 +707,24 @@ odf_apply_style_props (GsfXMLIn *xin, GSList *props, GOStyle *style)
int angle = g_value_get_int (&prop->value);
go_style_set_text_angle (style, angle);
} else if (0 == strcmp (prop->name, "font-size")) {
- pango_font_description_set_size
- (desc, PANGO_SCALE * g_value_get_double
+ pango_font_description_set_size
+ (desc, PANGO_SCALE * g_value_get_double
(&prop->value));
desc_changed = TRUE;
} else if (0 == strcmp (prop->name, "font-weight")) {
- pango_font_description_set_weight
+ pango_font_description_set_weight
(desc, g_value_get_int (&prop->value));
desc_changed = TRUE;
} else if (0 == strcmp (prop->name, "font-variant")) {
- pango_font_description_set_variant
+ pango_font_description_set_variant
(desc, g_value_get_int (&prop->value));
desc_changed = TRUE;
} else if (0 == strcmp (prop->name, "font-style")) {
- pango_font_description_set_style
+ pango_font_description_set_style
(desc, g_value_get_int (&prop->value));
desc_changed = TRUE;
} else if (0 == strcmp (prop->name, "font-stretch-pango")) {
- pango_font_description_set_stretch
+ pango_font_description_set_stretch
(desc, g_value_get_int (&prop->value));
desc_changed = TRUE;
} else if (0 == strcmp (prop->name, "font-gravity-pango")) {
@@ -749,7 +749,7 @@ odf_apply_style_props (GsfXMLIn *xin, GSList *props, GOStyle *style)
line_is_not_dash = TRUE;
}
} else if (0 == strcmp (prop->name, "stroke-dash") && !line_is_not_dash) {
- style->line.dash_type = odf_match_dash_type
+ style->line.dash_type = odf_match_dash_type
(state, g_value_get_string (&prop->value));
} else if (0 == strcmp (prop->name, "symbol-type"))
symbol_type = g_value_get_int (&prop->value);
@@ -770,7 +770,7 @@ odf_apply_style_props (GsfXMLIn *xin, GSList *props, GOStyle *style)
switch (fill_type) {
case OO_FILL_TYPE_HATCH:
if (hatch_name != NULL) {
- GOPattern *pat = g_hash_table_lookup
+ GOPattern *pat = g_hash_table_lookup
(state->chart.hatches, hatch_name);
if (pat == NULL)
oo_warning (xin, _("Unknown hatch name \'%s\'"
@@ -778,7 +778,7 @@ odf_apply_style_props (GsfXMLIn *xin, GSList *props, GOStyle *style)
else {
style->fill.pattern.fore = pat->fore;
style->fill.auto_fore = FALSE;
- style->fill.pattern.pattern = (gnm_hatch > 0) ?
+ style->fill.pattern.pattern = (gnm_hatch > 0) ?
gnm_hatch : pat->pattern;
}
} else oo_warning (xin, _("Hatch fill without hatch name "
@@ -786,7 +786,7 @@ odf_apply_style_props (GsfXMLIn *xin, GSList *props, GOStyle *style)
break;
case OO_FILL_TYPE_GRADIENT:
if (gradient_name != NULL) {
- gradient_info_t *info = g_hash_table_lookup
+ gradient_info_t *info = g_hash_table_lookup
(state->chart.gradient_styles, gradient_name);
if (info == NULL)
oo_warning (xin, _("Unknown gradient name \'%s\'"
@@ -799,7 +799,7 @@ odf_apply_style_props (GsfXMLIn *xin, GSList *props, GOStyle *style)
style->fill.gradient.dir = info->dir;
style->fill.gradient.brightness = -1.0;
if (info->brightness >= 0)
- go_style_set_fill_brightness
+ go_style_set_fill_brightness
(style, info->brightness);
}
} else oo_warning (xin, _("Gradient fill without gradient "
@@ -807,7 +807,7 @@ odf_apply_style_props (GsfXMLIn *xin, GSList *props, GOStyle *style)
break;
case OO_FILL_TYPE_BITMAP:
if (fill_image_name != NULL) {
- char const *href = g_hash_table_lookup
+ char const *href = g_hash_table_lookup
(state->chart.fill_image_styles, fill_image_name);
if (href == NULL)
oo_warning (xin, _("Unknown image fill name \'%s\'"
@@ -826,20 +826,20 @@ odf_apply_style_props (GsfXMLIn *xin, GSList *props, GOStyle *style)
break;
}
- href_complete = g_strconcat (state->object_name,
+ href_complete = g_strconcat (state->object_name,
"/", href, NULL);
path = g_strsplit (href_complete, "/", -1);
- input = gsf_infile_child_by_aname
+ input = gsf_infile_child_by_aname
(state->zip, (const char **) path);
g_strfreev (path);
if (input == NULL)
- oo_warning (xin, _("Unable to open \'%s\'."),
+ oo_warning (xin, _("Unable to open \'%s\'."),
href_complete);
else {
gsf_off_t len = gsf_input_size (input);
- guint8 const *data = gsf_input_read
+ guint8 const *data = gsf_input_read
(input, len, NULL);
- GdkPixbufLoader *loader
+ GdkPixbufLoader *loader
= gdk_pixbuf_loader_new ();
GdkPixbuf *pixbuf = NULL;
@@ -851,13 +851,13 @@ odf_apply_style_props (GsfXMLIn *xin, GSList *props, GOStyle *style)
pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
g_object_ref (G_OBJECT (pixbuf));
if (style->fill.image.image != NULL)
- g_object_set
+ g_object_set
(G_OBJECT (style->fill.image.image),
"pixbuf", pixbuf, NULL);
else
style->fill.image.image =
go_image_new_from_pixbuf (pixbuf);
- go_image_set_name (style->fill.image.image,
+ go_image_set_name (style->fill.image.image,
fill_image_name);
g_object_unref (G_OBJECT (loader));
} else {
@@ -883,14 +883,14 @@ odf_apply_style_props (GsfXMLIn *xin, GSList *props, GOStyle *style)
case OO_SYMBOL_TYPE_NONE:
style->marker.auto_shape = FALSE;
m = go_marker_new ();
- go_marker_set_shape (m, GO_MARKER_NONE);
+ go_marker_set_shape (m, GO_MARKER_NONE);
go_style_set_marker (style, m);
break;
case OO_SYMBOL_TYPE_NAMED:
style->marker.auto_shape = FALSE;
m = go_marker_new ();
- go_marker_set_shape (m, symbol_name);
- go_style_set_marker (style, m);
+ go_marker_set_shape (m, symbol_name);
+ go_style_set_marker (style, m);
break;
default:
break;
@@ -1272,7 +1272,7 @@ oo_table_start (GsfXMLIn *xin, xmlChar const **attrs)
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_TABLE, "name")) {
- table_name = g_strdup (CXML2C (attrs[1]));
+ table_name = g_strdup (CXML2C (attrs[1]));
} else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_TABLE, "style-name")) {
style_name = g_strdup (CXML2C (attrs[1]));
}
@@ -1288,18 +1288,18 @@ oo_table_start (GsfXMLIn *xin, xmlChar const **attrs)
if (NULL != g_slist_find (state->sheet_order, state->pos.sheet)) {
/* corrupted file! */
char *new_name, *base;
-
+
base = g_strdup_printf (_("%s_IN_CORRUPTED_FILE"), table_name);
new_name = workbook_sheet_get_free_name (state->pos.wb,
base, FALSE, FALSE);
g_free (base);
-
+
oo_warning (xin, _("This file is corrupted with a "
"duplicate sheet name \"%s\", "
- "now renamed to \"%s\"."),
+ "now renamed to \"%s\"."),
table_name, new_name);
- state->pos.sheet = sheet_new (state->pos.wb, new_name,
- gnm_conf_get_core_workbook_n_cols (),
+ state->pos.sheet = sheet_new (state->pos.wb, new_name,
+ gnm_conf_get_core_workbook_n_cols (),
gnm_conf_get_core_workbook_n_rows ());
workbook_sheet_attach (state->pos.wb, state->pos.sheet);
g_free (new_name);
@@ -1309,15 +1309,15 @@ oo_table_start (GsfXMLIn *xin, xmlChar const **attrs)
table_name = workbook_sheet_get_free_name (state->pos.wb,
_("SHEET_IN_CORRUPTED_FILE"),
TRUE, FALSE);
- state->pos.sheet = sheet_new (state->pos.wb, table_name,
- gnm_conf_get_core_workbook_n_cols (),
+ state->pos.sheet = sheet_new (state->pos.wb, table_name,
+ gnm_conf_get_core_workbook_n_cols (),
gnm_conf_get_core_workbook_n_rows ());
workbook_sheet_attach (state->pos.wb, state->pos.sheet);
-
+
/* We are missing the table name. This is bad! */
oo_warning (xin, _("This file is corrupted with an "
"unnamed sheet "
- "now named \"%s\"."),
+ "now named \"%s\"."),
table_name);
}
@@ -1325,9 +1325,9 @@ oo_table_start (GsfXMLIn *xin, xmlChar const **attrs)
/* Store sheets in correct order in case we implicitly
* created one out of order */
- state->sheet_order = g_slist_prepend
+ state->sheet_order = g_slist_prepend
(state->sheet_order, state->pos.sheet);
-
+
if (style_name != NULL) {
OOSheetStyle const *style = g_hash_table_lookup (state->styles.sheet, style_name);
if (style) {
@@ -1336,9 +1336,9 @@ oo_table_start (GsfXMLIn *xin, xmlChar const **attrs)
"text-is-rtl", style->is_rtl,
NULL);
if (style->tab_color_set) {
- GnmColor *color
+ GnmColor *color
= style_color_new_go (style->tab_color);
- g_object_set
+ g_object_set
(state->pos.sheet,
"tab-background",
color,
@@ -1346,10 +1346,10 @@ oo_table_start (GsfXMLIn *xin, xmlChar const **attrs)
style_color_unref (color);
}
if (style->tab_text_color_set){
- GnmColor *color
- = style_color_new_go
+ GnmColor *color
+ = style_color_new_go
(style->tab_text_color);
- g_object_set
+ g_object_set
(state->pos.sheet,
"tab-foreground",
color,
@@ -1978,18 +1978,18 @@ oo_cell_start (GsfXMLIn *xin, xmlChar const **attrs)
oo_extent_sheet_rows (sheet, r.end.row + 1);
if (r.end.col > gnm_sheet_get_last_col (sheet)) {
- oo_warning
- (xin,
+ oo_warning
+ (xin,
_("Content past the maximum number "
- "of columns (%i) supported."),
+ "of columns (%i) supported."),
gnm_sheet_get_max_cols (sheet));
r.end.col = gnm_sheet_get_last_col (sheet);
}
if (r.end.row > gnm_sheet_get_last_row (sheet)) {
- oo_warning
- (xin,
+ oo_warning
+ (xin,
_("Content past the maximum number "
- "of rows (%i) supported."),
+ "of rows (%i) supported."),
gnm_sheet_get_max_rows (sheet));
r.end.row = gnm_sheet_get_last_row (sheet);
}
@@ -1998,8 +1998,8 @@ oo_cell_start (GsfXMLIn *xin, xmlChar const **attrs)
gnm_expr_top_unref (texpr);
if (val != NULL)
gnm_cell_assign_value (cell, val);
- oo_update_data_extent
- (state,
+ oo_update_data_extent
+ (state,
r.end.col - r.start.col + 1,
r.end.row - r.start.row + 1);
} else {
@@ -2142,20 +2142,20 @@ oo_dash (GsfXMLIn *xin, xmlChar const **attrs)
name = CXML2C (attrs[1]);
else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_DRAW, "style"))
/* rect or round, ignored */;
- else if (NULL != oo_attr_distance (xin, attrs, OO_NS_DRAW, "distance",
+ else if (NULL != oo_attr_distance (xin, attrs, OO_NS_DRAW, "distance",
&distance))
/* FIXME: this could be a percentage in 1.2 */;
- else if (NULL != oo_attr_distance (xin, attrs, OO_NS_DRAW, "dots1-length",
+ else if (NULL != oo_attr_distance (xin, attrs, OO_NS_DRAW, "dots1-length",
&len_dot1))
/* FIXME: this could be a percentage in 1.2 */;
- else if (NULL != oo_attr_distance (xin, attrs, OO_NS_DRAW, "dots2-length",
+ else if (NULL != oo_attr_distance (xin, attrs, OO_NS_DRAW, "dots2-length",
&len_dot2))
/* FIXME: this could be a percentage in 1.2 */;
- else if (oo_attr_int_range (xin, attrs, OO_NS_DRAW,
+ else if (oo_attr_int_range (xin, attrs, OO_NS_DRAW,
"dots1", &n_dots1, 0, 10));
- else if (oo_attr_int_range (xin, attrs, OO_NS_DRAW,
+ else if (oo_attr_int_range (xin, attrs, OO_NS_DRAW,
"dots2", &n_dots2, 0, 10));
-
+
/* We need to figure out the best matching dot style */
if (n_dots2 == 0) {
@@ -2168,7 +2168,7 @@ oo_dash (GsfXMLIn *xin, xmlChar const **attrs)
t = GO_LINE_S_DASH;
else if (len_dot1 < 15)
t = GO_LINE_DASH;
- else
+ else
t = GO_LINE_LONG_DASH;
} else if (n_dots2 > 1 && n_dots1 > 1 )
t = GO_LINE_DASH_DOT_DOT_DOT; /* no matching dashing available */
@@ -2191,7 +2191,7 @@ oo_dash (GsfXMLIn *xin, xmlChar const **attrs)
}
if (name != NULL)
- g_hash_table_replace (state->chart.dash_styles,
+ g_hash_table_replace (state->chart.dash_styles,
g_strdup (name), GUINT_TO_POINTER (t));
else
oo_warning (xin, _("Unnamed dash style encountered."));
@@ -2208,7 +2208,7 @@ oo_fill_image (GsfXMLIn *xin, xmlChar const **attrs)
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_DRAW, "name"))
name = CXML2C (attrs[1]);
- else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_XLINK, "href"))
href = CXML2C (attrs[1]);
if (name == NULL)
@@ -2217,7 +2217,7 @@ oo_fill_image (GsfXMLIn *xin, xmlChar const **attrs)
oo_warning (xin, _("Image fill style \'%s\' has no attached image."),
name);
else {
- g_hash_table_replace (state->chart.fill_image_styles,
+ g_hash_table_replace (state->chart.fill_image_styles,
g_strdup (name), g_strdup (href));
}
}
@@ -2232,8 +2232,8 @@ oo_gradient (GsfXMLIn *xin, xmlChar const **attrs)
char const *style = NULL;
unsigned int axial_types[] =
{GO_GRADIENT_S_TO_N_MIRRORED, GO_GRADIENT_SE_TO_NW_MIRRORED,
- GO_GRADIENT_E_TO_W_MIRRORED, GO_GRADIENT_NE_TO_SW_MIRRORED,
- GO_GRADIENT_N_TO_S_MIRRORED, GO_GRADIENT_NW_TO_SE_MIRRORED,
+ GO_GRADIENT_E_TO_W_MIRRORED, GO_GRADIENT_NE_TO_SW_MIRRORED,
+ GO_GRADIENT_N_TO_S_MIRRORED, GO_GRADIENT_NW_TO_SE_MIRRORED,
GO_GRADIENT_W_TO_E_MIRRORED, GO_GRADIENT_SW_TO_NE_MIRRORED};
unsigned int linear_types[] =
{GO_GRADIENT_S_TO_N, GO_GRADIENT_SE_TO_NW,
@@ -2260,7 +2260,7 @@ oo_gradient (GsfXMLIn *xin, xmlChar const **attrs)
oo_warning (xin, _("Unable to parse gradient color: %s"), CXML2C (attrs[1]));
} else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_DRAW, "style"))
style = CXML2C (attrs[1]);
- else if (oo_attr_float (xin, attrs, OO_GNUM_NS_EXT,
+ else if (oo_attr_float (xin, attrs, OO_GNUM_NS_EXT,
"brightness", &info->brightness));
else if (NULL != oo_attr_angle (xin, attrs, OO_NS_DRAW, "angle", &angle));
@@ -2268,13 +2268,13 @@ oo_gradient (GsfXMLIn *xin, xmlChar const **attrs)
if (angle < 0)
angle += 360;
angle = ((angle + 22)/45) % 8; /* angle is now 0,1,2,...,7*/
-
+
if (style != NULL && 0 == strcmp (style, "axial"))
info->dir = axial_types[angle];
else /* linear */
info->dir = linear_types[angle];
-
- g_hash_table_replace (state->chart.gradient_styles,
+
+ g_hash_table_replace (state->chart.gradient_styles,
g_strdup (name), info);
} else {
oo_warning (xin, _("Unnamed gradient style encountered."));
@@ -2513,17 +2513,17 @@ oo_style_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
OOParseState *state = (OOParseState *)xin->user_state;
switch (state->cur_style.type) {
- case OO_STYLE_CELL :
+ case OO_STYLE_CELL :
gnm_style_unref (state->cur_style.cells);
state->cur_style.cells = NULL;
break;
case OO_STYLE_COL :
- case OO_STYLE_ROW :
+ case OO_STYLE_ROW :
if (state->cur_style.requires_disposal)
g_free (state->cur_style.col_rows);
state->cur_style.col_rows = NULL;
break;
- case OO_STYLE_SHEET :
+ case OO_STYLE_SHEET :
if (state->cur_style.requires_disposal)
g_free (state->cur_style.sheets);
state->cur_style.sheets = NULL;
@@ -2716,7 +2716,7 @@ oo_date_seconds (GsfXMLIn *xin, xmlChar const **attrs)
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_NUMBER, "style"))
is_short = attr_eq (attrs[1], "short");
- else if (oo_attr_int_range (xin, attrs, OO_NS_NUMBER,
+ else if (oo_attr_int_range (xin, attrs, OO_NS_NUMBER,
"decimal-places", &digits, 0, 9))
;
else if (oo_attr_bool (xin, attrs, OO_GNUM_NS_EXT,
@@ -2767,7 +2767,7 @@ oo_date_text_end_append (GString *accum, char const *text, int n) {
g_string_append_c (accum, '"');
}
-/* date_text_end is also used for non-date formats */
+/* date_text_end is also used for non-date formats */
static void
oo_date_text_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
{
@@ -2794,8 +2794,8 @@ oo_date_text_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
char const *percent_sign;
while ((percent_sign = strchr (xin->content->str, '%')) != NULL) {
if (percent_sign > text) {
- oo_date_text_end_append
- (state->cur_format.accum, text,
+ oo_date_text_end_append
+ (state->cur_format.accum, text,
percent_sign - text);
len -= (percent_sign - text);
}
@@ -2805,8 +2805,8 @@ oo_date_text_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
}
if (len > 0)
oo_date_text_end_append (state->cur_format.accum, text, len);
- } else
- oo_date_text_end_append (state->cur_format.accum,
+ } else
+ oo_date_text_end_append (state->cur_format.accum,
xin->content->str, xin->content->len);
}
}
@@ -2876,7 +2876,7 @@ oo_date_style_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
go_format_new_magic (state->cur_format.magic));
else {
g_return_if_fail (state->cur_format.accum != NULL);
-
+
while (elapsed != 0 && elapsed != ODF_ELAPSED_SET_SECONDS
&& elapsed != ODF_ELAPSED_SET_MINUTES
&& elapsed != ODF_ELAPSED_SET_HOURS) {
@@ -2943,7 +2943,7 @@ odf_fraction (GsfXMLIn *xin, xmlChar const **attrs)
if (!no_int_part) {
g_string_append_c (state->cur_format.accum, '#');
- odf_go_string_append_c_n (state->cur_format.accum, '0',
+ odf_go_string_append_c_n (state->cur_format.accum, '0',
min_i_digits);
g_string_append_c (state->cur_format.accum, ' ');
}
@@ -2958,14 +2958,14 @@ odf_fraction (GsfXMLIn *xin, xmlChar const **attrs)
count ++;
}
min_d_digits -= count;
- odf_go_string_append_c_n (state->cur_format.accum, '0',
+ odf_go_string_append_c_n (state->cur_format.accum, '0',
min_d_digits);
g_string_append_printf (state->cur_format.accum, "%i", denominator);
} else {
max_d_digits -= min_d_digits;
- odf_go_string_append_c_n (state->cur_format.accum, '?',
+ odf_go_string_append_c_n (state->cur_format.accum, '?',
max_d_digits);
- odf_go_string_append_c_n (state->cur_format.accum, '0',
+ odf_go_string_append_c_n (state->cur_format.accum, '0',
min_d_digits);
}
}
@@ -3018,7 +3018,7 @@ odf_scientific (GsfXMLIn *xin, xmlChar const **attrs)
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
if (oo_attr_bool (xin, attrs, OO_NS_NUMBER, "grouping", &details->thousands_sep)) {}
- else if (oo_attr_int_range (xin, attrs, OO_NS_NUMBER, "decimal-places",
+ else if (oo_attr_int_range (xin, attrs, OO_NS_NUMBER, "decimal-places",
&details->num_decimals, 0, 30))
;
else if (oo_attr_int_range (xin, attrs, OO_NS_NUMBER, "min-integer-digits",
@@ -3212,7 +3212,7 @@ odf_number_style_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
g_string_append_printf (state->cur_format.accum, "[=%s]", val);
fmt = g_hash_table_lookup (state->formats, lf->data);
if (fmt != NULL)
- g_string_append (state->cur_format.accum,
+ g_string_append (state->cur_format.accum,
go_format_as_XL (fmt));
else {
g_string_append (state->cur_format.accum, "\"\"");
@@ -3240,7 +3240,7 @@ odf_number_style_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
g_string_append_printf (state->cur_format.accum, "[<>%s]", val);
fmt = g_hash_table_lookup (state->formats, lf->data);
if (fmt != NULL)
- g_string_append (state->cur_format.accum,
+ g_string_append (state->cur_format.accum,
go_format_as_XL (fmt));
else {
g_string_append (state->cur_format.accum, "\"\"");
@@ -3277,7 +3277,7 @@ odf_number_style_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
(*(cond+1) == '=') ? "[<=%s]" : "[<%s]", val);
fmt = g_hash_table_lookup (state->formats, lf->data);
if (fmt != NULL)
- g_string_append (state->cur_format.accum,
+ g_string_append (state->cur_format.accum,
go_format_as_XL (fmt));
else {
g_string_append (state->cur_format.accum, "\"\"");
@@ -3303,7 +3303,7 @@ odf_number_style_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
g_string_append_printf (state->cur_format.accum, "[=%s]", val);
fmt = g_hash_table_lookup (state->formats, lf->data);
if (fmt != NULL)
- g_string_append (state->cur_format.accum,
+ g_string_append (state->cur_format.accum,
go_format_as_XL (fmt));
else {
g_string_append (state->cur_format.accum, "\"\"");
@@ -3331,7 +3331,7 @@ odf_number_style_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
g_string_append_printf (state->cur_format.accum, "[<>%s]", val);
fmt = g_hash_table_lookup (state->formats, lf->data);
if (fmt != NULL)
- g_string_append (state->cur_format.accum,
+ g_string_append (state->cur_format.accum,
go_format_as_XL (fmt));
else {
g_string_append (state->cur_format.accum, "\"\"");
@@ -3619,11 +3619,11 @@ oo_style_prop_cell (GsfXMLIn *xin, xmlChar const **attrs)
gnm_style_set_font_italic (style, attr_eq (attrs[1], "italic"));
else if (oo_attr_font_weight (xin, attrs, &tmp))
gnm_style_set_font_bold (style, tmp >= PANGO_WEIGHT_SEMIBOLD);
- 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",
text_line_through_styles, &strike_through_type));
- else if (oo_attr_enum (xin, attrs, OO_NS_STYLE, "text-line-through-type",
+ else if (oo_attr_enum (xin, attrs, OO_NS_STYLE, "text-line-through-type",
text_line_through_types, &strike_through_style));
-
+
#if 0
else if (!strcmp (attrs[0], OO_NS_FO, "font-weight")) {
gnm_style_set_font_bold (style, TRUE);
@@ -3711,28 +3711,28 @@ oo_style_prop_table (GsfXMLIn *xin, xmlChar const **attrs)
style->visibility = GNM_SHEET_VISIBILITY_HIDDEN;
} else if (oo_attr_enum (xin, attrs, OO_NS_STYLE, "writing-mode", modes, &tmp_i))
style->is_rtl = tmp_i;
- else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_GNUM_NS_EXT, "tab-color")) {
GdkColor gdk_color;
if (gdk_color_parse (CXML2C (attrs[1]), &gdk_color)) {
- style->tab_color
+ style->tab_color
= GO_COLOR_FROM_GDK (gdk_color);
style->tab_color_set = TRUE;
} else
oo_warning (xin, _("Unable to parse "
- "tab color \'%s\'"),
- CXML2C (attrs[1]));
- } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
- OO_GNUM_NS_EXT,
+ "tab color \'%s\'"),
+ CXML2C (attrs[1]));
+ } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ OO_GNUM_NS_EXT,
"tab-text-color")) {
GdkColor gdk_color;
if (gdk_color_parse (CXML2C (attrs[1]), &gdk_color)) {
- style->tab_text_color
+ style->tab_text_color
= GO_COLOR_FROM_GDK (gdk_color);
style->tab_text_color_set = TRUE;
} else
oo_warning (xin, _("Unable to parse tab "
- "text color \'%s\'"),
+ "text color \'%s\'"),
CXML2C (attrs[1]));
}
@@ -4026,7 +4026,7 @@ oo_prop_list_has (GSList *props, gboolean *threed, char const *tag)
GSList *ptr;
for (ptr = props; ptr; ptr = ptr->next) {
OOProp *prop = ptr->data;
- if (0 == strcmp (prop->name, tag) &&
+ if (0 == strcmp (prop->name, tag) &&
g_value_get_boolean (&prop->value))
*threed = TRUE;
}
@@ -4098,11 +4098,11 @@ od_style_prop_chart (GsfXMLIn *xin, xmlChar const **attrs)
{ "italic", PANGO_STYLE_ITALIC},
{ NULL, 0},
};
-
+
static OOEnum const image_fill_types [] = {
{"stretch", GO_IMAGE_STRETCHED },
{"repeat", GO_IMAGE_WALLPAPER },
- {"no-repeat", GO_IMAGE_CENTERED },
+ {"no-repeat", GO_IMAGE_CENTERED },
{ NULL, 0 },
};
@@ -4115,13 +4115,13 @@ od_style_prop_chart (GsfXMLIn *xin, xmlChar const **attrs)
gboolean draw_stroke_set = FALSE;
gboolean draw_stroke;
- g_return_if_fail (style != NULL ||
+ g_return_if_fail (style != NULL ||
state->default_style.cells != NULL);
if (style == NULL && state->default_style.cells != NULL) {
style = g_new0 (OOChartStyle, 1);
}
-
+
style->grid = FALSE;
style->src_in_rows = FALSE;
@@ -4143,74 +4143,74 @@ od_style_prop_chart (GsfXMLIn *xin, xmlChar const **attrs)
} else if (oo_attr_bool (xin, attrs, OO_GNUM_NS_EXT, "reverse-direction", &btmp)) {
style->axis_props = g_slist_prepend (style->axis_props,
oo_prop_new_bool ("invert-axis", btmp));
- } else if (oo_attr_bool (xin, attrs, OO_NS_CHART,
+ } else if (oo_attr_bool (xin, attrs, OO_NS_CHART,
"reverse-direction", &btmp)) {
style->axis_props = g_slist_prepend (style->axis_props,
oo_prop_new_bool ("invert-axis", btmp));
- } else if (oo_attr_bool (xin, attrs, OO_GNUM_NS_EXT,
+ } else if (oo_attr_bool (xin, attrs, OO_GNUM_NS_EXT,
"vary-style-by-element", &btmp)) {
style->plot_props = g_slist_prepend (style->plot_props,
- oo_prop_new_bool ("vary-style-by-element",
+ oo_prop_new_bool ("vary-style-by-element",
btmp));
- } else if (oo_attr_bool (xin, attrs, OO_GNUM_NS_EXT,
+ } else if (oo_attr_bool (xin, attrs, OO_GNUM_NS_EXT,
"show-negatives", &btmp)) {
style->plot_props = g_slist_prepend (style->plot_props,
oo_prop_new_bool ("show-negatives", btmp));
- } else if (oo_attr_float (xin, attrs, OO_NS_CHART,
+ } else if (oo_attr_float (xin, attrs, OO_NS_CHART,
"minimum", &ftmp)) {
style->axis_props = g_slist_prepend (style->axis_props,
oo_prop_new_double ("minimum", ftmp));
- } else if (oo_attr_float (xin, attrs, OO_NS_CHART,
+ } else if (oo_attr_float (xin, attrs, OO_NS_CHART,
"maximum", &ftmp)) {
style->axis_props = g_slist_prepend (style->axis_props,
oo_prop_new_double ("maximum", ftmp));
- } else if (oo_attr_float (xin, attrs, OO_GNUM_NS_EXT,
+ } else if (oo_attr_float (xin, attrs, OO_GNUM_NS_EXT,
"radius-ratio", &ftmp)) {
style->plot_props = g_slist_prepend (style->plot_props,
oo_prop_new_double ("radius-ratio", ftmp));
- } else if (oo_attr_percent (xin, attrs, OO_GNUM_NS_EXT,
+ } else if (oo_attr_percent (xin, attrs, OO_GNUM_NS_EXT,
"default-separation", &ftmp)) {
style->plot_props = g_slist_prepend (style->plot_props,
oo_prop_new_double ("default-separation", ftmp));
- } else if (oo_attr_int_range (xin, attrs, OO_NS_CHART,
+ } else if (oo_attr_int_range (xin, attrs, OO_NS_CHART,
"pie-offset", &tmp, 0, 500)) {
style->plot_props = g_slist_prepend (style->plot_props,
- oo_prop_new_double ("default-separation",
+ oo_prop_new_double ("default-separation",
tmp/100.));
style->plot_props = g_slist_prepend (style->plot_props,
- oo_prop_new_double ("separation",
+ oo_prop_new_double ("separation",
tmp/100.));
- } else if (oo_attr_percent (xin, attrs, OO_NS_CHART,
+ } else if (oo_attr_percent (xin, attrs, OO_NS_CHART,
"hole-size", &ftmp)) {
style->plot_props = g_slist_prepend (style->plot_props,
oo_prop_new_double ("center-size", ftmp));
- } else if (oo_attr_bool (xin, attrs, OO_NS_CHART,
+ } else if (oo_attr_bool (xin, attrs, OO_NS_CHART,
"reverse-direction", &btmp)) {
style->axis_props = g_slist_prepend (style->axis_props,
oo_prop_new_bool ("invert-axis", btmp));
- } else if (oo_attr_bool (xin, attrs, OO_NS_CHART, "stacked",
+ } else if (oo_attr_bool (xin, attrs, OO_NS_CHART, "stacked",
&btmp)) {
if (btmp)
- style->plot_props = g_slist_prepend
+ style->plot_props = g_slist_prepend
(style->plot_props,
- oo_prop_new_string ("type",
+ oo_prop_new_string ("type",
"stacked"));
} else if (oo_attr_bool (xin, attrs, OO_NS_CHART, "percentage",
&btmp)) {
if (btmp)
- style->plot_props = g_slist_prepend
+ style->plot_props = g_slist_prepend
(style->plot_props,
- oo_prop_new_string ("type",
+ oo_prop_new_string ("type",
"as_percentage"));
- } else if (oo_attr_int_range (xin, attrs, OO_NS_CHART,
+ } else if (oo_attr_int_range (xin, attrs, OO_NS_CHART,
"overlap", &tmp, -150, 150)) {
style->plot_props = g_slist_prepend (style->plot_props,
oo_prop_new_int ("overlap-percentage", tmp));
- } else if (oo_attr_int_range (xin, attrs, OO_NS_CHART,
+ } else if (oo_attr_int_range (xin, attrs, OO_NS_CHART,
"gap-width", &tmp, 0, 500))
style->plot_props = g_slist_prepend (style->plot_props,
oo_prop_new_int ("gap-percentage", tmp));
- else if (oo_attr_enum (xin, attrs, OO_NS_CHART, "symbol-type",
+ else if (oo_attr_enum (xin, attrs, OO_NS_CHART, "symbol-type",
symbol_type, &tmp)) {
style->plot_props = g_slist_prepend
(style->plot_props,
@@ -4219,15 +4219,15 @@ od_style_prop_chart (GsfXMLIn *xin, xmlChar const **attrs)
style->style_props = g_slist_prepend
(style->style_props,
oo_prop_new_int ("symbol-type", tmp));
- } else if (oo_attr_enum (xin, attrs, OO_NS_CHART,
- "symbol-name",
+ } else if (oo_attr_enum (xin, attrs, OO_NS_CHART,
+ "symbol-name",
named_symbols, &tmp)) {
style->style_props = g_slist_prepend
(style->style_props,
oo_prop_new_int ("symbol-name", tmp));
- } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_CHART, "interpolation")) {
- char const *interpolation = NULL;
+ char const *interpolation = NULL;
if (attr_eq (attrs[1], "none"))
interpolation = "linear";
@@ -4237,16 +4237,16 @@ od_style_prop_chart (GsfXMLIn *xin, xmlChar const **attrs)
interpolation = "cspline";
else if (g_str_has_prefix (CXML2C(attrs[1]), "gnm:"))
interpolation = CXML2C(attrs[1]) + 4;
- else oo_warning
+ else oo_warning
(xin, _("Unknown interpolation type "
- "encountered: %s"),
+ "encountered: %s"),
CXML2C(attrs[1]));
if (interpolation != NULL)
style->plot_props = g_slist_prepend
(style->plot_props,
- oo_prop_new_string
+ oo_prop_new_string
("interpolation", interpolation));
- } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_DRAW, "stroke")) {
draw_stroke = !attr_eq (attrs[1], "none");
draw_stroke_set = TRUE;
@@ -4254,19 +4254,19 @@ od_style_prop_chart (GsfXMLIn *xin, xmlChar const **attrs)
(style->style_props,
oo_prop_new_string ("stroke",
CXML2C(attrs[1])));
- } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_DRAW, "stroke-dash")) {
style->style_props = g_slist_prepend
(style->style_props,
oo_prop_new_string ("stroke-dash",
CXML2C(attrs[1])));
- } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_SVG, "stroke-color")) {
style->style_props = g_slist_prepend
(style->style_props,
oo_prop_new_string ("stroke-color",
CXML2C(attrs[1])));
- } else if (NULL != oo_attr_distance (xin, attrs, OO_NS_SVG,
+ } else if (NULL != oo_attr_distance (xin, attrs, OO_NS_SVG,
"stroke-width", &ftmp))
style->style_props = g_slist_prepend
(style->style_props,
@@ -4316,18 +4316,18 @@ od_style_prop_chart (GsfXMLIn *xin, xmlChar const **attrs)
else if (oo_attr_bool (xin, attrs, OO_NS_CHART, "fill-hatch-solid", &btmp))
style->other_props = g_slist_prepend (style->other_props,
oo_prop_new_bool ("fill-hatch-solid", btmp));
- else if (oo_attr_int_range (xin, attrs, OO_GNUM_NS_EXT,
- "pattern", &tmp,
+ else if (oo_attr_int_range (xin, attrs, OO_GNUM_NS_EXT,
+ "pattern", &tmp,
GO_PATTERN_GREY75, GO_PATTERN_MAX - 1))
style->style_props = g_slist_prepend
(style->style_props,
oo_prop_new_int ("gnm-pattern", tmp));
- else if (oo_attr_angle (xin, attrs, OO_NS_STYLE,
+ else if (oo_attr_angle (xin, attrs, OO_NS_STYLE,
"text-rotation-angle", &tmp)) {
style->style_props = g_slist_prepend
(style->style_props,
oo_prop_new_int ("text-rotation-angle", tmp));
- } else if (oo_attr_angle (xin, attrs, OO_NS_STYLE,
+ } else if (oo_attr_angle (xin, attrs, OO_NS_STYLE,
"rotation-angle", &tmp)) {
style->style_props = g_slist_prepend
(style->style_props,
@@ -4343,12 +4343,12 @@ od_style_prop_chart (GsfXMLIn *xin, xmlChar const **attrs)
style->style_props = g_slist_prepend
(style->style_props,
oo_prop_new_int ("font-weight", tmp));
- else if (oo_attr_enum (xin, attrs, OO_NS_FO, "font-variant",
+ else if (oo_attr_enum (xin, attrs, OO_NS_FO, "font-variant",
font_variants, &tmp))
style->style_props = g_slist_prepend
(style->style_props,
oo_prop_new_int ("font_variant", tmp));
- else if (oo_attr_enum (xin, attrs, OO_NS_FO, "font-style",
+ else if (oo_attr_enum (xin, attrs, OO_NS_FO, "font-style",
font_styles, &tmp))
style->style_props = g_slist_prepend
(style->style_props,
@@ -4358,69 +4358,69 @@ od_style_prop_chart (GsfXMLIn *xin, xmlChar const **attrs)
(style->style_props,
oo_prop_new_string ("font-family",
CXML2C(attrs[1])));
- else if (oo_attr_int_range (xin, attrs, OO_GNUM_NS_EXT,
- "font-stretch-pango", &tmp,
+ else if (oo_attr_int_range (xin, attrs, OO_GNUM_NS_EXT,
+ "font-stretch-pango", &tmp,
0, PANGO_STRETCH_ULTRA_EXPANDED))
style->style_props = g_slist_prepend
(style->style_props,
oo_prop_new_int ("font-stretch-pango", tmp));
- else if (oo_attr_int_range (xin, attrs, OO_GNUM_NS_EXT,
- "font-gravity-pango", &tmp,
+ else if (oo_attr_int_range (xin, attrs, OO_GNUM_NS_EXT,
+ "font-gravity-pango", &tmp,
0, PANGO_GRAVITY_WEST))
style->style_props = g_slist_prepend
(style->style_props,
oo_prop_new_int ("font-gravity-pango", tmp));
- else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_CHART,
+ else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_CHART,
"regression-type"))
style->other_props = g_slist_prepend
(style->other_props,
oo_prop_new_string ("regression-type",
CXML2C(attrs[1])));
- else if (oo_attr_int_range (xin, attrs, OO_GNUM_NS_EXT,
- "regression-polynomial-dims", &tmp,
+ else if (oo_attr_int_range (xin, attrs, OO_GNUM_NS_EXT,
+ "regression-polynomial-dims", &tmp,
1, 100))
style->other_props = g_slist_prepend
(style->other_props,
oo_prop_new_int ("dims", tmp));
- else if (oo_attr_bool (xin, attrs, OO_GNUM_NS_EXT, "regression-affine",
+ else if (oo_attr_bool (xin, attrs, OO_GNUM_NS_EXT, "regression-affine",
&btmp))
style->other_props = g_slist_prepend (style->other_props,
oo_prop_new_bool ("regression-affine", btmp));
- else if (oo_attr_bool (xin, attrs, OO_GNUM_NS_EXT,
- "is-position-manual",
+ else if (oo_attr_bool (xin, attrs, OO_GNUM_NS_EXT,
+ "is-position-manual",
&btmp))
style->plot_props = g_slist_prepend
(style->plot_props,
- oo_prop_new_bool
+ oo_prop_new_bool
("is-position-manual", btmp));
- else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
- OO_GNUM_NS_EXT,
+ else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ OO_GNUM_NS_EXT,
"position"))
style->plot_props = g_slist_prepend
(style->plot_props,
oo_prop_new_string
("position", CXML2C(attrs[1])));
- else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
- OO_GNUM_NS_EXT,
+ else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ OO_GNUM_NS_EXT,
"anchor"))
style->plot_props = g_slist_prepend
(style->plot_props,
oo_prop_new_string
("anchor", CXML2C(attrs[1])));
- else if (oo_attr_enum (xin, attrs, OO_NS_STYLE, "repeat",
+ else if (oo_attr_enum (xin, attrs, OO_NS_STYLE, "repeat",
image_fill_types, &tmp))
style->style_props = g_slist_prepend
(style->style_props,
oo_prop_new_int ("repeat", tmp));
- else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
- OO_NS_DRAW,
+ else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ OO_NS_DRAW,
"marker-start"))
style->other_props = g_slist_prepend
(style->other_props,
oo_prop_new_string
("marker-start", CXML2C(attrs[1])));
- else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
- OO_NS_DRAW,
+ else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ OO_NS_DRAW,
"marker-end"))
style->other_props = g_slist_prepend
(style->other_props,
@@ -4450,7 +4450,7 @@ oo_style_prop (GsfXMLIn *xin, xmlChar const **attrs)
case OO_STYLE_COL :
case OO_STYLE_ROW : oo_style_prop_col_row (xin, attrs); break;
case OO_STYLE_SHEET : oo_style_prop_table (xin, attrs); break;
- case OO_STYLE_CHART :
+ case OO_STYLE_CHART :
case OO_STYLE_GRAPHICS :
od_style_prop_chart (xin, attrs); break;
@@ -4543,13 +4543,13 @@ oo_db_range_start (GsfXMLIn *xin, xmlChar const **attrs)
/* expression or range with that name. */
if (expr != NULL) {
GnmNamedExpr *nexpr = NULL;
- if (name != NULL
- && (NULL == (nexpr = expr_name_lookup
- (parse_pos_init (&pp, state->pos.wb, NULL, 0, 0), name)) ||
+ if (name != NULL
+ && (NULL == (nexpr = expr_name_lookup
+ (parse_pos_init (&pp, state->pos.wb, NULL, 0, 0), name)) ||
nexpr->is_placeholder)) {
GnmExprTop const *texpr = gnm_expr_top_new (expr);
expr_name_add (&pp, name, texpr, NULL, TRUE, NULL);
- } else
+ } else
gnm_expr_free (expr);
}
}
@@ -4760,10 +4760,10 @@ od_draw_control_start (GsfXMLIn *xin, xmlChar const **attrs)
oc->t == sheet_widget_spinbutton_get_type () ||
oc->t == sheet_widget_slider_get_type ()) {
GtkAdjustment *adj;
- int min_real = (oc->min < oc->max) ? oc->min : oc->max;
+ int min_real = (oc->min < oc->max) ? oc->min : oc->max;
int max_real = (oc->min < oc->max) ? oc->max : oc->min;
gnm_float value_real;
-
+
if (oc->value != NULL) {
char *end;
value_real = gnm_strto (oc->value, &end);
@@ -4775,7 +4775,7 @@ od_draw_control_start (GsfXMLIn *xin, xmlChar const **attrs)
if (oc->value_type != NULL && 0 != strcmp (oc->value_type, "float"))
oo_warning (xin, _("Invalid value-type '%s' advertised for "
"'form:value' attribute in 'form:value-range' "
- "element."),
+ "element."),
oc->value_type);
} else value_real = 0.;
@@ -4783,11 +4783,11 @@ od_draw_control_start (GsfXMLIn *xin, xmlChar const **attrs)
value_real = min_real;
if (value_real > (gnm_float)max_real)
value_real = max_real;
-
- so = state->chart.so = g_object_new
+
+ so = state->chart.so = g_object_new
(oc->t, "horizontal", oc->horizontal, NULL);
adj = sheet_widget_adjustment_get_adjustment (so);
-
+
gtk_adjustment_configure (adj,
value_real,
min_real,
@@ -4796,11 +4796,11 @@ od_draw_control_start (GsfXMLIn *xin, xmlChar const **attrs)
oc->page_step,
0);
} else if (oc->t == sheet_widget_radio_button_get_type ()) {
- so = state->chart.so = g_object_new
+ so = state->chart.so = g_object_new
(oc->t, "text", oc->label, NULL);
if (oc->value != NULL) {
GnmValue *val = NULL;
- if (oc->value_type == NULL ||
+ if (oc->value_type == NULL ||
0 == strcmp (oc->value_type, "string"))
val = value_new_string (oc->value);
else if (0 == strcmp (oc->value_type, "float")) {
@@ -4819,42 +4819,42 @@ od_draw_control_start (GsfXMLIn *xin, xmlChar const **attrs)
} else
val = value_new_string (oc->value);
sheet_widget_radio_button_set_value (so, val);
- value_release (val);
+ value_release (val);
}
} else if (oc->t == sheet_widget_checkbox_get_type ()) {
- so = state->chart.so = g_object_new
+ so = state->chart.so = g_object_new
(oc->t, "text", oc->label, NULL);
} else if (oc->t == sheet_widget_list_get_type () ||
oc->t == sheet_widget_combo_get_type ()) {
- so = state->chart.so = g_object_new
+ so = state->chart.so = g_object_new
(oc->t, NULL);
} else if (oc->t == sheet_widget_button_get_type ()) {
- so = state->chart.so = g_object_new
+ so = state->chart.so = g_object_new
(oc->t, "text", oc->label, NULL);
} else if (oc->t == sheet_widget_frame_get_type ()) {
- so = state->chart.so = g_object_new
+ so = state->chart.so = g_object_new
(oc->t, "text", oc->label, NULL);
}
od_draw_frame_end (xin, NULL);
-
+
if (oc->linked_cell) {
GnmParsePos pp;
GnmRangeRef ref;
- char const *ptr = oo_rangeref_parse
+ char const *ptr = oo_rangeref_parse
(&ref, oc->linked_cell,
parse_pos_init_sheet (&pp, state->pos.sheet));
if (ptr != oc->linked_cell) {
- GnmValue *v = value_new_cellrange
+ GnmValue *v = value_new_cellrange
(&ref.a, &ref.a, 0, 0);
- GnmExprTop const *texpr
+ GnmExprTop const *texpr
= gnm_expr_top_new_constant (v);
if (texpr != NULL) {
if (oc->t == sheet_widget_scrollbar_get_type () ||
oc->t == sheet_widget_spinbutton_get_type () ||
oc->t == sheet_widget_slider_get_type ())
- sheet_widget_adjustment_set_link
+ sheet_widget_adjustment_set_link
(so, texpr);
else if (oc->t == sheet_widget_checkbox_get_type ())
sheet_widget_checkbox_set_link
@@ -4879,28 +4879,28 @@ od_draw_control_start (GsfXMLIn *xin, xmlChar const **attrs)
if (oc->source_cell_range) {
GnmParsePos pp;
GnmRangeRef ref;
- char const *ptr = oo_rangeref_parse
+ char const *ptr = oo_rangeref_parse
(&ref, oc->source_cell_range,
parse_pos_init_sheet (&pp, state->pos.sheet));
if (ptr != oc->source_cell_range) {
- GnmValue *v = value_new_cellrange
+ GnmValue *v = value_new_cellrange
(&ref.a, &ref.b, 0, 0);
- GnmExprTop const *texpr
+ GnmExprTop const *texpr
= gnm_expr_top_new_constant (v);
if (texpr != NULL) {
- sheet_widget_list_base_set_links
- (so,
+ sheet_widget_list_base_set_links
+ (so,
result_texpr, texpr);
gnm_expr_top_unref (texpr);
}
- }
- }
+ }
+ }
if (result_texpr != NULL)
gnm_expr_top_unref (result_texpr);
sheet_widget_list_base_set_result_type (so, oc->as_index);
}
}
- } else
+ } else
od_draw_frame_end (xin, NULL);
}
@@ -4939,39 +4939,39 @@ od_draw_object (GsfXMLIn *xin, xmlChar const **attrs)
state->chart.so = sheet_object_graph_new (NULL);
state->chart.graph = sheet_object_graph_get_gog (state->chart.so);
- state->chart.saved_graph_styles
+ state->chart.saved_graph_styles
= g_slist_prepend (state->chart.saved_graph_styles,
state->chart.graph_styles);
state->chart.saved_hatches
= g_slist_prepend (state->chart.saved_hatches,
state->chart.hatches);
- state->chart.saved_dash_styles
+ state->chart.saved_dash_styles
= g_slist_prepend (state->chart.saved_dash_styles,
state->chart.dash_styles);
- state->chart.saved_fill_image_styles
+ state->chart.saved_fill_image_styles
= g_slist_prepend (state->chart.saved_fill_image_styles,
state->chart.fill_image_styles);
- state->chart.saved_gradient_styles
+ state->chart.saved_gradient_styles
= g_slist_prepend (state->chart.saved_gradient_styles,
state->chart.gradient_styles);
- state->chart.graph_styles = g_hash_table_new_full
+ state->chart.graph_styles = g_hash_table_new_full
(g_str_hash, g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) oo_chart_style_free);
- state->chart.hatches = g_hash_table_new_full
+ state->chart.hatches = g_hash_table_new_full
(g_str_hash, g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) g_free);
- state->chart.dash_styles = g_hash_table_new_full
+ state->chart.dash_styles = g_hash_table_new_full
(g_str_hash, g_str_equal,
(GDestroyNotify) g_free,
NULL);
- state->chart.fill_image_styles = g_hash_table_new_full
+ state->chart.fill_image_styles = g_hash_table_new_full
(g_str_hash, g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) g_free);
- state->chart.gradient_styles = g_hash_table_new_full
+ state->chart.gradient_styles = g_hash_table_new_full
(g_str_hash, g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) g_free);
@@ -5007,7 +5007,7 @@ od_draw_object (GsfXMLIn *xin, xmlChar const **attrs)
gsf_xml_in_doc_free (doc);
g_object_unref (content);
}
-
+
content = gsf_infile_child_by_vname (state->zip, name, "content.xml", NULL);
if (content != NULL) {
GsfXMLInDoc *doc =
@@ -5028,9 +5028,9 @@ od_draw_object (GsfXMLIn *xin, xmlChar const **attrs)
pop_hash (&state->chart.saved_graph_styles, &state->chart.graph_styles);
pop_hash (&state->chart.saved_hatches, &state->chart.hatches);
pop_hash (&state->chart.saved_dash_styles, &state->chart.dash_styles);
- pop_hash (&state->chart.saved_fill_image_styles,
+ pop_hash (&state->chart.saved_fill_image_styles,
&state->chart.fill_image_styles);
- pop_hash (&state->chart.saved_gradient_styles,
+ pop_hash (&state->chart.saved_gradient_styles,
&state->chart.gradient_styles);
}
@@ -5048,7 +5048,7 @@ od_draw_image (GsfXMLIn *xin, xmlChar const **attrs)
return;
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
- if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_XLINK, "href")) {
file = CXML2C (attrs[1]);
break;
@@ -5130,22 +5130,22 @@ oo_chart_title (GsfXMLIn *xin, xmlChar const **attrs)
state->chart.title_style = NULL;
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2){
- if ((gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
- OO_NS_TABLE, "cell-address" ) ||
- gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ if ((gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ OO_NS_TABLE, "cell-address" ) ||
+ gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_TABLE, "cell-range" ))
&& state->chart.title_expr == NULL) {
GnmParsePos pp;
char *end_str = g_strconcat ("[", CXML2C (attrs[1]), "]", NULL);
parse_pos_init (&pp, state->pos.wb, NULL, 0, 0);
- state->chart.title_expr
- = oo_expr_parse_str
+ state->chart.title_expr
+ = oo_expr_parse_str
(xin, end_str, &pp,
GNM_EXPR_PARSE_FORCE_EXPLICIT_SHEET_REFERENCES,
FORMULA_OPENFORMULA);
g_free (end_str);
- } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_GNUM_NS_EXT, "expression")) {
GnmParsePos pp;
@@ -5153,12 +5153,12 @@ oo_chart_title (GsfXMLIn *xin, xmlChar const **attrs)
gnm_expr_top_unref (state->chart.title_expr);
parse_pos_init (&pp, state->pos.wb, NULL, 0, 0);
- state->chart.title_expr
- = oo_expr_parse_str
+ state->chart.title_expr
+ = oo_expr_parse_str
(xin, CXML2C (attrs[1]), &pp,
GNM_EXPR_PARSE_FORCE_EXPLICIT_SHEET_REFERENCES,
FORMULA_OPENFORMULA);
- } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_CHART, "style-name")) {
state->chart.title_style = g_strdup (CXML2C (attrs[1]));
}
@@ -5170,7 +5170,7 @@ oo_chart_title_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
{
OOParseState *state = (OOParseState *)xin->user_state;
if (state->chart.title_expr) {
- GOData *data = gnm_go_data_scalar_new_expr
+ GOData *data = gnm_go_data_scalar_new_expr
(state->chart.src_sheet, state->chart.title_expr);
GogObject *label;
GogObject *obj;
@@ -5191,12 +5191,12 @@ oo_chart_title_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
gog_dataset_set_dim (GOG_DATASET (label), 0, data, NULL);
state->chart.title_expr = NULL;
if (state->chart.title_style != NULL) {
- OOChartStyle *oostyle = g_hash_table_lookup
+ OOChartStyle *oostyle = g_hash_table_lookup
(state->chart.graph_styles, state->chart.title_style);
if (oostyle != NULL) {
GOStyle *style;
g_object_get (G_OBJECT (label), "style", &style, NULL);
-
+
if (style != NULL) {
odf_apply_style_props (xin, oostyle->style_props, style);
g_object_unref (style);
@@ -5206,7 +5206,7 @@ oo_chart_title_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
state->chart.title_style = NULL;
}
}
-
+
}
static void
@@ -5215,8 +5215,8 @@ oo_chart_title_text (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
OOParseState *state = (OOParseState *)xin->user_state;
if (state->chart.title_expr == NULL)
- state->chart.title_expr =
- gnm_expr_top_new_constant
+ state->chart.title_expr =
+ gnm_expr_top_new_constant
(value_new_string (xin->content->str));
}
@@ -5226,10 +5226,10 @@ od_chart_axis_categories (GsfXMLIn *xin, xmlChar const **attrs)
OOParseState *state = (OOParseState *)xin->user_state;
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
- if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_TABLE, "cell-range-address")) {
if (state->chart.cat_expr == NULL)
- state->chart.cat_expr
+ state->chart.cat_expr
= g_strdup (CXML2C (attrs[1]));
}
}
@@ -5261,8 +5261,8 @@ oo_chart_axis (GsfXMLIn *xin, xmlChar const **attrs)
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_CHART, "style-name"))
style_name = CXML2C (attrs[1]);
- else if (oo_attr_enum (xin, attrs, OO_NS_CHART, "dimension",
- (state->chart.plot_type == OO_PLOT_RADAR ||
+ else if (oo_attr_enum (xin, attrs, OO_NS_CHART, "dimension",
+ (state->chart.plot_type == OO_PLOT_RADAR ||
state->chart.plot_type == OO_PLOT_RADARAREA ||
state->chart.plot_type == OO_PLOT_POLAR)? types_radar : types, &tmp))
axis_type = tmp;
@@ -5279,7 +5279,7 @@ oo_chart_axis (GsfXMLIn *xin, xmlChar const **attrs)
GOStyle *gostyle;
g_object_get (G_OBJECT (state->chart.axis), "style", &gostyle, NULL);
- oo_prop_list_apply_to_axis (style->axis_props,
+ oo_prop_list_apply_to_axis (style->axis_props,
G_OBJECT (state->chart.axis));
odf_apply_style_props (xin, style->style_props, gostyle);
g_object_unref (gostyle);
@@ -5369,7 +5369,7 @@ oo_plot_assign_dim (GsfXMLIn *xin, xmlChar const *range, int dim_type, char cons
&state->chart.src_range);
if (state->debug)
- g_print ("%d = implicit (%s)\n", dim,
+ g_print ("%d = implicit (%s)\n", dim,
range_as_string (&state->chart.src_range));
state->chart.src_n_vectors--;
@@ -5377,7 +5377,7 @@ oo_plot_assign_dim (GsfXMLIn *xin, xmlChar const *range, int dim_type, char cons
state->chart.src_range.end.row = ++state->chart.src_range.start.row;
else
state->chart.src_range.end.col = ++state->chart.src_range.start.col;
-
+
set_default_labels = state->chart.src_abscissa_set;
set_default_series_name = state->chart.src_label_set;
}
@@ -5395,7 +5395,7 @@ oo_plot_assign_dim (GsfXMLIn *xin, xmlChar const *range, int dim_type, char cons
texpr = gnm_expr_top_new_constant (v);
if (NULL != texpr)
gog_series_set_dim (state->chart.series, GOG_DIM_LABEL,
- gnm_go_data_vector_new_expr
+ gnm_go_data_vector_new_expr
(state->pos.sheet, texpr),
NULL);
}
@@ -5405,7 +5405,7 @@ oo_plot_assign_dim (GsfXMLIn *xin, xmlChar const *range, int dim_type, char cons
texpr = gnm_expr_top_new_constant (v);
if (NULL != texpr)
gog_series_set_name (state->chart.series,
- GO_DATA_SCALAR (gnm_go_data_scalar_new_expr
+ GO_DATA_SCALAR (gnm_go_data_scalar_new_expr
(state->pos.sheet, texpr)),
NULL);
if (state->chart.src_in_rows)
@@ -5425,10 +5425,10 @@ odf_gog_check_position (GsfXMLIn *xin, xmlChar const **attrs, GSList **list)
*list = g_slist_prepend (*list, oo_prop_new_bool("is-position-manual",
b));
else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_GNUM_NS_EXT, "position"))
- *list = g_slist_prepend (*list, oo_prop_new_string ("position",
+ *list = g_slist_prepend (*list, oo_prop_new_string ("position",
CXML2C(attrs[1])));
else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_GNUM_NS_EXT, "anchor"))
- *list = g_slist_prepend (*list, oo_prop_new_string ("anchor",
+ *list = g_slist_prepend (*list, oo_prop_new_string ("anchor",
CXML2C(attrs[1])));
}
@@ -5442,7 +5442,7 @@ odf_gog_plot_area_check_position (GsfXMLIn *xin, xmlChar const **attrs, GSList *
*list = g_slist_prepend (*list, oo_prop_new_bool("is-plot-area-manual",
b));
else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_GNUM_NS_EXT, "position"))
- *list = g_slist_prepend (*list, oo_prop_new_string ("plot-area",
+ *list = g_slist_prepend (*list, oo_prop_new_string ("plot-area",
CXML2C(attrs[1])));
}
@@ -5462,7 +5462,7 @@ oo_plot_area (GsfXMLIn *xin, xmlChar const **attrs)
xmlChar const *source_range_str = NULL;
int label_flags = 0;
GSList *prop_list = NULL;
-
+
odf_gog_plot_area_check_position (xin, attrs, &prop_list);
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
@@ -5669,8 +5669,8 @@ oo_plot_series (GsfXMLIn *xin, xmlChar const **attrs)
if (state->chart.series == NULL) {
state->chart.series = gog_plot_new_series (state->chart.plot);
if (state->chart.cat_expr != NULL) {
- oo_plot_assign_dim
- (xin, state->chart.cat_expr,
+ oo_plot_assign_dim
+ (xin, state->chart.cat_expr,
GOG_MS_DIM_CATEGORIES, NULL);
}
}
@@ -5685,7 +5685,7 @@ oo_plot_series (GsfXMLIn *xin, xmlChar const **attrs)
g_strdup (attrs[1]));
break;
case OO_PLOT_SURFACE:
- case OO_PLOT_CONTOUR:
+ case OO_PLOT_CONTOUR:
{
GnmRangeRef ref;
GnmValue *v;
@@ -5699,13 +5699,13 @@ oo_plot_series (GsfXMLIn *xin, xmlChar const **attrs)
texpr = gnm_expr_top_new_constant (v);
if (NULL != texpr)
gog_series_set_dim (state->chart.series, 2,
- gnm_go_data_matrix_new_expr
+ gnm_go_data_matrix_new_expr
(state->pos.sheet, texpr), NULL);
}
break;
case OO_PLOT_GANTT:
- oo_plot_assign_dim (xin, attrs[1],
- (state->chart.series_count % 2 == 1) ? GOG_MS_DIM_START : GOG_MS_DIM_END,
+ oo_plot_assign_dim (xin, attrs[1],
+ (state->chart.series_count % 2 == 1) ? GOG_MS_DIM_START : GOG_MS_DIM_END,
NULL);
break;
case OO_PLOT_BUBBLE:
@@ -5736,13 +5736,13 @@ oo_plot_series (GsfXMLIn *xin, xmlChar const **attrs)
if (f_type != FORMULA_NOT_SUPPORTED) {
GnmParsePos pp;
GnmRangeRef ref;
- char const *ptr = oo_rangeref_parse
+ char const *ptr = oo_rangeref_parse
(&ref, CXML2C (label),
parse_pos_init_sheet (&pp, state->pos.sheet));
if (ptr == CXML2C (label))
texpr = oo_expr_parse_str (xin, label,
- &state->pos,
- GNM_EXPR_PARSE_DEFAULT,
+ &state->pos,
+ GNM_EXPR_PARSE_DEFAULT,
f_type);
else {
GnmValue *v = value_new_cellrange (&ref.a, &ref.b, 0, 0);
@@ -5750,14 +5750,14 @@ oo_plot_series (GsfXMLIn *xin, xmlChar const **attrs)
}
if (texpr != NULL)
gog_series_set_name (state->chart.series,
- GO_DATA_SCALAR (gnm_go_data_scalar_new_expr
+ GO_DATA_SCALAR (gnm_go_data_scalar_new_expr
(state->pos.sheet, texpr)),
NULL);
}
}
- oo_chart_style_to_series (xin, state->chart.i_plot_styles[OO_CHART_STYLE_PLOTAREA],
+ oo_chart_style_to_series (xin, state->chart.i_plot_styles[OO_CHART_STYLE_PLOTAREA],
G_OBJECT (state->chart.series));
- oo_chart_style_to_series (xin, state->chart.i_plot_styles[OO_CHART_STYLE_SERIES],
+ oo_chart_style_to_series (xin, state->chart.i_plot_styles[OO_CHART_STYLE_SERIES],
G_OBJECT (state->chart.series));
}
@@ -5846,12 +5846,12 @@ oo_series_pt (GsfXMLIn *xin, xmlChar const **attrs)
if (gostyle != NULL) {
OOChartStyle *astyle = state->chart.i_plot_styles[OO_CHART_STYLE_PLOTAREA];
if (astyle != NULL)
- odf_apply_style_props
+ odf_apply_style_props
(xin, astyle->style_props, gostyle);
astyle = state->chart.i_plot_styles[OO_CHART_STYLE_SERIES];
if (astyle != NULL)
- odf_apply_style_props
- (xin, astyle->style_props, gostyle);
+ odf_apply_style_props
+ (xin, astyle->style_props, gostyle);
odf_apply_style_props (xin, style->style_props, gostyle);
g_object_unref (gostyle);
}
@@ -5871,35 +5871,35 @@ od_series_reg_equation (GsfXMLIn *xin, xmlChar const **attrs)
gboolean dispay_equation = TRUE;
gboolean display_r_square = TRUE;
GSList *prop_list = NULL;
-
+
odf_gog_check_position (xin, attrs, &prop_list);
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_CHART, "style-name"))
style_name = CXML2C (attrs[1]);
- else if (oo_attr_bool (xin, attrs, OO_NS_CHART, "automatic-content",
+ else if (oo_attr_bool (xin, attrs, OO_NS_CHART, "automatic-content",
&automatic_content));
- else if (oo_attr_bool (xin, attrs, OO_GNUM_NS_EXT, "automatic-content",
+ else if (oo_attr_bool (xin, attrs, OO_GNUM_NS_EXT, "automatic-content",
&automatic_content));
- else if (oo_attr_bool (xin, attrs, OO_NS_CHART, "display-equation",
+ else if (oo_attr_bool (xin, attrs, OO_NS_CHART, "display-equation",
&dispay_equation));
- else if (oo_attr_bool (xin, attrs, OO_GNUM_NS_EXT, "display-equation",
+ else if (oo_attr_bool (xin, attrs, OO_GNUM_NS_EXT, "display-equation",
&dispay_equation));
- else if (oo_attr_bool (xin, attrs, OO_NS_CHART, "display-r-square",
+ else if (oo_attr_bool (xin, attrs, OO_NS_CHART, "display-r-square",
&display_r_square));
-
- equation = gog_object_add_by_name (GOG_OBJECT (state->chart.regression),
+
+ equation = gog_object_add_by_name (GOG_OBJECT (state->chart.regression),
"Equation", NULL);
- g_object_set (G_OBJECT (equation),
- "show-eq", dispay_equation,
+ g_object_set (G_OBJECT (equation),
+ "show-eq", dispay_equation,
"show-r2", display_r_square,
NULL);
-
+
oo_prop_list_apply (prop_list, G_OBJECT (equation));
oo_prop_list_free (prop_list);
-
+
if (!automatic_content)
oo_warning (xin, _("Gnumeric does not support non-automatic"
" regression equations. Using automatic"
@@ -5912,11 +5912,11 @@ od_series_reg_equation (GsfXMLIn *xin, xmlChar const **attrs)
g_object_get (G_OBJECT (equation), "style", &style, NULL);
if (style != NULL) {
odf_apply_style_props (xin, chart_style->style_props, style);
- g_object_unref (style);
+ g_object_unref (style);
}
/* In the moment we don't need this. */
/* oo_prop_list_apply (chart_style->plot_props, G_OBJECT (equation)); */
- }
+ }
}
static void
@@ -5925,7 +5925,7 @@ odf_store_data (OOParseState *state, gchar const *str, GogObject *obj, int dim)
if (str != NULL) {
GnmParsePos pp;
GnmRangeRef ref;
- char const *ptr = oo_rangeref_parse
+ char const *ptr = oo_rangeref_parse
(&ref, CXML2C (str),
parse_pos_init (&pp, state->pos.wb, NULL, 0, 0));
if (ptr != CXML2C (str)) {
@@ -5933,7 +5933,7 @@ odf_store_data (OOParseState *state, gchar const *str, GogObject *obj, int dim)
GnmExprTop const *texpr = gnm_expr_top_new_constant (v);
if (NULL != texpr) {
gog_dataset_set_dim (GOG_DATASET (obj), dim,
- gnm_go_data_scalar_new_expr
+ gnm_go_data_scalar_new_expr
(state->pos.sheet, texpr),
NULL);
}
@@ -5966,49 +5966,49 @@ od_series_regression (GsfXMLIn *xin, xmlChar const **attrs)
GOStyle *style = NULL;
GogObject *regression;
gchar const *type_name = "GogLinRegCurve";
-
+
for (l = chart_style->other_props; l != NULL; l = l->next) {
OOProp *prop = l->data;
if (0 == strcmp ("regression-type", prop->name)) {
char const *reg_type = g_value_get_string (&prop->value);
- if (0 == strcmp (reg_type, "linear"))
+ if (0 == strcmp (reg_type, "linear"))
type_name = "GogLinRegCurve";
- else if (0 == strcmp (reg_type, "power"))
+ else if (0 == strcmp (reg_type, "power"))
type_name = "GogPowerRegCurve";
- else if (0 == strcmp (reg_type, "exponential"))
+ else if (0 == strcmp (reg_type, "exponential"))
type_name = "GogExpRegCurve";
- else if (0 == strcmp (reg_type, "logarithmic"))
+ else if (0 == strcmp (reg_type, "logarithmic"))
type_name = "GogLogRegCurve";
- else if (0 == strcmp
+ else if (0 == strcmp
(reg_type, "gnm:exponential-smoothing"))
type_name = "GogExpSmooth";
- else if (0 == strcmp
- (reg_type, "gnm:logfit"))
+ else if (0 == strcmp
+ (reg_type, "gnm:logfit"))
type_name = "GogLogFitCurve";
- else if (0 == strcmp
- (reg_type, "gnm:polynomial"))
+ else if (0 == strcmp
+ (reg_type, "gnm:polynomial"))
type_name = "GogPolynomRegCurve";
- else if (0 == strcmp
- (reg_type, "gnm:moving-average"))
+ else if (0 == strcmp
+ (reg_type, "gnm:moving-average"))
type_name = "GogMovingAvg";
}
}
-
- state->chart.regression = regression =
+
+ state->chart.regression = regression =
GOG_OBJECT (gog_trend_line_new_by_name (type_name));
- regression = gog_object_add_by_name (GOG_OBJECT (state->chart.series),
+ regression = gog_object_add_by_name (GOG_OBJECT (state->chart.series),
"Regression curve", regression);
oo_prop_list_apply (chart_style->other_props, G_OBJECT (regression));
g_object_get (G_OBJECT (regression), "style", &style, NULL);
if (style != NULL) {
odf_apply_style_props (xin, chart_style->style_props, style);
- g_object_unref (style);
+ g_object_unref (style);
}
odf_store_data (state, lower_bd, regression , 0);
odf_store_data (state, upper_bd, regression , 1);
- }
+ }
}
@@ -6036,7 +6036,7 @@ oo_series_droplines (GsfXMLIn *xin, xmlChar const **attrs)
}
switch (state->chart.plot_type) {
- case OO_PLOT_LINE:
+ case OO_PLOT_LINE:
role_name = "Drop lines";
break;
case OO_PLOT_SCATTER:
@@ -6046,13 +6046,13 @@ oo_series_droplines (GsfXMLIn *xin, xmlChar const **attrs)
oo_warning (xin , _("Encountered drop lines in a plot not supporting them."));
return;
}
-
+
lines = gog_object_add_by_name (GOG_OBJECT (state->chart.series), role_name, NULL);
g_object_get (G_OBJECT (lines), "style", &style, NULL);
if (style != NULL) {
odf_apply_style_props (xin, chart_style->style_props, style);
- g_object_unref (style);
+ g_object_unref (style);
}
}
}
@@ -6211,7 +6211,7 @@ oo_chart_wall (GsfXMLIn *xin, xmlChar const **attrs)
if (style_name != NULL && backplane != NULL) {
GOStyle *style = NULL;
g_object_get (G_OBJECT (backplane), "style", &style, NULL);
-
+
if (style != NULL) {
OOChartStyle *chart_style = g_hash_table_lookup
(state->chart.graph_styles, style_name);
@@ -6302,24 +6302,24 @@ odf_so_filled (GsfXMLIn *xin, xmlChar const **attrs, gboolean is_oval)
char const *style_name = NULL;
od_draw_frame_start (xin, attrs);
- state->chart.so = g_object_new (GNM_SO_FILLED_TYPE,
+ state->chart.so = g_object_new (GNM_SO_FILLED_TYPE,
"is-oval", is_oval, NULL);
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
- if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_DRAW, "style-name"))
style_name = CXML2C (attrs[1]);
-
+
if (style_name != NULL) {
- OOChartStyle *oostyle = g_hash_table_lookup
+ OOChartStyle *oostyle = g_hash_table_lookup
(state->chart.graph_styles, style_name);
if (oostyle != NULL) {
GOStyle *style;
- g_object_get (G_OBJECT (state->chart.so),
+ g_object_get (G_OBJECT (state->chart.so),
"style", &style, NULL);
-
+
if (style != NULL) {
- odf_apply_style_props (xin, oostyle->style_props,
+ odf_apply_style_props (xin, oostyle->style_props,
style);
g_object_unref (style);
}
@@ -6372,26 +6372,26 @@ odf_line (GsfXMLIn *xin, xmlChar const **attrs)
cell_base.start.row = cell_base.end.row = state->pos.eval.row;
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
- if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_DRAW, "style-name"))
style_name = CXML2C (attrs[1]);
- else if (NULL != oo_attr_distance (xin, attrs,
- OO_NS_SVG, "x1",
+ else if (NULL != oo_attr_distance (xin, attrs,
+ OO_NS_SVG, "x1",
&x1));
- else if (NULL != oo_attr_distance (xin, attrs,
- OO_NS_SVG, "x2",
+ else if (NULL != oo_attr_distance (xin, attrs,
+ OO_NS_SVG, "x2",
&x2));
- else if (NULL != oo_attr_distance (xin, attrs,
- OO_NS_SVG, "y1",
+ else if (NULL != oo_attr_distance (xin, attrs,
+ OO_NS_SVG, "y1",
&y1));
- else if (NULL != oo_attr_distance (xin, attrs,
- OO_NS_SVG, "y2",
+ else if (NULL != oo_attr_distance (xin, attrs,
+ OO_NS_SVG, "y2",
&y2));
- else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_TABLE, "end-cell-address")) {
GnmParsePos pp;
GnmRangeRef ref;
- char const *ptr = oo_rangeref_parse
+ char const *ptr = oo_rangeref_parse
(&ref, CXML2C (attrs[1]),
parse_pos_init_sheet (&pp, state->pos.sheet));
if (ptr != CXML2C (attrs[1])) {
@@ -6401,14 +6401,14 @@ odf_line (GsfXMLIn *xin, xmlChar const **attrs)
}
if (x1 < x2) {
- if (y1 < y2)
+ if (y1 < y2)
direction = GOD_ANCHOR_DIR_DOWN_RIGHT;
else
direction = GOD_ANCHOR_DIR_UP_RIGHT;
frame_offset[0] = x1;
frame_offset[2] = x2;
} else {
- if (y1 < y2)
+ if (y1 < y2)
direction = GOD_ANCHOR_DIR_DOWN_LEFT;
else
direction = GOD_ANCHOR_DIR_UP_LEFT;
@@ -6443,13 +6443,13 @@ odf_line (GsfXMLIn *xin, xmlChar const **attrs)
frame_offset[3] /= row->size_pts;
- sheet_object_anchor_init (&state->chart.anchor, &cell_base,
+ sheet_object_anchor_init (&state->chart.anchor, &cell_base,
frame_offset,
direction);
state->chart.so = g_object_new (GNM_SO_LINE_TYPE, NULL);
if (style_name != NULL) {
- OOChartStyle *oostyle = g_hash_table_lookup
+ OOChartStyle *oostyle = g_hash_table_lookup
(state->chart.graph_styles, style_name);
if (oostyle != NULL) {
GOStyle *style;
@@ -6457,15 +6457,15 @@ odf_line (GsfXMLIn *xin, xmlChar const **attrs)
char const *end_marker = NULL;
GSList *l;
- g_object_get (G_OBJECT (state->chart.so),
+ g_object_get (G_OBJECT (state->chart.so),
"style", &style, NULL);
-
+
if (style != NULL) {
- odf_apply_style_props (xin, oostyle->style_props,
+ odf_apply_style_props (xin, oostyle->style_props,
style);
g_object_unref (style);
}
-
+
for (l = oostyle->other_props; l != NULL; l = l->next) {
OOProp *prop = l->data;
if (0 == strcmp ("marker-start", prop->name))
@@ -6476,7 +6476,7 @@ odf_line (GsfXMLIn *xin, xmlChar const **attrs)
if (start_marker != NULL) {
GOArrow *arrow = odf_get_arrow_marker (state, start_marker);
-
+
if (arrow != NULL) {
g_object_set (G_OBJECT (state->chart.so),
"start-arrow", arrow, NULL);
@@ -6485,7 +6485,7 @@ odf_line (GsfXMLIn *xin, xmlChar const **attrs)
}
if (end_marker != NULL) {
GOArrow *arrow = odf_get_arrow_marker (state, end_marker);
-
+
if (arrow != NULL) {
g_object_set (G_OBJECT (state->chart.so),
"end-arrow", arrow, NULL);
@@ -6494,7 +6494,7 @@ odf_line (GsfXMLIn *xin, xmlChar const **attrs)
}
}
}
-
+
}
/****************************************************************************/
@@ -6528,89 +6528,89 @@ odf_form_control (GsfXMLIn *xin, xmlChar const **attrs, GType t)
if (0 == strcmp (CXML2C (attrs[0]), "xml:id")) {
g_free (name);
name = g_strdup (CXML2C (attrs[1]));
- } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_FORM, "id")) {
if (name == NULL)
name = g_strdup (CXML2C (attrs[1]));
- } else if (oo_attr_enum (xin, attrs, OO_NS_FORM, "orientation", orientations,
+ } else if (oo_attr_enum (xin, attrs, OO_NS_FORM, "orientation", orientations,
&tmp))
oc->horizontal = (tmp != 0);
- else if (oo_attr_int (xin, attrs, OO_NS_FORM, "min-value",
+ else if (oo_attr_int (xin, attrs, OO_NS_FORM, "min-value",
&(oc->min)));
- else if (oo_attr_int (xin, attrs, OO_NS_FORM, "max-value",
+ else if (oo_attr_int (xin, attrs, OO_NS_FORM, "max-value",
&(oc->max)));
- else if (oo_attr_int_range (xin, attrs, OO_NS_FORM, "step-size",
+ else if (oo_attr_int_range (xin, attrs, OO_NS_FORM, "step-size",
&(oc->step), 0, INT_MAX));
- else if (oo_attr_int_range (xin, attrs, OO_NS_FORM, "page-step-size",
+ else if (oo_attr_int_range (xin, attrs, OO_NS_FORM, "page-step-size",
&(oc->page_step), 0, INT_MAX));
- else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_FORM, "value")) {
g_free (oc->value);
oc->value = g_strdup (CXML2C (attrs[1]));
- } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_GNUM_NS_EXT, "value-type")) {
g_free (oc->value_type);
oc->value_type = g_strdup (CXML2C (attrs[1]));
- } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_FORM, "linked-cell")) {
g_free (oc->linked_cell);
oc->linked_cell = g_strdup (CXML2C (attrs[1]));
- } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_GNUM_NS_EXT, "linked-cell")) {
g_free (oc->linked_cell);
oc->linked_cell = g_strdup (CXML2C (attrs[1]));
- } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_FORM, "label")) {
g_free (oc->label);
oc->label = g_strdup (CXML2C (attrs[1]));
- } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_FORM, "control-implementation")) {
g_free (oc->implementation);
oc->implementation = g_strdup (CXML2C (attrs[1]));
- } else if (oo_attr_enum (xin, attrs, OO_NS_FORM, "list-linkage-type", list_linkages,
+ } else if (oo_attr_enum (xin, attrs, OO_NS_FORM, "list-linkage-type", list_linkages,
&tmp))
oc->as_index = (tmp != 0);
- else if (oo_attr_enum (xin, attrs, OO_GNUM_NS_EXT, "list-linkage-type", list_linkages,
+ else if (oo_attr_enum (xin, attrs, OO_GNUM_NS_EXT, "list-linkage-type", list_linkages,
&tmp))
oc->as_index = (tmp != 0);
- else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_FORM, "source-cell-range")) {
g_free (oc->source_cell_range);
oc->source_cell_range = g_strdup (CXML2C (attrs[1]));
- } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ } else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_GNUM_NS_EXT, "source-cell-range")) {
if (oc->source_cell_range == NULL)
oc->source_cell_range = g_strdup (CXML2C (attrs[1]));
- } else if (oo_attr_int (xin, attrs, OO_NS_FORM, "bound-column",
+ } else if (oo_attr_int (xin, attrs, OO_NS_FORM, "bound-column",
&tmp)) {
if (tmp != 1)
oo_warning (xin, _("Attribute '%s' has "
- "the unsupported value '%s'."),
+ "the unsupported value '%s'."),
"form:bound-column", CXML2C (attrs[1]));
}
-
+
if (name != NULL) {
- if (oc->implementation != NULL &&
+ if (oc->implementation != NULL &&
t == sheet_widget_slider_get_type ()) {
if (0 == strcmp (oc->implementation, "gnm:scrollbar"))
oc->t = sheet_widget_scrollbar_get_type ();
- else if (0 == strcmp (oc->implementation,
+ else if (0 == strcmp (oc->implementation,
"gnm:spinbutton"))
oc->t = sheet_widget_spinbutton_get_type ();
- else if (0 == strcmp (oc->implementation,
+ else if (0 == strcmp (oc->implementation,
"gnm:slider"))
oc->t = sheet_widget_slider_get_type ();
- else if (0 == strcmp (oc->implementation,
+ else if (0 == strcmp (oc->implementation,
"ooo:com.sun.star.form."
"component.ScrollBar"))
oc->t = sheet_widget_scrollbar_get_type ();
} else if (t == sheet_widget_frame_get_type ()) {
- if (oc->implementation == NULL ||
+ if (oc->implementation == NULL ||
0 != strcmp (oc->implementation, "gnm:frame")) {
oo_control_free (oc);
return;
} else
- oc->t = t;
+ oc->t = t;
} else
oc->t = t;
g_hash_table_replace (state->controls, name, oc);
@@ -6619,7 +6619,7 @@ odf_form_control (GsfXMLIn *xin, xmlChar const **attrs, GType t)
return;
}
- if (t == sheet_widget_button_get_type () ||
+ if (t == sheet_widget_button_get_type () ||
t == sheet_widget_frame_get_type ())
state->cur_control = oc;
}
@@ -6628,7 +6628,7 @@ odf_form_control (GsfXMLIn *xin, xmlChar const **attrs, GType t)
static void
odf_form_value_range (GsfXMLIn *xin, xmlChar const **attrs)
{
-
+
odf_form_control (xin, attrs, sheet_widget_slider_get_type ());
}
@@ -6687,13 +6687,13 @@ odf_button_event_listener (GsfXMLIn *xin, xmlChar const **attrs)
return;
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
- if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_SCRIPT, "event-name"))
event_name = CXML2C (attrs[1]);
- else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_SCRIPT, "language"))
language = CXML2C (attrs[1]);
- else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_SCRIPT, "macro-name"))
macro_name = CXML2C (attrs[1]);
@@ -6714,10 +6714,10 @@ odf_control_property (GsfXMLIn *xin, xmlChar const **attrs)
return;
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
- if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_FORM, "property-name"))
property_name = CXML2C (attrs[1]);
- else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_OFFICE, "string-value"))
value = CXML2C (attrs[1]);
@@ -6752,7 +6752,7 @@ odf_config_item_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
if (state->settings.stack == NULL)
parent_hash = state->settings.settings;
- else
+ else
parent_hash = state->settings.stack->data;
if (parent_hash != NULL && state->settings.config_item_name != NULL) {
@@ -6793,8 +6793,8 @@ odf_config_item_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
break;
}
if (val != NULL)
- g_hash_table_replace
- (parent_hash, g_strdup (state->settings.config_item_name),
+ g_hash_table_replace
+ (parent_hash, g_strdup (state->settings.config_item_name),
val);
}
@@ -6821,7 +6821,7 @@ odf_config_item (GsfXMLIn *xin, xmlChar const **attrs)
state->settings.config_item_name = NULL;
state->settings.type = G_TYPE_INVALID;
-
+
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2) {
int i;
@@ -6838,9 +6838,9 @@ odf_config_stack_pop (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
OOParseState *state = (OOParseState *)xin->user_state;
g_return_if_fail (state->settings.stack != NULL);
-
+
g_hash_table_unref (state->settings.stack->data);
- state->settings.stack = g_slist_delete_link
+ state->settings.stack = g_slist_delete_link
(state->settings.stack, state->settings.stack);
}
@@ -6861,7 +6861,7 @@ odf_config_item_set (GsfXMLIn *xin, xmlChar const **attrs)
if (state->settings.stack == NULL)
parent_hash = state->settings.settings;
- else
+ else
parent_hash = state->settings.stack->data;
if (name == NULL) {
@@ -6903,8 +6903,8 @@ odf_created_by_gnumeric (OOParseState *state)
"meta:generator");
char const *str;
- return (prop != NULL &&
- (NULL != (str = g_value_get_string
+ return (prop != NULL &&
+ (NULL != (str = g_value_get_string
(gsf_doc_prop_get_val (prop)))) &&
g_str_has_prefix (str, "gnumeric"));
}
@@ -6913,7 +6913,7 @@ static gboolean
odf_has_gnm_foreign (OOParseState *state)
{
GValue *val;
- if ((state->settings.settings != NULL) &&
+ if ((state->settings.settings != NULL) &&
NULL != (val = g_hash_table_lookup (state->settings.settings, "gnm:settings")) &&
G_VALUE_HOLDS(val,G_TYPE_HASH_TABLE)) {
GHashTable *hash = g_value_get_boxed (val);
@@ -6925,7 +6925,7 @@ odf_has_gnm_foreign (OOParseState *state)
}
static void
-odf_apply_ooo_table_config (char const *key, GValue *val, OOParseState *state)
+odf_apply_ooo_table_config (char const *key, GValue *val, OOParseState *state)
{
if (G_VALUE_HOLDS(val,G_TYPE_HASH_TABLE)) {
GHashTable *hash = g_value_get_boxed (val);
@@ -6948,30 +6948,30 @@ odf_apply_ooo_config (OOParseState *state)
GValue *val;
GHashTable *hash;
- if ((state->settings.settings == NULL) ||
+ if ((state->settings.settings == NULL) ||
NULL == (val = g_hash_table_lookup (state->settings.settings, "ooo:view-settings")) ||
!G_VALUE_HOLDS(val,G_TYPE_HASH_TABLE))
return;
hash = g_value_get_boxed (val);
- if ((hash == NULL) ||
+ if ((hash == NULL) ||
NULL == (val = g_hash_table_lookup (hash, "Views")) ||
!G_VALUE_HOLDS(val,G_TYPE_HASH_TABLE))
return;
hash = g_value_get_boxed (val);
- if ((hash == NULL) ||
+ if ((hash == NULL) ||
NULL == (val = g_hash_table_lookup (hash, "Unnamed_Config_Set-0")) ||
!G_VALUE_HOLDS(val,G_TYPE_HASH_TABLE))
return;
hash = g_value_get_boxed (val);
-
- if ((hash == NULL) ||
+
+ if ((hash == NULL) ||
NULL == (val = g_hash_table_lookup (hash, "Tables")) ||
!G_VALUE_HOLDS(val,G_TYPE_HASH_TABLE))
return;
hash = g_value_get_boxed (val);
-
+
if (hash == NULL)
return;
@@ -6988,24 +6988,24 @@ oo_marker (GsfXMLIn *xin, xmlChar const **attrs)
int type = GO_ARROW_NONE;
double a = 0., b = 0., c = 0.;
char const *name = NULL;
-
+
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
- if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_DRAW, "name"))
name = CXML2C (attrs[1]);
- else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_SVG, "viewBox"))
marker->view_box = g_strdup (CXML2C (attrs[1]));
- else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
+ else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_NS_SVG, "d"))
marker->d = g_strdup (CXML2C (attrs[1]));
- else if (oo_attr_int_range (xin, attrs, OO_GNUM_NS_EXT, "arrow-type", &type,
+ else if (oo_attr_int_range (xin, attrs, OO_GNUM_NS_EXT, "arrow-type", &type,
GO_ARROW_KITE, GO_ARROW_OVAL));
- else if (oo_attr_float (xin, attrs, OO_GNUM_NS_EXT,
+ else if (oo_attr_float (xin, attrs, OO_GNUM_NS_EXT,
"arrow-a", &a));
- else if (oo_attr_float (xin, attrs, OO_GNUM_NS_EXT,
+ else if (oo_attr_float (xin, attrs, OO_GNUM_NS_EXT,
"arrow-b", &b));
- else if (oo_attr_float (xin, attrs, OO_GNUM_NS_EXT,
+ else if (oo_attr_float (xin, attrs, OO_GNUM_NS_EXT,
"arrow-c", &c));
if (type != GO_ARROW_NONE) {
marker->arrow = g_new0 (GOArrow, 1);
@@ -7351,7 +7351,7 @@ static GsfXMLInNode const opendoc_content_dtd [] =
GSF_XML_IN_NODE (CHART_CHART, CHART_TITLE, OO_NS_CHART, "title", GSF_XML_NO_CONTENT, &oo_chart_title, &oo_chart_title_end),
GSF_XML_IN_NODE (CHART_TITLE, TITLE_TEXT, OO_NS_TEXT, "p", GSF_XML_CONTENT, NULL, &oo_chart_title_text),
- GSF_XML_IN_NODE (CHART_CHART, CHART_SUBTITLE, OO_NS_CHART, "subtitle", GSF_XML_NO_CONTENT, &oo_chart_title, &oo_chart_title_end),
+ GSF_XML_IN_NODE (CHART_CHART, CHART_SUBTITLE, OO_NS_CHART, "subtitle", GSF_XML_NO_CONTENT, &oo_chart_title, &oo_chart_title_end),
GSF_XML_IN_NODE (CHART_SUBTITLE, TITLE_TEXT, OO_NS_TEXT, "p", GSF_XML_NO_CONTENT, NULL, NULL), /* 2nd Def */
GSF_XML_IN_NODE (CHART_CHART, CHART_LEGEND, OO_NS_CHART, "legend", GSF_XML_NO_CONTENT, &oo_legend, &oo_legend_end),
GSF_XML_IN_NODE (CHART_LEGEND, CHART_LEGEND_TITLE, OO_GNUM_NS_EXT, "title", GSF_XML_NO_CONTENT, &oo_chart_title, &oo_chart_title_end),
@@ -8363,31 +8363,31 @@ openoffice_file_open (GOFileOpener const *fo, GOIOContext *io_context,
state.chart.saved_dash_styles = NULL;
state.chart.saved_fill_image_styles = NULL;
state.chart.saved_gradient_styles = NULL;
- state.chart.graph_styles = g_hash_table_new_full
+ state.chart.graph_styles = g_hash_table_new_full
(g_str_hash, g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) oo_chart_style_free);
- state.chart.hatches = g_hash_table_new_full
+ state.chart.hatches = g_hash_table_new_full
(g_str_hash, g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) g_free);
- state.chart.dash_styles = g_hash_table_new_full
+ state.chart.dash_styles = g_hash_table_new_full
(g_str_hash, g_str_equal,
(GDestroyNotify) g_free,
NULL);
- state.chart.fill_image_styles = g_hash_table_new_full
+ state.chart.fill_image_styles = g_hash_table_new_full
(g_str_hash, g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) g_free);
- state.chart.gradient_styles = g_hash_table_new_full
+ state.chart.gradient_styles = g_hash_table_new_full
(g_str_hash, g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) g_free);
- state.controls = g_hash_table_new_full
+ state.controls = g_hash_table_new_full
(g_str_hash, g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) oo_control_free);
- state.chart.arrow_markers = g_hash_table_new_full
+ state.chart.arrow_markers = g_hash_table_new_full
(g_str_hash, g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) oo_marker_free);
@@ -8465,14 +8465,14 @@ openoffice_file_open (GOFileOpener const *fo, GOIOContext *io_context,
g_slist_free (state.sheet_order);
/* look for the view settings */
- state.settings.settings
+ state.settings.settings
= g_hash_table_new_full (g_str_hash, g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) destroy_gvalue);
state.settings.stack = NULL;
settings = gsf_infile_child_by_name (zip, "settings.xml");
if (settings != NULL) {
- GsfXMLInDoc *sdoc = gsf_xml_in_doc_new
+ GsfXMLInDoc *sdoc = gsf_xml_in_doc_new
(opendoc_settings_dtd, gsf_ooo_ns);
gsf_xml_in_doc_parse (sdoc, settings, &state);
gsf_xml_in_doc_free (sdoc);
@@ -8490,18 +8490,18 @@ openoffice_file_open (GOFileOpener const *fo, GOIOContext *io_context,
/* Use the settings here! */
if (state.debug)
- g_hash_table_foreach (state.settings.settings,
+ g_hash_table_foreach (state.settings.settings,
(GHFunc)dump_settings_hash, (char *)"");
if (!odf_has_gnm_foreign (&state)) {
odf_apply_ooo_config (&state);
- filesaver = odf_created_by_gnumeric (&state) ?
+ filesaver = odf_created_by_gnumeric (&state) ?
"Gnumeric_OpenCalc:openoffice"
: "Gnumeric_OpenCalc:odf";
} else
filesaver = "Gnumeric_OpenCalc:odf";
-
+
workbook_set_saveinfo (state.pos.wb, GO_FILE_FL_AUTO,
- go_file_saver_for_id
+ go_file_saver_for_id
(filesaver));
g_hash_table_destroy (state.settings.settings);
@@ -8524,7 +8524,7 @@ openoffice_file_open (GOFileOpener const *fo, GOIOContext *io_context,
g_hash_table_destroy (state.styles.cell_datetime);
g_hash_table_destroy (state.styles.cell_date);
g_hash_table_destroy (state.styles.cell_time);
- go_slist_free_custom (state.chart.saved_graph_styles,
+ go_slist_free_custom (state.chart.saved_graph_styles,
(GFreeFunc) g_hash_table_destroy);
g_hash_table_destroy (state.chart.graph_styles);
g_hash_table_destroy (state.chart.hatches);
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 76bed9c..b0718ff 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -204,9 +204,9 @@ odf_update_progress (GnmOOExport *state, float delta)
state->last_progress += delta;
new = state->last_progress;
-
+
if (new != old)
- go_io_value_progress_update (state->ioc, new);
+ go_io_value_progress_update (state->ioc, new);
}
/*****************************************************************************/
@@ -487,94 +487,94 @@ gnm_xml_out_add_hex_color (GsfXMLOut *o, char const *id, GnmColor const *c, int
}
static void
-odf_write_plot_style_int (GsfXMLOut *xml, GogObject const *plot,
+odf_write_plot_style_int (GsfXMLOut *xml, GogObject const *plot,
GObjectClass *klass, char const *property,
char const *id)
{
GParamSpec *spec;
- if (NULL != (spec = g_object_class_find_property (klass, property))
- && spec->value_type == G_TYPE_INT
+ if (NULL != (spec = g_object_class_find_property (klass, property))
+ && spec->value_type == G_TYPE_INT
&& (G_PARAM_READABLE & spec->flags)) {
int i;
g_object_get (G_OBJECT (plot), property, &i, NULL);
gsf_xml_out_add_int (xml, id, i);
- }
+ }
}
static void
-odf_write_plot_style_uint (GsfXMLOut *xml, GogObject const *plot,
+odf_write_plot_style_uint (GsfXMLOut *xml, GogObject const *plot,
GObjectClass *klass, char const *property,
char const *id)
{
GParamSpec *spec;
- if (NULL != (spec = g_object_class_find_property (klass, property))
- && spec->value_type == G_TYPE_UINT
+ if (NULL != (spec = g_object_class_find_property (klass, property))
+ && spec->value_type == G_TYPE_UINT
&& (G_PARAM_READABLE & spec->flags)) {
unsigned int i;
g_object_get (G_OBJECT (plot), property, &i, NULL);
gsf_xml_out_add_uint (xml, id, i);
- }
+ }
}
static void
-odf_write_plot_style_double (GsfXMLOut *xml, GogObject const *plot,
+odf_write_plot_style_double (GsfXMLOut *xml, GogObject const *plot,
GObjectClass *klass, char const *property,
char const *id)
{
GParamSpec *spec;
- if (NULL != (spec = g_object_class_find_property (klass, property))
- && spec->value_type == G_TYPE_DOUBLE
+ if (NULL != (spec = g_object_class_find_property (klass, property))
+ && spec->value_type == G_TYPE_DOUBLE
&& (G_PARAM_READABLE & spec->flags)) {
double d;
g_object_get (G_OBJECT (plot), property, &d, NULL);
gsf_xml_out_add_float (xml, id, d, -1);
- }
+ }
}
static void
-odf_write_plot_style_double_percent (GsfXMLOut *xml, GogObject const *plot,
+odf_write_plot_style_double_percent (GsfXMLOut *xml, GogObject const *plot,
GObjectClass *klass, char const *property,
char const *id)
{
GParamSpec *spec;
- if (NULL != (spec = g_object_class_find_property (klass, property))
- && spec->value_type == G_TYPE_DOUBLE
+ if (NULL != (spec = g_object_class_find_property (klass, property))
+ && spec->value_type == G_TYPE_DOUBLE
&& (G_PARAM_READABLE & spec->flags)) {
double d;
g_object_get (G_OBJECT (plot), property, &d, NULL);
odf_add_percent (xml, id, d);
- }
+ }
}
static void
-odf_write_plot_style_bool (GsfXMLOut *xml, GogObject const *plot,
+odf_write_plot_style_bool (GsfXMLOut *xml, GogObject const *plot,
GObjectClass *klass, char const *property,
char const *id)
{
GParamSpec *spec;
- if (NULL != (spec = g_object_class_find_property (klass, property))
- && spec->value_type == G_TYPE_BOOLEAN
+ if (NULL != (spec = g_object_class_find_property (klass, property))
+ && spec->value_type == G_TYPE_BOOLEAN
&& (G_PARAM_READABLE & spec->flags)) {
gboolean b;
g_object_get (G_OBJECT (plot), property, &b, NULL);
odf_add_bool (xml, id, b);
- }
+ }
}
static void
-odf_write_plot_style_from_bool (GsfXMLOut *xml, GogObject const *plot,
+odf_write_plot_style_from_bool (GsfXMLOut *xml, GogObject const *plot,
GObjectClass *klass, char const *property,
char const *id,
char const *t_val, char const *f_val)
{
GParamSpec *spec;
- if (NULL != (spec = g_object_class_find_property (klass, property))
- && spec->value_type == G_TYPE_BOOLEAN
+ if (NULL != (spec = g_object_class_find_property (klass, property))
+ && spec->value_type == G_TYPE_BOOLEAN
&& (G_PARAM_READABLE & spec->flags)) {
gboolean b;
g_object_get (G_OBJECT (plot), property, &b, NULL);
gsf_xml_out_add_cstr (xml, id, b ? t_val : f_val);
- }
+ }
}
static void
@@ -602,7 +602,7 @@ odf_write_table_style (GnmOOExport *state,
sheet->tab_color, 1);
}
if (sheet->tab_text_color && !sheet->tab_text_color->is_auto) {
- gnm_xml_out_add_hex_color (state->xml,
+ gnm_xml_out_add_hex_color (state->xml,
GNMSTYLE "tab-text-color",
sheet->tab_text_color, 1);
}
@@ -736,16 +736,16 @@ odf_get_arrow_marker_name (GnmOOExport *state, GOArrow *arrow)
gchar *new_name;
if (name != NULL)
return name;
-
+
new_name = g_strdup_printf ("gnm-arrow-%i-%.2f-%.2f-%.2f-%i",
arrow->typ,
arrow->a,
arrow->b,
arrow->c,
g_hash_table_size (state->arrow_markers));
- g_hash_table_insert (state->arrow_markers,
+ g_hash_table_insert (state->arrow_markers,
(gpointer) arrow, new_name);
- return new_name;
+ return new_name;
}
@@ -781,11 +781,11 @@ odf_write_sheet_object_line_style (GnmOOExport *state, SheetObject *so)
char const *start_arrow_name = NULL;
char const *end_arrow_name = NULL;
- g_object_get (G_OBJECT (so),
- "style", &style,
+ g_object_get (G_OBJECT (so),
+ "style", &style,
"start-arrow", &start,
"end-arrow", &end, NULL);
-
+
if (start != NULL && start->typ != GO_ARROW_NONE)
start_arrow_name = odf_get_arrow_marker_name (state, start);
else
@@ -800,7 +800,7 @@ odf_write_sheet_object_line_style (GnmOOExport *state, SheetObject *so)
if (start_arrow_name != NULL)
gsf_xml_out_add_cstr (state->xml, DRAW "marker-start", start_arrow_name);
if (end_arrow_name != NULL)
- gsf_xml_out_add_cstr (state->xml, DRAW "marker-end", end_arrow_name);
+ gsf_xml_out_add_cstr (state->xml, DRAW "marker-end", end_arrow_name);
odf_write_gog_style_graphic (state, style);
gsf_xml_out_end_element (state->xml); /* </style:graphic-properties> */
gsf_xml_out_end_element (state->xml); /* </style:style> */
@@ -843,10 +843,10 @@ odf_write_gog_position (GnmOOExport *state, GogObject const *obj)
if (!state->with_extension)
return;
- g_object_get (G_OBJECT (obj),
+ g_object_get (G_OBJECT (obj),
"is-position-manual", &is_position_manual,
"position", &position,
- "anchor", &anchor,
+ "anchor", &anchor,
NULL);
odf_add_bool (state->xml, GNMSTYLE "is-position-manual", is_position_manual);
if (is_position_manual) {
@@ -869,7 +869,7 @@ odf_write_gog_plot_area_position (GnmOOExport *state, GogObject const *obj)
if (!state->with_extension)
return;
- g_object_get (G_OBJECT (obj),
+ g_object_get (G_OBJECT (obj),
"is-plot-area-manual", &is_position_manual,
"plot-area", &position,
NULL);
@@ -2269,8 +2269,8 @@ odf_expr_func_handler (GnmConventionsOut *out, GnmExprFunction const *func)
{ "SECH","SECH" },
{ "SECOND","SECOND" },
{ "SERIESSUM","SERIESSUM" },
- { "SHEET","SHEET" },
- { "SHEETS","SHEETS" },
+ { "SHEET","SHEET" },
+ { "SHEETS","SHEETS" },
{ "SIGN","SIGN" },
{ "SIN","SIN" },
{ "SINH","SINH" },
@@ -2525,7 +2525,7 @@ odf_write_frame_size (GnmOOExport *state, SheetObject *so)
GnmExprTop const *texpr;
GnmParsePos pp;
char *formula;
-
+
sheet_object_anchor_to_offset_pts (anchor, state->sheet, res_pts);
odf_add_pt (state->xml, SVG "x", res_pts[0]);
@@ -2544,7 +2544,7 @@ odf_write_frame_size (GnmOOExport *state, SheetObject *so)
parse_pos_init_sheet (&pp, state->sheet);
formula = gnm_expr_top_as_string (texpr, &pp, state->conv);
gnm_expr_top_unref (texpr);
- gsf_xml_out_add_cstr (state->xml, TABLE "end-cell-address",
+ gsf_xml_out_add_cstr (state->xml, TABLE "end-cell-address",
odf_strip_brackets (formula));
g_free (formula);
}
@@ -2594,8 +2594,8 @@ odf_write_image (GnmOOExport *state, SheetObject *so, char const *name)
if (name != NULL) {
char *image_type;
char *fullname;
- g_object_get (G_OBJECT (so),
- "image-type", &image_type,
+ g_object_get (G_OBJECT (so),
+ "image-type", &image_type,
NULL);
fullname = g_strdup_printf ("Pictures/%s.%s", name, image_type);
@@ -2605,7 +2605,7 @@ odf_write_image (GnmOOExport *state, SheetObject *so, char const *name)
gsf_xml_out_add_cstr (state->xml, XLINK "show", "embed");
gsf_xml_out_add_cstr (state->xml, XLINK "actuate", "onLoad");
gsf_xml_out_end_element (state->xml); /* DRAW "image" */
-
+
g_free(fullname);
g_free (image_type);
} else
@@ -2625,7 +2625,7 @@ odf_write_frame (GnmOOExport *state, SheetObject *so)
odf_write_image (state, so, g_hash_table_lookup (state->images, so));
else {
gsf_xml_out_start_element (state->xml, DRAW "text-box");
- gsf_xml_out_simple_element (state->xml, TEXT "p",
+ gsf_xml_out_simple_element (state->xml, TEXT "p",
"Missing Framed Sheet Object");
gsf_xml_out_end_element (state->xml); /* DRAW "text-box" */
}
@@ -2649,7 +2649,7 @@ odf_write_so_filled (GnmOOExport *state, SheetObject *so)
gboolean is_oval = FALSE;
gchar *text = NULL;
gchar const *style_name = g_hash_table_lookup (state->so_styles, so);
-
+
g_object_get (G_OBJECT (so), "is-oval", &is_oval, "text", &text, NULL);
element = is_oval ? DRAW "ellipse" : DRAW "rect";
@@ -2674,7 +2674,7 @@ odf_write_line (GnmOOExport *state, SheetObject *so)
char *formula;
double x1, y1, x2, y2;
gchar const *style_name = g_hash_table_lookup (state->so_styles, so);
-
+
gsf_xml_out_start_element (state->xml, DRAW "line");
if (style_name != NULL)
gsf_xml_out_add_cstr (state->xml, DRAW "style-name", style_name);
@@ -2723,7 +2723,7 @@ odf_write_line (GnmOOExport *state, SheetObject *so)
parse_pos_init_sheet (&pp, state->sheet);
formula = gnm_expr_top_as_string (texpr, &pp, state->conv);
gnm_expr_top_unref (texpr);
- gsf_xml_out_add_cstr (state->xml, TABLE "end-cell-address",
+ gsf_xml_out_add_cstr (state->xml, TABLE "end-cell-address",
odf_strip_brackets (formula));
g_free (formula);
@@ -2752,9 +2752,9 @@ odf_write_objects (GnmOOExport *state, GSList *objects)
odf_write_so_filled (state, so);
else if (IS_GNM_SO_LINE (so))
odf_write_line (state, so);
- else
+ else
odf_write_frame (state, so);
-
+
}
}
@@ -2929,7 +2929,7 @@ odf_write_cell (GnmOOExport *state, GnmCell *cell, GnmRange const *merge_range,
/* this is the same that Excel does, OOo does not have */
/* error literals. ODF 1.2 might be introducing a new */
/* value-type to address this issue */
- char *eq_formula = g_strdup_printf
+ char *eq_formula = g_strdup_printf
("of:=%s", value_peek_string (cell->value));
gsf_xml_out_add_cstr (state->xml,
TABLE "formula",
@@ -3235,8 +3235,8 @@ odf_write_content_rows (GnmOOExport *state, Sheet const *sheet, int from, int to
objects = odf_sheet_objects_get (sheet, &pos);
if ((merge_range == NULL) && (objects == NULL) &&
- gnm_cell_is_empty (current_cell) &&
- NULL == gnm_style_get_hlink
+ gnm_cell_is_empty (current_cell) &&
+ NULL == gnm_style_get_hlink
((this_style = sheet_style_get (sheet, pos.col, pos.row)))) {
if ((null_cell == 0) || (null_style == this_style)) {
null_style = this_style;
@@ -3333,14 +3333,14 @@ odf_write_sheet_control_content (GnmOOExport *state, GnmExprTop const *texpr)
parse_pos_init_sheet (&pp, state->sheet);
link = gnm_expr_top_as_string (texpr, &pp, state->conv);
-
+
if (get_gsf_odf_version () > 101)
- gsf_xml_out_add_cstr (state->xml,
- FORM "source-cell-range",
+ gsf_xml_out_add_cstr (state->xml,
+ FORM "source-cell-range",
odf_strip_brackets (link));
else
- gsf_xml_out_add_cstr (state->xml,
- GNMSTYLE "source-cell-range",
+ gsf_xml_out_add_cstr (state->xml,
+ GNMSTYLE "source-cell-range",
odf_strip_brackets (link));
g_free (link);
gnm_expr_top_unref (texpr);
@@ -3356,12 +3356,12 @@ odf_write_sheet_control_linked_cell (GnmOOExport *state, GnmExprTop const *texpr
parse_pos_init_sheet (&pp, state->sheet);
link = gnm_expr_top_as_string (texpr, &pp, state->conv);
-
+
if (get_gsf_odf_version () > 101)
- gsf_xml_out_add_cstr (state->xml, FORM "linked-cell",
+ gsf_xml_out_add_cstr (state->xml, FORM "linked-cell",
odf_strip_brackets (link));
else
- gsf_xml_out_add_cstr (state->xml, GNMSTYLE "linked-cell",
+ gsf_xml_out_add_cstr (state->xml, GNMSTYLE "linked-cell",
odf_strip_brackets (link));
g_free (link);
gnm_expr_top_unref (texpr);
@@ -3376,11 +3376,11 @@ odf_sheet_control_start_element (GnmOOExport *state, SheetObject *so,
gsf_xml_out_start_element (state->xml, element);
gsf_xml_out_add_cstr (state->xml, XML "id", id);
gsf_xml_out_add_cstr (state->xml, FORM "id", id);
-
+
}
static void
-odf_write_sheet_control_scrollbar (GnmOOExport *state, SheetObject *so,
+odf_write_sheet_control_scrollbar (GnmOOExport *state, SheetObject *so,
char const *implementation)
{
GtkAdjustment *adj = sheet_widget_adjustment_get_adjustment (so);
@@ -3389,17 +3389,17 @@ odf_write_sheet_control_scrollbar (GnmOOExport *state, SheetObject *so,
odf_sheet_control_start_element (state, so, FORM "value-range");
if (implementation != NULL)
- gsf_xml_out_add_cstr (state->xml,
- FORM "control-implementation",
+ gsf_xml_out_add_cstr (state->xml,
+ FORM "control-implementation",
implementation);
- gsf_xml_out_add_cstr (state->xml, FORM "orientation",
- sheet_widget_adjustment_get_horizontal (so) ?
+ gsf_xml_out_add_cstr (state->xml, FORM "orientation",
+ sheet_widget_adjustment_get_horizontal (so) ?
"horizontal" : "vertical");
- gsf_xml_out_add_float (state->xml, FORM "value",
+ gsf_xml_out_add_float (state->xml, FORM "value",
gtk_adjustment_get_value (adj), -1);
- gsf_xml_out_add_float (state->xml, FORM "min-value",
+ gsf_xml_out_add_float (state->xml, FORM "min-value",
gtk_adjustment_get_lower (adj), -1);
- gsf_xml_out_add_float (state->xml, FORM "max-value",
+ gsf_xml_out_add_float (state->xml, FORM "max-value",
gtk_adjustment_get_upper (adj), -1);
gsf_xml_out_add_int (state->xml, FORM "step-size",
(int)(gtk_adjustment_get_step_increment (adj) + 0.5));
@@ -3427,7 +3427,7 @@ odf_write_sheet_control_checkbox (GnmOOExport *state, SheetObject *so)
gsf_xml_out_add_cstr (state->xml, FORM "label", label);
odf_write_sheet_control_linked_cell (state, texpr);
-
+
gsf_xml_out_end_element (state->xml); /* form:checkbox */
g_free (label);
@@ -3441,13 +3441,13 @@ odf_write_sheet_control_frame (GnmOOExport *state, SheetObject *so)
g_object_get (G_OBJECT (so), "text", &label, NULL);
odf_sheet_control_start_element (state, so, FORM "generic-control");
- gsf_xml_out_add_cstr_unchecked (state->xml,
- FORM "control-implementation",
+ gsf_xml_out_add_cstr_unchecked (state->xml,
+ FORM "control-implementation",
GNMSTYLE "frame");
gsf_xml_out_start_element (state->xml, FORM "properties");
gsf_xml_out_start_element (state->xml, FORM "property");
-
+
gsf_xml_out_add_cstr_unchecked (state->xml, FORM "property-name", GNMSTYLE "label");
gsf_xml_out_add_cstr_unchecked (state->xml, OFFICE "value-type", "string");
gsf_xml_out_add_cstr (state->xml, OFFICE "string-value", label);
@@ -3474,14 +3474,14 @@ odf_write_sheet_control_list (GnmOOExport *state, SheetObject *so,
odf_write_sheet_control_content (state, texpr);
if (get_gsf_odf_version () > 101)
- gsf_xml_out_add_cstr_unchecked
- (state->xml, FORM "list-linkage-type",
+ gsf_xml_out_add_cstr_unchecked
+ (state->xml, FORM "list-linkage-type",
as_index ? "selection-indexes" : "selection");
else if (state->with_extension)
- gsf_xml_out_add_cstr_unchecked
- (state->xml, GNMSTYLE "list-linkage-type",
+ gsf_xml_out_add_cstr_unchecked
+ (state->xml, GNMSTYLE "list-linkage-type",
as_index ? "selection-indices" : "selection");
-
+
gsf_xml_out_add_int (state->xml, FORM "bound-column", 1);
gsf_xml_out_end_element (state->xml); /* form:checkbox */
}
@@ -3505,9 +3505,9 @@ odf_write_sheet_control_radio_button (GnmOOExport *state, SheetObject *so)
break;
case VALUE_BOOLEAN:
if (state->with_extension)
- gsf_xml_out_add_cstr_unchecked
+ gsf_xml_out_add_cstr_unchecked
(state->xml,
- GNMSTYLE "value-type",
+ GNMSTYLE "value-type",
"boolean");
odf_add_bool (state->xml, FORM "value",
value_get_as_bool (val, NULL));
@@ -3515,12 +3515,12 @@ odf_write_sheet_control_radio_button (GnmOOExport *state, SheetObject *so)
case VALUE_FLOAT: {
GString *str = g_string_new (NULL);
if (state->with_extension)
- gsf_xml_out_add_cstr_unchecked
+ gsf_xml_out_add_cstr_unchecked
(state->xml,
- GNMSTYLE "value-type",
+ GNMSTYLE "value-type",
"float");
value_get_as_gstring (val, str, state->conv);
- gsf_xml_out_add_cstr (state->xml, FORM "value",
+ gsf_xml_out_add_cstr (state->xml, FORM "value",
str->str);
g_string_free (str, TRUE);
break;
@@ -3528,9 +3528,9 @@ odf_write_sheet_control_radio_button (GnmOOExport *state, SheetObject *so)
case VALUE_ERROR:
case VALUE_STRING:
if (state->with_extension)
- gsf_xml_out_add_cstr_unchecked
+ gsf_xml_out_add_cstr_unchecked
(state->xml,
- GNMSTYLE "value-type",
+ GNMSTYLE "value-type",
"string");
gsf_xml_out_add_cstr (state->xml,
FORM "value",
@@ -3555,7 +3555,7 @@ odf_write_sheet_control_button (GnmOOExport *state, SheetObject *so)
{
GnmExprTop const *texpr = sheet_widget_button_get_link (so);
char *label = NULL;
-
+
g_object_get (G_OBJECT (so), "text", &label, NULL);
odf_sheet_control_start_element (state, so, FORM "button");
@@ -3615,20 +3615,20 @@ odf_write_sheet_controls (GnmOOExport *state)
SheetObject *so = l->data;
if (GNM_IS_SOW_SCROLLBAR (so))
- odf_write_sheet_control_scrollbar
+ odf_write_sheet_control_scrollbar
(state, so, GNMSTYLE "scrollbar");
else if (GNM_IS_SOW_SLIDER (so))
- odf_write_sheet_control_scrollbar
+ odf_write_sheet_control_scrollbar
(state, so, GNMSTYLE "slider");
else if (GNM_IS_SOW_SPINBUTTON (so))
- odf_write_sheet_control_scrollbar
+ odf_write_sheet_control_scrollbar
(state, so, GNMSTYLE "spinbutton");
else if (GNM_IS_SOW_CHECKBOX (so))
odf_write_sheet_control_checkbox (state, so);
else if (GNM_IS_SOW_RADIO_BUTTON (so))
odf_write_sheet_control_radio_button (state, so);
else if (GNM_IS_SOW_LIST (so))
- odf_write_sheet_control_list (state, so,
+ odf_write_sheet_control_list (state, so,
FORM "listbox");
else if (GNM_IS_SOW_COMBO (so))
odf_write_sheet_control_list (state, so,
@@ -3992,12 +3992,12 @@ odf_write_styles (GnmOOExport *state, GsfOutput *child)
g_hash_table_foreach (state->graph_gradients, (GHFunc) odf_write_gradient_info, state);
g_hash_table_foreach (state->graph_fill_images, (GHFunc) odf_write_fill_images_info, state);
g_hash_table_foreach (state->arrow_markers, (GHFunc) odf_write_arrow_marker_info, state);
-
+
g_hash_table_remove_all (state->graph_dashes);
g_hash_table_remove_all (state->graph_hatches);
g_hash_table_remove_all (state->graph_gradients);
- g_hash_table_remove_all (state->graph_fill_images);
- g_hash_table_remove_all (state->arrow_markers);
+ g_hash_table_remove_all (state->graph_fill_images);
+ g_hash_table_remove_all (state->arrow_markers);
gsf_xml_out_end_element (state->xml); /* </office:styles> */
gsf_xml_out_end_element (state->xml); /* </office:document-styles> */
@@ -4078,7 +4078,7 @@ odf_write_arrow_marker_info (GOArrow const *arrow, char const *name, GnmOOExport
gsf_xml_out_add_cstr (state->xml, SVG "viewBox", "0 0 20 30");
gsf_xml_out_add_cstr (state->xml, SVG "d", "m10 0-10 30h20z");
-
+
gsf_xml_out_end_element (state->xml); /* </draw:marker> */
}
@@ -4120,9 +4120,9 @@ odf_write_gradient_info (GOStyle const *style, char const *name, GnmOOExport *st
g_free (color);
if (style->fill.gradient.brightness >= 0.0 && state->with_extension)
- gsf_xml_out_add_float (state->xml, GNMSTYLE "brightness",
+ gsf_xml_out_add_float (state->xml, GNMSTYLE "brightness",
style->fill.gradient.brightness, -1);
-
+
color = odf_go_color_to_string (style->fill.pattern.fore);
gsf_xml_out_add_cstr_unchecked (state->xml, DRAW "end-color", color);
g_free (color);
@@ -4136,7 +4136,7 @@ odf_write_gradient_info (GOStyle const *style, char const *name, GnmOOExport *st
}
gsf_xml_out_add_cstr_unchecked (state->xml, DRAW "style", type);
gsf_xml_out_add_int (state->xml, DRAW "angle", angle);
-
+
gsf_xml_out_end_element (state->xml); /* </draw:gradient> */
}
@@ -4186,7 +4186,7 @@ odf_write_hatch_info (GOPattern *pattern, char const *name, GnmOOExport *state)
if (info[i].type == pattern->pattern)
break;
- gsf_xml_out_add_cstr_unchecked (state->xml, DRAW "style",
+ gsf_xml_out_add_cstr_unchecked (state->xml, DRAW "style",
info[i].style);
odf_add_angle (state->xml, DRAW "rotation", info[i].angle);
odf_add_pt (state->xml, DRAW "distance", info[i].distance);
@@ -4204,7 +4204,7 @@ odf_write_dash_info (char const *name, gpointer data, GnmOOExport *state)
gsf_xml_out_start_element (state->xml, DRAW "stroke-dash");
gsf_xml_out_add_cstr_unchecked (state->xml, DRAW "name", name);
- gsf_xml_out_add_cstr_unchecked (state->xml, DRAW "display-name",
+ gsf_xml_out_add_cstr_unchecked (state->xml, DRAW "display-name",
go_line_dash_as_label (type));
gsf_xml_out_add_cstr_unchecked (state->xml, DRAW "style", "rect");
@@ -4215,14 +4215,14 @@ odf_write_dash_info (char const *name, gpointer data, GnmOOExport *state)
double dot_1 = lds->dash [0];
guint n_1 = 1;
guint i = 2;
-
+
if (new)
- odf_add_percent (state->xml, DRAW "distance",
+ odf_add_percent (state->xml, DRAW "distance",
(lds->n_dash > 1) ? lds->dash[1] : 1.);
else
- odf_add_pt (state->xml, DRAW "distance",
+ odf_add_pt (state->xml, DRAW "distance",
(lds->n_dash > 1) ? lds->dash[1] : 1.);
-
+
for (; lds->n_dash > i && lds->dash[i] == dot_1; i += 2);
gsf_xml_out_add_int (state->xml, DRAW "dots1", n_1);
if (dot_1 == 0.)
@@ -4234,17 +4234,17 @@ odf_write_dash_info (char const *name, gpointer data, GnmOOExport *state)
if (lds->n_dash > i) {
dot_1 = lds->dash [i];
n_1 = 1;
- for (i += 2; lds->n_dash > i
+ for (i += 2; lds->n_dash > i
&& lds->dash[i] == dot_1; i += 2);
gsf_xml_out_add_int (state->xml, DRAW "dots2", n_1);
if (dot_1 == 0.)
dot_1 = scale * 0.2;
if (new)
- odf_add_percent (state->xml, DRAW "dots2-length",
+ odf_add_percent (state->xml, DRAW "dots2-length",
dot_1);
else
- odf_add_pt (state->xml, DRAW "dots2-length",
- dot_1);
+ odf_add_pt (state->xml, DRAW "dots2-length",
+ dot_1);
}
}
@@ -4308,7 +4308,7 @@ odf_write_ooo_settings (GnmOOExport *state)
gsf_xml_out_add_cstr_unchecked (state->xml, CONFIG "type", "string");
gsf_xml_out_add_cstr (state->xml, NULL, "View1");
gsf_xml_out_end_element (state->xml); /* </config:config-item> */
- gsf_xml_out_start_element (state->xml,
+ gsf_xml_out_start_element (state->xml,
CONFIG "config-item-map-named");
gsf_xml_out_add_cstr_unchecked (state->xml, CONFIG "name",
"Tables");
@@ -4329,10 +4329,10 @@ odf_write_ooo_settings (GnmOOExport *state)
gsf_xml_out_add_cstr_unchecked (state->xml, CONFIG "type", "boolean");
gsf_xml_out_add_cstr_unchecked (state->xml, NULL, "true");
gsf_xml_out_end_element (state->xml); /* </config:config-item> */
-
+
gsf_xml_out_end_element (state->xml); /* </config:config-item-map-entry> */
- }
-
+ }
+
gsf_xml_out_end_element (state->xml); /* </config:config-item-map-named> */
gsf_xml_out_end_element (state->xml); /* </config:config-item-map-entry> */
gsf_xml_out_end_element (state->xml); /* </config:config-item-map-indexed> */
@@ -4411,7 +4411,7 @@ odf_write_image_manifest (SheetObject *image, char const *name, GnmOOExport *sta
g_free (mime);
g_free(fullname);
g_free (image_type);
-
+
}
static void
@@ -4478,7 +4478,7 @@ odf_write_label_cell_address (GnmOOExport *state, GOData const *dat)
if (dat == NULL)
return;
-
+
texpr = gnm_go_data_get_expr (dat);
if (texpr != NULL) {
char *str;
@@ -4496,13 +4496,13 @@ odf_write_label_cell_address (GnmOOExport *state, GOData const *dat)
}
static void
-odf_write_drop_line (GnmOOExport *state, GogObject const *series, char const *drop,
+odf_write_drop_line (GnmOOExport *state, GogObject const *series, char const *drop,
gboolean vertical)
{
- GogObjectRole const *role = gog_object_find_role_by_name (series, drop);
+ GogObjectRole const *role = gog_object_find_role_by_name (series, drop);
if (role != NULL) {
- GSList *drops = gog_object_get_children
+ GSList *drops = gog_object_get_children
(series, role);
if (drops != NULL && drops->data != NULL) {
char *style = odf_get_gog_style_name_from_obj (GOG_OBJECT (drops->data));
@@ -4553,10 +4553,10 @@ static gint
cmp_data_points (GObject *a, GObject *b)
{
int ind_a = 0, ind_b = 0;
-
- g_object_get (a, "index", &ind_a, NULL);
+
+ g_object_get (a, "index", &ind_a, NULL);
g_object_get (b, "index", &ind_b, NULL);
-
+
if (ind_a < ind_b)
return -1;
else if (ind_a > ind_b)
@@ -4575,48 +4575,48 @@ odf_write_standard_series (GnmOOExport *state, GSList const *series)
GOData const *dat = gog_dataset_get_dim (GOG_DATASET (series->data), GOG_MS_DIM_VALUES);
if (NULL != dat && odf_write_data_element (state, dat, &pp, CHART "series",
CHART "values-cell-range-address")) {
- GogObjectRole const *role =
- gog_object_find_role_by_name
+ GogObjectRole const *role =
+ gog_object_find_role_by_name
(GOG_OBJECT (series->data), "Regression curve");
GSList *points;
- GOData const *cat = gog_dataset_get_dim (GOG_DATASET (series->data),
+ GOData const *cat = gog_dataset_get_dim (GOG_DATASET (series->data),
GOG_MS_DIM_LABELS);
char *str = odf_get_gog_style_name_from_obj (series->data);
gsf_xml_out_add_cstr (state->xml, CHART "style-name", str);
g_free (str);
-
- odf_write_label_cell_address
+
+ odf_write_label_cell_address
(state, gog_series_get_name (GOG_SERIES (series->data)));
-
- if (NULL != cat && odf_write_data_element (state, cat, &pp, CHART "domain",
+
+ if (NULL != cat && odf_write_data_element (state, cat, &pp, CHART "domain",
TABLE "cell-range-address"))
gsf_xml_out_end_element (state->xml); /* </chart:domain> */
-
+
if (role != NULL) {
- GSList *l, *regressions = gog_object_get_children
+ GSList *l, *regressions = gog_object_get_children
(GOG_OBJECT (series->data), role);
for (l = regressions; l != NULL && l->data != NULL; l = l->next) {
GOData const *bd;
GogObject const *regression = l->data;
- GogObject const *equation
+ GogObject const *equation
= gog_object_get_child_by_name (regression, "Equation");
- str = odf_get_gog_style_name_from_obj
+ str = odf_get_gog_style_name_from_obj
(GOG_OBJECT (regression));
- gsf_xml_out_start_element
- (state->xml,
- (l == regressions) ? CHART "regression-curve"
+ gsf_xml_out_start_element
+ (state->xml,
+ (l == regressions) ? CHART "regression-curve"
: GNMSTYLE "regression-curve");
gsf_xml_out_add_cstr (state->xml, CHART "style-name", str);
-
+
if (state->with_extension) {
/* Upper and lower bounds */
bd = gog_dataset_get_dim (GOG_DATASET (regression), 0);
if (bd != NULL)
- odf_write_data_attribute
+ odf_write_data_attribute
(state, bd, &pp, GNMSTYLE "lower-bound");
bd = gog_dataset_get_dim (GOG_DATASET (regression), 1);
- if (bd != NULL)
- odf_write_data_attribute
+ if (bd != NULL)
+ odf_write_data_attribute
(state, bd, &pp, GNMSTYLE "upper-bound");
}
if (equation != NULL) {
@@ -4633,20 +4633,20 @@ odf_write_standard_series (GnmOOExport *state, GSList const *series)
eq_display = GNMSTYLE "display-equation";
eq_r = GNMSTYLE "display-r-square";
}
- gsf_xml_out_start_element
+ gsf_xml_out_start_element
(state->xml, eq_element);
odf_add_bool (state->xml, eq_automatic, TRUE);
odf_write_plot_style_bool (state->xml, equation, klass,
"show-eq", eq_display);
odf_write_plot_style_bool (state->xml, equation, klass,
"show-r2", eq_r);
- str = odf_get_gog_style_name_from_obj
+ str = odf_get_gog_style_name_from_obj
(GOG_OBJECT (equation));
gsf_xml_out_add_cstr (state->xml, CHART "style-name", str);
odf_write_gog_position (state, equation);
gsf_xml_out_end_element (state->xml); /* </chart:equation> */
}
-
+
gsf_xml_out_end_element (state->xml); /* </chart:regression-curve> */
g_free (str);
}
@@ -4654,43 +4654,43 @@ odf_write_standard_series (GnmOOExport *state, GSList const *series)
/* Write data points if any */
- role = gog_object_find_role_by_name
+ role = gog_object_find_role_by_name
(GOG_OBJECT (series->data), "Point");
- if (role != NULL && NULL != (points = gog_object_get_children
+ if (role != NULL && NULL != (points = gog_object_get_children
(GOG_OBJECT (series->data), role))) {
int index = 0, next_index = 0;
GSList *l;
points = g_slist_sort (points, (GCompareFunc) cmp_data_points);
-
+
for (l = points; l != NULL; l = l->next) {
- char *style = odf_get_gog_style_name_from_obj
+ char *style = odf_get_gog_style_name_from_obj
(GOG_OBJECT (l->data));
g_object_get (G_OBJECT (l->data), "index", &index, NULL);
if (index > next_index) {
- gsf_xml_out_start_element (state->xml,
+ gsf_xml_out_start_element (state->xml,
CHART "data-point");
- gsf_xml_out_add_int (state->xml, CHART "repeated",
+ gsf_xml_out_add_int (state->xml, CHART "repeated",
index - next_index);
- gsf_xml_out_end_element (state->xml);
+ gsf_xml_out_end_element (state->xml);
/* CHART "data-point" */
}
- gsf_xml_out_start_element (state->xml,
+ gsf_xml_out_start_element (state->xml,
CHART "data-point");
gsf_xml_out_add_cstr (state->xml, CHART "style-name", style);
- gsf_xml_out_end_element (state->xml);
+ gsf_xml_out_end_element (state->xml);
/* CHART "data-point" */
g_free (style);
next_index = index + 1;
}
g_slist_free (points);
}
-
+
if (state->with_extension) {
- odf_write_drop_line (state, GOG_OBJECT (series->data),
+ odf_write_drop_line (state, GOG_OBJECT (series->data),
"Horizontal drop lines", FALSE);
- odf_write_drop_line (state, GOG_OBJECT (series->data),
+ odf_write_drop_line (state, GOG_OBJECT (series->data),
"Vertical drop lines", TRUE);
- odf_write_drop_line (state, GOG_OBJECT (series->data),
+ odf_write_drop_line (state, GOG_OBJECT (series->data),
"Drop lines", TRUE);
}
gsf_xml_out_end_element (state->xml); /* </chart:series> */
@@ -4720,7 +4720,7 @@ odf_write_box_series (GnmOOExport *state, GSList const *series)
str = odf_get_gog_style_name_from_obj (series->data);
gsf_xml_out_add_cstr (state->xml, CHART "style-name", str);
g_free (str);
- odf_write_label_cell_address
+ odf_write_label_cell_address
(state, gog_series_get_name (GOG_SERIES (series->data)));
gsf_xml_out_end_element (state->xml); /* </chart:series> */
}
@@ -4856,27 +4856,27 @@ odf_write_min_max_series (GnmOOExport *state, GSList const *orig_series)
static void
-odf_write_interpolation_attribute (GnmOOExport *state, GOStyle const *style, GogObject const *series)
+odf_write_interpolation_attribute (GnmOOExport *state, GOStyle const *style, GogObject const *series)
{
gchar *interpolation = NULL;
- g_object_get (G_OBJECT (series), "interpolation",
+ g_object_get (G_OBJECT (series), "interpolation",
&interpolation, NULL);
if (interpolation != NULL) {
if (0 == strcmp (interpolation, "linear"))
- gsf_xml_out_add_cstr
+ gsf_xml_out_add_cstr
(state->xml, CHART "interpolation", "none");
else if (0 == strcmp (interpolation, "spline"))
- gsf_xml_out_add_cstr
+ gsf_xml_out_add_cstr
(state->xml, CHART "interpolation", "b-spline");
else if (0 == strcmp (interpolation, "cspline"))
- gsf_xml_out_add_cstr
- (state->xml, CHART "interpolation",
+ gsf_xml_out_add_cstr
+ (state->xml, CHART "interpolation",
"cubic-spline");
else {
char *tag = g_strdup_printf ("gnm:%s", interpolation);
- gsf_xml_out_add_cstr
+ gsf_xml_out_add_cstr
(state->xml, CHART "interpolation", tag);
g_free (tag);
}
@@ -4894,38 +4894,38 @@ odf_write_plot_style (GnmOOExport *state, GogObject const *plot)
odf_add_bool (state->xml, CHART "auto-size", TRUE);
- if (NULL != (spec = g_object_class_find_property (klass, "type"))
- && spec->value_type == G_TYPE_STRING
+ if (NULL != (spec = g_object_class_find_property (klass, "type"))
+ && spec->value_type == G_TYPE_STRING
&& (G_PARAM_READABLE & spec->flags)) {
gchar *type = NULL;
g_object_get (G_OBJECT (plot), "type", &type, NULL);
if (type != NULL) {
- odf_add_bool (state->xml, CHART "stacked",
+ odf_add_bool (state->xml, CHART "stacked",
(0== strcmp (type, "stacked")));
- odf_add_bool (state->xml, CHART "percentage",
+ odf_add_bool (state->xml, CHART "percentage",
(0== strcmp (type, "as_percentage")));
g_free (type);
}
}
- if (NULL != (spec = g_object_class_find_property (klass, "default-separation"))
+ if (NULL != (spec = g_object_class_find_property (klass, "default-separation"))
&& spec->value_type == G_TYPE_DOUBLE
&& (G_PARAM_READABLE & spec->flags)) {
double default_separation = 0.;
- g_object_get (G_OBJECT (plot),
- "default-separation", &default_separation,
+ g_object_get (G_OBJECT (plot),
+ "default-separation", &default_separation,
NULL);
if (0 == strcmp ("GogRingPlot", plot_type)) {
- if (state->with_extension)
- odf_add_percent (state->xml,
- GNMSTYLE "default-separation",
+ if (state->with_extension)
+ odf_add_percent (state->xml,
+ GNMSTYLE "default-separation",
default_separation);
} else
- gsf_xml_out_add_int (state->xml,
- CHART "pie-offset",
+ gsf_xml_out_add_int (state->xml,
+ CHART "pie-offset",
(default_separation * 100. + 0.5));
}
-
+
/* Note: horizontal refers to the bars and vertical to the x-axis */
odf_write_plot_style_bool (state->xml, plot, klass,
@@ -4934,28 +4934,28 @@ odf_write_plot_style (GnmOOExport *state, GogObject const *plot)
odf_write_plot_style_bool (state->xml, plot, klass,
"vertical", CHART "vertical");
- odf_write_plot_style_from_bool
+ odf_write_plot_style_from_bool
(state->xml, plot, klass,
"default-style-has-markers", CHART "symbol-type",
"automatic", "none");
odf_write_plot_style_int (state->xml, plot, klass,
"gap-percentage", CHART "gap-width");
-
+
odf_write_plot_style_int (state->xml, plot, klass,
"overlap-percentage", CHART "overlap");
odf_write_plot_style_double_percent (state->xml, plot, klass,
- "center-size",
+ "center-size",
CHART "hole-size");
- if (NULL != (spec = g_object_class_find_property (klass, "interpolation"))
+ if (NULL != (spec = g_object_class_find_property (klass, "interpolation"))
&& spec->value_type == G_TYPE_STRING
&& (G_PARAM_READABLE & spec->flags))
odf_write_interpolation_attribute (state, NULL, plot);
- if (0 == strcmp ( "GogXYZSurfacePlot", plot_type) ||
- 0 == strcmp ( "GogSurfacePlot", plot_type) ||
+ if (0 == strcmp ( "GogXYZSurfacePlot", plot_type) ||
+ 0 == strcmp ( "GogSurfacePlot", plot_type) ||
0 == strcmp ( "XLSurfacePlot", plot_type))
odf_add_bool (state->xml, CHART "three-dimensional", TRUE);
else
@@ -4978,17 +4978,17 @@ odf_write_plot_style (GnmOOExport *state, GogObject const *plot)
odf_write_plot_style_bool (state->xml, plot, klass,
"show-negatives", GNMSTYLE "show-negatives");
}
-
-
+
+
}
static char const *
-odf_get_marker (GOMarkerShape m)
+odf_get_marker (GOMarkerShape m)
{
static struct {
- guint m;
- char const *str;
- } marks [] =
+ guint m;
+ char const *str;
+ } marks [] =
{{GO_MARKER_NONE, "none"},
{GO_MARKER_SQUARE, "square"},
{GO_MARKER_DIAMOND,"diamond"},
@@ -5028,10 +5028,10 @@ odf_write_axis_style (GnmOOExport *state, GOStyle const *style, GogObject const
odf_add_bool (state->xml, CHART "display-label", TRUE);
if (NULL != (spec = g_object_class_find_property (klass, "map-name"))
- && spec->value_type == G_TYPE_STRING
+ && spec->value_type == G_TYPE_STRING
&& (G_PARAM_READABLE & spec->flags)) {
g_object_get (G_OBJECT (axis), "map-name", &type, NULL);
- odf_add_bool (state->xml, CHART "logarithmic",
+ odf_add_bool (state->xml, CHART "logarithmic",
0 != strcmp (type, "Linear"));
}
if (gog_axis_get_bounds (GOG_AXIS (axis), &minima, &maxima)) {
@@ -5040,11 +5040,11 @@ odf_write_axis_style (GnmOOExport *state, GOStyle const *style, GogObject const
}
if (get_gsf_odf_version () > 101)
- odf_write_plot_style_bool
+ odf_write_plot_style_bool
(state->xml, axis, klass,
"invert-axis", CHART "reverse-direction");
else
- odf_write_plot_style_bool
+ odf_write_plot_style_bool
(state->xml, axis, klass,
"invert-axis", GNMSTYLE "reverse-direction");
}
@@ -5131,7 +5131,7 @@ odf_write_surface_axes_styles (GnmOOExport *state, GogObject const *chart,
}
static void
-odf_write_one_axis_grid (GnmOOExport *state, GogObject const *axis,
+odf_write_one_axis_grid (GnmOOExport *state, GogObject const *axis,
char const *role, char const *class)
{
GogObject const *grid;
@@ -5141,7 +5141,7 @@ odf_write_one_axis_grid (GnmOOExport *state, GogObject const *axis,
gsf_xml_out_start_element (state->xml, CHART "grid");
gsf_xml_out_add_cstr (state->xml, CHART "class", class);
gsf_xml_out_end_element (state->xml); /* </chart:grid> */
- }
+ }
}
static void
@@ -5153,7 +5153,7 @@ odf_write_axis_grid (GnmOOExport *state, GogObject const *axis)
}
static void
-odf_write_title (GnmOOExport *state, GogObject const *title,
+odf_write_title (GnmOOExport *state, GogObject const *title,
char const *id, gboolean allow_content)
{
if (title != NULL && id != NULL) {
@@ -5168,7 +5168,7 @@ odf_write_title (GnmOOExport *state, GogObject const *title,
gsf_xml_out_start_element (state->xml, id);
name = odf_get_gog_style_name_from_obj (title);
-
+
if (name != NULL) {
gsf_xml_out_add_cstr (state->xml, CHART "style-name",
name);
@@ -5180,53 +5180,53 @@ odf_write_title (GnmOOExport *state, GogObject const *title,
if (gnm_expr_top_is_rangeref (texpr)) {
char *f = odf_strip_brackets (formula);
- gsf_xml_out_add_cstr (state->xml,
+ gsf_xml_out_add_cstr (state->xml,
TABLE "cell-address", f);
- gsf_xml_out_add_cstr (state->xml,
+ gsf_xml_out_add_cstr (state->xml,
TABLE "cell-range", f);
- } else if (GNM_EXPR_GET_OPER (texpr->expr)
- == GNM_EXPR_OP_CONSTANT
+ } else if (GNM_EXPR_GET_OPER (texpr->expr)
+ == GNM_EXPR_OP_CONSTANT
&& texpr->expr->constant.value->type == VALUE_STRING
&& allow_content) {
gboolean white_written = TRUE;
char const *str;
gsf_xml_out_start_element (state->xml, TEXT "p");
str = value_peek_string (texpr->expr->constant.value);
- odf_add_chars (state, str, strlen (str),
- &white_written);
+ odf_add_chars (state, str, strlen (str),
+ &white_written);
gsf_xml_out_end_element (state->xml); /* </text:p> */
} else {
gboolean white_written = TRUE;
if (state->with_extension)
- gsf_xml_out_add_cstr (state->xml,
+ gsf_xml_out_add_cstr (state->xml,
GNMSTYLE "expression",
formula);
if (allow_content) {
- gsf_xml_out_start_element
+ gsf_xml_out_start_element
(state->xml, TEXT "p");
- odf_add_chars (state, formula,
- strlen (formula),
- &white_written);
- gsf_xml_out_end_element (state->xml);
- /* </text:p> */
+ odf_add_chars (state, formula,
+ strlen (formula),
+ &white_written);
+ gsf_xml_out_end_element (state->xml);
+ /* </text:p> */
}
}
gsf_xml_out_end_element (state->xml); /* </chart:title> */
g_free (formula);
}
}
- }
+ }
}
static void
odf_write_label (GnmOOExport *state, GogObject const *axis)
{
- GSList *labels = gog_object_get_children
+ GSList *labels = gog_object_get_children
(axis, gog_object_find_role_by_name (axis, "Label"));
if (labels != NULL) {
GogObject const *label = NULL;
-
+
label = labels->data;
odf_write_title (state, label, CHART "title", TRUE);
g_slist_free (labels);
@@ -5260,11 +5260,11 @@ odf_get_gradient_name (GnmOOExport *state, GOStyle const* style)
gchar *new_name;
if (grad != NULL)
return g_strdup (grad);
-
+
new_name = g_strdup_printf ("Gradient-%i", g_hash_table_size (state->graph_gradients));
- g_hash_table_insert (state->graph_gradients,
+ g_hash_table_insert (state->graph_gradients,
(gpointer) style, g_strdup (new_name));
- return new_name;
+ return new_name;
}
static gboolean
@@ -5285,7 +5285,7 @@ odf_get_image_name (GnmOOExport *state, GOStyle const* style)
new_name = g_strdup_printf ("Fill-Image-%i",
g_hash_table_size (state->graph_fill_images));
- g_hash_table_insert (state->graph_fill_images,
+ g_hash_table_insert (state->graph_fill_images,
(gpointer) style->fill.image.image, g_strdup (new_name));
return new_name;
}
@@ -5306,10 +5306,10 @@ odf_get_pattern_name (GnmOOExport *state, GOStyle const* style)
gchar *new_name;
if (hatch != NULL)
return g_strdup (hatch);
-
- new_name = g_strdup_printf ("Pattern-%i-%i", style->fill.pattern.pattern,
+
+ new_name = g_strdup_printf ("Pattern-%i-%i", style->fill.pattern.pattern,
g_hash_table_size (state->graph_hatches));
- g_hash_table_insert (state->graph_hatches,
+ g_hash_table_insert (state->graph_hatches,
(gpointer) &style->fill.pattern, g_strdup (new_name));
return new_name;
}
@@ -5351,7 +5351,7 @@ odf_write_gog_style_graphic (GnmOOExport *state, GOStyle const *style)
g_free (hatch);
odf_add_bool (state->xml, DRAW "fill-hatch-solid", TRUE);
if (state->with_extension)
- gsf_xml_out_add_int
+ gsf_xml_out_add_int
(state->xml,
GNMSTYLE "pattern",
style->fill.pattern.pattern);
@@ -5370,9 +5370,9 @@ odf_write_gog_style_graphic (GnmOOExport *state, GOStyle const *style)
gsf_xml_out_add_cstr (state->xml, DRAW "fill", "bitmap");
gsf_xml_out_add_cstr (state->xml, DRAW "fill-image-name", image);
g_free (image);
- if (0 <= style->fill.image.type &&
+ if (0 <= style->fill.image.type &&
style->fill.image.type < (int)G_N_ELEMENTS (image_types))
- gsf_xml_out_add_cstr (state->xml, STYLE "repeat",
+ gsf_xml_out_add_cstr (state->xml, STYLE "repeat",
image_types [style->fill.image.type]);
else g_warning ("Unexpected GOImageType value");
break;
@@ -5380,30 +5380,30 @@ odf_write_gog_style_graphic (GnmOOExport *state, GOStyle const *style)
}
if (go_style_is_line_visible (style)) {
GOLineDashType dash_type = style->line.dash_type;
-
+
if (dash_type == GO_LINE_SOLID)
- gsf_xml_out_add_cstr (state->xml,
+ gsf_xml_out_add_cstr (state->xml,
DRAW "stroke", "solid");
else {
char const *dash = go_line_dash_as_str (dash_type);
- gsf_xml_out_add_cstr (state->xml,
+ gsf_xml_out_add_cstr (state->xml,
DRAW "stroke", "dash");
- gsf_xml_out_add_cstr
- (state->xml,
+ gsf_xml_out_add_cstr
+ (state->xml,
DRAW "stroke-dash", dash);
- g_hash_table_insert (state->graph_dashes, g_strdup (dash),
+ g_hash_table_insert (state->graph_dashes, g_strdup (dash),
GINT_TO_POINTER (dash_type));
}
if (style->line.width == 0.0)
odf_add_pt (state->xml, SVG "stroke-width", 1.);
else if (style->line.width > 0.0)
- odf_add_pt (state->xml, SVG "stroke-width",
+ odf_add_pt (state->xml, SVG "stroke-width",
style->line.width);
if (!style->line.auto_color) {
color = odf_go_color_to_string (style->line.color);
- gsf_xml_out_add_cstr (state->xml, SVG "stroke-color",
+ gsf_xml_out_add_cstr (state->xml, SVG "stroke-color",
color);
-
+
}
} else {
gsf_xml_out_add_cstr (state->xml, DRAW "stroke", "none");
@@ -5418,25 +5418,25 @@ odf_write_gog_style_text (GnmOOExport *state, GOStyle const *style)
PangoFontDescription const *desc = style->font.font->desc;
PangoFontMask mask = pango_font_description_get_set_fields (desc);
int val = style->text_layout.angle;
-
+
odf_add_angle (state->xml, STYLE "text-rotation-angle", val);
-
+
if (mask & PANGO_FONT_MASK_SIZE)
odf_add_pt (state->xml, FOSTYLE "font-size",
- pango_font_description_get_size
- (style->font.font->desc)
+ pango_font_description_get_size
+ (style->font.font->desc)
/ (double)PANGO_SCALE);
if (mask & PANGO_FONT_MASK_VARIANT) {
PangoVariant var = pango_font_description_get_variant (desc);
switch (var) {
case PANGO_VARIANT_NORMAL:
- gsf_xml_out_add_cstr (state->xml,
+ gsf_xml_out_add_cstr (state->xml,
FOSTYLE "font-variant", "normal");
break;
case PANGO_VARIANT_SMALL_CAPS:
- gsf_xml_out_add_cstr (state->xml,
- FOSTYLE "font-variant",
+ gsf_xml_out_add_cstr (state->xml,
+ FOSTYLE "font-variant",
"small-caps");
break;
default:
@@ -5445,23 +5445,23 @@ odf_write_gog_style_text (GnmOOExport *state, GOStyle const *style)
}
/*Note that we should be using style:font-name instead of fo:font-family*/
if (mask & PANGO_FONT_MASK_FAMILY)
- gsf_xml_out_add_cstr
- (state->xml,
- FOSTYLE "font-family",
+ gsf_xml_out_add_cstr
+ (state->xml,
+ FOSTYLE "font-family",
pango_font_description_get_family (desc));
if (mask & PANGO_FONT_MASK_STYLE) {
PangoStyle s = pango_font_description_get_style (desc);
switch (s) {
case PANGO_STYLE_NORMAL:
- gsf_xml_out_add_cstr (state->xml,
+ gsf_xml_out_add_cstr (state->xml,
FOSTYLE "font-style", "normal");
break;
case PANGO_STYLE_OBLIQUE:
- gsf_xml_out_add_cstr (state->xml,
+ gsf_xml_out_add_cstr (state->xml,
FOSTYLE "font-style", "oblique");
break;
case PANGO_STYLE_ITALIC:
- gsf_xml_out_add_cstr (state->xml,
+ gsf_xml_out_add_cstr (state->xml,
FOSTYLE "font-style", "italic");
break;
default:
@@ -5474,12 +5474,12 @@ odf_write_gog_style_text (GnmOOExport *state, GOStyle const *style)
w = 900;
gsf_xml_out_add_int (state->xml, FOSTYLE "font-weight", w);
}
-
+
if ((mask & PANGO_FONT_MASK_STRETCH) && state->with_extension)
- gsf_xml_out_add_int (state->xml, GNMSTYLE "font-stretch-pango",
+ gsf_xml_out_add_int (state->xml, GNMSTYLE "font-stretch-pango",
pango_font_description_get_stretch (desc));
if ((mask & PANGO_FONT_MASK_GRAVITY) && state->with_extension)
- gsf_xml_out_add_int (state->xml, GNMSTYLE "font-gravity-pango",
+ gsf_xml_out_add_int (state->xml, GNMSTYLE "font-gravity-pango",
pango_font_description_get_gravity (desc));
}
}
@@ -5507,29 +5507,29 @@ odf_write_gog_style_chart (GnmOOExport *state, GOStyle const *style, GogObject c
}
if (style->marker.auto_shape) {
- if (NULL != (spec = g_object_class_find_property (klass, "type"))
- && spec->value_type == G_TYPE_BOOLEAN
+ if (NULL != (spec = g_object_class_find_property (klass, "type"))
+ && spec->value_type == G_TYPE_BOOLEAN
&& (G_PARAM_READABLE & spec->flags)) {
gboolean has_marker = TRUE;
- g_object_get (G_OBJECT (obj), "default-style-has-markers",
+ g_object_get (G_OBJECT (obj), "default-style-has-markers",
&has_marker, NULL);
if (has_marker)
- gsf_xml_out_add_cstr (state->xml, CHART "symbol-type",
+ gsf_xml_out_add_cstr (state->xml, CHART "symbol-type",
"automatic");
else
- gsf_xml_out_add_cstr (state->xml, CHART "symbol-type",
- "none");
- }
+ gsf_xml_out_add_cstr (state->xml, CHART "symbol-type",
+ "none");
+ }
} else {
- GOMarkerShape m
+ GOMarkerShape m
= go_marker_get_shape (go_style_get_marker ((GOStyle *)style));
if (m == GO_MARKER_NONE)
- gsf_xml_out_add_cstr (state->xml, CHART "symbol-type",
+ gsf_xml_out_add_cstr (state->xml, CHART "symbol-type",
"none");
else {
- gsf_xml_out_add_cstr (state->xml, CHART "symbol-type",
+ gsf_xml_out_add_cstr (state->xml, CHART "symbol-type",
"named-symbol");
- gsf_xml_out_add_cstr
+ gsf_xml_out_add_cstr
(state->xml, CHART "symbol-name", odf_get_marker (m));
}
}
@@ -5537,7 +5537,7 @@ odf_write_gog_style_chart (GnmOOExport *state, GOStyle const *style, GogObject c
}
static void
-odf_write_gog_style (GnmOOExport *state, GOStyle const *style,
+odf_write_gog_style (GnmOOExport *state, GOStyle const *style,
GogObject const *obj)
{
char *name = odf_get_gog_style_name (style, obj);
@@ -5551,16 +5551,16 @@ odf_write_gog_style (GnmOOExport *state, GOStyle const *style,
gsf_xml_out_start_element (state->xml, STYLE "graphic-properties");
odf_write_gog_style_graphic (state, style);
gsf_xml_out_end_element (state->xml); /* </style:graphic-properties> */
-
+
gsf_xml_out_start_element (state->xml, STYLE "paragraph-properties");
gsf_xml_out_end_element (state->xml); /* </style:paragraph-properties> */
-
+
gsf_xml_out_start_element (state->xml, STYLE "text-properties");
odf_write_gog_style_text (state, style);
gsf_xml_out_end_element (state->xml); /* </style:text-properties> */
gsf_xml_out_end_element (state->xml); /* </style:style> */
-
+
g_free (name);
}
}
@@ -5570,7 +5570,7 @@ odf_write_gog_styles (GogObject const *obj, GnmOOExport *state)
{
GObjectClass *klass = G_OBJECT_GET_CLASS (G_OBJECT (obj));
GSList *children;
-
+
if (NULL != g_object_class_find_property (klass, "style")) {
GOStyle const *style = NULL;
g_object_get (G_OBJECT (obj), "style", &style, NULL);
@@ -5591,7 +5591,7 @@ odf_write_axis_categories (GnmOOExport *state, GSList const *series)
{
if (series != NULL && series->data != NULL) {
GOData const *cat = gog_dataset_get_dim (GOG_DATASET (series->data), GOG_MS_DIM_LABELS);
- if (NULL != cat) {
+ if (NULL != cat) {
GnmExprTop const *texpr = gnm_go_data_get_expr (cat);
if (NULL != texpr) {
char *cra;
@@ -5600,7 +5600,7 @@ odf_write_axis_categories (GnmOOExport *state, GSList const *series)
cra = gnm_expr_top_as_string (texpr, &pp, state->conv);
gsf_xml_out_start_element (state->xml, CHART "categories");
- gsf_xml_out_add_cstr (state->xml, TABLE "cell-range-address",
+ gsf_xml_out_add_cstr (state->xml, TABLE "cell-range-address",
odf_strip_brackets (cra));
gsf_xml_out_end_element (state->xml); /* </chart:categories> */
@@ -5611,7 +5611,7 @@ odf_write_axis_categories (GnmOOExport *state, GSList const *series)
}
static void
-odf_write_axis (GnmOOExport *state, GogObject const *chart, char const *axis_role,
+odf_write_axis (GnmOOExport *state, GogObject const *chart, char const *axis_role,
char const *style_label,
char const *dimension, odf_chart_type_t gtype, GSList const *series)
{
@@ -5633,17 +5633,17 @@ odf_write_axis (GnmOOExport *state, GogObject const *chart, char const *axis_rol
}
static void
-odf_write_generic_axis (GnmOOExport *state, GogObject const *chart,
- char const *axis_role,
+odf_write_generic_axis (GnmOOExport *state, GogObject const *chart,
+ char const *axis_role,
char const *style_label,
- char const *dimension, odf_chart_type_t gtype,
+ char const *dimension, odf_chart_type_t gtype,
GSList const *series)
{
gsf_xml_out_start_element (state->xml, CHART "axis");
gsf_xml_out_add_cstr (state->xml, CHART "dimension", dimension);
gsf_xml_out_add_cstr (state->xml, CHART "style-name", style_label);
odf_write_axis_categories (state, series);
- gsf_xml_out_end_element (state->xml); /* </chart:axis> */
+ gsf_xml_out_end_element (state->xml); /* </chart:axis> */
}
static void
@@ -5669,52 +5669,52 @@ odf_write_plot (GnmOOExport *state, SheetObject *so, GogObject const *chart, Gog
char const * x_axis_name;
char const * y_axis_name;
char const * z_axis_name;
- void (*odf_write_axes_styles) (GnmOOExport *state,
+ void (*odf_write_axes_styles) (GnmOOExport *state,
GogObject const *chart,
GogObject const *plot,
gchar **x_style,
gchar **y_style,
gchar **z_style);
- void (*odf_write_series) (GnmOOExport *state,
+ void (*odf_write_series) (GnmOOExport *state,
GSList const *series);
- void (*odf_write_x_axis) (GnmOOExport *state,
- GogObject const *chart,
- char const *axis_role,
+ void (*odf_write_x_axis) (GnmOOExport *state,
+ GogObject const *chart,
+ char const *axis_role,
char const *style_label,
- char const *dimension,
- odf_chart_type_t gtype,
+ char const *dimension,
+ odf_chart_type_t gtype,
GSList const *series);
- void (*odf_write_y_axis) (GnmOOExport *state,
- GogObject const *chart,
- char const *axis_role,
+ void (*odf_write_y_axis) (GnmOOExport *state,
+ GogObject const *chart,
+ char const *axis_role,
char const *style_label,
- char const *dimension,
- odf_chart_type_t gtype,
+ char const *dimension,
+ odf_chart_type_t gtype,
GSList const *series);
- void (*odf_write_z_axis) (GnmOOExport *state,
- GogObject const *chart,
- char const *axis_role,
+ void (*odf_write_z_axis) (GnmOOExport *state,
+ GogObject const *chart,
+ char const *axis_role,
char const *style_label,
- char const *dimension,
- odf_chart_type_t gtype,
+ char const *dimension,
+ odf_chart_type_t gtype,
GSList const *series);
} *this_plot, plots[] = {
{ "GogBarColPlot", CHART "bar", ODF_BARCOL,
20., "X-Axis", "Y-Axis", NULL, odf_write_standard_axes_styles,
- odf_write_standard_series,
+ odf_write_standard_series,
odf_write_axis, odf_write_axis, odf_write_axis},
{ "GogLinePlot", CHART "line", ODF_LINE,
20., "X-Axis", "Y-Axis", NULL, odf_write_standard_axes_styles,
- odf_write_standard_series,
+ odf_write_standard_series,
odf_write_axis, odf_write_axis, odf_write_axis},
{ "GogPolarPlot", GNMSTYLE "polar", ODF_POLAR,
- 20., "Circular-Axis", "Radial-Axis", NULL,
+ 20., "Circular-Axis", "Radial-Axis", NULL,
odf_write_radar_axes_styles,
odf_write_standard_series,
odf_write_axis, odf_write_axis, odf_write_axis},
{ "GogAreaPlot", CHART "area", ODF_AREA,
20., "X-Axis", "Y-Axis", NULL, odf_write_standard_axes_styles,
- odf_write_standard_series,
+ odf_write_standard_series,
odf_write_axis, odf_write_axis, odf_write_axis},
{ "GogDropBarPlot", CHART "gantt", ODF_DROPBAR,
20., "X-Axis", "Y-Axis", NULL, odf_write_standard_axes_styles,
@@ -5729,7 +5729,7 @@ odf_write_plot (GnmOOExport *state, SheetObject *so, GogObject const *chart, Gog
odf_write_standard_series,
odf_write_axis, odf_write_axis, odf_write_axis},
{ "GogRadarPlot", CHART "radar", ODF_RADAR,
- 10., "Circular-Axis", "Radial-Axis", NULL,
+ 10., "Circular-Axis", "Radial-Axis", NULL,
odf_write_radar_axes_styles,
odf_write_standard_series,
odf_write_axis, odf_write_axis, odf_write_axis},
@@ -5743,7 +5743,7 @@ odf_write_plot (GnmOOExport *state, SheetObject *so, GogObject const *chart, Gog
odf_write_generic_axis, odf_write_generic_axis, NULL},
{ "GogXYPlot", CHART "scatter", ODF_SCATTER,
20., "X-Axis", "Y-Axis", NULL, odf_write_standard_axes_styles,
- odf_write_standard_series,
+ odf_write_standard_series,
odf_write_axis, odf_write_axis, odf_write_axis},
{ "GogContourPlot", CHART "surface", ODF_SURF,
20., "X-Axis", "Y-Axis", NULL, odf_write_standard_axes_styles,
@@ -5830,7 +5830,7 @@ odf_write_plot (GnmOOExport *state, SheetObject *so, GogObject const *chart, Gog
odf_write_title (state, title, CHART "title", TRUE);
if (titles->next != NULL) {
title = titles->next->data;
- odf_write_title (state, title, CHART "subtitle", TRUE);
+ odf_write_title (state, title, CHART "subtitle", TRUE);
}
g_slist_free (titles);
@@ -5843,36 +5843,36 @@ odf_write_plot (GnmOOExport *state, SheetObject *so, GogObject const *chart, Gog
GogObjectPosition flags;
char *style_name = odf_get_gog_style_name_from_obj
(legend);
- GSList *ltitles = gog_object_get_children
- (legend, gog_object_find_role_by_name
+ GSList *ltitles = gog_object_get_children
+ (legend, gog_object_find_role_by_name
(legend, "Title"));
-
- flags = gog_object_get_position_flags
+
+ flags = gog_object_get_position_flags
(legend, GOG_POSITION_COMPASS);
gsf_xml_out_start_element (state->xml, CHART "legend");
- gsf_xml_out_add_cstr (state->xml,
- CHART "style-name",
+ gsf_xml_out_add_cstr (state->xml,
+ CHART "style-name",
style_name);
g_free (style_name);
if (flags) {
GString *compass = g_string_new (NULL);
-
+
if (flags & GOG_POSITION_N)
g_string_append (compass, "top");
if (flags & GOG_POSITION_S)
g_string_append (compass, "bottom");
- if ((flags & (GOG_POSITION_S | GOG_POSITION_N)) &&
+ if ((flags & (GOG_POSITION_S | GOG_POSITION_N)) &&
(flags & (GOG_POSITION_E | GOG_POSITION_W)))
g_string_append (compass, "-");
if (flags & GOG_POSITION_E)
g_string_append (compass, "end");
if (flags & GOG_POSITION_W)
g_string_append (compass, "start");
-
- gsf_xml_out_add_cstr (state->xml,
- CHART "legend-position",
+
+ gsf_xml_out_add_cstr (state->xml,
+ CHART "legend-position",
compass->str);
g_string_free (compass, TRUE);
@@ -5882,7 +5882,7 @@ odf_write_plot (GnmOOExport *state, SheetObject *so, GogObject const *chart, Gog
GogObject const *title = ltitles->data;
if (state->with_extension)
- odf_write_title (state, title,
+ odf_write_title (state, title,
GNMSTYLE "title", get_gsf_odf_version () > 101);
else if (get_gsf_odf_version () > 101) {
GOData const *dat =
@@ -5898,7 +5898,7 @@ odf_write_plot (GnmOOExport *state, SheetObject *so, GogObject const *chart, Gog
char const *str;
gsf_xml_out_start_element (state->xml, TEXT "p");
str = value_peek_string (texpr->expr->constant.value);
- odf_add_chars (state, str, strlen (str),
+ odf_add_chars (state, str, strlen (str),
&white_written);
gsf_xml_out_end_element (state->xml); /* </text:p> */
}
@@ -5912,7 +5912,7 @@ odf_write_plot (GnmOOExport *state, SheetObject *so, GogObject const *chart, Gog
}
gsf_xml_out_start_element (state->xml, CHART "plot-area");
-
+
name = odf_get_gog_style_name_from_obj (plot);
if (name != NULL) {
gsf_xml_out_add_cstr (state->xml, CHART "style-name", name);
@@ -5942,16 +5942,16 @@ odf_write_plot (GnmOOExport *state, SheetObject *so, GogObject const *chart, Gog
odf_write_gog_plot_area_position (state, chart);
if (this_plot->odf_write_z_axis)
- this_plot->odf_write_z_axis
- (state, chart, this_plot->z_axis_name, z_style, "z",
+ this_plot->odf_write_z_axis
+ (state, chart, this_plot->z_axis_name, z_style, "z",
this_plot->gtype, series);
if (this_plot->odf_write_y_axis)
- this_plot->odf_write_y_axis
- (state, chart, this_plot->y_axis_name, y_style, "y",
+ this_plot->odf_write_y_axis
+ (state, chart, this_plot->y_axis_name, y_style, "y",
this_plot->gtype, series);
if (this_plot->odf_write_x_axis)
- this_plot->odf_write_x_axis
- (state, chart, this_plot->x_axis_name, x_style, "x",
+ this_plot->odf_write_x_axis
+ (state, chart, this_plot->x_axis_name, x_style, "x",
this_plot->gtype, series);
if (this_plot->odf_write_series != NULL)
@@ -5959,7 +5959,7 @@ odf_write_plot (GnmOOExport *state, SheetObject *so, GogObject const *chart, Gog
if (wall != NULL) {
char *name = odf_get_gog_style_name_from_obj (wall);
-
+
gsf_xml_out_start_element (state->xml, CHART "wall");
odf_add_pt (state->xml, SVG "width", res_pts[2] - res_pts[0] - 2 * this_plot->pad);
if (name != NULL)
@@ -5997,17 +5997,17 @@ odf_write_graph_content (GnmOOExport *state, GsfOutput *child, SheetObject *so)
graph = sheet_object_graph_get_gog (so);
if (graph != NULL) {
- GogObjectRole const *role =
+ GogObjectRole const *role =
gog_object_find_role_by_name (GOG_OBJECT (graph), "Chart");
if (role != NULL) {
- GSList *charts = gog_object_get_children
+ GSList *charts = gog_object_get_children
(GOG_OBJECT (graph), role);
-
+
if (charts != NULL && charts->data != NULL) {
GogObject const *chart = charts->data;
role = gog_object_find_role_by_name (chart, "Plot");
if (role != NULL) {
- GSList *plots = gog_object_get_children
+ GSList *plots = gog_object_get_children
(chart, gog_object_find_role_by_name (chart, "Plot"));
if (plots != NULL && plots->data != NULL) {
odf_write_plot (state, so, chart, plots->data);
@@ -6045,9 +6045,9 @@ odf_write_images (SheetObjectImage *image, char const *name, GnmOOExport *state)
GsfOutput *child;
GByteArray *bytes;
- g_object_get (G_OBJECT (image),
- "image-type", &image_type,
- "image-data", &bytes,
+ g_object_get (G_OBJECT (image),
+ "image-type", &image_type,
+ "image-data", &bytes,
NULL);
fullname = g_strdup_printf ("Pictures/%s.%s", name, image_type);
@@ -6067,9 +6067,9 @@ odf_write_images (SheetObjectImage *image, char const *name, GnmOOExport *state)
}
static void
-odf_write_drop (GnmOOExport *state, GOStyle const *style, GogObject const *obj)
+odf_write_drop (GnmOOExport *state, GOStyle const *style, GogObject const *obj)
{
- GogObjectRole const *h_role = gog_object_find_role_by_name
+ GogObjectRole const *h_role = gog_object_find_role_by_name
(obj->parent, "Horizontal drop lines");
gboolean vertical = !(h_role == obj->role);
@@ -6077,7 +6077,7 @@ odf_write_drop (GnmOOExport *state, GOStyle const *style, GogObject const *obj)
}
static void
-odf_write_lin_reg (GnmOOExport *state, GOStyle const *style, GogObject const *obj)
+odf_write_lin_reg (GnmOOExport *state, GOStyle const *style, GogObject const *obj)
{
gsf_xml_out_add_cstr (state->xml, CHART "regression-type", "linear");
if (state->with_extension) {
@@ -6090,12 +6090,12 @@ odf_write_lin_reg (GnmOOExport *state, GOStyle const *style, GogObject const *ob
}
static void
-odf_write_polynom_reg (GnmOOExport *state, GOStyle const *style, GogObject const *obj)
+odf_write_polynom_reg (GnmOOExport *state, GOStyle const *style, GogObject const *obj)
{
if (state->with_extension) {
GObjectClass *klass = G_OBJECT_GET_CLASS (G_OBJECT (obj));
-
- gsf_xml_out_add_cstr (state->xml, CHART "regression-type",
+
+ gsf_xml_out_add_cstr (state->xml, CHART "regression-type",
GNMSTYLE "polynomial");
odf_write_plot_style_uint (state->xml, obj, klass,
"dims", GNMSTYLE "regression-polynomial-dims");
@@ -6105,62 +6105,62 @@ odf_write_polynom_reg (GnmOOExport *state, GOStyle const *style, GogObject const
}
static void
-odf_write_exp_reg (GnmOOExport *state, GOStyle const *style, GogObject const *obj)
+odf_write_exp_reg (GnmOOExport *state, GOStyle const *style, GogObject const *obj)
{
gsf_xml_out_add_cstr (state->xml, CHART "regression-type", "exponential");
}
static void
-odf_write_power_reg (GnmOOExport *state, GOStyle const *style, GogObject const *obj)
+odf_write_power_reg (GnmOOExport *state, GOStyle const *style, GogObject const *obj)
{
gsf_xml_out_add_cstr (state->xml, CHART "regression-type", "power");
}
static void
-odf_write_log_reg (GnmOOExport *state, GOStyle const *style, GogObject const *obj)
+odf_write_log_reg (GnmOOExport *state, GOStyle const *style, GogObject const *obj)
{
gsf_xml_out_add_cstr (state->xml, CHART "regression-type", "logarithmic");
}
static void
-odf_write_log_fit_reg (GnmOOExport *state, GOStyle const *style, GogObject const *obj)
+odf_write_log_fit_reg (GnmOOExport *state, GOStyle const *style, GogObject const *obj)
{
if (state->with_extension)
- gsf_xml_out_add_cstr (state->xml, CHART "regression-type",
+ gsf_xml_out_add_cstr (state->xml, CHART "regression-type",
GNMSTYLE "log-fit");
}
static void
-odf_write_movig_avg_reg (GnmOOExport *state, GOStyle const *style, GogObject const *obj)
+odf_write_movig_avg_reg (GnmOOExport *state, GOStyle const *style, GogObject const *obj)
{
if (state->with_extension)
- gsf_xml_out_add_cstr (state->xml, CHART "regression-type",
+ gsf_xml_out_add_cstr (state->xml, CHART "regression-type",
GNMSTYLE "moving-average");
}
static void
-odf_write_exp_smooth_reg (GnmOOExport *state, GOStyle const *style, GogObject const *obj)
+odf_write_exp_smooth_reg (GnmOOExport *state, GOStyle const *style, GogObject const *obj)
{
if (state->with_extension)
- gsf_xml_out_add_cstr (state->xml, CHART "regression-type",
+ gsf_xml_out_add_cstr (state->xml, CHART "regression-type",
GNMSTYLE "exponential-smoothed");
}
static void
-odf_write_pie_point (GnmOOExport *state, GOStyle const *style, GogObject const *obj)
+odf_write_pie_point (GnmOOExport *state, GOStyle const *style, GogObject const *obj)
{
GObjectClass *klass = G_OBJECT_GET_CLASS (obj);
GParamSpec *spec;
- if (NULL != (spec = g_object_class_find_property (klass, "separation"))
+ if (NULL != (spec = g_object_class_find_property (klass, "separation"))
&& spec->value_type == G_TYPE_DOUBLE
&& (G_PARAM_READABLE & spec->flags)) {
double separation = 0.;
- g_object_get (G_OBJECT (obj),
- "separation", &separation,
+ g_object_get (G_OBJECT (obj),
+ "separation", &separation,
NULL);
- gsf_xml_out_add_int (state->xml,
- CHART "pie-offset",
+ gsf_xml_out_add_int (state->xml,
+ CHART "pie-offset",
(separation * 100. + 0.5));
}
@@ -6172,8 +6172,8 @@ odf_fill_chart_props_hash (GnmOOExport *state)
int i;
static struct {
gchar const *type;
- void (*odf_write_property) (GnmOOExport *state,
- GOStyle const *style,
+ void (*odf_write_property) (GnmOOExport *state,
+ GOStyle const *style,
GogObject const *obj);
} props[] = {
{"GogSeriesLines", odf_write_drop},
@@ -6189,9 +6189,9 @@ odf_fill_chart_props_hash (GnmOOExport *state)
{"GogPieSeriesElement", odf_write_pie_point},
{"GogXYSeries", odf_write_interpolation_attribute},
};
-
+
for (i = 0 ; i < (int)G_N_ELEMENTS (props) ; i++)
- g_hash_table_insert (state->chart_props_hash, (gpointer) props[i].type,
+ g_hash_table_insert (state->chart_props_hash, (gpointer) props[i].type,
props[i].odf_write_property);
}
@@ -6217,7 +6217,7 @@ odf_write_fill_images (GOImage *image, char const *name, GnmOOExport *state)
char *manifest_name = g_strdup_printf ("%s/Pictures/%s.png",
state->object_name, name);
- child = gsf_outfile_new_child_full (state->outfile, manifest_name,
+ child = gsf_outfile_new_child_full (state->outfile, manifest_name,
FALSE,
"compression-level", GSF_ZIP_DEFLATED,
NULL);
@@ -6225,7 +6225,7 @@ odf_write_fill_images (GOImage *image, char const *name, GnmOOExport *state)
if (child != NULL) {
GdkPixbuf *output_pixbuf;
- state->fill_image_files
+ state->fill_image_files
= g_slist_prepend (state->fill_image_files,
manifest_name);
output_pixbuf = go_image_get_pixbuf (image);
@@ -6239,7 +6239,7 @@ odf_write_fill_images (GOImage *image, char const *name, GnmOOExport *state)
} else
g_free (manifest_name);
-
+
}
@@ -6401,21 +6401,21 @@ openoffice_file_save_real (GOFileSaver const *fs, GOIOContext *ioc,
state.xl_styles_conditional = g_hash_table_new_full (g_str_hash, g_str_equal,
(GDestroyNotify) g_free, (GDestroyNotify) g_free);
state.graph_dashes = g_hash_table_new_full (g_str_hash, g_str_equal,
- (GDestroyNotify) g_free,
+ (GDestroyNotify) g_free,
NULL);
- state.graph_hatches = g_hash_table_new_full (g_direct_hash,
+ state.graph_hatches = g_hash_table_new_full (g_direct_hash,
(GEqualFunc)odf_match_pattern,
NULL,
(GDestroyNotify) g_free);
- state.graph_gradients = g_hash_table_new_full (g_direct_hash,
+ state.graph_gradients = g_hash_table_new_full (g_direct_hash,
(GEqualFunc)odf_match_gradient,
NULL,
(GDestroyNotify) g_free);
- state.graph_fill_images = g_hash_table_new_full (g_direct_hash,
+ state.graph_fill_images = g_hash_table_new_full (g_direct_hash,
(GEqualFunc)odf_match_image,
NULL,
(GDestroyNotify) g_free);
- state.arrow_markers = g_hash_table_new_full (g_direct_hash,
+ state.arrow_markers = g_hash_table_new_full (g_direct_hash,
(GEqualFunc)odf_match_arrow_markers,
NULL,
(GDestroyNotify) g_free);
@@ -6429,7 +6429,7 @@ openoffice_file_save_real (GOFileSaver const *fs, GOIOContext *ioc,
state.fill_image_files = NULL;
state.last_progress = 0;
- state.sheet_progress = ((float) PROGRESS_STEPS) / 2 /
+ state.sheet_progress = ((float) PROGRESS_STEPS) / 2 /
(workbook_sheet_count (state.wb) + G_N_ELEMENTS (streams));
state.graph_progress = ((float) PROGRESS_STEPS) / 2;
go_io_progress_message (state.ioc, _("Writing Sheets..."));
diff --git a/plugins/plan-perfect/ChangeLog b/plugins/plan-perfect/ChangeLog
index c3c5382..6f78e79 100644
--- a/plugins/plan-perfect/ChangeLog
+++ b/plugins/plan-perfect/ChangeLog
@@ -353,7 +353,7 @@
2002-11-02 J.H.M. Dassen (Ray) <jdassen debian org>
* charset.c: Don't use // comments.
- * charset.c (pln_get_str): made static.
+ * charset.c (pln_get_str): made static.
2002-11-01 Jody Goldberg <jody gnome org>
diff --git a/plugins/psiconv/ChangeLog b/plugins/psiconv/ChangeLog
index 8e54c62..40e5a70 100644
--- a/plugins/psiconv/ChangeLog
+++ b/plugins/psiconv/ChangeLog
@@ -306,12 +306,12 @@
(psi_new_string, value_new_from_psi_cell, parse_subexpr,
expr_new_from_formula, add_cell, add_workbook): Remove iconv state
argument.
- (psiconv_read):
+ (psiconv_read):
2004-08-17 Jon K Hellan <hellan acm org>
* psiconv-read.c (psi_new_string): Change type of data argument to
- psiconv_ucs2
+ psiconv_ucs2
(cellref_init): Rename to p_cellref_init because of name collision.
(set_layout, parse_subexpr, expr_new_from_formula, add_cell):
Minor fixes to shut up warnings.
diff --git a/plugins/python-loader/ChangeLog b/plugins/python-loader/ChangeLog
index f12d1aa..2c56ce2 100644
--- a/plugins/python-loader/ChangeLog
+++ b/plugins/python-loader/ChangeLog
@@ -367,7 +367,7 @@
* py-gnumeric.c (py_CellRef_object_getattr): Implement col, row,
sheet, col_relative, row_relative attributes.
(py_RangeRef_get_tuple_method): New. Return a Python tuple of
- CellRefs.
+ CellRefs.
(py_RangeRef_object_getattr): Implement start and end attributes.
CellRef, RangeRef, Cell: Note that lifecycle is broken.
@@ -395,7 +395,7 @@
* gnm-python.c, gnm-py-interpreter.c, py-gnumeric.c,
python-loader.c: Move Python.h include just after gnumeric-config,
to shut up redefinition warnings. Working around Python project
- bug 107450 at sourceforge.
+ bug 107450 at sourceforge.
2004-07-19 Jody Goldberg <jody gnome org>
@@ -509,7 +509,7 @@
2003-07-26 Jon K Hellan <hellan acm org>
* py-gnumeric.c (py_Workbook_object_getattr): Reverse accidental
- commit.
+ commit.
2003-07-25 Jon K Hellan <hellan acm org>
@@ -583,7 +583,7 @@
2003-07-10 Jon K Hellan <hellan acm org>
- * py-gnumeric.c (py_gnumeric_workbook_new): New.
+ * py-gnumeric.c (py_gnumeric_workbook_new): New.
Implements Gnumeric.workbook_new()
* py-console.c (show_python_console): Make console window
@@ -595,7 +595,7 @@
2003-06-20 Jon K Hellan <hellan acm org>
- * py-interpreter-selector.c (menu_find_item_with_interpreter):
+ * py-interpreter-selector.c (menu_find_item_with_interpreter):
return NULL, not FALSE if no interpreter found.
(gnm_py_interpreter_selector_new): Replace gtk_type_new with
g_object_new.
@@ -891,7 +891,7 @@
2002-05-06 Jon K Hellan <hellan acm org>
- * python-loader.c (gnumeric_plugin_loader_python_set_attributes)
+ * python-loader.c (gnumeric_plugin_loader_python_set_attributes)
(gnumeric_plugin_loader_python_info_get_extra_info_list): Change
from GList to GSList, as the prototypes in
GnumericPluginLoaderClass already did a while ago. This silences
@@ -1140,7 +1140,7 @@
* py-gnumeric.c, py-gnumeric.h, python-loader.c: Fix include path
for Python.h.
-
+
* .cvsignore: Add it.
2001-03-05 Zbigniew Chyla <cyba gnome pl>
diff --git a/plugins/sc/sc.c b/plugins/sc/sc.c
index 084c483..9474711 100644
--- a/plugins/sc/sc.c
+++ b/plugins/sc/sc.c
@@ -116,14 +116,14 @@ sc_warning (ScParseState *state, char const *fmt, ...)
if (0 != go_str_compare (msg, state->last_error)) {
GOErrorInfo *ei = sc_go_error_info_new_vprintf
(GO_WARNING, "%s", msg);
-
+
go_io_error_info_set (state->context, ei);
g_free (state->last_error);
state->last_error = msg;
} else
g_free (msg);
- go_error_info_add_details
+ go_error_info_add_details
(state->context->info->data,
sc_go_error_info_new_vprintf (GO_WARNING, "%s", detail));
@@ -141,17 +141,17 @@ sc_sheet_cell_fetch (ScParseState *state, int col, int row)
if (col >= size->max_cols
|| row >= size->max_rows) {
GOUndo * goundo;
- int cols_needed = (col >= size->max_cols) ? col + 1
+ int cols_needed = (col >= size->max_cols) ? col + 1
: size->max_cols;
- int rows_needed = (row >= size->max_rows) ? row + 1
+ int rows_needed = (row >= size->max_rows) ? row + 1
: size->max_rows;
gnm_sheet_suggest_size (&cols_needed, &rows_needed);
- goundo = gnm_sheet_resize
+ goundo = gnm_sheet_resize
(state->sheet, cols_needed, rows_needed, NULL, &err);
if (goundo) g_object_unref (goundo);
}
-
+
if (err) {
sc_warning (state, _("The cell in row %i and column %i is beyond "
"Gnumeric's maximum sheet size."),
@@ -349,7 +349,7 @@ sc_parse_goto (ScParseState *state, char const *cmd, char const *str,
return FALSE;
SHEET_FOREACH_VIEW(state->sheet, sv,
- sv_selection_set
+ sv_selection_set
(sv, &pos, pos.col, pos.row, pos.col, pos.row););
return TRUE;
@@ -374,7 +374,7 @@ sc_parse_format_set_width (ScParseState *state, int len, int col_from, int col_t
return;
mstyle = gnm_style_new_default ();
- style_font = gnm_style_get_font
+ style_font = gnm_style_get_font
(mstyle, state->sheet->rendered_values->context);
width = PANGO_PIXELS (len * style_font->go.metrics->avg_digit_width) + 4;
gnm_style_unref (mstyle);
@@ -400,7 +400,7 @@ sc_parse_format_get_precision (ScParseState *state, int col)
}
static void
-sc_parse_format_save_precision (ScParseState *state, int precision,
+sc_parse_format_save_precision (ScParseState *state, int precision,
int col_from, int col_to)
{
int col;
@@ -416,7 +416,7 @@ sc_parse_format_save_precision (ScParseState *state, int precision,
}
static char *
-sc_parse_format_apply_precision (ScParseState *state, char *format, int col)
+sc_parse_format_apply_precision (ScParseState *state, char *format, int col)
{
if (strchr (format, '&')) {
GString* str = g_string_new (format);
@@ -438,12 +438,12 @@ sc_parse_format_apply_precision (ScParseState *state, char *format, int col)
for (i = 0; i < p; i++)
g_string_insert_c (str, off, '0');
}
-
+
}
format = g_string_free (str, FALSE);
}
return format;
-}
+}
static void
sc_parse_format_set_type (ScParseState *state, int type, int col_from, int col_to)
@@ -470,7 +470,7 @@ sc_parse_format_set_type (ScParseState *state, int type, int col_from, int col_t
go_format_unref (gfmt);
g_free (fmt);
}
-
+
}
static gboolean
@@ -483,17 +483,17 @@ sc_parse_format (ScParseState *state, char const *cmd, char const *str,
if (g_ascii_isdigit ((gchar) *str))
return sc_parse_format_definition (state, cmd, str);
-
+
d = sc_colname_to_coords (s, &col_from);
- if (d == 0)
+ if (d == 0)
goto cannotparse;
s += d;
if (*s == ':') {
s++;
d = sc_colname_to_coords (s, &col_to);
- if (d == 0)
+ if (d == 0)
goto cannotparse;
s += d;
} else
@@ -502,7 +502,7 @@ sc_parse_format (ScParseState *state, char const *cmd, char const *str,
s++;
d = sscanf(s, "%i %i %i", &len, &precision, &format_type);
-
+
if (d != 3)
goto cannotparse;
@@ -510,7 +510,7 @@ sc_parse_format (ScParseState *state, char const *cmd, char const *str,
sc_parse_format_set_width (state, len, col_from, col_to);
sc_parse_format_save_precision (state, precision, col_from, col_to);
sc_parse_format_set_type (state, format_type, col_from, col_to);
-
+
return TRUE;
cannotparse:
sc_warning (state, "Unable to parse: %s %s", cmd, str);
diff --git a/plugins/sylk/ChangeLog b/plugins/sylk/ChangeLog
index a5f1606..1a11419 100644
--- a/plugins/sylk/ChangeLog
+++ b/plugins/sylk/ChangeLog
@@ -658,7 +658,7 @@
* sylk.c (sylk_parse_sheet) : Return an error string.
1999-11-21 Jeff Garzik <jgarzik mandrakesoft com>
-
+
* sylk.c (sylk_cleanup_plugin): free pd->title
1999-11-19 Jeff Garzik <jgarzik mandrakesoft com>
diff --git a/plugins/xbase/ChangeLog b/plugins/xbase/ChangeLog
index c1ea8c4..b451010 100644
--- a/plugins/xbase/ChangeLog
+++ b/plugins/xbase/ChangeLog
@@ -511,7 +511,7 @@
* signedness fixes/workarounds
* boot.c (xb_setdouble) : make s gchar* rather than guint8*.
* xbase.c (record_new) : cast g_strnfill result to guint8*.
- * xbase.c, xbase.h (record_get_field) : return gchar* rather than
+ * xbase.c, xbase.h (record_get_field) : return gchar* rather than
guint8.
* xbase.h (XBfield) : made name gchar[] rather than guint8[].
@@ -757,7 +757,7 @@
* xbase.c: don't define type_descriptions if not debugging.
1999-11-21 Jeff Garzik <jgarzik mandrakesoft com>
-
+
* boot.c (xbase_cleanup_plugin): free pd->title
1999-08-11 Michael Meeks <michael imaginator com>
diff --git a/po-functions/ChangeLog b/po-functions/ChangeLog
index c9e2137..7ff81fd 100644
--- a/po-functions/ChangeLog
+++ b/po-functions/ChangeLog
@@ -200,7 +200,7 @@
* Release 1.9.2
-2008-07-31 Djihed Afifi <djihed gmail com>
+2008-07-31 Djihed Afifi <djihed gmail com>
* ar.po: Updated Arabic Translation by Djihed Afifi.
@@ -224,7 +224,7 @@
* es.po: Updated Spanish translation
-2008-03-01 Jorge Gonzalez <jorgegonz svn gnome org>
+2008-03-01 Jorge Gonzalez <jorgegonz svn gnome org>
* es.po: Updated Spanish translation.
@@ -281,7 +281,7 @@
* et.po: Estonian translation updates by Ivar Smolin <okul linux ee>
-2007-08-01 Jorge Gonzalez <jorgegonz svn gnome org>
+2007-08-01 Jorge Gonzalez <jorgegonz svn gnome org>
* Updated Spanish translation
@@ -293,7 +293,7 @@
* Release 1.7.10
-2007-04-21 Djihed Afifi <djihed gmail com>
+2007-04-21 Djihed Afifi <djihed gmail com>
* ar.po: Updated Arabic Translation by Djihed Afifi.
@@ -345,7 +345,7 @@
* Release 1.7.3
-2006-11-18 Djihed Afifi <djihed gmail com>
+2006-11-18 Djihed Afifi <djihed gmail com>
* ar.po: Added Arabic Translation.
diff --git a/po/ChangeLog b/po/ChangeLog
index a4ab1de..bb49eaa 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -32,7 +32,7 @@
2010-06-06 Andreas J. Guelzow <aguelzow pyrshep ca>
- * POTFILES.in: removed src/dialogs/dialog-paste-names.c and
+ * POTFILES.in: removed src/dialogs/dialog-paste-names.c and
src/dialogs/paste-names.glade
2010-05-31 Andreas J. Guelzow <aguelzow pyrshep ca>
@@ -88,9 +88,9 @@
2009-12-22 Andreas J. Guelzow <aguelzow pyrshep ca>
- * POTFILES.in: added
+ * POTFILES.in: added
src/dialogs/dialog-analysis-principal-components.c,
- src/tools/analysis-principal-components.c and
+ src/tools/analysis-principal-components.c and
src/dialogs/principal-components.glade
2009-12-17 Andreas J. Guelzow <aguelzow pyrshep ca>
@@ -274,10 +274,10 @@
2008-10-12 Andreas J. Guelzow <aguelzow pyrshep ca>
- * POTFILES.in: added src/tools/analysis-frequency.c and
+ * POTFILES.in: added src/tools/analysis-frequency.c and
src/dialogs/dialog-analysis-tool-frequency.c
-2008-10-12 Jorge Gonzalez <jorgegonz svn gnome org>
+2008-10-12 Jorge Gonzalez <jorgegonz svn gnome org>
* es.po: Updated Spanish translation
@@ -301,9 +301,9 @@
* es.po: Updated Spanish translation.
-2008-09-12 Jorge Gonzalez <joregegonz svn gnome org>
+2008-09-12 Jorge Gonzalez <joregegonz svn gnome org>
- * es.po: Updated Spanish translation.
+ * es.po: Updated Spanish translation.
2008-09-10 Jorge Gonzalez <jorgegonz svn gnome org>
@@ -317,7 +317,7 @@
* Release 1.9.2
-2008-07-31 Djihed Afifi <djihed gmail com>
+2008-07-31 Djihed Afifi <djihed gmail com>
* ar.po: Updated Arabic Translation by Djihed Afifi.
@@ -331,7 +331,7 @@
2008-07-05 Jorge Gonzalez <jorgegonz svn gnome org>
- * es.po: Updated Spanish translation
+ * es.po: Updated Spanish translation
2008-07-02 Yannig Marchegay <yannig marchegay org>
@@ -379,7 +379,7 @@
* zh_HK.po: Added Traditional Chinese translation(Hong Kong).
* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
-2008-03-10 Jorge Gonzalez <jorgegonz svn gnome org>
+2008-03-10 Jorge Gonzalez <jorgegonz svn gnome org>
* es.po: Updated Spanish translation
@@ -441,7 +441,7 @@
* POTFILES.in: added src/dialogs/hf-dt-format.glade
-2007-11-14 Jorge Gonzalez <jorgegonz svn gnome org>
+2007-11-14 Jorge Gonzalez <jorgegonz svn gnome org>
* es.po: Updated Spanish translation.
@@ -453,7 +453,7 @@
* Release 1.7.14
-2007-11-03 Jorge Gonzalez <jorgegonz svn gnome org>
+2007-11-03 Jorge Gonzalez <jorgegonz svn gnome org>
* es.po: Updated Spanish translation
@@ -473,7 +473,7 @@
* Release 1.7.13
-2007-10-15 Jorge Gonzalez <jorgegonz svn gnome org>
+2007-10-15 Jorge Gonzalez <jorgegonz svn gnome org>
* es.po: Updated Spanish translation.
@@ -530,9 +530,9 @@
* es.po: Updated Spanish translation
-2007-08-01 Jorge Gonzalez <jorgegonz svn gnome org>
+2007-08-01 Jorge Gonzalez <jorgegonz svn gnome org>
- * es.po: Updated Spanish translation
+ * es.po: Updated Spanish translation
2007-07-29 Leonardo Ferreira Fontenelle <leonardof svn gnome org>
@@ -566,7 +566,7 @@
* vi.po: Updated Vietnamese translation.
-2007-06-18 Jorge Gonzalez <jorgegonz svn gnome org>
+2007-06-18 Jorge Gonzalez <jorgegonz svn gnome org>
* es.po: Updated Spanish translation
@@ -576,7 +576,7 @@
2007-06-04 Jorge Gonzalez <jorgegonz svn gnome org>
- * es.po: Updated spanish translation.
+ * es.po: Updated spanish translation.
2007-05-15 David Lodge <dave cirt net>
@@ -606,7 +606,7 @@
* es.po: Updated Spanish translation
-2007-04-21 Djihed Afifi <djihed gmail com>
+2007-04-21 Djihed Afifi <djihed gmail com>
* ar.po: Updated Arabic Translation by Djihed Afifi.
@@ -619,7 +619,7 @@
* oc.po: Added Occitan translation from
Yannig MARCHEGAY (Kokoyaya) <yannig marchegay>.
-2007-04-14 Djihed Afifi <djihed gmail com>
+2007-04-14 Djihed Afifi <djihed gmail com>
* ar.po: Updated Arabic Translation by Djihed Afifi.
@@ -708,7 +708,7 @@
* Release 1.7.3
-2006-11-18 Djihed Afifi <djihed gmail com>
+2006-11-18 Djihed Afifi <djihed gmail com>
* ar.po: Added Arabic Translation.
@@ -851,7 +851,7 @@
2006-06-30 Francisco Javier F. Serrador <serrador cvs gnome org>
- * es.po: Updated SPanish translation.
+ * es.po: Updated SPanish translation.
2006-06-26 Valek Filippov <frob df ru>
@@ -1265,7 +1265,7 @@
2005-07-28 Ilkka Tuohela <hile iki fi>
- * fi.po: Bulk change to some Finnish translations.
+ * fi.po: Bulk change to some Finnish translations.
2005-07-25 Priit Laes <plaes cvs gnome org>
@@ -1663,9 +1663,9 @@
* no.po: Same.
2005-02-13 David Lodge <dave cirt net>
-
+
* en_GB.po: Updated British translation.
-
+
2005-02-13 Miloslav Trmac <mitr volny cz>
* cs.po: Updated Czech translation.
@@ -1836,7 +1836,7 @@
2004-12-03 Jan Morén <jan moren lucs lu se>
* sv.po: Updated Swedish translation.
- * Changelog: Reencoded into utf-8
+ * Changelog: Reencoded into utf-8
2004-11-30 Raphael Higino <raphaelh cvs gnome org>
@@ -1895,9 +1895,9 @@
* pt_BR.po: Updated Brazilian Portuguese translation.
2004-11-21 David Lodge <dave cirt net>
-
+
* en_GB.po: Updated British translation.
-
+
2004-11-21 Vincent van Adrighem <adrighem gnome org>
* nl.po: Translation updated by Tino Meinen.
@@ -2110,17 +2110,17 @@
* en_CA.po: Updated Canadian English translation.
2004-10-06 David Lodge <dave cirt net>
-
+
* en_GB.po: Updated British English translation.
-
+
2004-10-05 Jody Goldberg <jody gnome org>
* Release 1.3.91
2004-10-05 David Lodge <dave cirt net>
-
+
* en_GB.po: Updated British English translation.
-
+
2004-10-04 Raphael Higino <raphaelh cvs gnome org>
* pt_BR.po: Updated Brazilian Portuguese translation.
@@ -2130,9 +2130,9 @@
* sv.po: Updated Swedish translation.
2004-10-03 David Lodge <dave cirt net>
-
+
* en_GB.po: Updated British English translation.
-
+
2004-10-02 Vincent van Adrighem <adrighem gnome org>
* nl.po: Translation updated by Tino Meinen.
@@ -2279,9 +2279,9 @@
* cs.po: Updated Czech translation.
2004-09-08 David Lodge <dave cirt net>
-
+
* en_GB.po: Updated British translation.
-
+
2004-09-08 Adam Weinberger <adamw gnome org>
* en_CA.po: Updated Canadian English translation.
@@ -2367,12 +2367,12 @@
Medina - debian <afmedina uol com br>
2003-03-21 Evandro Fernandes Giovanini <evandrofg ig com br>
-
+
* pt_BR.po: Updated Brazilian Portuguese translation
from Afonso Celso Medina <medina maua br>.
2003-03-19 Evandro Fernandes Giovanini <evandrofg ig com br>
-
+
* pt_BR.po: Updated Brazilian Portuguese translation
from Afonso Celso Medina <medina maua br>.
@@ -2538,7 +2538,7 @@
* es.po: Updated Spanish translation by
Francisco Javier F. Serrador <serrador arrakis es>.
-
+
2003-11-01 Danilo � egan <dsegan gmx net>
* sr.po, sr Latn po: Updated Serbian translation.
@@ -2547,7 +2547,7 @@
* es.po: Updated Spanish translation by
Francisco Javier F. Serrador <serrador arrakis es>.
-
+
2003-10-31 Jan Mor�©n <jan moren lucs lu se>
* sv.po: Updated Swedish translation.
@@ -2800,7 +2800,7 @@
2003-09-08 Danilo � egan <dsegan gmx net>
- * sr.po, sr Latn po: Updated Serbian translation by Serbian
+ * sr.po, sr Latn po: Updated Serbian translation by Serbian
team (Prevod.org).
2003-09-08 Andras Timar <timar gnome hu>
@@ -2844,7 +2844,7 @@
* no.po: Updated Norwegian translation.
2003-09-02 Pablo Gonzalo del Campo <pablodc bigfoot com>
-
+
* es.po: Updated Spanish translation by
Francisco Javier F. Serrador <serrador arrakis es>.
@@ -2929,7 +2929,7 @@
2003-08-15 Danilo � egan <dsegan gmx net>
- * sr.po, sr Latn po: Added Serbian translation by Serbian
+ * sr.po, sr Latn po: Added Serbian translation by Serbian
team (Prevod.org).
2003-08-13 Pablo Gonzalo del Campo <pablodc bigfoot com>
@@ -3320,7 +3320,7 @@
* POTFILES.in: Added new schema file.
2003-06-11 Pablo Gonzalo del Campo <pablodc bigfoot com>
-
+
* es.po: Updated Spanish translation by
Francisco Javier F. Serrador <serrador arrakis es>
@@ -3333,7 +3333,7 @@
* sv.po: Updated Swedish translation.
2003-06-10 Pablo Gonzalo del Campo <pablodc bigfoot com>
-
+
* es.po: Updated Spanish translation by
Francisco Javier F. Serrador <serrador arrakis es>
@@ -3397,7 +3397,7 @@
* cs.po: Updated Czech translation.
2003-05-30 Pablo Gonzalo del Campo <pablodc bigfoot com>
-
+
* es.po: Updated Spanish translation by
Francisco Javier F. Serrador <serrador arrakis es>
@@ -3410,7 +3410,7 @@
* sv.po: Updated Swedish translation.
2003-05-26 Pablo Gonzalo del Campo <pablodc bigfoot com>
-
+
* es.po: Updated Spanish translation by
Francisco Javier F. Serrador <serrador arrakis es>
@@ -3513,7 +3513,7 @@
2003-05-05 Andreas Guelzow <aguelzow taliesin ca>
- * POTFILES.in: remove src/charset.c and add
+ * POTFILES.in: remove src/charset.c and add
src/widgets/widget-charmap-selector.c
2003-05-05 Andreas Guelzow <aguelzow taliesin ca>
@@ -4288,7 +4288,7 @@
2002-04-08 Andreas J. Guelzow <aguelzow taliesin ca>
- * POTFILES.in : added src/dialogs/dialog-row-height.c and
+ * POTFILES.in : added src/dialogs/dialog-row-height.c and
src/dialogs/dialog-col-width.c
2002-04-03 Duarte Loreto <happyguy_pt hotmail com>
@@ -4341,7 +4341,7 @@
2002-03-15 Andreas J. Guelzow <aguelzow taliesin ca>
- * POTFILES.in : removed dialog-sheet-name.c and
+ * POTFILES.in : removed dialog-sheet-name.c and
sheet-rename.glade
2002-03-13 Valek Filippov <frob df ru>
@@ -6006,7 +6006,7 @@
2001-01-02 Szabolcs Ban <shooby gnome hu>
- * hu.po: Updated some Hungarian translations,
+ * hu.po: Updated some Hungarian translations,
thanks to Andras Timar <timar gnome hu>
2000-12-31 Yukihiro Nakai <nakai gnome gr jp>
@@ -6051,7 +6051,7 @@
2000-12-12 Szabolcs Ban <shooby gnome hu>
- * hu.po: Updated some Hungarian translations,
+ * hu.po: Updated some Hungarian translations,
thanks to Andras Timar <timar gnome hu>
2000-12-7 Jody Goldberg <jgoldberg home com>
@@ -6072,7 +6072,7 @@
2000-12-04 Szabolcs Ban <shooby gnome hu>
- * hu.po: Updated some Hungarian translations,
+ * hu.po: Updated some Hungarian translations,
thanks to Andras Timar <timar_a freemail hu>
2000-12-04 Stanislav Visnovsky <visnovsky nenya ms mff cuni cz>
@@ -6125,7 +6125,7 @@
2000-11-22 Szabolcs Ban <shooby gnome hu>
- * hu.po: Updated some Hungarian translations,
+ * hu.po: Updated some Hungarian translations,
thanks to Andras Timar <timar_a freemail hu>
2000-11-21 Christian Rose <menthos menthos com>
@@ -6154,7 +6154,7 @@
2000-11-17 Szabolcs Ban <shooby gnome hu>
- * hu.po: Updated some Hungarian translations,
+ * hu.po: Updated some Hungarian translations,
thanks to Andras Timar <timar_a freemail hu>
2000-11-17 Christian Rose <menthos menthos com>
@@ -6216,7 +6216,7 @@
2000-10-30 Szabolcs Ban <shooby gnome hu>
- * hu.po: Updated some Hungarian translations,
+ * hu.po: Updated some Hungarian translations,
thanks to Andras Timar <timar_a freemail hu>
2000-10-30 Kenneth Christiansen <kenneth gnu org>
@@ -6234,7 +6234,7 @@
2000-10-25 Szabolcs Ban <shooby gnome hu>
- * hu.po: Updated some Hungarian translations,
+ * hu.po: Updated some Hungarian translations,
thanks to Andras Timar <timar_a freemail hu>
2000-10-23 Kjartan Maraas <kmaraas gnome org>
@@ -6277,7 +6277,7 @@
2000-09-28 Kenneth Christiansen <kenneth gnu org>
- * Makefile.in.in: Made 'make update-po' and 'make
+ * Makefile.in.in: Made 'make update-po' and 'make
dist' work with new update.pl script
* update.pl: the same as above
@@ -6290,7 +6290,7 @@
* xml2pot.pl: Corrected small errors. Thanks to
Morten Welinder, for giving me suggestings to
- improve the script, and thanks to all testers
+ improve the script, and thanks to all testers
also.
2000-09-20 Kenneth Christiansen <kenneth gnu org>
@@ -6301,7 +6301,7 @@
works with xml2pot.pl
* XMLFILES.in: New file which specifices which
files should be processed by xml2pot.pl
- * da.po: New update.
+ * da.po: New update.
2000-09-21 Jesus Bravo Alvarez <jba pobox com>
@@ -6712,7 +6712,7 @@
2000-04-29 Almer. S. Tigelaar. <almer1 dds nl>
- * POTFILES.in : Add stf importer and
+ * POTFILES.in : Add stf importer and
stf exporter files
2000-04-27 Karl Eichwalder <ke suse de>
@@ -6784,7 +6784,7 @@
2000-04-11 Christopher R. Gabriel <cgabriel linux it>
- * it.po: Updated italian translation from
+ * it.po: Updated italian translation from
Leandro Noferini <lnoferin cybervalley org>
2000-04-04 Kjartan Maraas <kmaraas online no>
@@ -6996,7 +6996,7 @@
* sv.po: Updated Swedish translation.
1999-09-27 Zbigniew Chyla <chyla alice ci pwr wroc pl>
-
+
* pl.po: Updated translation.
1999-09-25 Lauris Kaplinski <lauris ariman ee>
diff --git a/src/cell-draw.c b/src/cell-draw.c
index 3c80dc8..71dd09e 100644
--- a/src/cell-draw.c
+++ b/src/cell-draw.c
@@ -111,7 +111,7 @@ cell_calc_layout (GnmCell const *cell, GnmRenderedValue *rv, int y_direction,
if (sin_a < 0) {
hoffset += (width - indent) - rv->layout_natural_width;
}
- } else if (!rv->rotation && rv->wrap_text
+ } else if (!rv->rotation && rv->wrap_text
&& (rv->effective_halign != HALIGN_FILL)) {
int wanted_width = MAX (0, width - indent);
if (wanted_width != pango_layout_get_width (layout)) {
@@ -174,7 +174,7 @@ cell_calc_layout (GnmCell const *cell, GnmRenderedValue *rv, int y_direction,
pango_layout_get_extents (layout, NULL, &r);
hoffset += (width - indent) - r.width;
}
-
+
rv->hfilled = TRUE;
break;
}
diff --git a/src/cell.c b/src/cell.c
index 6bd79d3..eeda429 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -338,21 +338,21 @@ gnm_cell_set_array_formula_cb (GnmSheetRange const *sr, GnmExprTop const *texpr
sheet_region_queue_recalc (sr->sheet, &sr->range);
gnm_expr_top_ref (texpr);
gnm_cell_set_array_formula (sr->sheet,
- sr->range.start.col, sr->range.start.row,
+ sr->range.start.col, sr->range.start.row,
sr->range.end.col, sr->range.end.row,
texpr);
sheet_region_queue_recalc (sr->sheet, &sr->range);
sheet_flag_status_update_range (sr->sheet, &sr->range);
sheet_queue_respan (sr->sheet, sr->range.start.row, sr->range.end.row);
-}
+}
GOUndo *
gnm_cell_set_array_formula_undo (GnmSheetRange *sr, GnmExprTop const *texpr)
{
gnm_expr_top_ref (texpr);
- return go_undo_binary_new (sr, (gpointer)texpr,
- (GOUndoBinaryFunc) gnm_cell_set_array_formula_cb,
- (GFreeFunc) gnm_sheet_range_free,
+ return go_undo_binary_new (sr, (gpointer)texpr,
+ (GOUndoBinaryFunc) gnm_cell_set_array_formula_cb,
+ (GFreeFunc) gnm_sheet_range_free,
(GFreeFunc) gnm_expr_top_unref);
}
diff --git a/src/cell.h b/src/cell.h
index 86e8e49..a6f59e2 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -71,7 +71,7 @@ void gnm_cell_set_expr_unsafe (GnmCell *cell, GnmExprTop const *texpr);
void gnm_cell_set_array_formula (Sheet *sheet,
int cola, int rowa, int colb, int rowb,
GnmExprTop const *texpr);
-GOUndo *gnm_cell_set_array_formula_undo (GnmSheetRange *sr,
+GOUndo *gnm_cell_set_array_formula_undo (GnmSheetRange *sr,
GnmExprTop const *texpr);
gboolean gnm_cell_set_array (Sheet *sheet,
const GnmRange *r,
diff --git a/src/clipboard.c b/src/clipboard.c
index 3add725..184b809 100644
--- a/src/clipboard.c
+++ b/src/clipboard.c
@@ -403,12 +403,12 @@ clipboard_paste_region (GnmCellRegion const *cr,
src_cols = cr->cols;
src_rows = cr->rows;
-
+
/* If the source is a single cell or a single merge */
/* Treat a target of a single merge specially, don't split the merge */
if ((src_cols == 1 && src_rows == 1) ||
- (g_slist_length (cr->merged) == 1 &&
+ (g_slist_length (cr->merged) == 1 &&
(NULL != (merge_src = cr->merged->data)) &&
range_height (merge_src) == cr->rows &&
range_width (merge_src) == cr->cols)) {
@@ -523,22 +523,22 @@ clipboard_paste_region (GnmCellRegion const *cr,
/* Move the styles on here so we get correct formats before recalc */
if (pt->paste_flags & PASTE_FORMATS) {
- if (pt->paste_flags & PASTE_TRANSPOSE)
+ if (pt->paste_flags & PASTE_TRANSPOSE)
sheet_style_set_list (pt->sheet, &dat.top_left,
- cr->styles,
+ cr->styles,
(sheet_style_set_list_cb_t)
- range_transpose,
+ range_transpose,
&dat.top_left);
else if (pt->paste_flags & PASTE_FLIP_H) {
int data = 2 * left + src_cols - 1;
sheet_style_set_list (pt->sheet, &dat.top_left,
- cr->styles,
+ cr->styles,
(sheet_style_set_list_cb_t)
range_flip_h, &data);
} else if (pt->paste_flags & PASTE_FLIP_V) {
int data = 2 * top + src_rows - 1;
sheet_style_set_list (pt->sheet, &dat.top_left,
- cr->styles,
+ cr->styles,
(sheet_style_set_list_cb_t)
range_flip_v, &data);
} else
@@ -687,7 +687,7 @@ cb_clipboard_copy_range_undo (GnmCellRegion *cr, GnmSheetRange *sr,
paste_target_init (&pt,
sr->sheet,
&sr->range,
- PASTE_CONTENTS | PASTE_FORMATS |
+ PASTE_CONTENTS | PASTE_FORMATS |
PASTE_OBJECTS | PASTE_COMMENTS),
cc);
}
diff --git a/src/cmd-edit.c b/src/cmd-edit.c
index 5b2b126..c057b45 100644
--- a/src/cmd-edit.c
+++ b/src/cmd-edit.c
@@ -408,7 +408,7 @@ cmd_shift_rows (WorkbookControl *wbc, Sheet *sheet,
r.start.col = r.end.col - count + 1;
if (!sheet_is_region_empty (sheet, &r)) {
- go_gtk_notice_dialog (wbcg_toplevel (WBC_GTK (wbc)), GTK_MESSAGE_ERROR,
+ go_gtk_notice_dialog (wbcg_toplevel (WBC_GTK (wbc)), GTK_MESSAGE_ERROR,
_("Inserting these cells would push data off the sheet. "
"Please enlarge the sheet first."));
return;
@@ -457,7 +457,7 @@ cmd_shift_cols (WorkbookControl *wbc, Sheet *sheet,
r.start.row = r.end.row - count + 1;
if (!sheet_is_region_empty (sheet, &r)) {
- go_gtk_notice_dialog (wbcg_toplevel (WBC_GTK (wbc)), GTK_MESSAGE_ERROR,
+ go_gtk_notice_dialog (wbcg_toplevel (WBC_GTK (wbc)), GTK_MESSAGE_ERROR,
_("Inserting these cells would push data off the sheet. "
"Please enlarge the sheet first."));
return;
diff --git a/src/colrow.c b/src/colrow.c
index 699aec4..753d237 100644
--- a/src/colrow.c
+++ b/src/colrow.c
@@ -205,8 +205,8 @@ cb_colrow_index_counter (gpointer data, gpointer user_data)
*count += index->last - index->first + 1;
}
-gint
-colrow_vis_list_length (ColRowVisList *list)
+gint
+colrow_vis_list_length (ColRowVisList *list)
{
gint count = 0;
g_slist_foreach (list, cb_colrow_index_counter, &count);
@@ -526,7 +526,7 @@ colrow_set_sizes (Sheet *sheet, gboolean is_cols,
for (i = index->first ; i <= index->last ; ++i) {
int tmp = new_size;
if (tmp < 0) {
- int max = is_cols ? gnm_sheet_get_last_row (sheet)
+ int max = is_cols ? gnm_sheet_get_last_row (sheet)
: gnm_sheet_get_last_col (sheet);
if (from < 0)
from = 0;
@@ -814,9 +814,9 @@ colrow_autofit_col (Sheet *sheet, GnmRange *r)
colrow_autofit (sheet, r, TRUE, TRUE,
TRUE, FALSE, NULL, NULL);
sheet_foreach_cell_in_range (sheet, CELL_ITER_IGNORE_BLANK,
- r->start.col, 0,
+ r->start.col, 0,
r->end.col, gnm_sheet_get_last_row (sheet),
- (CellIterFunc) &cb_clear_variable_width_content,
+ (CellIterFunc) &cb_clear_variable_width_content,
NULL);
}
diff --git a/src/colrow.h b/src/colrow.h
index d15a9de..f07b2c0 100644
--- a/src/colrow.h
+++ b/src/colrow.h
@@ -111,7 +111,7 @@ void colrow_set_states (Sheet *sheet, gboolean is_cols,
ColRowStateGroup *colrow_state_group_destroy (ColRowStateGroup *set);
ColRowStateGroup *colrow_set_sizes (Sheet *sheet, gboolean is_cols,
- ColRowIndexList *src, int new_size,
+ ColRowIndexList *src, int new_size,
int from, int to);
ColRowStateGroup *colrow_get_sizes (Sheet *sheet, gboolean is_cols,
ColRowIndexList *src, int new_size);
diff --git a/src/commands.c b/src/commands.c
index 7c81658..0581144 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -738,7 +738,7 @@ command_undo_sheet_delete (Sheet* sheet)
static GnmValue *
cmd_set_text_full_check_texpr (GnmCellIter const *iter, GnmExprTop const *texpr)
{
- if (iter->cell == NULL ||
+ if (iter->cell == NULL ||
!gnm_expr_top_equal (iter->cell->base.texpr, texpr))
return VALUE_TERMINATE;
return NULL;
@@ -759,10 +759,10 @@ cmd_set_text_full_check_text (GnmCellIter const *iter, char *text)
old_text = gnm_cell_get_entered_text (iter->cell);
same = strcmp (old_text, text) == 0;
- if (!same && iter->cell->value && VALUE_IS_STRING (iter->cell->value)
+ if (!same && iter->cell->value && VALUE_IS_STRING (iter->cell->value)
&& text[0] == '\'')
same = strcmp (old_text, text + 1) == 0;
-
+
g_free (old_text);
return (same ? NULL : VALUE_TERMINATE);
@@ -838,13 +838,13 @@ cmd_set_text_full (WorkbookControl *wbc, GSList *selection, GnmEvalPos *ep,
for (l = selection; l != NULL && same_texpr; l = l->next) {
GnmRange *r = l->data;
GnmValue *val =
- sheet_foreach_cell_in_range
+ sheet_foreach_cell_in_range
(sheet, CELL_ITER_ALL,
r->start.col, r->start.row,
r->end.col, r->end.row,
- (CellIterFunc) cmd_set_text_full_check_texpr,
+ (CellIterFunc) cmd_set_text_full_check_texpr,
(gpointer) texpr);
-
+
same_texpr = (val != VALUE_TERMINATE);
if (val != NULL && same_texpr)
value_release (val);
@@ -853,14 +853,14 @@ cmd_set_text_full (WorkbookControl *wbc, GSList *selection, GnmEvalPos *ep,
if (same_texpr) {
gnm_expr_top_unref (texpr);
g_free (name);
- range_fragment_free (selection);
+ range_fragment_free (selection);
return TRUE;
}
text = g_strdup_printf (_("Inserting expression in %s"), name);
- if (go_format_is_general
- (gnm_style_get_format
+ if (go_format_is_general
+ (gnm_style_get_format
(sheet_style_get (sheet, ep->eval.col, ep->eval.row)))) {
sf = auto_style_format_suggest (texpr, ep);
if (sf != NULL) {
@@ -872,14 +872,14 @@ cmd_set_text_full (WorkbookControl *wbc, GSList *selection, GnmEvalPos *ep,
for (l = selection; l != NULL; l = l->next) {
GnmSheetRange *sr;
- undo = go_undo_combine
+ undo = go_undo_combine
(undo, clipboard_copy_range_undo (sheet, l->data));
sr = gnm_sheet_range_new (sheet, l->data);
- redo = go_undo_combine
+ redo = go_undo_combine
(redo, sheet_range_set_expr_undo (sr, texpr));
if (new_style) {
sr = gnm_sheet_range_new (sheet, l->data);
- redo = go_undo_combine
+ redo = go_undo_combine
(redo, sheet_apply_style_undo (sr, new_style));
}
}
@@ -890,7 +890,7 @@ cmd_set_text_full (WorkbookControl *wbc, GSList *selection, GnmEvalPos *ep,
} else {
GString *text_str;
PangoAttrList *adj_markup = NULL;
- char *corrected = (new_text != NULL) ?
+ char *corrected = (new_text != NULL) ?
autocorrect_tool (new_text) : NULL;
gboolean same_text = TRUE;
gboolean same_markup = TRUE;
@@ -905,13 +905,13 @@ cmd_set_text_full (WorkbookControl *wbc, GSList *selection, GnmEvalPos *ep,
for (l = selection; l != NULL && same_text; l = l->next) {
GnmRange *r = l->data;
GnmValue *val =
- sheet_foreach_cell_in_range
+ sheet_foreach_cell_in_range
(sheet, CELL_ITER_ALL,
r->start.col, r->start.row,
r->end.col, r->end.row,
- (CellIterFunc) cmd_set_text_full_check_text,
+ (CellIterFunc) cmd_set_text_full_check_text,
(gpointer) corrected);
-
+
same_text = (val != VALUE_TERMINATE);
if (val != NULL && same_text)
value_release (val);
@@ -923,18 +923,18 @@ cmd_set_text_full (WorkbookControl *wbc, GSList *selection, GnmEvalPos *ep,
markup = adj_markup = pango_attr_list_copy (markup);
go_pango_attr_list_erase (adj_markup, 0, 1);
}
-
+
if (same_text) {
for (l = selection; l != NULL && same_text; l = l->next) {
GnmRange *r = l->data;
GnmValue *val =
- sheet_foreach_cell_in_range
+ sheet_foreach_cell_in_range
(sheet, CELL_ITER_IGNORE_BLANK,
r->start.col, r->start.row,
r->end.col, r->end.row,
- (CellIterFunc) cmd_set_text_full_check_markup,
+ (CellIterFunc) cmd_set_text_full_check_markup,
(gpointer) markup);
-
+
same_markup = (val != VALUE_TERMINATE);
if (val != NULL && same_markup)
value_release (val);
@@ -958,18 +958,18 @@ cmd_set_text_full (WorkbookControl *wbc, GSList *selection, GnmEvalPos *ep,
for (l = selection; l != NULL; l = l->next) {
GnmSheetRange *sr;
- undo = go_undo_combine
+ undo = go_undo_combine
(undo, clipboard_copy_range_undo (sheet, l->data));
if (corrected) {
sr = gnm_sheet_range_new (sheet, l->data);
- redo = go_undo_combine
- (redo, sheet_range_set_text_undo
+ redo = go_undo_combine
+ (redo, sheet_range_set_text_undo
(sr, corrected));
}
if (markup) {
sr = gnm_sheet_range_new (sheet, l->data);
/* Note: order of combination matters!! */
- redo = go_undo_combine
+ redo = go_undo_combine
(sheet_range_set_markup_undo (sr, markup), redo);
}
}
@@ -981,10 +981,10 @@ cmd_set_text_full (WorkbookControl *wbc, GSList *selection, GnmEvalPos *ep,
same_text_and_not_same_markup = (same_text && !same_markup);
}
g_free (name);
-
+
/* We are combining this since we don't want to apply and undo twice.*/
if (same_text_and_not_same_markup || !autofit_col) {
- GnmCell *cell = sheet_cell_fetch
+ GnmCell *cell = sheet_cell_fetch
(sheet, ep->eval.col, ep->eval.row);
gboolean nvis;
@@ -1011,42 +1011,42 @@ cmd_set_text_full (WorkbookControl *wbc, GSList *selection, GnmEvalPos *ep,
GnmRange *new_r;
new_r = g_new (GnmRange, 1);
- *new_r = *r;
- redo = go_undo_combine
- (go_undo_binary_new
- (sheet, new_r,
+ *new_r = *r;
+ redo = go_undo_combine
+ (go_undo_binary_new
+ (sheet, new_r,
(GOUndoBinaryFunc) colrow_autofit_row,
NULL, g_free),
redo);
- cri_row_list = colrow_get_index_list
+ cri_row_list = colrow_get_index_list
(r->start.row, r->end.row, cri_row_list);
if (autofit_col) {
new_r = g_new (GnmRange, 1);
- *new_r = *r;
- redo = go_undo_combine
- (go_undo_binary_new
- (sheet, new_r,
+ *new_r = *r;
+ redo = go_undo_combine
+ (go_undo_binary_new
+ (sheet, new_r,
(GOUndoBinaryFunc) colrow_autofit_col,
NULL, g_free),
redo);
- cri_col_list = colrow_get_index_list
+ cri_col_list = colrow_get_index_list
(r->start.col, r->end.col, cri_col_list);
}
}
undo = go_undo_combine (undo,
- gnm_undo_colrow_restore_state_group_new
- (sheet, TRUE,
- cri_col_list,
+ gnm_undo_colrow_restore_state_group_new
+ (sheet, TRUE,
+ cri_col_list,
colrow_get_sizes (sheet, TRUE,
cri_col_list, -1)));
undo = go_undo_combine (undo,
- gnm_undo_colrow_restore_state_group_new
- (sheet, FALSE,
- cri_row_list,
+ gnm_undo_colrow_restore_state_group_new
+ (sheet, FALSE,
+ cri_row_list,
colrow_get_sizes (sheet, FALSE,
cri_row_list, -1)));
-
+
result = cmd_generic (wbc, text, undo, redo);
g_free (text);
@@ -1147,39 +1147,39 @@ cmd_area_set_array_expr (WorkbookControl *wbc, SheetView *sv,
r = selection->data;
- cri_row_list = colrow_get_index_list
+ cri_row_list = colrow_get_index_list
(r->start.row, r->end.row, NULL);
- cri_col_list = colrow_get_index_list
+ cri_col_list = colrow_get_index_list
(r->start.col, r->end.col, NULL);
undo = clipboard_copy_range_undo (sheet, selection->data);
undo = go_undo_combine (undo,
- gnm_undo_colrow_restore_state_group_new
- (sheet, TRUE,
- cri_col_list,
+ gnm_undo_colrow_restore_state_group_new
+ (sheet, TRUE,
+ cri_col_list,
colrow_get_sizes (sheet, TRUE,
cri_col_list, -1)));
undo = go_undo_combine (undo,
- gnm_undo_colrow_restore_state_group_new
- (sheet, FALSE,
- cri_row_list,
+ gnm_undo_colrow_restore_state_group_new
+ (sheet, FALSE,
+ cri_row_list,
colrow_get_sizes (sheet, FALSE,
cri_row_list, -1)));
-
+
sr = gnm_sheet_range_new (sheet, r);
r_1 = g_new (GnmRange, 1);
*r_1 = *r;
r_2 = g_new (GnmRange, 1);
*r_2 = *r;
redo = gnm_cell_set_array_formula_undo (sr, texpr);
- redo = go_undo_combine
- (go_undo_binary_new
- (sheet, r_1,
+ redo = go_undo_combine
+ (go_undo_binary_new
+ (sheet, r_1,
(GOUndoBinaryFunc) colrow_autofit_col,
NULL, g_free),
redo);
- redo = go_undo_combine
- (go_undo_binary_new
- (sheet, r_2,
+ redo = go_undo_combine
+ (go_undo_binary_new
+ (sheet, r_2,
(GOUndoBinaryFunc) colrow_autofit_row,
NULL, g_free),
redo);
@@ -1440,11 +1440,11 @@ cmd_insert_cols (WorkbookControl *wbc,
r.end.col += count;
if (gnm_sheet_get_last_col (sheet) < r.end.col) {
- go_gtk_notice_dialog (wbcg_toplevel (WBC_GTK (wbc)), GTK_MESSAGE_ERROR,
+ go_gtk_notice_dialog (wbcg_toplevel (WBC_GTK (wbc)), GTK_MESSAGE_ERROR,
ngettext ("Inserting %i column before column %s would push data off the sheet. "
"Please enlarge the sheet first.",
"Inserting %i columns before column %s would push data off the sheet. "
- "Please enlarge the sheet first.",
+ "Please enlarge the sheet first.",
count),
count, col_name (start_col));
return TRUE;
@@ -1468,11 +1468,11 @@ cmd_insert_rows (WorkbookControl *wbc,
r.end.row += count;
if (gnm_sheet_get_last_row (sheet) < r.end.row) {
- go_gtk_notice_dialog (wbcg_toplevel (WBC_GTK (wbc)), GTK_MESSAGE_ERROR,
+ go_gtk_notice_dialog (wbcg_toplevel (WBC_GTK (wbc)), GTK_MESSAGE_ERROR,
ngettext ("Inserting %i row before row %s would push data off the sheet. "
"Please enlarge the sheet first.",
"Inserting %i rows before row %s would push data off the sheet. "
- "Please enlarge the sheet first.",
+ "Please enlarge the sheet first.",
count),
count, row_name (start_row));
return TRUE;
@@ -1512,11 +1512,11 @@ cmd_delete_rows (WorkbookControl *wbc,
typedef struct {
GSList *selection;
- GnmRange const *r;
+ GnmRange const *r;
} cmd_selection_clear_row_handler_t;
static gboolean
-cmd_selection_clear_row_handler (GnmColRowIter const *iter,
+cmd_selection_clear_row_handler (GnmColRowIter const *iter,
cmd_selection_clear_row_handler_t *data)
{
if ((!iter->cri->in_filter) || iter->cri->visible) {
@@ -1548,7 +1548,7 @@ cmd_selection_clear (WorkbookControl *wbc, int clear_flags)
for (ranges = selection; ranges != NULL ; ranges = ranges->next) {
GnmFilter *filter;
data.r = ranges->data;
- filter = gnm_sheet_filter_intersect_rows
+ filter = gnm_sheet_filter_intersect_rows
(sheet, data.r->start.row, data.r->end.row);
if (filter) {
colrow_foreach (&sheet->rows, data.r->start.row, data.r->end.row,
@@ -1563,7 +1563,7 @@ cmd_selection_clear (WorkbookControl *wbc, int clear_flags)
/* We should first determine whether we break anything by clearing */
/* Check for array subdivision *//* Check for locked cells */
if (sheet_ranges_split_region (sheet, selection,
- GO_CMD_CONTEXT (wbc), _("Clear")) ||
+ GO_CMD_CONTEXT (wbc), _("Clear")) ||
cmd_selection_is_locked_effective (sheet, selection, wbc, _("Clear"))) {
range_fragment_free (selection);
return TRUE;
@@ -1606,15 +1606,15 @@ cmd_selection_clear (WorkbookControl *wbc, int clear_flags)
g_string_free (types, TRUE);
size = g_slist_length (selection);
-
+
/* We are now ready to build the redo and undo items */
for (ranges = selection; ranges != NULL ; ranges = ranges->next) {
GnmRange const *r = ranges->data;
GnmSheetRange *sr = gnm_sheet_range_new (sheet, r);
undo = go_undo_combine (undo, clipboard_copy_range_undo (sheet, r));
- redo = go_undo_combine
- (redo, sheet_clear_region_undo
+ redo = go_undo_combine
+ (redo, sheet_clear_region_undo
(sr, clear_flags | CLEAR_NOCHECKARRAY | CLEAR_RECALC_DEPS));
}
@@ -1867,7 +1867,7 @@ cmd_selection_format (WorkbookControl *wbc,
static gboolean
cmd_selection_format_toggle_font_style_filter (PangoAttribute *attribute, PangoAttrType *pt)
{
- return ((attribute->klass->type == *pt) ||
+ return ((attribute->klass->type == *pt) ||
((PANGO_ATTR_RISE == *pt) && (attribute->klass->type == PANGO_ATTR_SCALE)));
}
@@ -1885,7 +1885,7 @@ cmd_selection_format_toggle_font_style_cb (GnmCellIter const *iter, csftfs *clos
const PangoAttrList *old_markup =
go_format_get_markup (fmt);
PangoAttrList *new_markup = pango_attr_list_copy ((PangoAttrList *)old_markup);
- PangoAttrList *other = pango_attr_list_filter
+ PangoAttrList *other = pango_attr_list_filter
(new_markup,
(PangoAttrFilterFunc) cmd_selection_format_toggle_font_style_filter,
&closure->pt);
@@ -1894,7 +1894,7 @@ cmd_selection_format_toggle_font_style_cb (GnmCellIter const *iter, csftfs *clos
GnmRange r;
range_init_cellpos (&r, &iter->pp.eval);
sr = gnm_sheet_range_new (iter->pp.sheet, &r);
- closure->undo = go_undo_combine (closure->undo,
+ closure->undo = go_undo_combine (closure->undo,
sheet_range_set_markup_undo (sr, new_markup));
}
pango_attr_list_unref (new_markup);
@@ -1904,7 +1904,7 @@ cmd_selection_format_toggle_font_style_cb (GnmCellIter const *iter, csftfs *clos
return NULL;
}
-gboolean
+gboolean
cmd_selection_format_toggle_font_style (WorkbookControl *wbc,
GnmStyle *style, GnmStyleElement t)
{
@@ -1938,7 +1938,7 @@ cmd_selection_format_toggle_font_style (WorkbookControl *wbc,
pt = PANGO_ATTR_INVALID;
break;
}
-
+
name = undo_range_list_name (sheet, selection);
text = g_strdup_printf (_("Setting Font Style of %s"), name);
@@ -1946,10 +1946,10 @@ cmd_selection_format_toggle_font_style (WorkbookControl *wbc,
for (l = selection; l != NULL; l = l->next) {
GnmSheetRange *sr;
- undo = go_undo_combine
+ undo = go_undo_combine
(undo, clipboard_copy_range_undo (sheet, l->data));
sr = gnm_sheet_range_new (sheet, l->data);
- redo = go_undo_combine
+ redo = go_undo_combine
(redo, sheet_apply_style_undo (sr, style));
if (pt != PANGO_ATTR_INVALID) {
csftfs closure;
@@ -2027,7 +2027,7 @@ cmd_resize_colrow (WorkbookControl *wbc, Sheet *sheet,
g_string_free (list, TRUE);
saved_state = colrow_get_sizes (sheet, is_cols, selection, new_size);;
- undo = gnm_undo_colrow_restore_state_group_new
+ undo = gnm_undo_colrow_restore_state_group_new
(sheet, is_cols, colrow_index_list_copy (selection), saved_state);
redo = gnm_undo_colrow_set_sizes_new (sheet, is_cols, selection, new_size, NULL);
@@ -2039,7 +2039,7 @@ cmd_resize_colrow (WorkbookControl *wbc, Sheet *sheet,
}
gboolean
-cmd_autofit_selection (WorkbookControl *wbc, SheetView *sv, Sheet *sheet, gboolean fit_width,
+cmd_autofit_selection (WorkbookControl *wbc, SheetView *sv, Sheet *sheet, gboolean fit_width,
ColRowIndexList *selectionlist)
{
GOUndo *undo = NULL;
@@ -2048,19 +2048,19 @@ cmd_autofit_selection (WorkbookControl *wbc, SheetView *sv, Sheet *sheet, gboole
ColRowStateGroup *saved_state;
GSList *l, *selection = selection_get_ranges (sv, TRUE);
gchar *names = undo_range_list_name (sheet, selection);
- gchar const *format = fit_width ?
+ gchar const *format = fit_width ?
N_("Autofitting width of %s") : N_("Autofitting height of %s");
gchar *text = g_strdup_printf (_(format), names);
-
+
g_free (names);
-
+
saved_state = colrow_get_sizes (sheet, fit_width, selectionlist, -1);;
- undo = gnm_undo_colrow_restore_state_group_new
+ undo = gnm_undo_colrow_restore_state_group_new
(sheet, fit_width, colrow_index_list_copy (selectionlist), saved_state);
for (l = selection; l != NULL; l = l->next)
- redo = go_undo_combine
- (redo, gnm_undo_colrow_set_sizes_new
+ redo = go_undo_combine
+ (redo, gnm_undo_colrow_set_sizes_new
(sheet, fit_width, NULL, -1, l->data));
result = cmd_generic (wbc, text, undo, redo);
@@ -2289,16 +2289,16 @@ cmd_selection_colrow_hide (WorkbookControl *wbc,
int i, max = gnm_sheet_get_max_cols (sheet);
ColRowInfo *ci;
for (i = 0 ; i < max ; i++)
- if (NULL ==
- (ci = sheet_col_get (sheet, i)) ||
+ if (NULL ==
+ (ci = sheet_col_get (sheet, i)) ||
(ci->visible))
count++;
} else {
int i, max = gnm_sheet_get_max_rows (sheet);
ColRowInfo *ci;
for (i = 0 ; i < max ; i++)
- if (NULL ==
- (ci = sheet_row_get (sheet, i)) ||
+ if (NULL ==
+ (ci = sheet_row_get (sheet, i)) ||
(ci->visible))
count++;
}
@@ -2312,13 +2312,13 @@ cmd_selection_colrow_hide (WorkbookControl *wbc,
"If you do so you can unhide them with the "
"'Format\xe2\x86\x92Row\xe2\x86\x92Unhide' "
"menu item.");
- if (!go_gtk_query_yes_no (wbcg_toplevel (WBC_GTK (wbc)),
+ if (!go_gtk_query_yes_no (wbcg_toplevel (WBC_GTK (wbc)),
FALSE, "%s", text)) {
colrow_vis_list_destroy (show);
colrow_vis_list_destroy (hide);
return TRUE;
}
- }
+ }
}
me = g_object_new (CMD_COLROW_HIDE_TYPE, NULL);
@@ -3012,11 +3012,11 @@ cmd_paste_copy_impl (GnmCommand *cmd, WorkbookControl *wbc,
/* Select the newly pasted contents (this queues a redraw) */
if (me->only_objects && IS_WBC_GTK (wbc)) {
- SheetControlGUI *scg =
- wbcg_get_nth_scg (WBC_GTK (wbc),
+ SheetControlGUI *scg =
+ wbcg_get_nth_scg (WBC_GTK (wbc),
cmd->sheet->index_in_wb);
scg_object_unselect (scg, NULL);
- g_slist_foreach (me->pasted_objects,
+ g_slist_foreach (me->pasted_objects,
(GFunc) cmd_paste_copy_select_obj, scg);
}
select_range (me->dst.sheet, &me->dst.range, wbc);
@@ -3041,11 +3041,11 @@ cmd_paste_copy_finalize (GObject *cmd)
{
CmdPasteCopy *me = CMD_PASTE_COPY (cmd);
- me->saved_sizes_rows = colrow_state_group_destroy
+ me->saved_sizes_rows = colrow_state_group_destroy
(me->saved_sizes_rows);
colrow_index_list_destroy (me->saved_list_rows);
me->saved_list_rows = NULL;
- me->saved_sizes_cols = colrow_state_group_destroy
+ me->saved_sizes_cols = colrow_state_group_destroy
(me->saved_sizes_cols);
colrow_index_list_destroy (me->saved_list_cols);
me->saved_list_cols = NULL;
@@ -3098,7 +3098,7 @@ cmd_paste_copy (WorkbookControl *wbc,
if (!me->only_objects) {
/* see if we need to do any tiling */
GnmRange *r = &me->dst.range;
- if (g_slist_length (cr->merged) == 1 &&
+ if (g_slist_length (cr->merged) == 1 &&
(NULL != (merge_src = cr->merged->data)) &&
range_height (merge_src) == cr->rows &&
range_width (merge_src) == cr->cols) {
@@ -3168,9 +3168,9 @@ cmd_paste_copy (WorkbookControl *wbc,
}
if (n_c * (gnm_float)n_r > 10000.) {
- char *number = g_strdup_printf ("%0.0" GNM_FORMAT_f,
+ char *number = g_strdup_printf ("%0.0" GNM_FORMAT_f,
(gnm_float)n_c * (gnm_float)n_r);
- gboolean result = go_gtk_query_yes_no (wbcg_toplevel (WBC_GTK (wbc)), FALSE,
+ gboolean result = go_gtk_query_yes_no (wbcg_toplevel (WBC_GTK (wbc)), FALSE,
_("Do you really want to paste "
"%s copies?"), number);
g_free (number);
@@ -3192,7 +3192,7 @@ cmd_paste_copy (WorkbookControl *wbc,
/* no need to test if all we have are objects or are copying from */
/*a single merge to a single merge*/
- if ((!me->only_objects) && (!me->single_merge_to_single_merge)&&
+ if ((!me->only_objects) && (!me->single_merge_to_single_merge)&&
sheet_range_splits_region (pt->sheet, &me->dst.range,
NULL, GO_CMD_CONTEXT (wbc), me->cmd.cmd_descriptor)) {
g_object_unref (me);
@@ -5967,7 +5967,7 @@ cmd_define_name (WorkbookControl *wbc, char const *name,
g_return_val_if_fail (texpr != NULL, TRUE);
if (name[0] == '\0') {
- go_cmd_context_error_invalid
+ go_cmd_context_error_invalid
(GO_CMD_CONTEXT (wbc), _("Defined Name"),
_("An empty string is not allowed as defined name."));
gnm_expr_top_unref (texpr);
@@ -5976,9 +5976,9 @@ cmd_define_name (WorkbookControl *wbc, char const *name,
sheet = wb_control_cur_sheet (wbc);
if (!expr_name_validate (name)) {
- gchar *err = g_strdup_printf
+ gchar *err = g_strdup_printf
(_("'%s' is not allowed as defined name."), name);
- go_cmd_context_error_invalid (GO_CMD_CONTEXT (wbc),
+ go_cmd_context_error_invalid (GO_CMD_CONTEXT (wbc),
_("Defined Name"), err);
g_free (err);
gnm_expr_top_unref (texpr);
@@ -7765,16 +7765,16 @@ cmd_autofilter_add_remove (WorkbookControl *wbc)
if (src == NULL)
return TRUE;
- f_old = gnm_sheet_filter_intersect_rows
+ f_old = gnm_sheet_filter_intersect_rows
(sv->sheet, src->start.row, src->end.row);
if (f_old != NULL) {
- GnmRange *r = gnm_sheet_filter_can_be_extended
+ GnmRange *r = gnm_sheet_filter_can_be_extended
(sv->sheet, f_old, src);
if (r == NULL) {
char *error;
name = undo_range_name (sv->sheet, &(f_old->r));
- error = g_strdup_printf
+ error = g_strdup_printf
(_("Auto Filter blocked by %s"),
name);
g_free(name);
@@ -7785,13 +7785,13 @@ cmd_autofilter_add_remove (WorkbookControl *wbc)
return TRUE;
}
/* extending existing filter. */
- undo = go_undo_binary_new
- (gnm_filter_ref (f_old), sv->sheet,
+ undo = go_undo_binary_new
+ (gnm_filter_ref (f_old), sv->sheet,
(GOUndoBinaryFunc) gnm_filter_attach,
(GFreeFunc) gnm_filter_unref,
NULL);
redo = go_undo_unary_new
- (gnm_filter_ref (f_old),
+ (gnm_filter_ref (f_old),
(GOUndoUnaryFunc) gnm_filter_remove,
(GFreeFunc) gnm_filter_unref);
gnm_filter_remove (f_old);
@@ -7827,30 +7827,30 @@ cmd_autofilter_add_remove (WorkbookControl *wbc)
if (f_old)
gnm_filter_attach (f_old, sv->sheet);
- redo = go_undo_combine (go_undo_binary_new
- (gnm_filter_ref (f), sv->sheet,
+ redo = go_undo_combine (go_undo_binary_new
+ (gnm_filter_ref (f), sv->sheet,
(GOUndoBinaryFunc) gnm_filter_attach,
(GFreeFunc) gnm_filter_unref,
NULL), redo);
undo = go_undo_combine (undo,
go_undo_unary_new
- (f,
+ (f,
(GOUndoUnaryFunc) gnm_filter_remove,
(GFreeFunc) gnm_filter_unref));
name = undo_range_name (sv->sheet, &(f->r));
- descr = g_strdup_printf
+ descr = g_strdup_printf
((f_old == NULL) ? _("Add Autofilter to %s")
: _("Extend Autofilter to %s"),
name);
} else {
- undo = go_undo_binary_new
- (gnm_filter_ref (f), sv->sheet,
+ undo = go_undo_binary_new
+ (gnm_filter_ref (f), sv->sheet,
(GOUndoBinaryFunc) gnm_filter_attach,
(GFreeFunc) gnm_filter_unref,
NULL);
redo = go_undo_unary_new
- (gnm_filter_ref (f),
+ (gnm_filter_ref (f),
(GOUndoUnaryFunc) gnm_filter_remove,
(GFreeFunc) gnm_filter_unref);
name = undo_range_name (sv->sheet, &(f->r));
@@ -7867,26 +7867,26 @@ cmd_autofilter_add_remove (WorkbookControl *wbc)
/******************************************************************/
-gboolean cmd_autofilter_set_condition (WorkbookControl *wbc,
- GnmFilter *filter, unsigned i,
+gboolean cmd_autofilter_set_condition (WorkbookControl *wbc,
+ GnmFilter *filter, unsigned i,
GnmFilterCondition *cond)
{
char *descr = NULL, *name = NULL;
GOUndo *undo = NULL;
GOUndo *redo = NULL;
gboolean result;
-
- undo = gnm_undo_filter_set_condition_new (filter, i,
+
+ undo = gnm_undo_filter_set_condition_new (filter, i,
NULL, TRUE);
g_return_val_if_fail (undo != NULL, TRUE);
- redo = gnm_undo_filter_set_condition_new (filter, i,
+ redo = gnm_undo_filter_set_condition_new (filter, i,
cond, FALSE);
g_return_val_if_fail (redo != NULL, TRUE);
name = undo_range_name (filter->sheet, &(filter->r));
descr = g_strdup_printf (_("Change filter condition for %s"),
name);
-
+
result = cmd_generic (wbc, descr, undo, redo);
g_free (name);
g_free (descr);
@@ -7897,8 +7897,8 @@ gboolean cmd_autofilter_set_condition (WorkbookControl *wbc,
/******************************************************************/
-static void
-cmd_page_breaks_set_breaks (Sheet *sheet,
+static void
+cmd_page_breaks_set_breaks (Sheet *sheet,
GnmPageBreaks const *breaks)
{
print_info_set_breaks (sheet->print_info, gnm_page_breaks_dup (breaks));
@@ -7916,39 +7916,39 @@ cmd_page_breaks_clear (WorkbookControl *wbc, Sheet *sheet)
g_return_val_if_fail (sheet != NULL, TRUE);
if (sheet->print_info->page_breaks.v != NULL) {
- redo = go_undo_binary_new
- (sheet,
- gnm_page_breaks_new (TRUE),
+ redo = go_undo_binary_new
+ (sheet,
+ gnm_page_breaks_new (TRUE),
(GOUndoBinaryFunc) cmd_page_breaks_set_breaks,
- NULL,
+ NULL,
(GFreeFunc) gnm_page_breaks_free);
- undo = go_undo_binary_new
- (sheet,
- gnm_page_breaks_dup
- (sheet->print_info->page_breaks.v),
+ undo = go_undo_binary_new
+ (sheet,
+ gnm_page_breaks_dup
+ (sheet->print_info->page_breaks.v),
(GOUndoBinaryFunc) cmd_page_breaks_set_breaks,
- NULL,
+ NULL,
(GFreeFunc) gnm_page_breaks_free);
}
if (sheet->print_info->page_breaks.h != NULL) {
- redo = go_undo_combine
- (redo,
- go_undo_binary_new
- (sheet,
- gnm_page_breaks_new (FALSE),
+ redo = go_undo_combine
+ (redo,
+ go_undo_binary_new
+ (sheet,
+ gnm_page_breaks_new (FALSE),
(GOUndoBinaryFunc) cmd_page_breaks_set_breaks,
- NULL,
+ NULL,
(GFreeFunc) gnm_page_breaks_free));
-
- undo = go_undo_combine
+
+ undo = go_undo_combine
(undo,
- go_undo_binary_new
- (sheet,
- gnm_page_breaks_dup
- (sheet->print_info->page_breaks.h),
+ go_undo_binary_new
+ (sheet,
+ gnm_page_breaks_dup
+ (sheet->print_info->page_breaks.h),
(GOUndoBinaryFunc) cmd_page_breaks_set_breaks,
- NULL,
+ NULL,
(GFreeFunc) gnm_page_breaks_free));
}
@@ -7958,7 +7958,7 @@ cmd_page_breaks_clear (WorkbookControl *wbc, Sheet *sheet)
return TRUE;
}
-gboolean
+gboolean
cmd_page_break_toggle (WorkbookControl *wbc, Sheet *sheet, gboolean is_vert)
{
SheetView const *sv = wb_control_cur_sheet_view (wbc);
@@ -7971,7 +7971,7 @@ cmd_page_break_toggle (WorkbookControl *wbc, Sheet *sheet, gboolean is_vert)
GOUndo *undo;
GOUndo *redo;
- target = is_vert ? sheet->print_info->page_breaks.v
+ target = is_vert ? sheet->print_info->page_breaks.v
: sheet->print_info->page_breaks.h;
old = (target == NULL) ? gnm_page_breaks_new (is_vert)
@@ -7988,17 +7988,17 @@ cmd_page_break_toggle (WorkbookControl *wbc, Sheet *sheet, gboolean is_vert)
gnm_page_breaks_set_break (new, rc, type);
- redo = go_undo_binary_new
- (sheet, new,
+ redo = go_undo_binary_new
+ (sheet, new,
(GOUndoBinaryFunc) cmd_page_breaks_set_breaks,
- NULL,
+ NULL,
(GFreeFunc) gnm_page_breaks_free);
- undo = go_undo_binary_new
- (sheet, old,
+ undo = go_undo_binary_new
+ (sheet, old,
(GOUndoBinaryFunc) cmd_page_breaks_set_breaks,
- NULL,
+ NULL,
(GFreeFunc) gnm_page_breaks_free);
-
+
return cmd_generic (wbc, label, undo, redo);
}
diff --git a/src/commands.h b/src/commands.h
index 78a2b6a..4d2c75c 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -17,10 +17,10 @@ void command_list_release (GSList *cmds);
GString *gnm_cmd_trunc_descriptor (GString *src, gboolean *truncated);
gboolean cmd_cell_range_is_locked_effective (Sheet *sheet, GnmRange *range,
- WorkbookControl *wbc,
+ WorkbookControl *wbc,
char const *cmd_name);
gboolean cmd_selection_is_locked_effective (Sheet *sheet, GSList *selection,
- WorkbookControl *wbc,
+ WorkbookControl *wbc,
char const *cmd_name);
/* Commands: note that any extensions should ideally use cmd_generic* */
@@ -57,8 +57,8 @@ gboolean cmd_delete_rows (WorkbookControl *wbc, Sheet *sheet,
gboolean cmd_resize_colrow (WorkbookControl *wbc, Sheet *sheet,
gboolean is_col, ColRowIndexList *selection,
int new_size);
-gboolean cmd_autofit_selection (WorkbookControl *wbc, SheetView *sv, Sheet *sheet,
- gboolean fit_width,
+gboolean cmd_autofit_selection (WorkbookControl *wbc, SheetView *sv, Sheet *sheet,
+ gboolean fit_width,
ColRowIndexList *selectionlist);
gboolean cmd_paste_cut (WorkbookControl *wbc,
@@ -138,7 +138,7 @@ gboolean cmd_define_name (WorkbookControl *wbc, char const *name,
GnmExprTop const *texpr,
char const *descriptor);
gboolean cmd_remove_name (WorkbookControl *wbc, GnmNamedExpr *nexpr);
-gboolean cmd_rescope_name (WorkbookControl *wbc, GnmNamedExpr *nexpr,
+gboolean cmd_rescope_name (WorkbookControl *wbc, GnmNamedExpr *nexpr,
Sheet *scope);
gboolean cmd_scenario_add (WorkbookControl *wbc, GnmScenario *s, Sheet *sheet);
@@ -163,8 +163,8 @@ gboolean cmd_tabulate (WorkbookControl *wbc, gpointer data);
gboolean cmd_toggle_rtl (WorkbookControl *wbc, Sheet *sheet);
gboolean cmd_autofilter_add_remove (WorkbookControl *wbc);
-gboolean cmd_autofilter_set_condition (WorkbookControl *wbc,
- GnmFilter *filter, unsigned i,
+gboolean cmd_autofilter_set_condition (WorkbookControl *wbc,
+ GnmFilter *filter, unsigned i,
GnmFilterCondition *cond);
/************************** Sheet Objects **************************************/
diff --git a/src/dead-kittens.h b/src/dead-kittens.h
index 9ca5477..e015854 100644
--- a/src/dead-kittens.h
+++ b/src/dead-kittens.h
@@ -4,7 +4,7 @@
/* To be included only from C files, not headers. */
#ifndef HAVE_GTK_ENTRY_GET_TEXT_LENGTH
-#define gtk_entry_get_text_length(x) g_utf8_strlen (gtk_entry_get_text (x), -1)
+#define gtk_entry_get_text_length(x) g_utf8_strlen (gtk_entry_get_text (x), -1)
#endif
#ifndef HAVE_GTK_LAYOUT_GET_BIN_WINDOW
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index b59647b..1ef391d 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -45,7 +45,7 @@
2010-09-15 Andreas J. Guelzow <aguelzow pyrshep ca>
- * dialog-sheet-order.c (cb_color_changed_fore): handle multiple
+ * dialog-sheet-order.c (cb_color_changed_fore): handle multiple
selection
(cb_color_changed_back): ditto
(cb_selection_changed): ditto
@@ -72,7 +72,7 @@
2010-07-30 Andreas J. Guelzow <aguelzow pyrshep ca>
- * dialog-autofilter.c (dialog_auto_filter): set up column label for
+ * dialog-autofilter.c (dialog_auto_filter): set up column label for
top 10 dialog; use separate keys otherwise they share their size.
* src/dialogs/autofilter-top10.glade: add label
@@ -87,12 +87,12 @@
2010-07-30 Andreas J. Guelzow <aguelzow pyrshep ca>
- * dialog-autofilter.c (cb_autofilter_ok): use
+ * dialog-autofilter.c (cb_autofilter_ok): use
cmd_autofilter_set_condition
-
+
2010-07-29 Andreas J. Guelzow <aguelzow pyrshep ca>
- * dialog-row-height.c (dialog_row_height): make sure the spin
+ * dialog-row-height.c (dialog_row_height): make sure the spin
box is at least 1, since 0 stands for "default".
2010-07-29 Morten Welinder <terra gnome org>
diff --git a/src/dialogs/dialog-advanced-filter.c b/src/dialogs/dialog-advanced-filter.c
index da8dd27..ba64cc9 100644
--- a/src/dialogs/dialog-advanced-filter.c
+++ b/src/dialogs/dialog-advanced-filter.c
@@ -143,7 +143,7 @@ advanced_filter_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
dao, data, analysis_tool_advanced_filter_engine)) {
err = data->base.err;
g_free (data);
- } else
+ } else
err = analysis_tools_noerr;
}
diff --git a/src/dialogs/dialog-analysis-tool-chi-squared.c b/src/dialogs/dialog-analysis-tool-chi-squared.c
index eae2412..2f30772 100644
--- a/src/dialogs/dialog-analysis-tool-chi-squared.c
+++ b/src/dialogs/dialog-analysis-tool-chi-squared.c
@@ -227,17 +227,17 @@ dialog_chi_square_tool (WBCGtk *wbcg, Sheet *sheet, gboolean independence)
type ="test-of-independence";
else
type ="test-of-homogeneity";
- gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON (go_gtk_builder_get_widget (state->base.gui,
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON (go_gtk_builder_get_widget (state->base.gui,
type)),
TRUE);
- state->label = tool_setup_update
+ state->label = tool_setup_update
(&state->base, "labels_button",
G_CALLBACK (chi_squared_tool_update_sensitivity_cb),
state);
- state->alpha_entry = tool_setup_update
+ state->alpha_entry = tool_setup_update
(&state->base, "alpha-entry",
G_CALLBACK (chi_squared_tool_update_sensitivity_cb),
state);
diff --git a/src/dialogs/dialog-analysis-tool-frequency.c b/src/dialogs/dialog-analysis-tool-frequency.c
index 4c4d5df..79637c6 100644
--- a/src/dialogs/dialog-analysis-tool-frequency.c
+++ b/src/dialogs/dialog-analysis-tool-frequency.c
@@ -261,18 +261,18 @@ dialog_frequency_tool (WBCGtk *wbcg, Sheet *sheet)
0))
return 0;
- state->predetermined_button = tool_setup_update
+ state->predetermined_button = tool_setup_update
(&state->base, "pre_determined_button",
G_CALLBACK (frequency_tool_update_sensitivity_cb),
- state);
+ state);
- state->calculated_button = tool_setup_update
+ state->calculated_button = tool_setup_update
(&state->base, "calculated_button",
G_CALLBACK (frequency_tool_update_sensitivity_cb),
- state);
+ state);
- state->n_entry =
- GTK_ENTRY(tool_setup_update
+ state->n_entry =
+ GTK_ENTRY(tool_setup_update
(&state->base, "n_entry",
G_CALLBACK (frequency_tool_update_sensitivity_cb),
state));
diff --git a/src/dialogs/dialog-analysis-tool-normality.c b/src/dialogs/dialog-analysis-tool-normality.c
index fad1e47..3881d02 100644
--- a/src/dialogs/dialog-analysis-tool-normality.c
+++ b/src/dialogs/dialog-analysis-tool-normality.c
@@ -205,9 +205,9 @@ dialog_normality_tool (WBCGtk *wbcg, Sheet *sheet)
return 0;
- state->alpha_entry = tool_setup_update
+ state->alpha_entry = tool_setup_update
(&state->base, "alpha-entry",
- G_CALLBACK (normality_tool_update_sensitivity_cb),
+ G_CALLBACK (normality_tool_update_sensitivity_cb),
state);
float_to_entry (GTK_ENTRY (state->alpha_entry), 0.05);
diff --git a/src/dialogs/dialog-analysis-tool-principal-components.c b/src/dialogs/dialog-analysis-tool-principal-components.c
index f05b4ee..3651f4f 100644
--- a/src/dialogs/dialog-analysis-tool-principal-components.c
+++ b/src/dialogs/dialog-analysis-tool-principal-components.c
@@ -152,7 +152,7 @@ int
dialog_principal_components_tool (WBCGtk *wbcg, Sheet *sheet)
{
GenericToolState *state;
- char const * plugins[] = { "Gnumeric_fnstat",
+ char const * plugins[] = { "Gnumeric_fnstat",
"Gnumeric_fnmath",
"Gnumeric_fnlogical",
NULL};
diff --git a/src/dialogs/dialog-analysis-tool-sign-test.c b/src/dialogs/dialog-analysis-tool-sign-test.c
index 8c94aa7..cac6655 100644
--- a/src/dialogs/dialog-analysis-tool-sign-test.c
+++ b/src/dialogs/dialog-analysis-tool-sign-test.c
@@ -138,7 +138,7 @@ sign_test_two_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy,
state->base.sheet);
if (input_range == NULL || input_range->type != VALUE_CELLRANGE) {
gtk_label_set_text (GTK_LABEL (state->base.warning),
- (state->base.input_entry_2 == NULL)
+ (state->base.input_entry_2 == NULL)
? _("The input range is invalid.")
: _("The first input range is invalid."));
gtk_widget_set_sensitive (state->base.ok_button, FALSE);
@@ -167,12 +167,12 @@ sign_test_two_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy,
GnmRange r;
range_init_rangeref (&r, &(input_range->v_range.cell));
value_release (input_range);
- if (w != range_width (&r) ||
+ if (w != range_width (&r) ||
h != range_height (&r)) {
- gtk_label_set_text
+ gtk_label_set_text
(GTK_LABEL (state->base.warning),
_("The input ranges do not have the same shape."));
- gtk_widget_set_sensitive
+ gtk_widget_set_sensitive
(state->base.ok_button, FALSE);
return;
@@ -206,7 +206,7 @@ sign_test_two_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
(GNM_EXPR_ENTRY (state->base.input_entry_2), state->base.sheet);
w = go_gtk_builder_get_widget (state->base.gui, "labels_button");
- data->base.labels = gtk_toggle_button_get_active
+ data->base.labels = gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (w));
err = entry_to_float
@@ -217,10 +217,10 @@ sign_test_two_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
w = go_gtk_builder_get_widget (state->base.gui, "signtest");
engine = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w))
- ? analysis_tool_sign_test_two_engine
+ ? analysis_tool_sign_test_two_engine
: analysis_tool_signed_rank_test_two_engine;
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg),
+ if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg),
state->base.sheet,
dao, data, engine))
gtk_widget_destroy (state->base.dialog);
@@ -257,28 +257,28 @@ dialog_sign_test_two_tool (WBCGtk *wbcg, Sheet *sheet, signtest_type type)
GNUMERIC_HELP_LINK_SIGN_TEST,
"sign-test-two.ui", "Sign-Test",
_("Could not create the Sign Test Tool dialog."),
- SIGN_TEST_KEY_TWO,
- G_CALLBACK (sign_test_two_tool_ok_clicked_cb),
- NULL,
- G_CALLBACK (sign_test_two_tool_update_sensitivity_cb),
+ SIGN_TEST_KEY_TWO,
+ G_CALLBACK (sign_test_two_tool_ok_clicked_cb),
+ NULL,
+ G_CALLBACK (sign_test_two_tool_update_sensitivity_cb),
GNM_EE_SINGLE_RANGE))
return 0;
- state->alpha_entry = tool_setup_update
+ state->alpha_entry = tool_setup_update
(&state->base, "alpha-entry",
- G_CALLBACK (sign_test_two_tool_update_sensitivity_cb),
+ G_CALLBACK (sign_test_two_tool_update_sensitivity_cb),
state);
float_to_entry (GTK_ENTRY (state->alpha_entry), 0.05);
- state->median_entry = tool_setup_update
+ state->median_entry = tool_setup_update
(&state->base, "median-entry",
G_CALLBACK (sign_test_two_tool_update_sensitivity_cb),
- state);
+ state);
int_to_entry (GTK_ENTRY (state->median_entry), 0);
w = go_gtk_builder_get_widget (state->base.gui,
- (type == SIGNTEST) ? "signtest"
+ (type == SIGNTEST) ? "signtest"
: "signedranktest");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), TRUE);
@@ -319,7 +319,7 @@ sign_test_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
data->base.group_by = gnm_gui_group_value (state->base.gui, grouped_by_group);
w = go_gtk_builder_get_widget (state->base.gui, "labels_button");
- data->base.labels = gtk_toggle_button_get_active
+ data->base.labels = gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (w));
err = entry_to_float
@@ -329,7 +329,7 @@ sign_test_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
w = go_gtk_builder_get_widget (state->base.gui, "signtest");
engine = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w))
- ? analysis_tool_sign_test_engine
+ ? analysis_tool_sign_test_engine
: analysis_tool_signed_rank_test_engine;
if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg), state->base.sheet,
@@ -358,7 +358,7 @@ sign_test_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy,
state->base.sheet);
if (input_range == NULL) {
gtk_label_set_text (GTK_LABEL (state->base.warning),
- (state->base.input_entry_2 == NULL)
+ (state->base.input_entry_2 == NULL)
? _("The input range is invalid.")
: _("The first input range is invalid."));
gtk_widget_set_sensitive (state->base.ok_button, FALSE);
@@ -402,28 +402,28 @@ dialog_sign_test_tool (WBCGtk *wbcg, Sheet *sheet, signtest_type type)
GNUMERIC_HELP_LINK_SIGN_TEST,
"sign-test.ui", "Sign-Test",
_("Could not create the Sign Test Tool dialog."),
- SIGN_TEST_KEY_ONE,
- G_CALLBACK (sign_test_tool_ok_clicked_cb),
- NULL,
- G_CALLBACK (sign_test_tool_update_sensitivity_cb),
+ SIGN_TEST_KEY_ONE,
+ G_CALLBACK (sign_test_tool_ok_clicked_cb),
+ NULL,
+ G_CALLBACK (sign_test_tool_update_sensitivity_cb),
0))
return 0;
- state->alpha_entry = tool_setup_update
+ state->alpha_entry = tool_setup_update
(&state->base, "alpha-entry",
- G_CALLBACK (sign_test_two_tool_update_sensitivity_cb),
+ G_CALLBACK (sign_test_two_tool_update_sensitivity_cb),
state);
- state->median_entry = tool_setup_update
+ state->median_entry = tool_setup_update
(&state->base, "median-entry",
G_CALLBACK (sign_test_two_tool_update_sensitivity_cb),
- state);
+ state);
int_to_entry (GTK_ENTRY (state->median_entry), 0);
float_to_entry (GTK_ENTRY (state->alpha_entry), 0.05);
w = go_gtk_builder_get_widget (state->base.gui,
- (type == SIGNTEST) ? "signtest"
+ (type == SIGNTEST) ? "signtest"
: "signedranktest");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), TRUE);
diff --git a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
index d81dd33..c0eb064 100644
--- a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
+++ b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
@@ -82,8 +82,8 @@ wilcoxon_mann_whitney_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy
GnmRange r;
if (rr != NULL) {
- group_by_t group_by
- = gnm_gui_group_value
+ group_by_t group_by
+ = gnm_gui_group_value
(state->gui, grouped_by_group);
range_init_rangeref (&r, rr);
len = (group_by == GROUPED_BY_ROW)
@@ -172,7 +172,7 @@ int
dialog_wilcoxon_m_w_tool (WBCGtk *wbcg, Sheet *sheet)
{
GenericToolState *state;
- char const * plugins[] = { "Gnumeric_fnstat",
+ char const * plugins[] = { "Gnumeric_fnstat",
"Gnumeric_fnmath",
"Gnumeric_fnlookup",
NULL};
@@ -197,7 +197,7 @@ dialog_wilcoxon_m_w_tool (WBCGtk *wbcg, Sheet *sheet)
GNM_EE_SINGLE_RANGE))
return 0;
- g_signal_connect_after
+ g_signal_connect_after
(G_OBJECT (go_gtk_builder_get_widget
(state->gui,
"grouped_by_row")), "toggled",
diff --git a/src/dialogs/dialog-analysis-tools.c b/src/dialogs/dialog-analysis-tools.c
index f7d4b55..34f6166 100644
--- a/src/dialogs/dialog-analysis-tools.c
+++ b/src/dialogs/dialog-analysis-tools.c
@@ -532,7 +532,7 @@ tool_load_selection (GenericToolState *state, gboolean allow_multiple)
}
-GtkWidget *
+GtkWidget *
tool_setup_update (GenericToolState* state, char const *name, GCallback cb,
gpointer closure)
{
@@ -2173,11 +2173,11 @@ regression_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
w = go_gtk_builder_get_widget (state->base.gui, "intercept-button");
data->intercept = 1 - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w));
- data->multiple_regression
- = !gtk_toggle_button_get_active
+ data->multiple_regression
+ = !gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (state->simple_linear_regression_radio));
- data->multiple_y = gtk_toggle_button_get_active
+ data->multiple_y = gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (state->switch_variables_check));
if (cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg), state->base.sheet,
@@ -2220,7 +2220,7 @@ regression_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy,
gint x_h, x_w;
gboolean switch_v;
- switch_v = gtk_toggle_button_get_active
+ switch_v = gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (state->switch_variables_check));
/* Checking Input Range */
@@ -2319,32 +2319,32 @@ regression_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy,
}
static void
-regression_tool_regression_radio_toggled_cb (G_GNUC_UNUSED
+regression_tool_regression_radio_toggled_cb (G_GNUC_UNUSED
GtkToggleButton *togglebutton,
- RegressionToolState *state)
+ RegressionToolState *state)
{
- if (!gtk_toggle_button_get_active
+ if (!gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (state->simple_linear_regression_radio)))
- gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON (state->switch_variables_check),
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON (state->switch_variables_check),
FALSE);
}
static void
-regression_tool_regression_check_toggled_cb (G_GNUC_UNUSED
+regression_tool_regression_check_toggled_cb (G_GNUC_UNUSED
GtkToggleButton *togglebutton,
- RegressionToolState *state)
+ RegressionToolState *state)
{
GtkWidget *w1, *w2;
w1 = go_gtk_builder_get_widget (state->base.gui, "var1-label");
w2 = go_gtk_builder_get_widget (state->base.gui, "var2-label");
- if (gtk_toggle_button_get_active
+ if (gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (state->switch_variables_check))) {
- gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON
- (state->simple_linear_regression_radio),
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON
+ (state->simple_linear_regression_radio),
TRUE);
gtk_label_set_markup_with_mnemonic (GTK_LABEL (w1),
_("_Y variables:"));
@@ -2407,29 +2407,29 @@ dialog_regression_tool (WBCGtk *wbcg, Sheet *sheet)
gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->confidence_entry));
- state->simple_linear_regression_radio
- = go_gtk_builder_get_widget
+ state->simple_linear_regression_radio
+ = go_gtk_builder_get_widget
(state->base.gui, "simple-regression-button");
- state->switch_variables_check
- = go_gtk_builder_get_widget
+ state->switch_variables_check
+ = go_gtk_builder_get_widget
(state->base.gui, "multiple-independent-check");
- gtk_toggle_button_set_active
+ gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON (state->simple_linear_regression_radio),
FALSE);
- gtk_toggle_button_set_active
+ gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON (state->switch_variables_check),
FALSE);
- g_signal_connect
+ g_signal_connect
(G_OBJECT (state->simple_linear_regression_radio),
"toggled",
- G_CALLBACK (regression_tool_regression_radio_toggled_cb),
+ G_CALLBACK (regression_tool_regression_radio_toggled_cb),
state);
- g_signal_connect
+ g_signal_connect
(G_OBJECT (state->switch_variables_check),
"toggled",
- G_CALLBACK (regression_tool_regression_check_toggled_cb),
+ G_CALLBACK (regression_tool_regression_check_toggled_cb),
state);
-
+
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
diff --git a/src/dialogs/dialog-autofilter.c b/src/dialogs/dialog-autofilter.c
index 9dd0ee5..b1a3dac 100644
--- a/src/dialogs/dialog-autofilter.c
+++ b/src/dialogs/dialog-autofilter.c
@@ -156,8 +156,8 @@ cb_autofilter_ok (G_GNUC_UNUSED GtkWidget *button,
!bottom, !percentage, count);
}
if (cond != NULL)
- cmd_autofilter_set_condition (WORKBOOK_CONTROL (state->wbcg),
- state->filter, state->field,
+ cmd_autofilter_set_condition (WORKBOOK_CONTROL (state->wbcg),
+ state->filter, state->field,
cond);
gtk_widget_destroy (state->dialog);
@@ -240,7 +240,7 @@ dialog_auto_filter (WBCGtk *wbcg,
g_return_if_fail (wbcg != NULL);
- if (gnumeric_dialog_raise_if_exists
+ if (gnumeric_dialog_raise_if_exists
(wbcg, is_expr ? DIALOG_KEY_EXPRESSION : DIALOG_KEY))
return;
gui = gnm_gtk_builder_new ((is_expr ? "autofilter-expression.ui" : "autofilter-top10.ui"),
@@ -269,18 +269,18 @@ dialog_auto_filter (WBCGtk *wbcg,
char *end = g_utf8_find_prev_char (content, content + len + 1 - strlen (UNICODE_ELLIPSIS));
strcpy (end, UNICODE_ELLIPSIS);
}
- label = g_strdup_printf (_("Column %s (\"%s\")"),
+ label = g_strdup_printf (_("Column %s (\"%s\")"),
col_name (col), content);
g_free (content);
}
if (is_expr) {
- gtk_label_set_text
+ gtk_label_set_text
(GTK_LABEL (go_gtk_builder_get_widget (state->gui, "col-label1")), label);
- gtk_label_set_text
+ gtk_label_set_text
(GTK_LABEL (go_gtk_builder_get_widget (state->gui, "col-label2")), label);
} else {
- gtk_label_set_text
+ gtk_label_set_text
(GTK_LABEL (go_gtk_builder_get_widget (state->gui, "col-label")), label);
w = go_gtk_builder_get_widget (state->gui, "item_vs_percentage_option_menu");
g_signal_connect (G_OBJECT (w),
@@ -349,7 +349,7 @@ dialog_auto_filter (WBCGtk *wbcg,
g_object_set_data_full (G_OBJECT (state->dialog),
"state", state, (GDestroyNotify)cb_autofilter_destroy);
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
+ gnumeric_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
is_expr ? DIALOG_KEY_EXPRESSION : DIALOG_KEY);
gtk_widget_show (state->dialog);
}
diff --git a/src/dialogs/dialog-cell-format.c b/src/dialogs/dialog-cell-format.c
index 0b0c995..3c71f14 100644
--- a/src/dialogs/dialog-cell-format.c
+++ b/src/dialogs/dialog-cell-format.c
@@ -2276,7 +2276,7 @@ cb_fmt_dialog_dialog_buttons (GtkWidget *btn, FormatState *state)
/* since we are acting on the current selection */
/* validation may have switched sheets. */
- wb_control_sheet_focus (WORKBOOK_CONTROL (state->wbcg),
+ wb_control_sheet_focus (WORKBOOK_CONTROL (state->wbcg),
state->sheet);
if (state->validation.changed)
diff --git a/src/dialogs/dialog-cell-sort.c b/src/dialogs/dialog-cell-sort.c
index b41f58b..e74b292 100644
--- a/src/dialogs/dialog-cell-sort.c
+++ b/src/dialogs/dialog-cell-sort.c
@@ -505,8 +505,8 @@ cb_dialog_ok_clicked (SortFlowState *state)
data_copy = gnm_sort_data_copy (data);
text = gnm_expr_entry_get_text (state->range_entry);
gnm_sheet_add_sort_setup
- (data->sheet,
- g_strdup((text != NULL && text[0] != '\0') ? text : "Other"),
+ (data->sheet,
+ g_strdup((text != NULL && text[0] != '\0') ? text : "Other"),
data_copy);
cmd_sort (WORKBOOK_CONTROL (state->wbcg), data);
@@ -563,7 +563,7 @@ dialog_cell_sort_load_sort_setup (SortFlowState *state, GnmSortData const *data)
ITEM_HEADER, header,
ITEM_NAME, str,
ITEM_DESCENDING, data->clauses[i].asc,
- ITEM_DESCENDING_IMAGE,
+ ITEM_DESCENDING_IMAGE,
!data->clauses[i].asc
? state->image_ascending
: state->image_descending,
@@ -598,11 +598,11 @@ dialog_load_selection (SortFlowState *state, gboolean *col_rb)
(*col_rb = TRUE));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (state->cell_sort_header_check),
- sheet_range_has_heading
+ sheet_range_has_heading
(state->sheet, first, *col_rb, FALSE));
cb_sort_header_check (state);
- data = gnm_sheet_find_sort_setup (state->sheet,
+ data = gnm_sheet_find_sort_setup (state->sheet,
gnm_expr_entry_get_text (state->range_entry));
if (data != NULL)
dialog_cell_sort_load_sort_setup (state, data);
diff --git a/src/dialogs/dialog-data-table.c b/src/dialogs/dialog-data-table.c
index b6f13dd..65698c5 100644
--- a/src/dialogs/dialog-data-table.c
+++ b/src/dialogs/dialog-data-table.c
@@ -158,7 +158,7 @@ dialog_data_table (WBCGtk *wbcg)
if (sheet_range_splits_region (sheet, &input_range, NULL,
GO_CMD_CONTEXT (wbcg), _("Data Table")))
return;
- if (cmd_cell_range_is_locked_effective
+ if (cmd_cell_range_is_locked_effective
(sheet, &input_range, WORKBOOK_CONTROL (wbcg),
_("Data Table")))
return;
diff --git a/src/dialogs/dialog-define-names.c b/src/dialogs/dialog-define-names.c
index 95d6b48..c4695f4 100644
--- a/src/dialogs/dialog-define-names.c
+++ b/src/dialogs/dialog-define-names.c
@@ -120,12 +120,12 @@ typedef enum {
static gboolean
name_guru_translate_pathstring_to_iter (NameGuruState *state,
- GtkTreeIter *iter,
+ GtkTreeIter *iter,
gchar const *path_string)
{
GtkTreeIter iter_f;
- if (!gtk_tree_model_get_iter_from_string
+ if (!gtk_tree_model_get_iter_from_string
(state->model_f, &iter_f, path_string))
return FALSE;
@@ -142,7 +142,7 @@ name_guru_translate_pathstring_to_iter (NameGuruState *state,
* @state:
* @iter:
*
- * expand the treeview at the given iter.
+ * expand the treeview at the given iter.
*
**/
static void
@@ -150,9 +150,9 @@ name_guru_expand_at_iter (NameGuruState *state, GtkTreeIter *iter)
{
GtkTreePath *path;
- path = gtk_tree_model_get_path
+ path = gtk_tree_model_get_path
(GTK_TREE_MODEL (state->model), iter);
- gtk_tree_view_expand_to_path
+ gtk_tree_view_expand_to_path
(GTK_TREE_VIEW (state->treeview), path);
gtk_tree_path_free (path);
@@ -173,8 +173,8 @@ static gboolean
name_guru_warn (NameGuruState *state,
GnmNamedExpr *nexpr)
{
- return (!expr_name_in_use (nexpr) ||
- go_gtk_query_yes_no
+ return (!expr_name_in_use (nexpr) ||
+ go_gtk_query_yes_no
(GTK_WINDOW (state->dialog), FALSE,
"The defined name '%s' is in use. "
"Do you really want to delete it?",
@@ -186,7 +186,7 @@ cb_name_guru_show_all (GtkTreeModel *model, GtkTreePath *path,
GtkTreeIter *iter, gpointer data)
{
NameGuruState *state = data;
- gtk_tree_store_set (state->model, iter,
+ gtk_tree_store_set (state->model, iter,
ITEM_VISIBLE, TRUE,
-1);
return FALSE;
@@ -231,14 +231,14 @@ cb_name_guru_search (GtkTreeModel *model, GtkTreePath *path,
name_n = g_utf8_normalize (name, -1, G_NORMALIZE_ALL);
name_cf = g_utf8_casefold(name_n, -1);
visible = (NULL != g_strstr_len (name_cf, -1, text_cf));
- g_free (text_n);
+ g_free (text_n);
g_free (text_cf);
- g_free (name_n);
+ g_free (name_n);
g_free (name_cf);
}
if (visible != was_visible)
- gtk_tree_store_set (GTK_TREE_STORE (model), iter,
+ gtk_tree_store_set (GTK_TREE_STORE (model), iter,
ITEM_VISIBLE, visible,
-1);
@@ -253,7 +253,7 @@ name_guru_search (GtkEntry *entry, gpointer data)
NameGuruState *state = data;
if (0 == gtk_entry_get_text_length (entry)){
- name_guru_erase_search_entry
+ name_guru_erase_search_entry
(entry,
#ifdef HAVE_GTK_ENTRY_SET_ICON_FROM_STOCK
GTK_ENTRY_ICON_SECONDARY, NULL,
@@ -279,7 +279,7 @@ name_guru_get_available_sheet_names (Sheet const *sheet)
{
GList *res = NULL;
- gnm_sheet_foreach_name (sheet, (GHFunc) cb_get_names,
+ gnm_sheet_foreach_name (sheet, (GHFunc) cb_get_names,
&res);
return g_list_sort (res, (GCompareFunc)expr_name_cmp_by_name);
}
@@ -290,7 +290,7 @@ name_guru_get_available_wb_names (Workbook const *wb)
GList *res = NULL;
workbook_foreach_name (wb, TRUE,
- (GHFunc) cb_get_names,
+ (GHFunc) cb_get_names,
&res);
return g_list_sort (res, (GCompareFunc)expr_name_cmp_by_name);
}
@@ -325,10 +325,10 @@ name_guru_set_images (NameGuruState *state, GtkTreeIter *name_iter,
break;
}
- gtk_tree_store_set (state->model, name_iter,
+ gtk_tree_store_set (state->model, name_iter,
ITEM_UPDOWN_IMAGE, button1,
ITEM_ADDDELETE_IMAGE, button2,
- ITEM_PASTE_IMAGE,
+ ITEM_PASTE_IMAGE,
pastable ? state->image_paste : NULL,
ITEM_UPDOWN_ACTIVE, button1 != NULL,
ITEM_ADDDELETE_ACTIVE, button2 != NULL,
@@ -353,8 +353,8 @@ name_guru_store_names (GList *list,
if (nexpr->is_hidden || expr_name_is_placeholder (nexpr))
continue;
- ispastable = ciseditable =
- type == item_type_available_wb_name
+ ispastable = ciseditable =
+ type == item_type_available_wb_name
|| type == item_type_available_sheet_name;
if (nexpr->is_permanent) {
@@ -367,14 +367,14 @@ name_guru_store_names (GList *list,
gnm_conventions_default);
- gtk_tree_store_append (state->model, &name_iter,
+ gtk_tree_store_append (state->model, &name_iter,
iter);
- gtk_tree_store_set (state->model, &name_iter,
- ITEM_NAME, expr_name_name (nexpr),
- ITEM_NAME_POINTER, nexpr,
- ITEM_CONTENT, content,
- ITEM_TYPE, adj_type,
- ITEM_CONTENT_IS_EDITABLE, ciseditable,
+ gtk_tree_store_set (state->model, &name_iter,
+ ITEM_NAME, expr_name_name (nexpr),
+ ITEM_NAME_POINTER, nexpr,
+ ITEM_CONTENT, content,
+ ITEM_TYPE, adj_type,
+ ITEM_CONTENT_IS_EDITABLE, ciseditable,
ITEM_NAME_IS_EDITABLE, FALSE,
ITEM_PASTABLE, ispastable,
ITEM_VISIBLE, TRUE,
@@ -398,10 +398,10 @@ name_guru_populate_list (NameGuruState *state)
gtk_tree_store_clear (state->model);
gtk_tree_store_append (state->model, &iter, NULL);
- gtk_tree_store_set (state->model, &iter,
- ITEM_NAME, _("Workbook"),
- ITEM_NAME_POINTER, NULL,
- ITEM_TYPE, item_type_workbook,
+ gtk_tree_store_set (state->model, &iter,
+ ITEM_NAME, _("Workbook"),
+ ITEM_NAME_POINTER, NULL,
+ ITEM_TYPE, item_type_workbook,
ITEM_CONTENT_IS_EDITABLE, FALSE,
ITEM_NAME_IS_EDITABLE, FALSE,
ITEM_PASTABLE, FALSE,
@@ -415,26 +415,26 @@ name_guru_populate_list (NameGuruState *state)
name_guru_expand_at_iter (state, &iter);
gtk_tree_store_append (state->model, &iter, NULL);
- gtk_tree_store_set (state->model, &iter,
- ITEM_NAME, state->sheet->name_unquoted,
- ITEM_NAME_POINTER, state->sheet,
- ITEM_TYPE, item_type_main_sheet,
- ITEM_CONTENT_IS_EDITABLE, FALSE,
+ gtk_tree_store_set (state->model, &iter,
+ ITEM_NAME, state->sheet->name_unquoted,
+ ITEM_NAME_POINTER, state->sheet,
+ ITEM_TYPE, item_type_main_sheet,
+ ITEM_CONTENT_IS_EDITABLE, FALSE,
ITEM_NAME_IS_EDITABLE, FALSE,
ITEM_PASTABLE, FALSE,
ITEM_VISIBLE, TRUE,
-1);
name_guru_set_images (state, &iter, item_type_main_sheet, FALSE);
- name_guru_store_names (name_guru_get_available_sheet_names
+ name_guru_store_names (name_guru_get_available_sheet_names
(state->sheet),
&iter,
state,
item_type_available_sheet_name);
name_guru_expand_at_iter (state, &iter);
- for (sheets = workbook_sheets (state->wb);
- sheets != NULL;
+ for (sheets = workbook_sheets (state->wb);
+ sheets != NULL;
sheets = sheets->next) {
Sheet *sheet = sheets->data;
@@ -442,29 +442,29 @@ name_guru_populate_list (NameGuruState *state)
continue;
gtk_tree_store_append (state->model, &iter, NULL);
- gtk_tree_store_set (state->model, &iter,
- ITEM_NAME, sheet->name_unquoted,
- ITEM_NAME_POINTER, sheet,
- ITEM_TYPE, item_type_other_sheet,
- ITEM_CONTENT_IS_EDITABLE, FALSE,
+ gtk_tree_store_set (state->model, &iter,
+ ITEM_NAME, sheet->name_unquoted,
+ ITEM_NAME_POINTER, sheet,
+ ITEM_TYPE, item_type_other_sheet,
+ ITEM_CONTENT_IS_EDITABLE, FALSE,
ITEM_NAME_IS_EDITABLE, FALSE,
ITEM_VISIBLE, TRUE,
ITEM_PASTABLE, FALSE,
-1);
- name_guru_store_names
+ name_guru_store_names
(name_guru_get_available_sheet_names (sheet),
&iter, state, item_type_foreign_name);
}
}
static gboolean
-name_guru_paste (NameGuruState *state, GtkTreeIter *iter)
+name_guru_paste (NameGuruState *state, GtkTreeIter *iter)
{
char *name;
gboolean is_pastable;
- gtk_tree_model_get (GTK_TREE_MODEL (state->model),
+ gtk_tree_model_get (GTK_TREE_MODEL (state->model),
iter,
ITEM_PASTABLE, &is_pastable,
ITEM_NAME, &name,
@@ -484,7 +484,7 @@ name_guru_paste (NameGuruState *state, GtkTreeIter *iter)
-1, &position);
else {
gtk_editable_delete_selection (GTK_EDITABLE (entry));
- position = gtk_editable_get_position
+ position = gtk_editable_get_position
(GTK_EDITABLE (entry));
}
if (state->has_pasted) {
@@ -521,11 +521,11 @@ cb_name_guru_clicked (GtkWidget *button, NameGuruState *state)
if (button == state->paste_button) {
GtkTreeIter iter_f;
GtkTreeIter iter;
- if (gtk_tree_selection_get_selected
- (gtk_tree_view_get_selection
+ if (gtk_tree_selection_get_selected
+ (gtk_tree_view_get_selection
(GTK_TREE_VIEW (state->treeview)), NULL, &iter_f)) {
gtk_tree_model_filter_convert_iter_to_child_iter
- (GTK_TREE_MODEL_FILTER (state->model_f),
+ (GTK_TREE_MODEL_FILTER (state->model_f),
&iter, &iter_f);
if (name_guru_paste (state, &iter))
gtk_widget_destroy (state->dialog);
@@ -602,14 +602,14 @@ name_guru_add (NameGuruState *state, GtkTreeIter *iter, gchar const *path_string
item_type_new_unsaved_sheet_name;
content = selection_to_string (state->sv, FALSE);
- gtk_tree_store_insert (state->model, &name_iter,
+ gtk_tree_store_insert (state->model, &name_iter,
iter, 0);
- gtk_tree_store_set (state->model, &name_iter,
- ITEM_NAME, _("<new name>"),
- ITEM_NAME_POINTER, NULL,
- ITEM_CONTENT,
+ gtk_tree_store_set (state->model, &name_iter,
+ ITEM_NAME, _("<new name>"),
+ ITEM_NAME_POINTER, NULL,
+ ITEM_CONTENT,
((content == NULL) ? "#REF!" : content),
- ITEM_TYPE, type,
+ ITEM_TYPE, type,
ITEM_CONTENT_IS_EDITABLE, TRUE,
ITEM_NAME_IS_EDITABLE, TRUE,
ITEM_PASTABLE, FALSE,
@@ -627,7 +627,7 @@ name_guru_delete (NameGuruState *state, GtkTreeIter *iter, item_type_t type)
if (type != item_type_new_unsaved_wb_name &&
type != item_type_new_unsaved_sheet_name) {
- gtk_tree_model_get (GTK_TREE_MODEL (state->model),
+ gtk_tree_model_get (GTK_TREE_MODEL (state->model),
iter,
ITEM_NAME_POINTER, &nexpr,
-1);
@@ -653,7 +653,7 @@ cb_name_guru_add_delete (G_GNUC_UNUSED GtkCellRendererToggle *cell,
(state, &iter, path_string)) {
item_type_t type;
- gtk_tree_model_get (GTK_TREE_MODEL (state->model),
+ gtk_tree_model_get (GTK_TREE_MODEL (state->model),
&iter,
ITEM_TYPE, &type,
-1);
@@ -679,23 +679,23 @@ cb_name_guru_add_delete (G_GNUC_UNUSED GtkCellRendererToggle *cell,
}
static void
-name_guru_find_place (NameGuruState *state, GtkTreeIter *iter,
+name_guru_find_place (NameGuruState *state, GtkTreeIter *iter,
GtkTreeIter *parent_iter, GnmNamedExpr *nexpr)
{
GtkTreeIter next_iter;
GnmNamedExpr *next_nexpr;
- if (nexpr != NULL &&
+ if (nexpr != NULL &&
gtk_tree_model_iter_children (GTK_TREE_MODEL (state->model),
&next_iter,
parent_iter)) {
do {
- gtk_tree_model_get (GTK_TREE_MODEL (state->model),
+ gtk_tree_model_get (GTK_TREE_MODEL (state->model),
&next_iter,
ITEM_NAME_POINTER, &next_nexpr,
-1);
- if (next_nexpr != NULL &&
+ if (next_nexpr != NULL &&
expr_name_cmp_by_name (nexpr, next_nexpr) < 0) {
- gtk_tree_store_insert_before
+ gtk_tree_store_insert_before
(state->model,
iter,
parent_iter,
@@ -715,7 +715,7 @@ name_guru_find_place (NameGuruState *state, GtkTreeIter *iter,
static void
-name_guru_move_record (NameGuruState *state, GtkTreeIter *from_iter,
+name_guru_move_record (NameGuruState *state, GtkTreeIter *from_iter,
GtkTreeIter *new_parent_iter, item_type_t new_type)
{
GnmNamedExpr *nexpr;
@@ -723,7 +723,7 @@ name_guru_move_record (NameGuruState *state, GtkTreeIter *from_iter,
gboolean ceditable, neditable, pastable, visible;
GtkTreeIter new_iter;
- gtk_tree_model_get (GTK_TREE_MODEL (state->model),
+ gtk_tree_model_get (GTK_TREE_MODEL (state->model),
from_iter,
ITEM_NAME, &name,
ITEM_NAME_POINTER, &nexpr,
@@ -738,11 +738,11 @@ name_guru_move_record (NameGuruState *state, GtkTreeIter *from_iter,
name_guru_find_place (state, &new_iter, new_parent_iter, nexpr);
- gtk_tree_store_set (state->model, &new_iter,
- ITEM_NAME, name,
- ITEM_NAME_POINTER, nexpr,
- ITEM_CONTENT, content,
- ITEM_TYPE, new_type,
+ gtk_tree_store_set (state->model, &new_iter,
+ ITEM_NAME, name,
+ ITEM_NAME_POINTER, nexpr,
+ ITEM_CONTENT, content,
+ ITEM_TYPE, new_type,
ITEM_CONTENT_IS_EDITABLE, ceditable,
ITEM_NAME_IS_EDITABLE, neditable,
ITEM_PASTABLE, pastable,
@@ -769,7 +769,7 @@ cb_name_guru_switch_scope (G_GNUC_UNUSED GtkCellRendererToggle *cell,
GnmNamedExpr *nexpr;
GtkTreeIter new_parent_iter;
- gtk_tree_model_get (GTK_TREE_MODEL (state->model),
+ gtk_tree_model_get (GTK_TREE_MODEL (state->model),
&iter,
ITEM_TYPE, &type,
ITEM_NAME_POINTER, &nexpr,
@@ -777,27 +777,27 @@ cb_name_guru_switch_scope (G_GNUC_UNUSED GtkCellRendererToggle *cell,
switch (type) {
case item_type_available_wb_name:
- if (cmd_rescope_name
- (WORKBOOK_CONTROL (state->wbcg),
+ if (cmd_rescope_name
+ (WORKBOOK_CONTROL (state->wbcg),
nexpr, state->sheet))
return;
- new_path = "1";
+ new_path = "1";
new_type = item_type_available_sheet_name;
break;
case item_type_new_unsaved_wb_name:
- new_path = "1";
+ new_path = "1";
new_type = item_type_new_unsaved_sheet_name;
break;
case item_type_available_sheet_name:
- if (cmd_rescope_name
- (WORKBOOK_CONTROL (state->wbcg),
+ if (cmd_rescope_name
+ (WORKBOOK_CONTROL (state->wbcg),
nexpr, NULL))
return;
- new_path = "0";
+ new_path = "0";
new_type = item_type_available_wb_name;
break;
case item_type_new_unsaved_sheet_name:
- new_path = "0";
+ new_path = "0";
new_type = item_type_new_unsaved_wb_name;
break;
case item_type_workbook:
@@ -809,10 +809,10 @@ cb_name_guru_switch_scope (G_GNUC_UNUSED GtkCellRendererToggle *cell,
return;
}
- if (gtk_tree_model_get_iter_from_string
- (GTK_TREE_MODEL (state->model),
+ if (gtk_tree_model_get_iter_from_string
+ (GTK_TREE_MODEL (state->model),
&new_parent_iter, new_path)) {
- name_guru_move_record
+ name_guru_move_record
(state, &iter, &new_parent_iter, new_type);
}
}
@@ -849,7 +849,7 @@ name_guru_parse_pos_init (NameGuruState *state,
*/
static GnmExprTop const*
-name_guru_check_expression (NameGuruState *state, gchar *text,
+name_guru_check_expression (NameGuruState *state, gchar *text,
GnmParsePos *pp, item_type_t type)
{
GnmExprTop const *texpr;
@@ -859,7 +859,7 @@ name_guru_check_expression (NameGuruState *state, gchar *text,
return NULL; /* We should have never gotten here. */
if (text == NULL || text[0] == '\0') {
- go_gtk_notice_dialog (GTK_WINDOW (state->dialog),
+ go_gtk_notice_dialog (GTK_WINDOW (state->dialog),
GTK_MESSAGE_ERROR,
_("Why would you want to define a "
"name for the empty string?"));
@@ -867,10 +867,10 @@ name_guru_check_expression (NameGuruState *state, gchar *text,
}
texpr = gnm_expr_parse_str (text, pp,
- GNM_EXPR_PARSE_DEFAULT |
+ GNM_EXPR_PARSE_DEFAULT |
GNM_EXPR_PARSE_UNKNOWN_NAMES_ARE_INVALID |
GNM_EXPR_PARSE_PERMIT_MULTIPLE_EXPRESSIONS,
- NULL,
+ NULL,
parse_error_init (&perr));
if (texpr == NULL) {
if (perr.err == NULL)
@@ -913,7 +913,7 @@ cb_name_guru_content_edited (GnumericCellRendererExprEntry *cell,
return;
gtk_tree_model_get (GTK_TREE_MODEL (state->model), &iter,
- ITEM_TYPE, &type,
+ ITEM_TYPE, &type,
ITEM_NAME_POINTER, &nexpr,
-1);
@@ -926,13 +926,13 @@ cb_name_guru_content_edited (GnumericCellRendererExprEntry *cell,
/* content is valid */
- if (type != item_type_new_unsaved_wb_name
+ if (type != item_type_new_unsaved_wb_name
&& type != item_type_new_unsaved_sheet_name) {
/* save the changes (if the name is already saved) */
- cmd_define_name (WORKBOOK_CONTROL (state->wbcg),
- expr_name_name (nexpr),
+ cmd_define_name (WORKBOOK_CONTROL (state->wbcg),
+ expr_name_name (nexpr),
&pp, texpr, NULL);
- } else
+ } else
gnm_expr_top_unref (texpr);
/* set the model */
@@ -964,7 +964,7 @@ cb_name_guru_name_edited (G_GNUC_UNUSED GtkCellRendererText *cell,
ITEM_CONTENT, &content,
-1);
- if (type != item_type_new_unsaved_wb_name &&
+ if (type != item_type_new_unsaved_wb_name &&
type != item_type_new_unsaved_sheet_name)
return;
@@ -973,10 +973,10 @@ cb_name_guru_name_edited (G_GNUC_UNUSED GtkCellRendererText *cell,
if (nexpr != NULL) {
Sheet *scope = nexpr->pos.sheet;
- if ((type == item_type_new_unsaved_wb_name &&
- scope == NULL) ||
+ if ((type == item_type_new_unsaved_wb_name &&
+ scope == NULL) ||
(type == item_type_new_unsaved_sheet_name)) {
- go_gtk_notice_dialog (GTK_WINDOW (state->dialog),
+ go_gtk_notice_dialog (GTK_WINDOW (state->dialog),
GTK_MESSAGE_ERROR,
_("This name is already in use!"));
return;
@@ -987,17 +987,17 @@ cb_name_guru_name_edited (G_GNUC_UNUSED GtkCellRendererText *cell,
if (texpr == NULL)
return;
- if (!cmd_define_name (WORKBOOK_CONTROL (state->wbcg),
+ if (!cmd_define_name (WORKBOOK_CONTROL (state->wbcg),
new_text, &pp,
texpr, NULL)) {
nexpr = expr_name_lookup (&pp, new_text);
- type = (type == item_type_new_unsaved_wb_name) ?
+ type = (type == item_type_new_unsaved_wb_name) ?
item_type_available_wb_name :
item_type_available_sheet_name;
- gtk_tree_store_set
- (state->model, &iter,
+ gtk_tree_store_set
+ (state->model, &iter,
ITEM_NAME, new_text,
ITEM_NAME_POINTER, nexpr,
ITEM_TYPE, type,
@@ -1017,10 +1017,10 @@ name_guru_update_sensitivity (GtkTreeSelection *treeselection,
gpointer user_data)
{
NameGuruState *state = user_data;
- gboolean is_pastable = FALSE;
+ gboolean is_pastable = FALSE;
GtkTreeIter iter;
- if (gtk_tree_selection_get_selected
+ if (gtk_tree_selection_get_selected
(treeselection, NULL, &iter))
gtk_tree_model_get (state->model_f, &iter,
ITEM_PASTABLE, &is_pastable,
@@ -1028,7 +1028,7 @@ name_guru_update_sensitivity (GtkTreeSelection *treeselection,
gtk_widget_set_sensitive (GTK_WIDGET (state->paste_button),
is_pastable);
-}
+}
static gboolean
cb_name_guru_selection_function (GtkTreeSelection *selection,
@@ -1042,8 +1042,8 @@ cb_name_guru_selection_function (GtkTreeSelection *selection,
if (path_currently_selected)
return TRUE;
if (gtk_tree_model_get_iter (model, &iter, path)) {
- gboolean is_pastable, is_editable;;
- gtk_tree_model_get (model,
+ gboolean is_pastable, is_editable;;
+ gtk_tree_model_get (model,
&iter,
ITEM_PASTABLE, &is_pastable,
ITEM_CONTENT_IS_EDITABLE, &is_editable,
@@ -1056,7 +1056,7 @@ cb_name_guru_selection_function (GtkTreeSelection *selection,
static gboolean
name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
{
- Workbook *wb = wb_control_get_workbook
+ Workbook *wb = wb_control_get_workbook
(WORKBOOK_CONTROL (wbcg));
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
@@ -1078,9 +1078,9 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
state->dialog = go_gtk_builder_get_widget (state->gui, "NameGuru");
- state->model = gtk_tree_store_new
- (NUM_COLMNS,
- G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_STRING,
+ state->model = gtk_tree_store_new
+ (NUM_COLMNS,
+ G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_STRING,
G_TYPE_INT, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
GDK_TYPE_PIXBUF, GDK_TYPE_PIXBUF,
G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
@@ -1088,16 +1088,16 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
state->treeview = go_gtk_builder_get_widget (state->gui, "name_list");
- state->model_f = gtk_tree_model_filter_new
+ state->model_f = gtk_tree_model_filter_new
(GTK_TREE_MODEL (state->model), NULL);
gtk_tree_model_filter_set_visible_column
(GTK_TREE_MODEL_FILTER (state->model_f), ITEM_VISIBLE);
gtk_tree_view_set_model (GTK_TREE_VIEW (state->treeview),
state->model_f);
- gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (state->treeview),
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (state->treeview),
FALSE);
- gtk_tree_view_set_grid_lines (GTK_TREE_VIEW (state->treeview),
+ gtk_tree_view_set_grid_lines (GTK_TREE_VIEW (state->treeview),
GTK_TREE_VIEW_GRID_LINES_NONE);
gtk_tree_view_set_reorderable (GTK_TREE_VIEW (state->treeview),
FALSE);
@@ -1105,7 +1105,7 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
renderer = gtk_cell_renderer_text_new ();
g_signal_connect (G_OBJECT (renderer), "edited",
G_CALLBACK (cb_name_guru_name_edited), state);
- column = gtk_tree_view_column_new_with_attributes
+ column = gtk_tree_view_column_new_with_attributes
("name",
renderer,
"text", ITEM_NAME,
@@ -1124,7 +1124,7 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
"active", ITEM_PASTABLE,
"pixbuf", ITEM_PASTE_IMAGE,
NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (state->treeview),
+ gtk_tree_view_append_column (GTK_TREE_VIEW (state->treeview),
column);
} else {
renderer = gnumeric_cell_renderer_toggle_new ();
@@ -1137,13 +1137,13 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
"active", ITEM_ADDDELETE_ACTIVE,
"pixbuf", ITEM_ADDDELETE_IMAGE,
NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (state->treeview),
+ gtk_tree_view_append_column (GTK_TREE_VIEW (state->treeview),
column);
renderer = gnumeric_cell_renderer_toggle_new ();
g_signal_connect (G_OBJECT (renderer),
"toggled",
- G_CALLBACK (cb_name_guru_switch_scope),
+ G_CALLBACK (cb_name_guru_switch_scope),
state);
column = gtk_tree_view_column_new_with_attributes
("Scope",
@@ -1151,14 +1151,14 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
"active", ITEM_UPDOWN_ACTIVE,
"pixbuf", ITEM_UPDOWN_IMAGE,
NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (state->treeview),
+ gtk_tree_view_append_column (GTK_TREE_VIEW (state->treeview),
column);
}
renderer = gnumeric_cell_renderer_expr_entry_new (state->wbcg);
g_signal_connect (G_OBJECT (renderer), "edited",
G_CALLBACK (cb_name_guru_content_edited), state);
- column = gtk_tree_view_column_new_with_attributes
+ column = gtk_tree_view_column_new_with_attributes
(_("content"),
renderer,
"text", ITEM_CONTENT,
@@ -1167,7 +1167,7 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
gtk_tree_view_append_column (GTK_TREE_VIEW (state->treeview), column);
- selection = gtk_tree_view_get_selection
+ selection = gtk_tree_view_get_selection
(GTK_TREE_VIEW (state->treeview));
gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
gtk_tree_selection_set_select_function
@@ -1182,7 +1182,7 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
"changed",
G_CALLBACK (name_guru_update_sensitivity),
state);
- state->image_paste = gtk_widget_render_icon
+ state->image_paste = gtk_widget_render_icon
(state->dialog,
GTK_STOCK_PASTE,
GTK_ICON_SIZE_SMALL_TOOLBAR,
@@ -1194,27 +1194,27 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
state->image_down = NULL;
} else {
state->image_paste = NULL;
- state->image_add = gtk_widget_render_icon
+ state->image_add = gtk_widget_render_icon
(state->dialog,
GTK_STOCK_ADD,
GTK_ICON_SIZE_SMALL_TOOLBAR,
"Gnumeric-Define-Names-Dialog");
- state->image_delete = gtk_widget_render_icon
+ state->image_delete = gtk_widget_render_icon
(state->dialog,
GTK_STOCK_REMOVE,
GTK_ICON_SIZE_SMALL_TOOLBAR,
"Gnumeric-Define-Names-Dialog");
- state->image_lock = gtk_widget_render_icon
+ state->image_lock = gtk_widget_render_icon
(state->dialog,
"Gnumeric_Protection_Yes",
GTK_ICON_SIZE_SMALL_TOOLBAR,
"Gnumeric-Define-Names-Dialog");
- state->image_up = gtk_widget_render_icon
+ state->image_up = gtk_widget_render_icon
(state->dialog,
GTK_STOCK_GO_UP,
GTK_ICON_SIZE_SMALL_TOOLBAR,
"Gnumeric-Define-Names-Dialog");
- state->image_down = gtk_widget_render_icon
+ state->image_down = gtk_widget_render_icon
(state->dialog,
GTK_STOCK_GO_DOWN,
GTK_ICON_SIZE_SMALL_TOOLBAR,
@@ -1225,10 +1225,10 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
"search_entry");
#ifdef HAVE_GTK_ENTRY_SET_ICON_FROM_STOCK
- gtk_entry_set_icon_from_stock
+ gtk_entry_set_icon_from_stock
(GTK_ENTRY (state->search_entry),
GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
- gtk_entry_set_icon_tooltip_text
+ gtk_entry_set_icon_tooltip_text
(GTK_ENTRY (state->search_entry),
GTK_ENTRY_ICON_SECONDARY,
_("Erase the search entry."));
diff --git a/src/dialogs/dialog-doc-metadata.c b/src/dialogs/dialog-doc-metadata.c
index 690f9f6..6d60d21 100644
--- a/src/dialogs/dialog-doc-metadata.c
+++ b/src/dialogs/dialog-doc-metadata.c
@@ -1417,7 +1417,7 @@ dialog_doc_metadata_init_calculations_page (DialogDocMetaData *state)
{
char *buf;
- gtk_toggle_button_set_active
+ gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON ( workbook_get_recalcmode (state->wb) ? state->recalc_auto : state->recalc_manual),
TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (state->recalc_iteration),
@@ -1606,7 +1606,7 @@ typedef struct {
GtkTreePath *path;
} page_search_t;
-static gboolean
+static gboolean
dialog_doc_metadata_select_page_search (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
@@ -1727,7 +1727,7 @@ dialog_doc_metadata_init (DialogDocMetaData *state,
for (i = 0; page_info[i].page > -1; i++) {
const page_info_t *this_page = &page_info[i];
this_page->page_initializer (state);
- dialog_doc_meta_data_add_item (state, this_page->page_name, this_page->icon_name,
+ dialog_doc_meta_data_add_item (state, this_page->page_name, this_page->icon_name,
this_page->page, this_page->parent_path);
}
diff --git a/src/dialogs/dialog-formula-guru.c b/src/dialogs/dialog-formula-guru.c
index 6b3ea4e..51e25f0 100644
--- a/src/dialogs/dialog-formula-guru.c
+++ b/src/dialogs/dialog-formula-guru.c
@@ -185,17 +185,17 @@ dialog_formula_guru_update_this_parent (GtkTreeIter *parent, FormulaGuruState *s
gtk_tree_path_free (b);
}
if (argument && strlen (argument) > 0) {
- GnmExprTop const *texpr = gnm_expr_parse_str
- (argument, state->pos,
+ GnmExprTop const *texpr = gnm_expr_parse_str
+ (argument, state->pos,
GNM_EXPR_PARSE_DEFAULT,
- sheet_get_conventions (state->pos->sheet),
+ sheet_get_conventions (state->pos->sheet),
NULL);
if (texpr == NULL) {
text = g_string_append_c (text, '"');
text = g_string_append (text, argument);
text = g_string_append_c (text, '"');
} else {
- if ((GNM_EXPR_GET_OPER (texpr->expr) == GNM_EXPR_OP_NAME)
+ if ((GNM_EXPR_GET_OPER (texpr->expr) == GNM_EXPR_OP_NAME)
&& expr_name_is_placeholder (texpr->expr->name.name)
&& gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (state->quote_button))) {
text = g_string_append_c (text, '"');
@@ -328,7 +328,7 @@ dialog_formula_guru_adjust_children (GtkTreeIter *parent, GnmFunc const *fd,
g_free (arg_name);
arg_name = mod_name;
}
- desc = gnm_func_convert_markup_to_pango
+ desc = gnm_func_convert_markup_to_pango
(gnm_func_get_arg_description (fd, i));
gtk_tree_store_set (state->model, &iter,
ARG_NAME, arg_name,
@@ -819,7 +819,7 @@ cb_dialog_formula_guru_query_tooltip (GtkWidget *widget,
GtkTreeIter iter;
GtkTreePath *path;
- if (gtk_tree_view_get_tooltip_context
+ if (gtk_tree_view_get_tooltip_context
(state->treeview, &x_, &y_, keyboard_mode, NULL, &path, &iter)) {
char *markup;
GtkRcStyle *rc_style = gnumeric_create_tooltip_rc_style ();
@@ -840,20 +840,20 @@ cb_dialog_formula_guru_query_tooltip (GtkWidget *widget,
gtk_widget_show_all (state->tooltip_widget);
g_object_ref (G_OBJECT (state->tooltip_widget));
g_object_ref (G_OBJECT (state->tooltip_label));
- }
+ }
gtk_tooltip_set_custom (tooltip, state->tooltip_widget);
window = gtk_widget_get_toplevel (state->tooltip_widget);
gtk_widget_modify_style /* Applying to window */
(window, rc_style);
gtk_widget_set_name (window, "gnumeric-tooltip");
gtk_widget_set_app_paintable (window, FALSE);
-
+
parent = gtk_widget_get_parent (state->tooltip_widget);
if (parent != NULL && GTK_IS_BOX (parent)) {
gtk_box_set_spacing (GTK_BOX (parent),0);
parent = gtk_widget_get_parent (parent);
if (parent != NULL && GTK_IS_ALIGNMENT (parent))
- gtk_alignment_set_padding
+ gtk_alignment_set_padding
(GTK_ALIGNMENT (parent),
0,0,0,0);
}
@@ -884,7 +884,7 @@ dialog_formula_guru_init (FormulaGuruState *state)
scrolled = go_gtk_builder_get_widget (state->gui, "scrolled");
state->model = gtk_tree_store_new (NUM_COLMNS, G_TYPE_STRING, G_TYPE_BOOLEAN,
G_TYPE_STRING, G_TYPE_STRING,
- G_TYPE_INT, G_TYPE_INT, G_TYPE_POINTER,
+ G_TYPE_INT, G_TYPE_INT, G_TYPE_POINTER,
G_TYPE_STRING);
state->treeview = GTK_TREE_VIEW (
gtk_tree_view_new_with_model (GTK_TREE_MODEL (state->model)));
diff --git a/src/dialogs/dialog-function-select.c b/src/dialogs/dialog-function-select.c
index cf23388..ae5a25f 100644
--- a/src/dialogs/dialog-function-select.c
+++ b/src/dialogs/dialog-function-select.c
@@ -154,18 +154,18 @@ cb_dialog_function_select_search_all (GtkTreeModel *model, GtkTreePath *path,
name_n = g_utf8_normalize (name, -1, G_NORMALIZE_ALL);
name_cf = g_utf8_casefold(name_n, -1);
visible = (NULL != g_strstr_len (name_cf, -1, text_cf));
- g_free (name_n);
+ g_free (name_n);
g_free (name_cf);
if (!visible) {
name_n = g_utf8_normalize (desc, -1, G_NORMALIZE_ALL);
name_cf = g_utf8_casefold(name_n, -1);
visible = (NULL != g_strstr_len (name_cf, -1, text_cf));
- g_free (name_n);
+ g_free (name_n);
g_free (name_cf);
}
- g_free (text_n);
+ g_free (text_n);
g_free (text_cf);
@@ -173,7 +173,7 @@ cb_dialog_function_select_search_all (GtkTreeModel *model, GtkTreePath *path,
g_free (desc);
}
if (visible != was_visible)
- gtk_list_store_set (GTK_LIST_STORE (model), iter,
+ gtk_list_store_set (GTK_LIST_STORE (model), iter,
FUNCTION_VISIBLE, visible,
-1);
return FALSE;
@@ -193,18 +193,18 @@ dialog_function_select_search (GtkEntry *entry, gpointer data)
gtk_tree_model_get (GTK_TREE_MODEL (state->model), &iter,
CATEGORY, &specs.cat,
-1);
- specs.recent_only
- = (specs.cat != NULL &&
+ specs.recent_only
+ = (specs.cat != NULL &&
specs.cat == GINT_TO_POINTER(-1));
- specs.used_only
- = (specs.cat != NULL &&
+ specs.used_only
+ = (specs.cat != NULL &&
specs.cat == GINT_TO_POINTER(-2));
if (specs.recent_only || specs.used_only)
specs.cat = NULL;
}
gtk_tree_model_foreach (GTK_TREE_MODEL (state->model_functions),
- cb_dialog_function_select_search_all,
+ cb_dialog_function_select_search_all,
(gpointer) &specs);
}
@@ -226,7 +226,7 @@ dialog_function_select_cat_changed (G_GNUC_UNUSED GtkComboBox *widget,
{
FunctionSelectState *state = data;
- dialog_function_select_search (GTK_ENTRY (state->search_entry),
+ dialog_function_select_search (GTK_ENTRY (state->search_entry),
data);
}
@@ -299,7 +299,7 @@ dialog_function_write_recent_func (FunctionSelectState *state, GnmFunc const *fd
}
static gboolean
-cb_unref (GtkTreeModel *model, G_GNUC_UNUSED GtkTreePath *path,
+cb_unref (GtkTreeModel *model, G_GNUC_UNUSED GtkTreePath *path,
GtkTreeIter *iter, G_GNUC_UNUSED gpointer data)
{
GnmFunc *f;
@@ -362,7 +362,7 @@ cb_dialog_function_select_ok_clicked (G_GNUC_UNUSED GtkWidget *button,
GnmFunc *func;
GtkTreeSelection *the_selection = gtk_tree_view_get_selection (state->treeview);
- if (state->formula_guru_key != NULL &&
+ if (state->formula_guru_key != NULL &&
gtk_tree_selection_get_selected (the_selection, &model, &iter)) {
WBCGtk *wbcg = state->wbcg;
gtk_tree_model_get (model, &iter,
@@ -397,7 +397,7 @@ cb_dialog_function_select_paste_clicked (G_GNUC_UNUSED GtkWidget *button,
if (gtk_tree_selection_get_selected (the_selection, &model, &iter) &&
wbcg_edit_start (state->wbcg, FALSE, FALSE)) {
- GtkEditable *entry
+ GtkEditable *entry
= GTK_EDITABLE (wbcg_get_entry (state->wbcg));
gint position;
gtk_tree_model_get (model, &iter,
@@ -406,12 +406,12 @@ cb_dialog_function_select_paste_clicked (G_GNUC_UNUSED GtkWidget *button,
if (func != NULL) {
dialog_function_write_recent_func (state, func);
if (state->paste.from >= 0)
- gtk_editable_select_region
+ gtk_editable_select_region
(entry, state->paste.from,
state->paste.to);
gtk_editable_delete_selection (entry);
position = gtk_editable_get_position (entry);
- gtk_editable_insert_text
+ gtk_editable_insert_text
(entry, func->name, -1, &position);
gtk_editable_set_position (entry, position);
}
@@ -472,7 +472,7 @@ cb_dialog_function_select_load_cb (GtkTreeModel *model,
CATEGORY, &ptr,
-1);
- if (ptr == NULL || ptr == GINT_TO_POINTER(-1)
+ if (ptr == NULL || ptr == GINT_TO_POINTER(-1)
|| ptr == GINT_TO_POINTER(-2))
return FALSE;
if (go_utf8_collate_casefold (specs->name, name) < 0) {
@@ -645,7 +645,7 @@ make_expr_example (Sheet *sheet, const char *text, gboolean localized)
GnmValue *val = gnm_expr_top_eval
(texpr, &ep, GNM_EXPR_EVAL_PERMIT_NON_SCALAR);
GOFormat *format = auto_style_format_suggest (texpr, &ep);
- char *vtxt = format_value(format, val, NULL, -1,
+ char *vtxt = format_value(format, val, NULL, -1,
workbook_date_conv (sheet->workbook));
go_format_unref (format);
@@ -890,16 +890,16 @@ dialog_function_select_find_func (FunctionSelectState *state, char* name)
&data);
if (data.path != NULL) {
GtkTreeIter iter;
- if (gtk_tree_model_get_iter
+ if (gtk_tree_model_get_iter
(GTK_TREE_MODEL (state->model_functions), &iter,
data.path))
- gtk_list_store_set (state->model_functions,
- &iter,
+ gtk_list_store_set (state->model_functions,
+ &iter,
FUNCTION_VISIBLE, TRUE,
-1);
path = gtk_tree_model_filter_convert_child_path_to_path
- (GTK_TREE_MODEL_FILTER (state->model_filter),
+ (GTK_TREE_MODEL_FILTER (state->model_filter),
data.path);
gtk_tree_selection_select_path (selection,
@@ -1007,7 +1007,7 @@ cb_dialog_function_select_fun_selection_changed (GtkTreeSelection *selection,
}
gtk_widget_set_sensitive (state->ok_button, active);
gtk_widget_set_sensitive (state->paste_button, active);
-
+
}
/**********************************************************************/
@@ -1110,12 +1110,12 @@ dialog_function_select_load_tree (FunctionSelectState *state)
for (ptr = funcs; ptr; ptr = ptr->next) {
func = ptr->data;
- if (!(func->flags &
+ if (!(func->flags &
(GNM_FUNC_INTERNAL | GNM_FUNC_IS_PLACEHOLDER))) {
gtk_list_store_append (state->model_functions, &iter);
gnm_func_ref (func);
desc = dialog_function_select_get_description (func, &pal);
- gtk_list_store_set
+ gtk_list_store_set
(state->model_functions, &iter,
FUN_NAME, gnm_func_get_name (func),
FUNCTION, func,
@@ -1150,29 +1150,29 @@ dialog_function_select_init (FunctionSelectState *state)
state);
/* Set-up combo box */
- state->cb = GTK_COMBO_BOX
+ state->cb = GTK_COMBO_BOX
(go_gtk_builder_get_widget (state->gui, "category-box"));
- state->model = gtk_list_store_new
+ state->model = gtk_list_store_new
(NUM_COLMNS, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN);
gtk_combo_box_set_model (state->cb, GTK_TREE_MODEL (state->model));
cell = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (state->cb), cell, TRUE);
- gtk_cell_layout_add_attribute
+ gtk_cell_layout_add_attribute
(GTK_CELL_LAYOUT (state->cb), cell, "text", CAT_NAME);
dialog_function_select_load_cb (state);
- gtk_combo_box_set_row_separator_func
+ gtk_combo_box_set_row_separator_func
(state->cb, dialog_function_select_cat_row_separator,
state, NULL);
- g_signal_connect (state->cb, "changed",
+ g_signal_connect (state->cb, "changed",
G_CALLBACK (dialog_function_select_cat_changed),
state);
/* Finished set-up of combo box */
/* Set-up treeview */
- state->model_functions = gtk_list_store_new
- (NUM_COLUMNS,
+ state->model_functions = gtk_list_store_new
+ (NUM_COLUMNS,
/* FUN_NAME, */
/* FUNCTION, */
/* FUNCTION_DESC, */
@@ -1181,37 +1181,37 @@ dialog_function_select_init (FunctionSelectState *state)
/* FUNCTION_VISIBLE, */
/* FUNCTION_RECENT, */
/* FUNCTION_USED, */
- G_TYPE_STRING, G_TYPE_POINTER,
- G_TYPE_STRING, PANGO_TYPE_ATTR_LIST,
- G_TYPE_POINTER, G_TYPE_BOOLEAN,
+ G_TYPE_STRING, G_TYPE_POINTER,
+ G_TYPE_STRING, PANGO_TYPE_ATTR_LIST,
+ G_TYPE_POINTER, G_TYPE_BOOLEAN,
G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
- state->model_filter = gtk_tree_model_filter_new
+ state->model_filter = gtk_tree_model_filter_new
(GTK_TREE_MODEL (state->model_functions), NULL);
gtk_tree_model_filter_set_visible_column
(GTK_TREE_MODEL_FILTER (state->model_filter), FUNCTION_VISIBLE);
- state->treeview= GTK_TREE_VIEW
+ state->treeview= GTK_TREE_VIEW
(go_gtk_builder_get_widget (state->gui, "function-list"));
- gtk_tree_view_set_model (state->treeview,
+ gtk_tree_view_set_model (state->treeview,
state->model_filter);
selection = gtk_tree_view_get_selection (state->treeview);
gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
g_signal_connect (selection, "changed",
- G_CALLBACK
- (cb_dialog_function_select_fun_selection_changed),
+ G_CALLBACK
+ (cb_dialog_function_select_fun_selection_changed),
state);
- column = gtk_tree_view_column_new_with_attributes
+ column = gtk_tree_view_column_new_with_attributes
(_("Name"),
gtk_cell_renderer_text_new (),
"text", FUN_NAME, NULL);
gtk_tree_view_append_column (state->treeview, column);
- column = gtk_tree_view_column_new_with_attributes
+ column = gtk_tree_view_column_new_with_attributes
(_("Description"),
gtk_cell_renderer_text_new (),
- "text", FUNCTION_DESC,
+ "text", FUNCTION_DESC,
"attributes", FUNCTION_PAL, NULL);
gtk_tree_view_append_column (state->treeview, column);
@@ -1221,18 +1221,18 @@ dialog_function_select_init (FunctionSelectState *state)
dialog_function_select_load_tree (state);
dialog_function_load_recent_funcs (state);
- state->search_entry = go_gtk_builder_get_widget (state->gui,
+ state->search_entry = go_gtk_builder_get_widget (state->gui,
"search-entry");
if (state->paste.prefix != NULL)
- gtk_entry_set_text (GTK_ENTRY (state->search_entry),
+ gtk_entry_set_text (GTK_ENTRY (state->search_entry),
state->paste.prefix);
-
+
#ifdef HAVE_GTK_ENTRY_SET_ICON_FROM_STOCK
- gtk_entry_set_icon_from_stock
+ gtk_entry_set_icon_from_stock
(GTK_ENTRY (state->search_entry),
GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
- gtk_entry_set_icon_tooltip_text
+ gtk_entry_set_icon_tooltip_text
(GTK_ENTRY (state->search_entry),
GTK_ENTRY_ICON_SECONDARY,
_("Erase the search entry."));
@@ -1245,7 +1245,7 @@ dialog_function_select_init (FunctionSelectState *state)
g_signal_connect (G_OBJECT (state->search_entry),
"icon-press",
- G_CALLBACK
+ G_CALLBACK
(dialog_function_select_erase_search_entry),
state);
#endif
@@ -1262,7 +1262,7 @@ dialog_function_select_init (FunctionSelectState *state)
gtk_paned_set_position (GTK_PANED (go_gtk_builder_get_widget
(state->gui, "vpaned1")), 300);
- state->description_view = GTK_TEXT_VIEW (go_gtk_builder_get_widget
+ state->description_view = GTK_TEXT_VIEW (go_gtk_builder_get_widget
(state->gui, "description"));
description = gtk_text_view_get_buffer (state->description_view);
gtk_text_buffer_get_start_iter (description, &where);
@@ -1289,7 +1289,7 @@ dialog_function_select_init (FunctionSelectState *state)
g_signal_connect (G_OBJECT (close_button), "clicked",
G_CALLBACK (cb_dialog_function_select_cancel_clicked), state);
- gnm_dialog_setup_destroy_handlers
+ gnm_dialog_setup_destroy_handlers
(GTK_DIALOG (state->dialog),
state->wbcg,
GNM_DIALOG_DESTROY_CURRENT_SHEET_REMOVED);
@@ -1297,24 +1297,24 @@ dialog_function_select_init (FunctionSelectState *state)
gnumeric_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
GNUMERIC_HELP_LINK_FUNCTION_SELECT);
- g_object_set_data_full
+ g_object_set_data_full
(G_OBJECT (state->dialog),
- "state", state,
+ "state", state,
(GDestroyNotify) cb_dialog_function_select_destroy);
if (state->paste.prefix != NULL)
- dialog_function_select_search
+ dialog_function_select_search
(GTK_ENTRY (state->search_entry), state);
-
+
gtk_widget_set_visible (close_button, state->mode != GURU_MODE);
- gtk_widget_set_visible (go_gtk_builder_get_widget
- (state->gui, "help_button"),
+ gtk_widget_set_visible (go_gtk_builder_get_widget
+ (state->gui, "help_button"),
state->mode == GURU_MODE);
gtk_widget_set_visible (cancel_button, state->mode == GURU_MODE);
gtk_widget_set_visible (state->ok_button, state->mode == GURU_MODE);
gtk_widget_set_visible (state->paste_button, state->mode == PASTE_MODE);
- gtk_widget_set_visible (go_gtk_builder_get_widget
- (state->gui, "title_label"),
+ gtk_widget_set_visible (go_gtk_builder_get_widget
+ (state->gui, "title_label"),
state->mode == GURU_MODE);
gtk_combo_box_set_active (state->cb, state->mode == HELP_MODE ? 2 : 0);
switch (state->mode) {
@@ -1332,7 +1332,7 @@ dialog_function_select_init (FunctionSelectState *state)
}
static void
-dialog_function_select_full (WBCGtk *wbcg, char const *guru_key,
+dialog_function_select_full (WBCGtk *wbcg, char const *guru_key,
char const *key, DialogMode mode, gint from, gint to)
{
FunctionSelectState* state;
@@ -1359,7 +1359,7 @@ dialog_function_select_full (WBCGtk *wbcg, char const *guru_key,
state->paste.to = to;
if (mode == PASTE_MODE && state->paste.from >= 0) {
- GtkEditable *entry
+ GtkEditable *entry
= GTK_EDITABLE (wbcg_get_entry (state->wbcg));
state->paste.prefix = gtk_editable_get_chars
(entry, state->paste.from,
@@ -1377,22 +1377,22 @@ dialog_function_select_full (WBCGtk *wbcg, char const *guru_key,
void
dialog_function_select (WBCGtk *wbcg, char const *key)
{
- dialog_function_select_full (wbcg, key,
- FUNCTION_SELECT_KEY, GURU_MODE, -1, -1);
+ dialog_function_select_full (wbcg, key,
+ FUNCTION_SELECT_KEY, GURU_MODE, -1, -1);
}
void
dialog_function_select_help (WBCGtk *wbcg)
{
- dialog_function_select_full (wbcg, NULL,
- FUNCTION_SELECT_HELP_KEY, HELP_MODE,
+ dialog_function_select_full (wbcg, NULL,
+ FUNCTION_SELECT_HELP_KEY, HELP_MODE,
-1, -1);
}
void
dialog_function_select_paste (WBCGtk *wbcg, gint from, gint to)
{
- dialog_function_select_full (wbcg, NULL,
- FUNCTION_SELECT_PASTE_KEY, PASTE_MODE,
+ dialog_function_select_full (wbcg, NULL,
+ FUNCTION_SELECT_PASTE_KEY, PASTE_MODE,
from, to);
}
diff --git a/src/dialogs/dialog-goto-cell.c b/src/dialogs/dialog-goto-cell.c
index 9550ea9..74944cb 100644
--- a/src/dialogs/dialog-goto-cell.c
+++ b/src/dialogs/dialog-goto-cell.c
@@ -272,8 +272,8 @@ dialog_goto_init (GotoState *state)
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled),
GTK_SHADOW_ETCHED_IN);
- state->model = gtk_tree_store_new (NUM_COLMNS, G_TYPE_STRING,
- G_TYPE_STRING, G_TYPE_POINTER,
+ state->model = gtk_tree_store_new (NUM_COLMNS, G_TYPE_STRING,
+ G_TYPE_STRING, G_TYPE_POINTER,
G_TYPE_POINTER);
state->treeview = GTK_TREE_VIEW (
gtk_tree_view_new_with_model (GTK_TREE_MODEL (state->model)));
diff --git a/src/dialogs/dialog-hyperlink.c b/src/dialogs/dialog-hyperlink.c
index 9f2ddc5..4bea348 100644
--- a/src/dialogs/dialog-hyperlink.c
+++ b/src/dialogs/dialog-hyperlink.c
@@ -108,11 +108,11 @@ dhl_set_tip (HyperlinkState* state)
return;
} else
g_free (default_tip);
- }
+ }
w = go_gtk_builder_get_widget (state->gui, "use-this-tip");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), TRUE);
- tb = gtk_text_view_get_buffer
+ tb = gtk_text_view_get_buffer
(GTK_TEXT_VIEW (go_gtk_builder_get_widget (state->gui, "tip-entry")));
gtk_text_buffer_set_text (tb, (tip == NULL) ? "" : tip, -1);
@@ -127,7 +127,7 @@ dhl_get_tip (HyperlinkState *state, char const *target)
return dhl_get_default_tip (target);
else {
char *tip;
- GtkTextBuffer *tb = gtk_text_view_get_buffer
+ GtkTextBuffer *tb = gtk_text_view_get_buffer
(GTK_TEXT_VIEW (go_gtk_builder_get_widget (state->gui, "tip-entry")));
GtkTextIter start_iter, end_iter;
diff --git a/src/dialogs/dialog-paste-special.c b/src/dialogs/dialog-paste-special.c
index c2f50f8..c7414d0 100644
--- a/src/dialogs/dialog-paste-special.c
+++ b/src/dialogs/dialog-paste-special.c
@@ -109,7 +109,7 @@ static void
paste_link_set_sensitive (PasteSpecialState *state)
{
gboolean sensitive =
- (!gtk_toggle_button_get_active
+ (!gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (go_gtk_builder_get_widget (state->gui,"skip-blanks")))
&& 0 == gnm_gui_group_value (state->gui, paste_type_group)
&& 0 == gnm_gui_group_value (state->gui, cell_operation_group)
@@ -154,7 +154,7 @@ dialog_paste_special_type_toggled_cb (GtkWidget *button, PasteSpecialState *stat
char const * const *group;
gboolean permit_cell_ops = paste_type_group_props[i].permit_cell_ops;
- for (group = cell_operation_group; *group != NULL; group++)
+ for (group = cell_operation_group; *group != NULL; group++)
gtk_widget_set_sensitive (go_gtk_builder_get_widget (state->gui,*group),
permit_cell_ops);
paste_link_set_sensitive (state);
@@ -202,7 +202,7 @@ cb_tool_ok_clicked (G_GNUC_UNUSED GtkWidget *button,
int paste_type = gnm_gui_group_value (state->gui, paste_type_group);
int region_op_type = gnm_gui_group_value (state->gui, region_operation_group);
- result = paste_type_group_props[paste_type].paste_enum
+ result = paste_type_group_props[paste_type].paste_enum
| region_operation_props[region_op_type].paste_enum;
if (paste_type_group_props[paste_type].permit_cell_ops) {
@@ -210,10 +210,10 @@ cb_tool_ok_clicked (G_GNUC_UNUSED GtkWidget *button,
result |= cell_operation_props[cell_op_type].paste_enum;
}
- if (gtk_toggle_button_get_active
+ if (gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (go_gtk_builder_get_widget (state->gui,"skip-blanks"))))
result |= PASTE_SKIP_BLANKS;
- if (gtk_toggle_button_get_active
+ if (gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (go_gtk_builder_get_widget (state->gui,"dont-change-formulae"))))
result |= PASTE_EXPR_LOCAL_RELOCATE;
@@ -269,15 +269,15 @@ dialog_paste_special (WBCGtk *wbcg)
G_CALLBACK (cb_tool_ok_clicked), state);
- for (group = paste_type_group; *group != NULL; group++)
+ for (group = paste_type_group; *group != NULL; group++)
g_signal_connect_after (go_gtk_builder_get_widget (state->gui,*group),
"toggled",
G_CALLBACK (dialog_paste_special_type_toggled_cb), state);
- for (group = cell_operation_group; *group != NULL; group++)
+ for (group = cell_operation_group; *group != NULL; group++)
g_signal_connect_after (go_gtk_builder_get_widget (state->gui,*group),
"toggled",
G_CALLBACK (dialog_paste_special_cell_op_toggled_cb), state);
- for (group = region_operation_group; *group != NULL; group++)
+ for (group = region_operation_group; *group != NULL; group++)
g_signal_connect_after (go_gtk_builder_get_widget (state->gui,*group),
"toggled",
G_CALLBACK (dialog_paste_special_region_op_toggled_cb), state);
diff --git a/src/dialogs/dialog-preferences.c b/src/dialogs/dialog-preferences.c
index 10af1bd..08f6b3a 100644
--- a/src/dialogs/dialog-preferences.c
+++ b/src/dialogs/dialog-preferences.c
@@ -161,11 +161,11 @@ static void
bool_pref_widget_to_conf (GtkToggleButton *button,
gboolean_conf_setter_t setter)
{
- gboolean_conf_getter_t getter
+ gboolean_conf_getter_t getter
= g_object_get_data (G_OBJECT (button), "getter");
gboolean val_in_button = gtk_toggle_button_get_active (button);
gboolean val_in_conf = getter ();
- if ((!val_in_button) != (!val_in_conf))
+ if ((!val_in_button) != (!val_in_conf))
setter (val_in_button);
}
@@ -323,7 +323,7 @@ enum_pref_create_widget (GOConfNode *node, GtkWidget *table,
static void
int_pref_widget_to_conf (GtkSpinButton *button, gint_conf_setter_t setter)
{
- gint_conf_getter_t getter
+ gint_conf_getter_t getter
= g_object_get_data (G_OBJECT (button), "getter");
gint val_in_button = gtk_spin_button_get_value_as_int (button);
gint val_in_conf = getter ();
@@ -406,7 +406,7 @@ power_of_2_handlers (GtkWidget *w)
static void
double_pref_widget_to_conf (GtkSpinButton *button, double_conf_setter_t setter)
{
- double_conf_getter_t getter
+ double_conf_getter_t getter
= g_object_get_data (G_OBJECT (button), "getter");
double val_in_button = gtk_spin_button_get_value (button);
double val_in_conf = getter();
@@ -431,7 +431,7 @@ double_pref_conf_to_widget (GOConfNode *node, G_GNUC_UNUSED char const *key,
static void
double_pref_create_widget (GOConfNode *node, GtkWidget *table,
gint row, gnm_float val, gnm_float from, gnm_float to,
- gnm_float step, gint digits,
+ gnm_float step, gint digits,
double_conf_setter_t setter,
double_conf_getter_t getter,
char const *default_label)
@@ -482,7 +482,7 @@ wordlist_pref_conf_to_widget (GOConfNode *node, G_GNUC_UNUSED char const *key,
g_slist_free (list);
}
-static void
+static void
wordlist_pref_remove (GtkButton *button, wordlist_conf_setter_t setter) {
GtkTreeView *tree = g_object_get_data (G_OBJECT (button), "treeview");
GtkTreeSelection *select = gtk_tree_view_get_selection (tree);
@@ -510,7 +510,7 @@ wordlist_pref_remove (GtkButton *button, wordlist_conf_setter_t setter) {
}
}
-static void
+static void
wordlist_pref_add (GtkButton *button, wordlist_conf_setter_t setter)
{
GtkEntry *entry = g_object_get_data (G_OBJECT (button), "entry");
@@ -540,7 +540,7 @@ static GtkWidget *
wordlist_pref_create_widget (GOConfNode *node, GtkWidget *table,
gint row, wordlist_conf_setter_t setter,
wordlist_conf_getter_t getter,
- char const *default_label)
+ char const *default_label)
{
GtkWidget *w= gtk_table_new (5, 2, FALSE);
GtkWidget *sw= gtk_scrolled_window_new (NULL, NULL);
@@ -551,7 +551,7 @@ wordlist_pref_create_widget (GOConfNode *node, GtkWidget *table,
GtkListStore *model = gtk_list_store_new (1, G_TYPE_STRING);
GtkTreeSelection *selection;
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
GTK_SHADOW_ETCHED_IN);
@@ -577,7 +577,7 @@ wordlist_pref_create_widget (GOConfNode *node, GtkWidget *table,
gtk_tree_view_set_model (GTK_TREE_VIEW (tv),
GTK_TREE_MODEL (model));
gtk_tree_view_append_column (GTK_TREE_VIEW (tv),
- gtk_tree_view_column_new_with_attributes
+ gtk_tree_view_column_new_with_attributes
(NULL,
gtk_cell_renderer_text_new (),
"text", 0,
@@ -596,7 +596,7 @@ wordlist_pref_create_widget (GOConfNode *node, GtkWidget *table,
G_CALLBACK (wordlist_pref_add), setter);
g_signal_connect (G_OBJECT (selection), "changed",
G_CALLBACK (wordlist_pref_update_remove_button), remove_button);
- wordlist_pref_update_remove_button (selection,
+ wordlist_pref_update_remove_button (selection,
GTK_BUTTON (remove_button));
connect_notification (node, (GOConfMonitorFunc)wordlist_pref_conf_to_widget,
@@ -892,7 +892,7 @@ custom_pref_conf_to_widget_ecd (GOConfNode *node, G_GNUC_UNUSED char const *key,
/* We can't use the getter here since the main preferences */
/* may be notified after us */
GSList *list = go_conf_get_str_list (node, NULL);
- gboolean val_in_conf
+ gboolean val_in_conf
= (NULL != g_slist_find_custom (list, "Gnumeric_stf:stf_assistant", go_str_compare));
if ((!val_in_button) != (!val_in_conf))
@@ -1188,7 +1188,7 @@ typedef struct {
GtkTreePath *path;
} page_search_t;
-static gboolean
+static gboolean
dialog_pref_select_page_search (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
@@ -1352,8 +1352,8 @@ dialog_preferences (WBCGtk *wbcg, gint page)
this_page->page_initializer (state, NULL,
state->notebook, i);
gtk_notebook_append_page (state->notebook, page_widget, NULL);
- dialog_pref_add_item (state, this_page->page_name,
- this_page->icon_name, i,
+ dialog_pref_add_item (state, this_page->page_name,
+ this_page->icon_name, i,
this_page->parent_path);
}
diff --git a/src/dialogs/dialog-random-generator-cor.c b/src/dialogs/dialog-random-generator-cor.c
index 3fa5e9a..14a9373 100644
--- a/src/dialogs/dialog-random-generator-cor.c
+++ b/src/dialogs/dialog-random-generator-cor.c
@@ -155,10 +155,10 @@ random_cor_tool_ok_clicked_cb (GtkWidget *button, RandomCorToolState *state)
(GNM_EXPR_ENTRY (state->base.input_entry),
state->base.sheet);
- data->variables = data->matrix->v_range.cell.b.row -
+ data->variables = data->matrix->v_range.cell.b.row -
data->matrix->v_range.cell.a.row + 1;
- data->matrix_type = gnm_gui_group_value
+ data->matrix_type = gnm_gui_group_value
(state->base.gui, matrix_group);
diff --git a/src/dialogs/dialog-search-replace.c b/src/dialogs/dialog-search-replace.c
index cb2f3e7..ec4e554 100644
--- a/src/dialogs/dialog-search-replace.c
+++ b/src/dialogs/dialog-search-replace.c
@@ -111,11 +111,11 @@ dialog_search_replace_save_in_prefs (DialogState *dd)
SETW("column_major", gnm_conf_set_searchreplace_columnmajor);
#undef SETW
- gnm_conf_set_searchreplace_regex
+ gnm_conf_set_searchreplace_regex
(gnm_gui_group_value (gui, search_type_group));
- gnm_conf_set_searchreplace_error_behaviour
+ gnm_conf_set_searchreplace_error_behaviour
(gnm_gui_group_value (gui, error_group));
- gnm_conf_set_searchreplace_scope
+ gnm_conf_set_searchreplace_scope
(gnm_gui_group_value (gui, scope_group));
}
@@ -311,25 +311,25 @@ dialog_search_replace (WBCGtk *wbcg,
SETW("match_words", gnm_conf_get_searchreplace_whole_words_only);
#undef SETW
- gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON
- (go_gtk_builder_get_widget
- (gui,
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON
+ (go_gtk_builder_get_widget
+ (gui,
search_type_group[gnm_conf_get_searchreplace_regex () ? 1 : 0])), TRUE);
- gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON
- (go_gtk_builder_get_widget
- (gui,
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON
+ (go_gtk_builder_get_widget
+ (gui,
direction_group[gnm_conf_get_searchreplace_columnmajor () ? 1 : 0])), TRUE);
- gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON
- (go_gtk_builder_get_widget
- (gui,
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON
+ (go_gtk_builder_get_widget
+ (gui,
error_group[gnm_conf_get_searchreplace_error_behaviour ()])), TRUE);
- gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON
- (go_gtk_builder_get_widget
- (gui,
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON
+ (go_gtk_builder_get_widget
+ (gui,
scope_group[gnm_conf_get_searchreplace_scope ()])), TRUE);
diff --git a/src/dialogs/dialog-search.c b/src/dialogs/dialog-search.c
index 7633001..0201097 100644
--- a/src/dialogs/dialog-search.c
+++ b/src/dialogs/dialog-search.c
@@ -254,9 +254,9 @@ dialog_search_save_in_prefs (DialogState *dd)
SETW("column_major", gnm_conf_set_searchreplace_columnmajor);
#undef SETW
- gnm_conf_set_searchreplace_regex
+ gnm_conf_set_searchreplace_regex
(go_gtk_builder_group_value (gui, search_type_group));
- gnm_conf_set_searchreplace_scope
+ gnm_conf_set_searchreplace_scope
(go_gtk_builder_group_value (gui, scope_group));
}
@@ -363,7 +363,7 @@ search_clicked (G_GNUC_UNUSED GtkWidget *widget, DialogState *dd)
if (is_checked (gui, "save-in-prefs"))
dialog_search_save_in_prefs (dd);
-
+
{
GnumericLazyList *ll;
GPtrArray *cells;
@@ -561,21 +561,21 @@ dialog_search (WBCGtk *wbcg)
SETW("match_words", gnm_conf_get_searchreplace_whole_words_only);
#undef SETW
- gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON
(gtk_builder_get_object
- (gui,
+ (gui,
search_type_group[gnm_conf_get_searchreplace_regex ()])), TRUE);
- gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON
- (gtk_builder_get_object
- (gui,
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON
+ (gtk_builder_get_object
+ (gui,
direction_group
[gnm_conf_get_searchreplace_columnmajor () ? 1 : 0])), TRUE);
- gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON
(gtk_builder_get_object
- (gui,
+ (gui,
scope_group[gnm_conf_get_searchreplace_scope ()])), TRUE);
g_signal_connect (G_OBJECT (dd->matches_table), "cursor_changed",
diff --git a/src/dialogs/dialog-sheet-order.c b/src/dialogs/dialog-sheet-order.c
index 4bae4ab..40539f9 100644
--- a/src/dialogs/dialog-sheet-order.c
+++ b/src/dialogs/dialog-sheet-order.c
@@ -308,12 +308,12 @@ cb_color_changed_fore (G_GNUC_UNUSED GOComboColor *go_combo_color,
GnmColor *gnm_color;
g_return_if_fail (selection != NULL);
-
+
selected_rows = gtk_tree_selection_get_selected_rows (selection, NULL);
p_gdk_color = (color == 0) ? NULL : go_color_to_gdk (color, &gdk_color);
gnm_color = (color == 0) ? NULL : style_color_new_gdk (&gdk_color);
-
+
old_state = workbook_sheet_state_new (wb);
for (l = selected_rows; l != NULL; l = l->next) {
@@ -360,12 +360,12 @@ cb_color_changed_back (G_GNUC_UNUSED GOComboColor *go_combo_color,
GnmColor *gnm_color;
g_return_if_fail (selection != NULL);
-
+
selected_rows = gtk_tree_selection_get_selected_rows (selection, NULL);
p_gdk_color = (color == 0) ? NULL : go_color_to_gdk (color, &gdk_color);
gnm_color = (color == 0) ? NULL : style_color_new_gdk (&gdk_color);
-
+
old_state = workbook_sheet_state_new (wb);
for (l = selected_rows; l != NULL; l = l->next) {
@@ -457,7 +457,7 @@ cb_selection_changed (G_GNUC_UNUSED GtkTreeSelection *ignored,
gtk_tree_model_get_iter (GTK_TREE_MODEL (state->model),
&iter, (GtkTreePath *) selected_rows->data);
-
+
gtk_tree_model_get (GTK_TREE_MODEL (state->model), &iter,
SHEET_POINTER, &sheet,
BACKGROUND_COLOUR, &back,
@@ -482,13 +482,13 @@ cb_selection_changed (G_GNUC_UNUSED GtkTreeSelection *ignored,
has_iter = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (state->model), &iter);
g_return_if_fail (has_iter);
gtk_widget_set_sensitive (state->up_btn,
- single_sel &&
+ single_sel &&
!gtk_tree_selection_iter_is_selected (selection, &iter));
gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (state->model), &iter, NULL,
- gtk_tree_model_iter_n_children
+ gtk_tree_model_iter_n_children
(GTK_TREE_MODEL (state->model), NULL) - 1);
gtk_widget_set_sensitive (state->down_btn,
- single_sel &&
+ single_sel &&
!gtk_tree_selection_iter_is_selected (selection, &iter));
if (sheet != NULL)
@@ -657,7 +657,7 @@ sheet_selection_can_toggle(GtkTreeSelection *selection,
GtkTreeIter iter;
gboolean is_visible;
- if (path_currently_selected ||
+ if (path_currently_selected ||
!gtk_tree_model_get_iter (model, &iter, path))
return TRUE;
@@ -878,10 +878,10 @@ cb_item_move (SheetManager *state, gnm_iter_search_t iter_search)
GtkTreeSelection *selection = gtk_tree_view_get_selection (state->sheet_list);
GtkTreeIter a, b;
GList *selected_rows;
-
+
g_return_if_fail (selection != NULL);
g_return_if_fail (gtk_tree_selection_count_selected_rows (selection) == 1);
-
+
selected_rows = gtk_tree_selection_get_selected_rows (selection, NULL);
gtk_tree_model_get_iter (GTK_TREE_MODEL (state->model),
&a, (GtkTreePath *) selected_rows->data);
@@ -921,12 +921,12 @@ cb_add_clicked (G_GNUC_UNUSED GtkWidget *ignore, SheetManager *state)
g_return_if_fail (selection != NULL);
g_return_if_fail (gtk_tree_selection_count_selected_rows (selection) == 1);
-
+
selected_rows = gtk_tree_selection_get_selected_rows (selection, NULL);
gtk_tree_model_get_iter (GTK_TREE_MODEL (state->model),
&sel_iter, (GtkTreePath *) selected_rows->data);
go_list_free_custom (selected_rows, (GFreeFunc) gtk_tree_path_free);
-
+
gtk_tree_model_get (GTK_TREE_MODEL (state->model), &sel_iter,
SHEET_POINTER, &old_sheet,
-1);
@@ -1000,7 +1000,7 @@ cb_duplicate_clicked (G_GNUC_UNUSED GtkWidget *ignore,
g_return_if_fail (selection != NULL);
g_return_if_fail (gtk_tree_selection_count_selected_rows (selection) == 1);
-
+
selected_rows = gtk_tree_selection_get_selected_rows (selection, NULL);
gtk_tree_model_get_iter (GTK_TREE_MODEL (state->model),
&sel_iter, (GtkTreePath *) selected_rows->data);
@@ -1043,11 +1043,11 @@ cb_delete_clicked (G_GNUC_UNUSED GtkWidget *ignore,
Workbook *wb = wb_control_get_workbook (wbc);
g_return_if_fail (selection != NULL);
-
+
selected_rows = gtk_tree_selection_get_selected_rows (selection, NULL);
-
- for (l = selected_rows; l != NULL; l = l->next)
- l->data = gtk_tree_row_reference_new (GTK_TREE_MODEL (state->model),
+
+ for (l = selected_rows; l != NULL; l = l->next)
+ l->data = gtk_tree_row_reference_new (GTK_TREE_MODEL (state->model),
(GtkTreePath *) l->data);
workbook_signals_block (state);
old_state = workbook_sheet_state_new (wb);
@@ -1068,7 +1068,7 @@ cb_delete_clicked (G_GNUC_UNUSED GtkWidget *ignore,
workbook_sheet_delete (sheet);
}
}
-
+
cmd_reorganize_sheets (wbc, old_state, NULL);
update_undo (state, wbc);
workbook_signals_unblock (state);
diff --git a/src/dialogs/dialog-sheetobject-size.c b/src/dialogs/dialog-sheetobject-size.c
index 84a4c30..f374dfc 100644
--- a/src/dialogs/dialog-sheetobject-size.c
+++ b/src/dialogs/dialog-sheetobject-size.c
@@ -92,13 +92,13 @@ cb_dialog_so_size_value_changed_update_points (GtkSpinButton *spinbutton,
static void
dialog_so_size_button_sensitivity (SOSizeState *state)
{
- gboolean sensitive = state->so_size_needs_restore ||
- state->so_pos_needs_restore ||
+ gboolean sensitive = state->so_size_needs_restore ||
+ state->so_pos_needs_restore ||
state->so_name_changed ||
state->so_print_check_changed;
- gtk_widget_set_sensitive
+ gtk_widget_set_sensitive
(state->ok_button, sensitive);
- gtk_widget_set_sensitive
+ gtk_widget_set_sensitive
(state->apply_button, sensitive);
}
@@ -164,7 +164,7 @@ cb_dialog_so_size_value_changed (G_GNUC_UNUSED GtkSpinButton *spinbutton,
else
new_coords[1] = new_coords[3] + new_height;
- scg_object_coords_to_anchor (state->scg, new_coords,
+ scg_object_coords_to_anchor (state->scg, new_coords,
state->active_anchor);
}
@@ -177,10 +177,10 @@ static void
dialog_so_size_load (SOSizeState *state)
{
g_free (state->old_anchor);
- state->old_anchor = sheet_object_anchor_dup
+ state->old_anchor = sheet_object_anchor_dup
(sheet_object_get_anchor (state->so));
- scg_object_anchor_to_coords (state->scg,
- state->old_anchor,
+ scg_object_anchor_to_coords (state->scg,
+ state->old_anchor,
state->coords);
state->so_size_needs_restore = FALSE;
state->so_pos_needs_restore = FALSE;
@@ -220,10 +220,10 @@ cb_dialog_so_size_apply_clicked (G_GNUC_UNUSED GtkWidget *button,
char const *label = state->so_pos_needs_restore ?
_("Move Object") : _("Resize Object");
sheet_object_set_anchor (state->so, state->old_anchor);
- if (!cmd_objects_move (WORKBOOK_CONTROL (state->wbcg),
+ if (!cmd_objects_move (WORKBOOK_CONTROL (state->wbcg),
g_slist_prepend (NULL, state->so),
- g_slist_prepend
- (NULL, sheet_object_anchor_dup
+ g_slist_prepend
+ (NULL, sheet_object_anchor_dup
(state->active_anchor)),
FALSE, label))
dialog_so_size_load (state);
@@ -246,9 +246,9 @@ cb_dialog_so_size_apply_clicked (G_GNUC_UNUSED GtkWidget *button,
}
if (state->so_print_check_changed) {
gboolean val = ((state->so->flags & SHEET_OBJECT_PRINT) != 0);
- undo = go_undo_combine (undo, set_print_flag
+ undo = go_undo_combine (undo, set_print_flag
(state->so, val));
- redo = go_undo_combine (redo, set_print_flag
+ redo = go_undo_combine (redo, set_print_flag
(state->so, !val));
undo_name = _("Set Object Print Property");
cnt++;
@@ -284,7 +284,7 @@ cb_dialog_so_size_name_changed (GtkEntry *entry,
char const *name = gtk_entry_get_text (entry);
if (name == NULL)
name = "";
- state->so_name_changed
+ state->so_name_changed
= (strcmp (name, state->old_name) != 0);
dialog_so_size_button_sensitivity (state);
return FALSE;
@@ -297,10 +297,10 @@ cb_dialog_so_size_print_check_toggled (GtkToggleButton *togglebutton,
gboolean new_print = !gtk_toggle_button_get_active (togglebutton);
gboolean old_print = ((state->so->flags & SHEET_OBJECT_PRINT) != 0);
- state->so_print_check_changed
- = (new_print != old_print);
+ state->so_print_check_changed
+ = (new_print != old_print);
dialog_so_size_button_sensitivity (state);
- return;
+ return;
}
void
@@ -351,10 +351,10 @@ dialog_so_size (WBCGtk *wbcg, GObject *so)
state->xspin = GTK_SPIN_BUTTON (go_gtk_builder_get_widget (state->gui, "x-spin"));
state->ypoints = GTK_WIDGET (go_gtk_builder_get_widget (state->gui, "y-pts-label"));
state->yspin = GTK_SPIN_BUTTON (go_gtk_builder_get_widget (state->gui, "y-spin"));
- state->print_check = GTK_WIDGET (go_gtk_builder_get_widget (state->gui,
+ state->print_check = GTK_WIDGET (go_gtk_builder_get_widget (state->gui,
"print-check"));
dialog_so_size_load (state);
- state->active_anchor = sheet_object_anchor_dup (sheet_object_get_anchor
+ state->active_anchor = sheet_object_anchor_dup (sheet_object_get_anchor
(state->so));
width = state->coords[2] - state->coords[0];
height = state->coords[3] - state->coords[1];
@@ -385,7 +385,7 @@ dialog_so_size (WBCGtk *wbcg, GObject *so)
"toggled",
G_CALLBACK (cb_dialog_so_size_print_check_toggled),
state);
-
+
cb_dialog_so_size_value_changed_update_points (state->wspin, GTK_LABEL (state->wpoints));
cb_dialog_so_size_value_changed_update_points (state->hspin, GTK_LABEL (state->hpoints));
cb_dialog_so_size_value_changed_update_points (state->xspin, GTK_LABEL (state->xpoints));
diff --git a/src/dialogs/dialog-so-list.c b/src/dialogs/dialog-so-list.c
index f9a1149..da7c62e 100644
--- a/src/dialogs/dialog-so-list.c
+++ b/src/dialogs/dialog-so-list.c
@@ -89,7 +89,7 @@ cb_so_list_response (GtkWidget *dialog, gint response_id, GnmDialogSOList *state
content = gnm_expr_entry_parse (state->content_entry,
&pp, NULL, FALSE, GNM_EE_FORCE_ABS_REF);
cmd_so_set_links (WORKBOOK_CONTROL (state->wbcg), state->so, output, content,
- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(state->as_index_radio)));
}
@@ -121,7 +121,7 @@ so_list_init (GnmDialogSOList *state, WBCGtk *wbcg, SheetObject *so)
if (texpr) gnm_expr_top_unref (texpr);
state->as_index_radio = go_gtk_builder_get_widget (gui, "as-index-radio");
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (state->as_index_radio),
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (state->as_index_radio),
sheet_widget_list_base_result_type_is_index (so));
g_signal_connect (G_OBJECT (state->dialog), "response",
diff --git a/src/dialogs/dialog-solver.c b/src/dialogs/dialog-solver.c
index 1c39795..e6e3a87 100644
--- a/src/dialogs/dialog-solver.c
+++ b/src/dialogs/dialog-solver.c
@@ -1128,7 +1128,7 @@ dialog_init (SolverState *state)
gnm_expr_entry_load_from_text (state->target_entry,
cell_name (target_cell));
else {
- SheetView *sv = wb_control_cur_sheet_view
+ SheetView *sv = wb_control_cur_sheet_view
(WORKBOOK_CONTROL (state->wbcg));
if (sv) {
GnmRange first = {sv->edit_pos, sv->edit_pos};
diff --git a/src/dialogs/dialog-stf-export.c b/src/dialogs/dialog-stf-export.c
index 3077b97..80df618 100644
--- a/src/dialogs/dialog-stf-export.c
+++ b/src/dialogs/dialog-stf-export.c
@@ -367,8 +367,8 @@ stf_export_dialog_finish (TextExportState *state)
"locale", locale,
NULL);
- if (gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON (go_gtk_builder_get_widget (state->gui,
+ if (gtk_toggle_button_get_active
+ (GTK_TOGGLE_BUTTON (go_gtk_builder_get_widget (state->gui,
"save-as-default-check")))) {
gnm_conf_set_stf_export_separator (separator);
gnm_conf_set_stf_export_stringindicator (quote);
diff --git a/src/dialogs/dialog-stf-format-page.c b/src/dialogs/dialog-stf-format-page.c
index 7396f70..f692a79 100644
--- a/src/dialogs/dialog-stf-format-page.c
+++ b/src/dialogs/dialog-stf-format-page.c
@@ -193,7 +193,7 @@ cb_col_check_clicked (GtkToggleButton *togglebutton, gpointer _i)
return;
}
-static void
+static void
cb_format_clicked (GtkButton *widget, gpointer _i)
{
int i = GPOINTER_TO_INT (_i);
@@ -201,7 +201,7 @@ cb_format_clicked (GtkButton *widget, gpointer _i)
g_object_get_data (G_OBJECT (widget), "pagedata");
gint result;
GOFormat *sf;
- GtkWidget *dialog = gtk_dialog_new_with_buttons
+ GtkWidget *dialog = gtk_dialog_new_with_buttons
(_("Format Selector"),
GTK_WINDOW (pagedata->dialog),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -229,7 +229,7 @@ cb_format_clicked (GtkButton *widget, gpointer _i)
"formatlabel");
sf = g_ptr_array_index (pagedata->format.formats, i);
go_format_unref (sf);
-
+
sf = go_format_ref (go_format_sel_get_fmt (format_selector));
gtk_button_set_label (GTK_BUTTON (format_label),
go_format_sel_format_classification (sf));
@@ -591,14 +591,14 @@ format_page_update_preview (StfDialogData *pagedata)
if (NULL == g_object_get_data (G_OBJECT (column), "checkbox")) {
GtkWidget *vbox = gtk_vbox_new (FALSE,5);
- GtkWidget *check,
+ GtkWidget *check,
*check_autofit = gtk_check_button_new_with_label (_("Auto fit"));
char * label_text = g_strdup_printf
(pagedata->format.col_header, i+1);
GOFormat const *gf = go_format_general ();
GtkWidget *format_label = gtk_button_new_with_label
(go_format_sel_format_classification (gf));
- GtkWidget *format_icon
+ GtkWidget *format_icon
= gtk_image_new_from_stock (GTK_STOCK_INFO, GTK_ICON_SIZE_BUTTON);
check = gtk_check_button_new_with_label (label_text);
diff --git a/src/dialogs/dialog-workbook-attr.c b/src/dialogs/dialog-workbook-attr.c
index c6e0735..61698ce 100644
--- a/src/dialogs/dialog-workbook-attr.c
+++ b/src/dialogs/dialog-workbook-attr.c
@@ -71,8 +71,8 @@ cb_widget_changed (GtkWidget *widget, AttrState *state)
{
char const *key;
- key = g_object_get_data (G_OBJECT (widget), "GNUMERIC:VIEWPROPERTY");
- g_object_set (G_OBJECT (state->wbv),
+ key = g_object_get_data (G_OBJECT (widget), "GNUMERIC:VIEWPROPERTY");
+ g_object_set (G_OBJECT (state->wbv),
key, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)),
NULL);
}
@@ -105,7 +105,7 @@ attr_dialog_init_toggle (AttrState *state, char const *name, char const *key)
GtkWidget *w = go_gtk_builder_get_widget (state->gui, name);
gboolean val = FALSE;
- g_object_get (G_OBJECT (state->wbv), key, &val, NULL);
+ g_object_get (G_OBJECT (state->wbv), key, &val, NULL);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), val);
g_signal_connect (G_OBJECT (w),
@@ -118,13 +118,13 @@ attr_dialog_init_toggle (AttrState *state, char const *name, char const *key)
static void
attr_dialog_init_widget_page (AttrState *state)
{
- attr_dialog_init_toggle
+ attr_dialog_init_toggle
(state,
"WorkbookView::show_horizontal_scrollbar", "show_horizontal_scrollbar");
- attr_dialog_init_toggle
+ attr_dialog_init_toggle
(state,
"WorkbookView::show_vertical_scrollbar", "show_vertical_scrollbar");
- attr_dialog_init_toggle
+ attr_dialog_init_toggle
(state,
"WorkbookView::show_notebook_tabs", "show_notebook_tabs");
}
@@ -132,7 +132,7 @@ attr_dialog_init_widget_page (AttrState *state)
static void
attr_dialog_init_autocompletion_page (AttrState *state)
{
- attr_dialog_init_toggle
+ attr_dialog_init_toggle
(state,
"WorkbookView::do_auto_completion", "do_auto_completion");
}
@@ -140,7 +140,7 @@ attr_dialog_init_autocompletion_page (AttrState *state)
static void
attr_dialog_init_cell_marker_page (AttrState *state)
{
- attr_dialog_init_toggle
+ attr_dialog_init_toggle
(state,
"WorkbookView::show_function_cell_markers", "show_function_cell_markers");
}
@@ -148,7 +148,7 @@ attr_dialog_init_cell_marker_page (AttrState *state)
static void
attr_dialog_init_protection_page (AttrState *state)
{
- attr_dialog_init_toggle
+ attr_dialog_init_toggle
(state,
"WorkbookView::workbook_protected", "protected");
}
@@ -203,7 +203,7 @@ typedef struct {
GtkTreePath *path;
} page_search_t;
-static gboolean
+static gboolean
attr_dialog_select_page_search (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
@@ -297,7 +297,7 @@ attr_dialog_impl (AttrState *state)
for (i = 0; page_info[i].page > -1; i++) {
const page_info_t *this_page = &page_info[i];
this_page->page_initializer (state);
- attr_dialog_add_item (state, this_page->page_name, this_page->icon_name,
+ attr_dialog_add_item (state, this_page->page_name, this_page->icon_name,
this_page->page, this_page->parent_path);
}
diff --git a/src/dialogs/dialogs.h b/src/dialogs/dialogs.h
index a0e79ff..2963c02 100644
--- a/src/dialogs/dialogs.h
+++ b/src/dialogs/dialogs.h
@@ -103,9 +103,9 @@ typedef enum {
SIGNTEST_WILCOXON
} signtest_type;
-int dialog_sign_test_tool (WBCGtk *wbcg, Sheet *sheet,
+int dialog_sign_test_tool (WBCGtk *wbcg, Sheet *sheet,
signtest_type type);
-int dialog_sign_test_two_tool (WBCGtk *wbcg, Sheet *sheet,
+int dialog_sign_test_two_tool (WBCGtk *wbcg, Sheet *sheet,
signtest_type type);
typedef enum {
diff --git a/src/expr-name.c b/src/expr-name.c
index 87c9990..b91760f 100644
--- a/src/expr-name.c
+++ b/src/expr-name.c
@@ -58,14 +58,14 @@ expr_name_validate_a1 (const char *name)
const char *p = name;
gint i;
- for (i = 0; *p && g_ascii_isalpha(p[0]);
+ for (i = 0; *p && g_ascii_isalpha(p[0]);
p = g_utf8_next_char (p))
i++;
if (i==0 || i>4) /* We want to allow "total2010" and it */
/* is unlikely to have more than 456976 */
/* columns atm */
return TRUE;
- for (i = 0; *p && g_ascii_isdigit (p[0]);
+ for (i = 0; *p && g_ascii_isdigit (p[0]);
p = g_utf8_next_char (p))
i++;
if (i==0)
@@ -938,7 +938,7 @@ expr_name_in_use (GnmNamedExpr *nexpr)
{
gchar const *name;
- if (nexpr->dependents != NULL &&
+ if (nexpr->dependents != NULL &&
g_hash_table_size (nexpr->dependents) != 0)
return TRUE;
@@ -953,7 +953,7 @@ expr_name_in_use (GnmNamedExpr *nexpr)
gboolean res;
GSList *sheets, *sheets_orig;
- res = expr_name_check_for_name
+ res = expr_name_check_for_name
(name, nexpr->pos.wb->names, FALSE);
if (res)
return TRUE;
@@ -962,7 +962,7 @@ expr_name_in_use (GnmNamedExpr *nexpr)
for (sheets = sheets_orig;
sheets != NULL; sheets = sheets->next) {
Sheet *this = sheets->data;
- res = expr_name_check_for_name
+ res = expr_name_check_for_name
(name, this->names, TRUE);
if (res) {
g_slist_free (sheets_orig);
@@ -975,7 +975,7 @@ expr_name_in_use (GnmNamedExpr *nexpr)
/* It can only be used by another sheet-level */
/* name of the same sheet. */
- return expr_name_check_for_name
+ return expr_name_check_for_name
(name, nexpr->pos.sheet->names, FALSE);
}
diff --git a/src/expr.c b/src/expr.c
index 03e7166..07ae4a4 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -2520,8 +2520,8 @@ gnm_insert_unique_value_cmp (gconstpointer a, gconstpointer b)
static GSList *
gnm_insert_unique_value (GSList *list, GnmValue *data)
{
- if (g_slist_find_custom (list, data,
- gnm_insert_unique_value_cmp)
+ if (g_slist_find_custom (list, data,
+ gnm_insert_unique_value_cmp)
== NULL)
return g_slist_prepend (list, data);
value_release (data);
diff --git a/src/func.c b/src/func.c
index 2fd5041..87da2e2 100644
--- a/src/func.c
+++ b/src/func.c
@@ -986,7 +986,7 @@ GSList *
gnm_func_lookup_prefix (char const *prefix, Workbook *scope)
{
GSList *list = symbol_names (global_symbol_table, NULL, prefix);
-
+
return list;
}
diff --git a/src/gnm-format.c b/src/gnm-format.c
index 55b41d3..1edd304 100644
--- a/src/gnm-format.c
+++ b/src/gnm-format.c
@@ -115,8 +115,8 @@ format_value_common (PangoLayout *layout, GString *str,
/* Close enough: */
type = VALUE_IS_ERROR (value) ? 'E' : 'S';
sval = format_nonnumber (value);
- if (sval != NULL && layout != NULL &&
- pango_layout_get_single_paragraph_mode (layout)
+ if (sval != NULL && layout != NULL &&
+ pango_layout_get_single_paragraph_mode (layout)
&& strchr (sval, '\n') != NULL) {
/* We are in single paragraph mode. This happens in HALIGN_FILL */
GString *str = g_string_new (sval);
@@ -129,12 +129,12 @@ format_value_common (PangoLayout *layout, GString *str,
line = pango_layout_get_line (layout, 0);
if (line) {
dir = line->resolved_dir;
- rtl = (dir == PANGO_DIRECTION_RTL || dir == PANGO_DIRECTION_TTB_RTL
+ rtl = (dir == PANGO_DIRECTION_RTL || dir == PANGO_DIRECTION_TTB_RTL
|| dir == PANGO_DIRECTION_WEAK_RTL);
}
while ((ptr = strchr (str->str, '\n')) != NULL)
- go_string_replace
+ go_string_replace
(str, ptr - str->str, 1, rtl ? UTF8_NEWLINE_RTL : UTF8_NEWLINE, -1);
sval = sval_free = g_string_free (str, FALSE);
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index 681f024..53fcc88 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -416,9 +416,9 @@ gnm_pane_key_mode_sheet (GnmPane *pane, GdkEventKey *event,
if (is_enter) {
horizontal = go_direction_is_horizontal (dir);
forward = go_direction_is_forward (dir);
- } else if ((event->state & GDK_CONTROL_MASK) &&
+ } else if ((event->state & GDK_CONTROL_MASK) &&
((sc_sheet (sc))->sheet_objects != NULL)) {
- scg_object_select_next
+ scg_object_select_next
(scg, (event->state & GDK_SHIFT_MASK) != 0);
break;
}
@@ -2190,17 +2190,17 @@ gnm_pane_mouse_cursor_set (GnmPane *pane, GdkCursor *c)
void
-gnm_pane_expr_cursor_bound_set (GnmPane *pane, GnmRange const *r,
+gnm_pane_expr_cursor_bound_set (GnmPane *pane, GnmRange const *r,
gboolean main_color)
{
- gchar const *colours[5]
+ gchar const *colours[5]
= {"green","yellow", "orange", "red", "purple"};
gint i;
ItemCursor *cursor;
i = g_slist_length (pane->cursor.expr_range) % 5;
- cursor = (ItemCursor *) goc_item_new
+ cursor = (ItemCursor *) goc_item_new
(GOC_GROUP (GOC_CANVAS (pane)->root),
item_cursor_get_type (),
"SheetControlGUI", pane->simple.scg,
@@ -2209,7 +2209,7 @@ gnm_pane_expr_cursor_bound_set (GnmPane *pane, GnmRange const *r,
NULL);
item_cursor_bound_set (cursor, r);
- pane->cursor.expr_range = g_slist_prepend
+ pane->cursor.expr_range = g_slist_prepend
(pane->cursor.expr_range, cursor);
}
diff --git a/src/gnm-random.c b/src/gnm-random.c
index 3cd6587..42e7dbc 100644
--- a/src/gnm-random.c
+++ b/src/gnm-random.c
@@ -304,7 +304,7 @@ random_01_mersenne (void)
/*
* It is conceivable that rounding turned the result
* into 1, so repeat in that case.
- */
+ */
} while (res >= 1);
return res;
@@ -1421,14 +1421,14 @@ random_landau (void)
/* ------------------------------------------------------------------------ */
/*
- * Generate a skew-normal distributed random number.
- *
+ * Generate a skew-normal distributed random number.
+ *
* based on the information provided at
* http://azzalini.stat.unipd.it/SN/faq-r.html
*
*/
-gnm_float
+gnm_float
random_skew_normal (gnm_float a)
{
gnm_float result;
@@ -1445,14 +1445,14 @@ random_skew_normal (gnm_float a)
/* ------------------------------------------------------------------------ */
/*
- * Generate a skew-t distributed random number.
- *
+ * Generate a skew-t distributed random number.
+ *
* based on the information provided at
* http://azzalini.stat.unipd.it/SN/faq-r.html
*
*/
-gnm_float
+gnm_float
random_skew_tdist (gnm_float nu, gnm_float a)
{
gnm_float chi = random_chisq (nu);
diff --git a/src/gnm-so-filled.c b/src/gnm-so-filled.c
index f1be8d1..72fce2a 100644
--- a/src/gnm-so-filled.c
+++ b/src/gnm-so-filled.c
@@ -300,8 +300,8 @@ gnm_so_filled_draw_cairo (SheetObject const *so, cairo_t *cr,
PangoRectangle r;
pango_layout_get_extents (pl, NULL, &r);
cairo_move_to (cr,
- (width - r.width / PANGO_SCALE * scale_h) / 2.,
- (height - r.height / PANGO_SCALE * scale_v) / 2.);
+ (width - r.width / PANGO_SCALE * scale_h) / 2.,
+ (height - r.height / PANGO_SCALE * scale_v) / 2.);
} else
cairo_move_to (cr, sof->margin_pts.left,
sof->margin_pts.top);
diff --git a/src/gui-util.c b/src/gui-util.c
index c7784c0..2629928 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -133,7 +133,7 @@ gnumeric_go_error_info_list_dialog_new (GSList *errs)
NULL);
g_free (tag_name);
}
- for (l = lf; l != NULL; l = l->next) {
+ for (l = lf; l != NULL; l = l->next) {
GOErrorInfo *err = l->data;
insert_error_info (text, err, 0);
}
@@ -167,7 +167,7 @@ gnumeric_go_error_info_dialog_show (GtkWindow *parent, GOErrorInfo *error)
go_gtk_dialog_run (GTK_DIALOG (dialog), parent);
}
-void
+void
gnumeric_go_error_info_list_dialog_show (GtkWindow *parent,
GSList *errs)
{
diff --git a/src/gutils.c b/src/gutils.c
index 6be2311..3860dd7 100644
--- a/src/gutils.c
+++ b/src/gutils.c
@@ -438,7 +438,7 @@ gnm_string_add_number (GString *buf, gnm_float d)
/* ------------------------------------------------------------------------- */
-void
+void
gnm_insert_meta_date (GODoc *doc, char const *name)
{
GValue *value = g_new0 (GValue, 1);
@@ -449,8 +449,8 @@ gnm_insert_meta_date (GODoc *doc, char const *name)
g_value_init (value, G_TYPE_STRING);
g_value_take_string (value,
g_time_val_to_iso8601 (&time));
- gsf_doc_meta_data_insert (go_doc_get_meta_data (doc),
- g_strdup (name),
+ gsf_doc_meta_data_insert (go_doc_get_meta_data (doc),
+ g_strdup (name),
value);
}
diff --git a/src/gutils.h b/src/gutils.h
index 194eebf..baee340 100644
--- a/src/gutils.h
+++ b/src/gutils.h
@@ -36,7 +36,7 @@ void gnm_string_add_number (GString *buf, gnm_float d);
/* Some Meta handling functions */
-void gnm_insert_meta_date (GODoc *doc, char const *name);
+void gnm_insert_meta_date (GODoc *doc, char const *name);
G_END_DECLS
diff --git a/src/io-context-gtk.c b/src/io-context-gtk.c
index d811f54..07ac7f3 100644
--- a/src/io-context-gtk.c
+++ b/src/io-context-gtk.c
@@ -275,7 +275,7 @@ icg_error_error_info_list (GOCmdContext *cc, GSList *error)
{
IOContextGtk *icg = IO_CONTEXT_GTK (cc);
if (icg->show_warnings && error != NULL && error->data != NULL) {
- GtkWidget *dialog = gnumeric_go_error_info_dialog_new
+ GtkWidget *dialog = gnumeric_go_error_info_dialog_new
(error->data);
gtk_widget_show_all (GTK_WIDGET (dialog));
gtk_dialog_run (GTK_DIALOG (dialog));
diff --git a/src/item-edit.c b/src/item-edit.c
index 11e9c80..97a38fe 100644
--- a/src/item-edit.c
+++ b/src/item-edit.c
@@ -262,7 +262,7 @@ item_edit_button_pressed (GocItem *item, int button, double x, double y)
target_index = strlen (text);
trailing = 0;
}
- ie->sel_start = g_utf8_pointer_to_offset (text, text + target_index) + trailing;
+ ie->sel_start = g_utf8_pointer_to_offset (text, text + target_index) + trailing;
gtk_editable_set_position (GTK_EDITABLE (ie->entry), ie->sel_start);
return TRUE;
diff --git a/src/item-grid.c b/src/item-grid.c
index 9e9c59c..c35b2b6 100644
--- a/src/item-grid.c
+++ b/src/item-grid.c
@@ -198,12 +198,12 @@ item_grid_update_bounds (GocItem *item)
}
static void
-draw_function_marker (GnmCell const *cell, cairo_t *cr,
+draw_function_marker (GnmCell const *cell, cairo_t *cr,
double x, double y, double w, double h, int const dir)
{
if (cell == NULL || !gnm_cell_has_expr (cell))
return;
-
+
cairo_save (cr);
cairo_new_path (cr);
cairo_rectangle (cr, x, y, w+1, h+1);
@@ -224,7 +224,7 @@ draw_function_marker (GnmCell const *cell, cairo_t *cr,
cairo_set_source_rgb(cr, 0.3, 0.3, 0.3);
cairo_set_line_width (cr, 0.5);
cairo_stroke (cr);
- cairo_restore (cr);
+ cairo_restore (cr);
}
static void
@@ -310,13 +310,13 @@ item_grid_draw_merged_range (cairo_t *cr, ItemGrid *ig,
if (dir > 0) {
if (show_function_cell_markers)
- draw_function_marker (cell, cr, l, t,
+ draw_function_marker (cell, cr, l, t,
r - l, b - t, dir);
cell_draw (cell, cr,
l, t, r - l, b - t, -1);
} else {
if (show_function_cell_markers)
- draw_function_marker (cell, cr, r, t,
+ draw_function_marker (cell, cr, r, t,
l - r, b - t, dir);
cell_draw (cell, cr,
r, t, l - r, b - t, -1);
@@ -680,10 +680,10 @@ plain_draw : /* a quick hack to deal with 142267 */
GnmCell const *cell = sheet_cell_get (sheet, col, row);
if (!gnm_cell_is_empty (cell) && cell != edit_cell) {
if (show_function_cell_markers)
- draw_function_marker (cell, cr, x, y,
+ draw_function_marker (cell, cr, x, y,
ci->size_pixels,
ri->size_pixels,
- dir);
+ dir);
cell_draw (cell, cr,
x, y, ci->size_pixels,
ri->size_pixels, -1);
@@ -737,9 +737,9 @@ plain_draw : /* a quick hack to deal with 142267 */
}
if (show_function_cell_markers)
- draw_function_marker (cell, cr, real_x, y,
+ draw_function_marker (cell, cr, real_x, y,
tmp_width,
- ri->size_pixels, dir);
+ ri->size_pixels, dir);
cell_draw (cell, cr,
real_x, y, tmp_width,
ri->size_pixels, center_offset);
diff --git a/src/libgnumeric.c b/src/libgnumeric.c
index 126eb0a..2b73586 100644
--- a/src/libgnumeric.c
+++ b/src/libgnumeric.c
@@ -183,7 +183,7 @@ gnm_pre_parse_init (int argc, gchar const **argv)
/* We cannot use gnm_debug_flag yet. See 627840. */
gnm_debug = getenv ("GNM_DEBUG");
if (gnm_debug && strstr (gnm_debug, "gmemdebug")) {
- g_mem_set_vtable (glib_mem_profiler_table);
+ g_mem_set_vtable (glib_mem_profiler_table);
}
g_thread_init (NULL);
diff --git a/src/mathfunc.c b/src/mathfunc.c
index bfc15cd..1e80b62 100644
--- a/src/mathfunc.c
+++ b/src/mathfunc.c
@@ -6463,7 +6463,7 @@ mmult (gnm_float *A, gnm_float *B, int cols_a, int rows_a, int cols_b,
/***************************************************************************/
static int
-gnm_matrix_eigen_max_index (gnm_float *row, guint row_n, guint size)
+gnm_matrix_eigen_max_index (gnm_float *row, guint row_n, guint size)
{
guint i, res = row_n + 1;
gnm_float max;
@@ -6507,8 +6507,8 @@ gnm_matrix_eigen_update (guint k, gnm_float t, gnm_float *eigenvalues, gboolean
/* Calculates the eigenvalues and eigenvectors of a real symmetric matrix.
*/
-gboolean
-gnm_matrix_eigen (gnm_float **matrix, gnm_float **eigenvectors, gnm_float *eigenvalues, int size)
+gboolean
+gnm_matrix_eigen (gnm_float **matrix, gnm_float **eigenvectors, gnm_float *eigenvalues, int size)
{
guint i, state, usize, *ind;
gboolean *changed;
@@ -6518,7 +6518,7 @@ gnm_matrix_eigen (gnm_float **matrix, gnm_float **eigenvectors, gnm_float *eigen
return FALSE;
usize = (guint) size;
- state = usize;
+ state = usize;
ind = g_new (guint, usize);
changed = g_new (gboolean, usize);
@@ -6541,7 +6541,7 @@ gnm_matrix_eigen (gnm_float **matrix, gnm_float **eigenvectors, gnm_float *eigen
if (counter > 400000) {
g_free (ind);
g_free (changed);
- g_print ("gnm_matrix_eigen exceeded iterations\n");
+ g_print ("gnm_matrix_eigen exceeded iterations\n");
return FALSE;
}
for (k = 1; k < (usize-1); k++)
diff --git a/src/mstyle.c b/src/mstyle.c
index 4f26076..99b62d5 100644
--- a/src/mstyle.c
+++ b/src/mstyle.c
@@ -1672,7 +1672,7 @@ gnm_style_get_pango_attrs (GnmStyle const *style,
/* Handle underlining. */
ul = gnm_style_get_font_uline (style);
if (ul != UNDERLINE_NONE)
- add_attr (l,
+ add_attr (l,
pango_attr_underline_new (gnm_translate_underline_to_pango (ul)));
/* Handle strikethrough. */
@@ -1718,10 +1718,10 @@ gnm_style_generate_attrs_full (GnmStyle const *style)
add_attr (l, pango_attr_weight_new (gnm_style_get_font_bold (style)
? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL));
add_attr (l, go_color_to_pango (fore->go_color, TRUE));
- add_attr (l, pango_attr_strikethrough_new
+ add_attr (l, pango_attr_strikethrough_new
(gnm_style_get_font_strike (style)));
- add_attr (l, pango_attr_underline_new
- (gnm_translate_underline_to_pango
+ add_attr (l, pango_attr_underline_new
+ (gnm_translate_underline_to_pango
(gnm_style_get_font_uline (style))));
return l;
}
@@ -1772,8 +1772,8 @@ gnm_style_set_from_pango_attribute (GnmStyle *style, PangoAttribute const *attr)
&((PangoAttrColor *)attr)->color));
break;
case PANGO_ATTR_UNDERLINE :
- gnm_style_set_font_uline
- (style, gnm_translate_underline_from_pango
+ gnm_style_set_font_uline
+ (style, gnm_translate_underline_from_pango
(((PangoAttrInt *)attr)->value));
break;
case PANGO_ATTR_STRIKETHROUGH :
diff --git a/src/number-match.c b/src/number-match.c
index 59a0c39..23de694 100644
--- a/src/number-match.c
+++ b/src/number-match.c
@@ -545,7 +545,7 @@ format_match_time (char const *text, gboolean allow_elapsed,
hour = handle_float (text, match + 3);
minute = handle_float (text, match + 4);
second = handle_float (text, match + 5);
-
+
if (valid_hms (hour, minute, second, allow_elapsed, &elapsed)) {
time_format = elapsed ? "[h]:mm:ss" : "h:mm:ss";
goto got_time;
@@ -925,7 +925,7 @@ format_match_fraction (char const *text, int *denlen)
GnmValue *
-format_match_decimal_number_with_locale (char const *text, GOFormatFamily *family,
+format_match_decimal_number_with_locale (char const *text, GOFormatFamily *family,
GString const *curr, GString const *thousand,
GString const *decimal)
{
diff --git a/src/number-match.h b/src/number-match.h
index 7aec1c0..aa7705a 100644
--- a/src/number-match.h
+++ b/src/number-match.h
@@ -11,8 +11,8 @@ GnmValue *format_match (char const *s, GOFormat const *cur_fmt,
GODateConventions const *date_conv);
GnmValue *format_match_number (char const *s, GOFormat const *cur_fmt,
GODateConventions const *date_conv);
-GnmValue *format_match_decimal_number_with_locale
- (char const *text, GOFormatFamily *family,
+GnmValue *format_match_decimal_number_with_locale
+ (char const *text, GOFormatFamily *family,
GString const *curr, GString const *thousand,
GString const *decimal);
diff --git a/src/print-info.c b/src/print-info.c
index 0e83605..0e93269 100644
--- a/src/print-info.c
+++ b/src/print-info.c
@@ -1231,7 +1231,7 @@ print_info_set_breaks (PrintInformation *pi,
*target = breaks;
}
-gboolean
+gboolean
print_info_has_manual_breaks (PrintInformation *pi)
{
if (gnm_page_breaks_get_next_manual_break (pi->page_breaks.v, 0) > -1)
diff --git a/src/print.c b/src/print.c
index 29cb77b..c5b55c8 100644
--- a/src/print.c
+++ b/src/print.c
@@ -902,8 +902,8 @@ load_repeat_range (char const *str, GnmRange *r, Sheet *sheet)
if (str == NULL || *str == '\0')
return FALSE;
- if (str != rangeref_parse (&res, str,
- parse_pos_init_sheet (&pp, sheet),
+ if (str != rangeref_parse (&res, str,
+ parse_pos_init_sheet (&pp, sheet),
gnm_conventions_default)) {
Sheet *start_sheet = sheet, *end_sheet = sheet;
gnm_rangeref_normalize_pp (&res, &pp,
diff --git a/src/ranges.c b/src/ranges.c
index f29cde6..3c94186 100644
--- a/src/ranges.c
+++ b/src/ranges.c
@@ -928,7 +928,7 @@ undo_range_name (Sheet const *sheet, GnmRange const *r)
g_string_free (str, TRUE);
}
- return g_string_free
+ return g_string_free
(gnm_cmd_trunc_descriptor (g_string_new (the_range_name), NULL), FALSE);
}
diff --git a/src/rendered-value.c b/src/rendered-value.c
index c538bab..d94a513 100644
--- a/src/rendered-value.c
+++ b/src/rendered-value.c
@@ -289,7 +289,7 @@ gnm_rendered_value_new (GnmCell const *cell,
res->effective_valign = gnm_style_get_align_v (mstyle);
res->effective_halign = gnm_style_default_halign (mstyle, cell);
res->indent_left = res->indent_right = 0;
-
+
if (res->effective_halign == HALIGN_FILL) {
pango_layout_set_single_paragraph_mode (layout, TRUE);
res->variable_width = TRUE;
diff --git a/src/sheet-control-gui.c b/src/sheet-control-gui.c
index 84883ba..69dcd56 100644
--- a/src/sheet-control-gui.c
+++ b/src/sheet-control-gui.c
@@ -1842,33 +1842,33 @@ context_menu_handler (GnumericPopupMenuElement const *element,
dialog_cell_format (wbcg, FD_CURRENT);
break;
case CONTEXT_CELL_AUTOFIT_HEIGHT :
- workbook_cmd_autofit_selection
+ workbook_cmd_autofit_selection
(wbc, wb_control_cur_sheet (wbc), FALSE);
break;
case CONTEXT_CELL_AUTOFIT_WIDTH :
- workbook_cmd_autofit_selection
+ workbook_cmd_autofit_selection
(wbc, wb_control_cur_sheet (wbc), TRUE);
break;
case CONTEXT_CELL_MERGE : {
- GSList *range_list = selection_get_ranges
+ GSList *range_list = selection_get_ranges
(wb_control_cur_sheet_view (wbc), FALSE);
cmd_merge_cells (wbc, wb_control_cur_sheet (wbc), range_list, FALSE);
range_fragment_free (range_list);
}
break;
case CONTEXT_CELL_UNMERGE : {
- GSList *range_list = selection_get_ranges
+ GSList *range_list = selection_get_ranges
(wb_control_cur_sheet_view (wbc), FALSE);
cmd_unmerge_cells (wbc, wb_control_cur_sheet (wbc), range_list);
range_fragment_free (range_list);
-
+
}
break;
case CONTEXT_COL_WIDTH :
dialog_col_width (wbcg, FALSE);
break;
case CONTEXT_COL_AUTOFIT :
- workbook_cmd_resize_selected_colrow
+ workbook_cmd_resize_selected_colrow
(wbc, wb_control_cur_sheet (wbc), TRUE, -1);
break;
case CONTEXT_COL_HIDE :
@@ -1881,7 +1881,7 @@ context_menu_handler (GnumericPopupMenuElement const *element,
dialog_row_height (wbcg, FALSE);
break;
case CONTEXT_ROW_AUTOFIT :
- workbook_cmd_resize_selected_colrow
+ workbook_cmd_resize_selected_colrow
(wbc, wb_control_cur_sheet (wbc), FALSE, -1);
break;
case CONTEXT_ROW_HIDE :
@@ -2003,7 +2003,7 @@ scg_context_menu (SheetControlGUI *scg, GdkEventButton *event,
POPUPITEM_FORMAT
};
- static GnumericPopupMenuElement popup_elements[] = {
+ static GnumericPopupMenuElement popup_elements[] = {
{ N_("Cu_t"), GTK_STOCK_CUT,
0, 0, CONTEXT_CUT },
{ N_("_Copy"), GTK_STOCK_COPY,
@@ -2016,25 +2016,25 @@ scg_context_menu (SheetControlGUI *scg, GdkEventButton *event,
{ "", NULL, 0, 0, 0 },
{ N_("_Insert Cells..."), NULL,
- CONTEXT_DISPLAY_FOR_CELLS,
+ CONTEXT_DISPLAY_FOR_CELLS,
CONTEXT_DISABLE_FOR_DISCONTIGUOUS_SELECTION, CONTEXT_INSERT },
{ N_("_Delete Cells..."), GTK_STOCK_DELETE,
- CONTEXT_DISPLAY_FOR_CELLS,
+ CONTEXT_DISPLAY_FOR_CELLS,
CONTEXT_DISABLE_FOR_DISCONTIGUOUS_SELECTION, CONTEXT_DELETE },
{ N_("_Insert Column(s)"), "Gnumeric_ColumnAdd",
- CONTEXT_DISPLAY_FOR_COLS,
+ CONTEXT_DISPLAY_FOR_COLS,
CONTEXT_DISABLE_FOR_DISCONTIGUOUS_SELECTION,
CONTEXT_INSERT },
{ N_("_Delete Column(s)"), "Gnumeric_ColumnDelete",
- CONTEXT_DISPLAY_FOR_COLS,
+ CONTEXT_DISPLAY_FOR_COLS,
CONTEXT_DISABLE_FOR_DISCONTIGUOUS_SELECTION,
CONTEXT_DELETE },
{ N_("_Insert Row(s)"), "Gnumeric_RowAdd",
- CONTEXT_DISPLAY_FOR_ROWS,
+ CONTEXT_DISPLAY_FOR_ROWS,
CONTEXT_DISABLE_FOR_DISCONTIGUOUS_SELECTION,
CONTEXT_INSERT },
{ N_("_Delete Row(s)"), "Gnumeric_RowDelete",
- CONTEXT_DISPLAY_FOR_ROWS,
+ CONTEXT_DISPLAY_FOR_ROWS,
CONTEXT_DISABLE_FOR_DISCONTIGUOUS_SELECTION,
CONTEXT_DELETE },
@@ -2091,9 +2091,9 @@ scg_context_menu (SheetControlGUI *scg, GdkEventButton *event,
{ N_("_Format All Cells..."), GTK_STOCK_PROPERTIES,
0, 0, CONTEXT_FORMAT_CELL },
{ N_("Cell"), NULL, 0, 0, -1},/* start sub menu */
- { N_("_Merge"), "Gnumeric_MergeCells", 0,
+ { N_("_Merge"), "Gnumeric_MergeCells", 0,
CONTEXT_DISABLE_FOR_ONLYMERGES, CONTEXT_CELL_MERGE },
- { N_("_Unmerge"), "Gnumeric_SplitCells", 0,
+ { N_("_Unmerge"), "Gnumeric_SplitCells", 0,
CONTEXT_DISABLE_FOR_NOMERGES, CONTEXT_CELL_UNMERGE },
{ N_("Auto Fit _Width"), "Gnumeric_ColumnSize", 0, 0, CONTEXT_CELL_AUTOFIT_WIDTH },
{ N_("Auto Fit _Height"), "Gnumeric_RowSize", 0, 0, CONTEXT_CELL_AUTOFIT_HEIGHT },
@@ -2208,9 +2208,9 @@ scg_context_menu (SheetControlGUI *scg, GdkEventButton *event,
sensitivity_filter |= CONTEXT_DISABLE_FOR_ONLYMERGES;
if (no_merges)
sensitivity_filter |= CONTEXT_DISABLE_FOR_NOMERGES;
-
- if ((display_filter & CONTEXT_DISPLAY_FOR_COLS) &&
+
+ if ((display_filter & CONTEXT_DISPLAY_FOR_COLS) &&
(display_filter & CONTEXT_DISPLAY_FOR_ROWS))
display_filter = 0;
if (n_sel > 1)
@@ -2268,7 +2268,7 @@ scg_context_menu (SheetControlGUI *scg, GdkEventButton *event,
popup_elements[POPUPITEM_DELETE_COLUMN].allocated_name = g_strdup_printf (format, n_cols);
if (!(sensitivity_filter & (CONTEXT_DISABLE_FOR_CELLS | CONTEXT_DISABLE_FOR_ROWS))) {
format = ngettext ("_Format %d Column", "_Format %d Columns", n_cols);
- popup_elements[POPUPITEM_FORMAT].allocated_name
+ popup_elements[POPUPITEM_FORMAT].allocated_name
= g_strdup_printf (format, n_cols);
}
}
@@ -2281,7 +2281,7 @@ scg_context_menu (SheetControlGUI *scg, GdkEventButton *event,
if (!(sensitivity_filter & (CONTEXT_DISABLE_FOR_CELLS | CONTEXT_DISABLE_FOR_COLS))) {
format = ngettext ("_Format %d Row", "_Format %d Rows", n_rows);
- popup_elements[POPUPITEM_FORMAT].allocated_name
+ popup_elements[POPUPITEM_FORMAT].allocated_name
= g_strdup_printf (format, n_rows);
}
}
@@ -2715,7 +2715,7 @@ cb_collect_objects_to_commit (SheetObject *so, double *coords, CollectObjectsDat
}
static char *
-scg_objects_drag_commit_get_undo_text (int drag_type, int n,
+scg_objects_drag_commit_get_undo_text (int drag_type, int n,
gboolean created_objects)
{
char const *format;
@@ -2723,17 +2723,17 @@ scg_objects_drag_commit_get_undo_text (int drag_type, int n,
if (created_objects) {
if (drag_type == 8)
/* xgettext : %d gives the number of objects. This is input to ngettext. */
- format = ngettext ("Duplicate %d Object", "Duplicate %d Objects", n);
+ format = ngettext ("Duplicate %d Object", "Duplicate %d Objects", n);
else
/* xgettext : %d gives the number of objects. This is input to ngettext. */
- format = ngettext ("Insert %d Object", "Insert %d Objects", n);
+ format = ngettext ("Insert %d Object", "Insert %d Objects", n);
} else {
if (drag_type == 8)
/* xgettext : %d gives the number of objects. This is input to ngettext. */
- format = ngettext ("Move %d Object", "Move %d Objects", n);
+ format = ngettext ("Move %d Object", "Move %d Objects", n);
else
/* xgettext : %d gives the number of objects. This is input to ngettext. */
- format = ngettext ("Resize %d Object", "Resize %d Objects", n);
+ format = ngettext ("Resize %d Object", "Resize %d Objects", n);
}
return g_strdup_printf (format, n);
@@ -2757,7 +2757,7 @@ scg_objects_drag_commit (SheetControlGUI *scg, int drag_type,
undo = sheet_object_move_undo (data.objects, created_objects);
redo = sheet_object_move_do (data.objects, data.anchors, created_objects);
- text = scg_objects_drag_commit_get_undo_text
+ text = scg_objects_drag_commit_get_undo_text
(drag_type, g_slist_length (data.objects), created_objects);
if (pundo && predo) {
@@ -2766,7 +2766,7 @@ scg_objects_drag_commit (SheetControlGUI *scg, int drag_type,
if (undo_title)
*undo_title = text;
} else {
- cmd_generic (WORKBOOK_CONTROL (scg_wbcg (scg)),
+ cmd_generic (WORKBOOK_CONTROL (scg_wbcg (scg)),
text, undo, redo);
g_free (text);
}
diff --git a/src/sheet-control-gui.h b/src/sheet-control-gui.h
index e1d2ef1..63a84a7 100644
--- a/src/sheet-control-gui.h
+++ b/src/sheet-control-gui.h
@@ -32,8 +32,8 @@ void scg_objects_drag (SheetControlGUI *scg, GnmPane *gcanvas,
int drag_type, gboolean symmetric, gboolean snap_to_grid,
gboolean is_mouse_move);
void scg_objects_drag_commit (SheetControlGUI *scg, int drag_type,
- gboolean created_objects,
- GOUndo **pundo, GOUndo **predo,
+ gboolean created_objects,
+ GOUndo **pundo, GOUndo **predo,
gchar **undo_title);
void scg_objects_nudge (SheetControlGUI *scg, GnmPane *gcanvas,
int drag_type, double dx, double dy,
diff --git a/src/sheet-filter.c b/src/sheet-filter.c
index 06d78ee..a8360b4 100644
--- a/src/sheet-filter.c
+++ b/src/sheet-filter.c
@@ -865,7 +865,7 @@ gnm_sheet_filter_at_pos (Sheet const *sheet, GnmCellPos const *pos)
/**
* gnm_sheet_filter_intersect_rows :
- *
+ *
* Returns: the filter (if any) that intersect the rows from to to
**/
GnmFilter *
diff --git a/src/sheet-filter.h b/src/sheet-filter.h
index 22346e3..891c1c0 100644
--- a/src/sheet-filter.h
+++ b/src/sheet-filter.h
@@ -86,7 +86,7 @@ gboolean gnm_filter_overlaps_range (GnmFilter const *filter, GnmRange const *
void gnm_filter_reapply (GnmFilter *filter);
GnmFilter *gnm_sheet_filter_at_pos (Sheet const *sheet, GnmCellPos const *pos);
-GnmFilter *gnm_sheet_filter_intersect_rows (Sheet const *sheet,
+GnmFilter *gnm_sheet_filter_intersect_rows (Sheet const *sheet,
int from, int to);
GnmRange *gnm_sheet_filter_can_be_extended (Sheet const *sheet,
GnmFilter const *f,
diff --git a/src/sheet-object-graph.c b/src/sheet-object-graph.c
index a757f03..1c1e037 100644
--- a/src/sheet-object-graph.c
+++ b/src/sheet-object-graph.c
@@ -217,7 +217,7 @@ gnm_sog_new_view (SheetObject *so, SheetObjectViewContainer *container)
GOC_TYPE_GRAPH,
"renderer", sog->renderer,
NULL);
- g_idle_add ((GSourceFunc) cb_post_new_view, item);
+ g_idle_add ((GSourceFunc) cb_post_new_view, item);
g_signal_connect_swapped (canvas, "size_allocate", G_CALLBACK (cb_graph_size_changed), item);
return (SheetObjectView *) view;
}
@@ -846,7 +846,7 @@ legend_start (GsfXMLIn *xin, G_GNUC_UNUSED xmlChar const **attrs)
GuppiReadState *state = (GuppiReadState *) xin->user_state;
state->cur = gog_object_add_by_name (state->chart, "Legend", NULL);
}
-
+
static void
position_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *unknown)
{
@@ -862,7 +862,7 @@ position_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *unknown)
if (0 == strcmp (xin->content->str, "south"))
g_object_set (G_OBJECT (state->cur), "compass", "bottom", NULL);
}
-
+
static void
series_start (GsfXMLIn *xin, xmlChar const **attrs)
{
@@ -920,7 +920,7 @@ dim_start (GsfXMLIn *xin, xmlChar const **attrs)
if (err)
g_error_free (err);
}
-
+
static void
marker_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *unknown)
{
@@ -955,7 +955,7 @@ horiz_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *unknown)
if (xin->content->str)
g_object_set (G_OBJECT (state->plot), "horizontal", 0 == strcmp (xin->content->str, "true"), NULL);
}
-
+
static void
stacked_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *unknown)
{
@@ -963,7 +963,7 @@ stacked_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *unknown)
if (xin->content->str && 0 == strcmp (xin->content->str, "true"))
g_object_set (G_OBJECT (state->plot), "type", "stacked", NULL);
}
-
+
static void
percent_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *unknown)
{
@@ -983,7 +983,7 @@ separation_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *unknown)
NULL);
}
}
-
+
static void
bubble_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *unknown)
{
@@ -1054,7 +1054,7 @@ gnm_sogg_prep_sax_parser (SheetObject *so, GsfXMLIn *xin, xmlChar const **attrs,
state->data = g_ptr_array_new ();
state->max_data = 10;
g_ptr_array_set_size (state->data, state->max_data);
-
+
sheet_object_graph_set_gog (so, state->graph);
gsf_xml_in_push_state (xin, doc, state,
(GsfXMLInExtDtor) gnm_sogg_sax_parser_done, attrs);
diff --git a/src/sheet-object-widget.c b/src/sheet-object-widget.c
index 1650f85..4dbc44a 100644
--- a/src/sheet-object-widget.c
+++ b/src/sheet-object-widget.c
@@ -99,7 +99,7 @@ draw_cairo_text (cairo_t *cr, char const *text, int *pwidth, int *pheight,
pango_cairo_show_layout (cr, layout);
g_object_unref (layout);
g_object_unref (style);
-
+
if (pwidth)
*pwidth = width * scale_h;
if (pheight)
@@ -1121,18 +1121,18 @@ sheet_widget_button_draw_cairo (SheetObject const *so, cairo_t *cr,
radius = width / 3.;
if (radius < 1)
radius = 1;
-
+
cairo_save (cr);
cairo_set_line_width (cr, 2 * half_line);
cairo_set_source_rgb(cr, 0.5, 0.5, 0.5);
cairo_new_path (cr);
cairo_arc (cr, radius + half_line, radius + half_line, radius, M_PI, - M_PI/2);
- cairo_arc (cr, width - (radius + half_line), radius + half_line,
+ cairo_arc (cr, width - (radius + half_line), radius + half_line,
radius, - M_PI/2, 0);
- cairo_arc (cr, width - (radius + half_line), height - (radius + half_line),
+ cairo_arc (cr, width - (radius + half_line), height - (radius + half_line),
radius, 0, M_PI/2);
- cairo_arc (cr, (radius + half_line), height - (radius + half_line),
+ cairo_arc (cr, (radius + half_line), height - (radius + half_line),
radius, M_PI/2, M_PI);
cairo_close_path (cr);
cairo_stroke (cr);
@@ -1365,7 +1365,7 @@ sheet_widget_adjustment_init_full (SheetWidgetAdjustment *swa,
{
SheetObject *so;
g_return_if_fail (swa != NULL);
-
+
so = SHEET_OBJECT (swa);
so->flags &= ~SHEET_OBJECT_PRINT;
@@ -1780,7 +1780,7 @@ sheet_widget_scrollbar_user_config (SheetObject *so, SheetControl *sc)
N_("Scrollbar Properties"));
}
-static void sheet_widget_slider_horizontal_draw_cairo
+static void sheet_widget_slider_horizontal_draw_cairo
(SheetObject const *so, cairo_t *cr, double width, double height);
static void
@@ -1827,10 +1827,10 @@ sheet_widget_scrollbar_draw_cairo (SheetObject const *so, cairo_t *cr,
{
SheetWidgetAdjustment *swa = SHEET_WIDGET_ADJUSTMENT (so);
if (swa->horizontal)
- sheet_widget_scrollbar_horizontal_draw_cairo
+ sheet_widget_scrollbar_horizontal_draw_cairo
(so, cr, width, height);
else
- sheet_widget_scrollbar_vertical_draw_cairo
+ sheet_widget_scrollbar_vertical_draw_cairo
(so, cr, width, height);
}
static void
@@ -1919,7 +1919,7 @@ sheet_widget_spinbutton_draw_cairo (SheetObject const *so, cairo_t *cr,
cairo_rel_line_to (cr, -6, 0);
cairo_close_path (cr);
cairo_fill (cr);
-
+
cairo_new_path (cr);
cairo_move_to (cr, width - 5, height - 3);
cairo_rel_line_to (cr, 3, -3);
@@ -1929,7 +1929,7 @@ sheet_widget_spinbutton_draw_cairo (SheetObject const *so, cairo_t *cr,
str = g_strdup_printf ("%i", ivalue);
cairo_set_source_rgb(cr, 0, 0, 0);
- cairo_move_to (cr, 4., halfheight);
+ cairo_move_to (cr, 4., halfheight);
draw_cairo_text (cr, str, NULL, NULL, TRUE);
g_free (str);
@@ -2000,7 +2000,7 @@ sheet_widget_slider_horizontal_draw_cairo (SheetObject const *so, cairo_t *cr,
double value = gtk_adjustment_get_value (adjustment);
double upper = gtk_adjustment_get_upper (adjustment);
double lower = gtk_adjustment_get_lower (adjustment);
- double fraction = (upper == lower) ? 0.0 : (value - lower)/(upper- lower);
+ double fraction = (upper == lower) ? 0.0 : (value - lower)/(upper- lower);
cairo_save (cr);
cairo_set_line_width (cr, 5);
@@ -2017,13 +2017,13 @@ sheet_widget_slider_horizontal_draw_cairo (SheetObject const *so, cairo_t *cr,
cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
cairo_new_path (cr);
- cairo_move_to (cr, fraction * (width - 8. - 20. - 5. - 5. + 2.5 + 2.5)
+ cairo_move_to (cr, fraction * (width - 8. - 20. - 5. - 5. + 2.5 + 2.5)
- 10. + 10. + 4. + 5. - 2.5, height/2);
cairo_rel_line_to (cr, 20, 0);
cairo_stroke (cr);
cairo_new_path (cr);
- cairo_restore (cr);
+ cairo_restore (cr);
}
static void
@@ -2553,7 +2553,7 @@ sheet_widget_checkbox_draw_cairo (SheetObject const *so, cairo_t *cr,
}
cairo_move_to (cr, 4. + 8. + 4, halfheight);
-
+
draw_cairo_text (cr, swc->label, NULL, NULL, TRUE);
cairo_new_path (cr);
@@ -3172,7 +3172,7 @@ sheet_widget_radio_button_draw_cairo (SheetObject const *so, cairo_t *cr,
cairo_new_path (cr);
cairo_move_to (cr, 4. + 8., halfheight);
- cairo_arc (cr, 4. + 4., halfheight, 4., 0., 2*M_PI);
+ cairo_arc (cr, 4. + 4., halfheight, 4., 0., 2*M_PI);
cairo_close_path (cr);
cairo_fill_preserve (cr);
cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
@@ -3181,7 +3181,7 @@ sheet_widget_radio_button_draw_cairo (SheetObject const *so, cairo_t *cr,
if (swr->active) {
cairo_new_path (cr);
cairo_move_to (cr, 4. + 6.5, halfheight);
- cairo_arc (cr, 4. + 4., halfheight, 2.5, 0., 2*M_PI);
+ cairo_arc (cr, 4. + 4., halfheight, 2.5, 0., 2*M_PI);
cairo_close_path (cr);
cairo_fill (cr);
}
@@ -3281,7 +3281,7 @@ sheet_widget_list_base_set_selection (SheetWidgetListBase *swl, int selection,
else if (selection != 0) {
GtkTreeIter iter;
char *content;
- gtk_tree_model_iter_nth_child
+ gtk_tree_model_iter_nth_child
(swl->model, &iter, NULL, selection - 1);
gtk_tree_model_get (swl->model, &iter,
0, &content, -1);
@@ -3333,9 +3333,9 @@ list_output_eval (GnmDependent *dep)
eval_pos_init_dep (&pos, dep),
GNM_EXPR_EVAL_SCALAR_NON_EMPTY);
SheetWidgetListBase *swl = DEP_TO_LIST_BASE_OUTPUT (dep);
-
+
if (swl->result_as_index)
- sheet_widget_list_base_set_selection
+ sheet_widget_list_base_set_selection
(swl, floor (value_get_as_float (v)), NULL);
else
sheet_widget_list_base_set_selection_value (swl, v);
@@ -3564,7 +3564,7 @@ sheet_widget_list_base_get_content_link (SheetObject const *so)
return texpr;
}
-gboolean
+gboolean
sheet_widget_list_base_result_type_is_index (SheetObject const *so)
{
SheetWidgetListBase *swl = SHEET_WIDGET_LIST_BASE (so);
@@ -3572,7 +3572,7 @@ sheet_widget_list_base_result_type_is_index (SheetObject const *so)
return swl->result_as_index;
}
-void
+void
sheet_widget_list_base_set_result_type (SheetObject *so, gboolean as_index)
{
SheetWidgetListBase *swl = SHEET_WIDGET_LIST_BASE (so);
@@ -3581,7 +3581,7 @@ sheet_widget_list_base_set_result_type (SheetObject *so, gboolean as_index)
return;
swl->result_as_index = as_index;
-
+
}
/* Note: allocates a new adjustment. */
@@ -3646,7 +3646,7 @@ cb_selection_changed (GtkTreeSelection *selection,
gtk_tree_path_free (path);
}
}
- sheet_widget_list_base_set_selection
+ sheet_widget_list_base_set_selection
(swl, pos,
scg_wbc (GNM_SIMPLE_CANVAS (view->parent->parent->parent)->scg));
}
@@ -3693,8 +3693,8 @@ static void
sheet_widget_list_draw_cairo (SheetObject const *so, cairo_t *cr,
double width, double height)
{
- SheetWidgetListBase *swl = SHEET_WIDGET_LIST_BASE (so);
-
+ SheetWidgetListBase *swl = SHEET_WIDGET_LIST_BASE (so);
+
cairo_save (cr);
cairo_set_line_width (cr, 0.5);
cairo_set_source_rgb(cr, 0, 0, 0);
@@ -3720,7 +3720,7 @@ sheet_widget_list_draw_cairo (SheetObject const *so, cairo_t *cr,
cairo_rel_line_to (cr, -3, 8);
cairo_close_path (cr);
cairo_fill (cr);
-
+
cairo_new_path (cr);
cairo_move_to (cr, width - 5 -3, 12);
cairo_rel_line_to (cr, 6, 0);
@@ -3756,7 +3756,7 @@ sheet_widget_list_draw_cairo (SheetObject const *so, cairo_t *cr,
g_string_append_c (str, '\n');
g_free (astr);
} while (gtk_tree_model_iter_next (swl->model, &iter));
-
+
pango_layout_set_font_description (layout, style->font_desc);
pango_layout_set_single_paragraph_mode (layout, FALSE);
pango_layout_set_spacing (layout, 3 * PANGO_SCALE);
@@ -3779,7 +3779,7 @@ sheet_widget_list_draw_cairo (SheetObject const *so, cairo_t *cr,
cairo_translate (cr, 0, (height - 4)/scale_v - dy1);
cairo_new_path (cr);
- cairo_rectangle (cr, -4/scale_h, dy0,
+ cairo_rectangle (cr, -4/scale_h, dy0,
width/scale_h, dy1 - dy0);
cairo_set_source_rgb(cr, 0.8, 0.8, 0.8);
cairo_fill (cr);
@@ -3789,13 +3789,13 @@ sheet_widget_list_draw_cairo (SheetObject const *so, cairo_t *cr,
pango_cairo_show_layout (cr, layout);
g_object_unref (layout);
g_object_unref (style);
-
-
+
+
g_string_free (str, TRUE);
}
cairo_new_path (cr);
- cairo_restore (cr);
+ cairo_restore (cr);
}
static void
@@ -3882,9 +3882,9 @@ static void
sheet_widget_combo_draw_cairo (SheetObject const *so, cairo_t *cr,
double width, double height)
{
- SheetWidgetListBase *swl = SHEET_WIDGET_LIST_BASE (so);
+ SheetWidgetListBase *swl = SHEET_WIDGET_LIST_BASE (so);
double halfheight = height/2;
-
+
cairo_save (cr);
cairo_set_line_width (cr, 0.5);
cairo_set_source_rgb(cr, 0, 0, 0);
@@ -3910,13 +3910,13 @@ sheet_widget_combo_draw_cairo (SheetObject const *so, cairo_t *cr,
cairo_rel_line_to (cr, -3, 8);
cairo_close_path (cr);
cairo_fill (cr);
-
+
cairo_set_source_rgb(cr, 0, 0, 0);
cairo_move_to (cr, 4., halfheight);
if (swl->model != NULL) {
GtkTreeIter iter;
- if (gtk_tree_model_iter_nth_child (swl->model, &iter, NULL,
+ if (gtk_tree_model_iter_nth_child (swl->model, &iter, NULL,
swl->selection - 1)) {
char *str = NULL;
gtk_tree_model_get (swl->model, &iter, 0, &str, -1);
@@ -3926,7 +3926,7 @@ sheet_widget_combo_draw_cairo (SheetObject const *so, cairo_t *cr,
}
cairo_new_path (cr);
- cairo_restore (cr);
+ cairo_restore (cr);
}
static void
diff --git a/src/sheet-object.c b/src/sheet-object.c
index 1d1d9b3..9947cf9 100644
--- a/src/sheet-object.c
+++ b/src/sheet-object.c
@@ -63,7 +63,7 @@ static GObjectClass *parent_klass;
static GQuark sov_so_quark;
static GQuark sov_container_quark;
-void
+void
sheet_object_set_print_flag (SheetObject *so, gboolean *print)
{
if (*print)
@@ -1486,19 +1486,19 @@ sheet_object_move_undo (GSList *objects, gboolean objects_created)
SheetObjectAnchor *tmp;
if (objects_created) {
- undo = go_undo_combine
- (undo,
- go_undo_unary_new
- (g_object_ref (obj),
+ undo = go_undo_combine
+ (undo,
+ go_undo_unary_new
+ (g_object_ref (obj),
(GOUndoUnaryFunc) sheet_object_clear_sheet,
(GFreeFunc) g_object_unref));
}
tmp = g_new (SheetObjectAnchor, 1);
*tmp = *sheet_object_get_anchor (obj);
- undo = go_undo_combine
- (undo, go_undo_binary_new
- (g_object_ref (obj), tmp,
+ undo = go_undo_combine
+ (undo, go_undo_binary_new
+ (g_object_ref (obj), tmp,
(GOUndoBinaryFunc) sheet_object_set_anchor,
(GFreeFunc) g_object_unref,
(GFreeFunc) g_free));
@@ -1507,7 +1507,7 @@ sheet_object_move_undo (GSList *objects, gboolean objects_created)
}
GOUndo *
-sheet_object_move_do (GSList *objects, GSList *anchors,
+sheet_object_move_do (GSList *objects, GSList *anchors,
gboolean objects_created)
{
GOUndo *undo = NULL;
@@ -1515,7 +1515,7 @@ sheet_object_move_do (GSList *objects, GSList *anchors,
g_return_val_if_fail (NULL != objects, NULL);
g_return_val_if_fail (NULL != anchors, NULL);
- g_return_val_if_fail (g_slist_length (objects)
+ g_return_val_if_fail (g_slist_length (objects)
== g_slist_length (anchors), NULL);
for (; objs && anchs; objs = objs->next, anchs = anchs->next) {
@@ -1524,10 +1524,10 @@ sheet_object_move_do (GSList *objects, GSList *anchors,
SheetObjectAnchor *tmp;
if (objects_created) {
- undo = go_undo_combine
+ undo = go_undo_combine
(undo,
- go_undo_binary_new
- (g_object_ref (obj),
+ go_undo_binary_new
+ (g_object_ref (obj),
sheet_object_get_sheet (obj),
(GOUndoBinaryFunc) sheet_object_set_sheet,
(GFreeFunc) g_object_unref,
@@ -1535,9 +1535,9 @@ sheet_object_move_do (GSList *objects, GSList *anchors,
}
tmp = g_new (SheetObjectAnchor, 1);
*tmp = *anch;
- undo = go_undo_combine
- (go_undo_binary_new
- (g_object_ref (obj), tmp,
+ undo = go_undo_combine
+ (go_undo_binary_new
+ (g_object_ref (obj), tmp,
(GOUndoBinaryFunc) sheet_object_set_anchor,
(GFreeFunc) g_object_unref,
(GFreeFunc) g_free), undo);
diff --git a/src/sheet-object.h b/src/sheet-object.h
index 52fbe4b..42556a7 100644
--- a/src/sheet-object.h
+++ b/src/sheet-object.h
@@ -106,7 +106,7 @@ void sheet_objects_relocate (GnmExprRelocateInfo const *rinfo,
void sheet_objects_clear (Sheet const *sheet, GnmRange const *r,
GType t, GOUndo **pundo);
GOUndo *sheet_object_move_undo (GSList *objects, gboolean objects_created);
-GOUndo *sheet_object_move_do (GSList *objects, GSList *anchors,
+GOUndo *sheet_object_move_do (GSList *objects, GSList *anchors,
gboolean objects_created);
GSList *sheet_objects_get (Sheet const *sheet, GnmRange const *r,
GType t);
diff --git a/src/sheet-style.c b/src/sheet-style.c
index d617c06..74fb01c 100644
--- a/src/sheet-style.c
+++ b/src/sheet-style.c
@@ -1939,7 +1939,7 @@ sheet_style_insert_colrow (GnmExprRelocateInfo const *rinfo)
sheet_style_relocate (rinfo);
if (styles != NULL) {
- sheet_style_set_list (rinfo->target_sheet, &corner, styles,
+ sheet_style_set_list (rinfo->target_sheet, &corner, styles,
NULL, NULL);
style_list_free (styles);
}
@@ -2392,7 +2392,7 @@ sheet_style_collect_validations (Sheet const *sheet, GnmRange const *r)
GnmSpanCalcFlags
sheet_style_set_list (Sheet *sheet, GnmCellPos const *corner,
GnmStyleList const *list,
- sheet_style_set_list_cb_t range_modify,
+ sheet_style_set_list_cb_t range_modify,
gpointer data)
{
GnmSpanCalcFlags spanflags = GNM_SPANCALC_SIMPLE;
diff --git a/src/sheet-style.h b/src/sheet-style.h
index 53b6524..7c94903 100644
--- a/src/sheet-style.h
+++ b/src/sheet-style.h
@@ -74,13 +74,13 @@ GnmStyle const *style_list_get_style (GnmStyleList const *l, int col, int ro
void style_list_free (GnmStyleList *l);
GnmStyleList *sheet_style_get_range (Sheet const *sheet, GnmRange const *r);
-typedef gboolean (*sheet_style_set_list_cb_t) (GnmRange *range,
- Sheet const *sheet,
+typedef gboolean (*sheet_style_set_list_cb_t) (GnmRange *range,
+ Sheet const *sheet,
gpointer data);
-GnmSpanCalcFlags sheet_style_set_list (Sheet *sheet,
+GnmSpanCalcFlags sheet_style_set_list (Sheet *sheet,
GnmCellPos const *corner,
GnmStyleList const *l,
- sheet_style_set_list_cb_t range_modify,
+ sheet_style_set_list_cb_t range_modify,
gpointer data);
GnmStyleList *sheet_style_collect_conditions (Sheet const *s, GnmRange const *r);
diff --git a/src/sheet-view.c b/src/sheet-view.c
index 0cd4ada..5b3ffee 100644
--- a/src/sheet-view.c
+++ b/src/sheet-view.c
@@ -641,9 +641,9 @@ sv_update (SheetView *sv)
sv->edit_pos_changed.location = FALSE;
if (wb_view_cur_sheet_view (sv->sv_wbv) == sv) {
wb_view_selection_desc (sv->sv_wbv, TRUE, NULL);
- SHEET_VIEW_FOREACH_CONTROL
- (sv, sc, wb_control_menu_state_update
- (sc_wbc (sc),
+ SHEET_VIEW_FOREACH_CONTROL
+ (sv, sc, wb_control_menu_state_update
+ (sc_wbc (sc),
MS_COMMENT_LINKS | MS_PAGE_BREAKS););
}
}
@@ -657,12 +657,12 @@ sv_update (SheetView *sv)
cb_update_auto_expr, (gpointer) sv, NULL);
}
SHEET_VIEW_FOREACH_CONTROL (sv, sc,
- wb_control_menu_state_update (sc_wbc (sc), MS_ADD_VS_REMOVE_FILTER |
+ wb_control_menu_state_update (sc_wbc (sc), MS_ADD_VS_REMOVE_FILTER |
MS_COMMENT_LINKS_RANGE););
}
SHEET_VIEW_FOREACH_CONTROL (sv, sc,
- wb_control_menu_state_update
+ wb_control_menu_state_update
(sc_wbc (sc), MS_SELECT_OBJECT););
}
@@ -703,7 +703,7 @@ sv_selection_intersects_filter_rows (SheetView const *sv)
g_return_val_if_fail (IS_SHEET_VIEW (sv), NULL);
r = selection_first_range (sv, NULL, NULL);
- return gnm_sheet_filter_intersect_rows
+ return gnm_sheet_filter_intersect_rows
(sv->sheet, r->start.row, r->end.row);
}
@@ -712,7 +712,7 @@ sv_selection_intersects_filter_rows (SheetView const *sv)
* @sv : #SheetView
*
* Returns: %NULL or GnmFilter whose rows intersect the rows
- * of the current selectiona range to which the filter can be
+ * of the current selectiona range to which the filter can be
* extended.
**/
GnmRange *
diff --git a/src/sheet-view.h b/src/sheet-view.h
index 735e2db..abbc13a 100644
--- a/src/sheet-view.h
+++ b/src/sheet-view.h
@@ -87,7 +87,7 @@ gboolean sv_is_region_empty_or_selected (SheetView const *sv,
GnmFilter *sv_editpos_in_filter (SheetView const *sv);
GnmFilter *sv_selection_intersects_filter_rows (SheetView const *sv);
-GnmRange *sv_selection_extends_filter (SheetView const *sv,
+GnmRange *sv_selection_extends_filter (SheetView const *sv,
GnmFilter const *f);
GnmSheetSlicer *sv_editpos_in_slicer (SheetView const *sv);
diff --git a/src/sheet.c b/src/sheet.c
index 2220b39..a463673 100644
--- a/src/sheet.c
+++ b/src/sheet.c
@@ -1535,15 +1535,15 @@ sheet_apply_style_cb (GnmSheetRange *sr,
sheet_flag_style_update_range (sr->sheet, &sr->range);
}
-GOUndo *
-sheet_apply_style_undo (GnmSheetRange *sr,
+GOUndo *
+sheet_apply_style_undo (GnmSheetRange *sr,
GnmStyle *style)
{
gnm_style_ref (style);
- return go_undo_binary_new
- (sr, (gpointer)style,
- (GOUndoBinaryFunc) sheet_apply_style_cb,
- (GFreeFunc) gnm_sheet_range_free,
+ return go_undo_binary_new
+ (sr, (gpointer)style,
+ (GOUndoBinaryFunc) sheet_apply_style_cb,
+ (GFreeFunc) gnm_sheet_range_free,
(GFreeFunc) gnm_style_unref);
}
@@ -2471,27 +2471,27 @@ sheet_range_set_expr_cb (GnmSheetRange const *sr, GnmExprTop const *texpr)
sheet_region_queue_recalc (sr->sheet, &sr->range);
/* Store the parsed result creating any cells necessary */
- sheet_foreach_cell_in_range
+ sheet_foreach_cell_in_range
(sr->sheet, CELL_ITER_ALL,
- sr->range.start.col, sr->range.start.row,
+ sr->range.start.col, sr->range.start.row,
sr->range.end.col, sr->range.end.row,
(CellIterFunc)&cb_set_cell_content, &closure);
merged = gnm_sheet_merge_get_overlap (sr->sheet, &sr->range);
for (ptr = merged ; ptr != NULL ; ptr = ptr->next) {
GnmRange const *tmp = ptr->data;
- sheet_foreach_cell_in_range
+ sheet_foreach_cell_in_range
(sr->sheet, CELL_ITER_ALL,
- tmp->start.col, tmp->start.row,
+ tmp->start.col, tmp->start.row,
tmp->end.col, tmp->end.row,
- (CellIterFunc)&cb_clear_non_corner,
+ (CellIterFunc)&cb_clear_non_corner,
(gpointer)tmp);
}
g_slist_free (merged);
sheet_region_queue_recalc (sr->sheet, &sr->range);
sheet_flag_status_update_range (sr->sheet, &sr->range);
- sheet_queue_respan (sr->sheet, sr->range.start.row,
+ sheet_queue_respan (sr->sheet, sr->range.start.row,
sr->range.end.row);
}
@@ -2499,10 +2499,10 @@ GOUndo *
sheet_range_set_expr_undo (GnmSheetRange *sr, GnmExprTop const *texpr)
{
gnm_expr_top_ref (texpr);
- return go_undo_binary_new
- (sr, (gpointer)texpr,
- (GOUndoBinaryFunc) sheet_range_set_expr_cb,
- (GFreeFunc) gnm_sheet_range_free,
+ return go_undo_binary_new
+ (sr, (gpointer)texpr,
+ (GOUndoBinaryFunc) sheet_range_set_expr_cb,
+ (GFreeFunc) gnm_sheet_range_free,
(GFreeFunc) gnm_expr_top_unref);
}
@@ -2585,18 +2585,18 @@ sheet_range_set_text_cb (GnmSheetRange const *sr, gchar const *text)
sheet_range_set_text (&pos, &sr->range, text);
sheet_region_queue_recalc (sr->sheet, &sr->range);
sheet_flag_status_update_range (sr->sheet, &sr->range);
- sheet_queue_respan (sr->sheet, sr->range.start.row,
+ sheet_queue_respan (sr->sheet, sr->range.start.row,
sr->range.end.row);
}
-GOUndo *
-sheet_range_set_text_undo (GnmSheetRange *sr,
+GOUndo *
+sheet_range_set_text_undo (GnmSheetRange *sr,
char const *text)
{
- return go_undo_binary_new
- (sr, g_strdup (text),
- (GOUndoBinaryFunc) sheet_range_set_text_cb,
- (GFreeFunc) gnm_sheet_range_free,
+ return go_undo_binary_new
+ (sr, g_strdup (text),
+ (GOUndoBinaryFunc) sheet_range_set_text_cb,
+ (GFreeFunc) gnm_sheet_range_free,
(GFreeFunc) g_free);
}
@@ -2623,27 +2623,27 @@ cb_set_markup (GnmCellIter const *iter, PangoAttrList *markup)
static void
sheet_range_set_markup_cb (GnmSheetRange const *sr, PangoAttrList *markup)
{
- sheet_foreach_cell_in_range
+ sheet_foreach_cell_in_range
(sr->sheet, CELL_ITER_ALL,
- sr->range.start.col, sr->range.start.row,
+ sr->range.start.col, sr->range.start.row,
sr->range.end.col, sr->range.end.row,
(CellIterFunc)&cb_set_markup, markup);
sheet_region_queue_recalc (sr->sheet, &sr->range);
sheet_flag_status_update_range (sr->sheet, &sr->range);
- sheet_queue_respan (sr->sheet, sr->range.start.row,
+ sheet_queue_respan (sr->sheet, sr->range.start.row,
sr->range.end.row);
}
-GOUndo *
+GOUndo *
sheet_range_set_markup_undo (GnmSheetRange *sr, PangoAttrList *markup)
{
if (markup == NULL)
return NULL;
- return go_undo_binary_new
- (sr, pango_attr_list_ref (markup),
- (GOUndoBinaryFunc) sheet_range_set_markup_cb,
- (GFreeFunc) gnm_sheet_range_free,
+ return go_undo_binary_new
+ (sr, pango_attr_list_ref (markup),
+ (GOUndoBinaryFunc) sheet_range_set_markup_cb,
+ (GFreeFunc) gnm_sheet_range_free,
(GFreeFunc) pango_attr_list_unref);
}
@@ -4312,10 +4312,10 @@ GOUndo *sheet_clear_region_undo (GnmSheetRange *sr, int clear_flags)
{
int *flags = g_new(int, 1);
*flags = clear_flags;
- return go_undo_binary_new
- (sr, (gpointer)flags,
- (GOUndoBinaryFunc) sheet_clear_region_cb,
- (GFreeFunc) gnm_sheet_range_free,
+ return go_undo_binary_new
+ (sr, (gpointer)flags,
+ (GOUndoBinaryFunc) sheet_clear_region_cb,
+ (GFreeFunc) gnm_sheet_range_free,
(GFreeFunc) g_free);
}
@@ -6061,14 +6061,14 @@ gnm_sheet_get_sort_setups (Sheet *sheet)
if (hash == NULL)
hash = sheet->sort_setups =
- g_hash_table_new_full
- (g_str_hash, g_str_equal,
+ g_hash_table_new_full
+ (g_str_hash, g_str_equal,
g_free, (GDestroyNotify)gnm_sort_data_destroy);
return hash;
}
-void
+void
gnm_sheet_add_sort_setup (Sheet *sheet, char *key, gpointer setup)
{
GHashTable *hash = gnm_sheet_get_sort_setups (sheet);
@@ -6076,7 +6076,7 @@ gnm_sheet_add_sort_setup (Sheet *sheet, char *key, gpointer setup)
g_hash_table_insert (hash, key, setup);
}
-gconstpointer
+gconstpointer
gnm_sheet_find_sort_setup (Sheet *sheet, char const *key)
{
if (sheet->sort_setups == NULL)
diff --git a/src/sheet.h b/src/sheet.h
index 23f38b6..374d5c1 100644
--- a/src/sheet.h
+++ b/src/sheet.h
@@ -319,16 +319,16 @@ void sheet_cell_set_value (GnmCell *cell, GnmValue *v);
void sheet_cell_set_text (GnmCell *cell, char const *str,
PangoAttrList *markup);
GnmValue const *sheet_cell_get_value(Sheet *sheet, int col, int row);
-void sheet_range_set_text (GnmParsePos const *pos,
+void sheet_range_set_text (GnmParsePos const *pos,
GnmRange const *r, char const *str);
-GOUndo * sheet_range_set_text_undo (GnmSheetRange *sr,
+GOUndo * sheet_range_set_text_undo (GnmSheetRange *sr,
char const *text);
-GOUndo * sheet_range_set_expr_undo (GnmSheetRange *sr,
+GOUndo * sheet_range_set_expr_undo (GnmSheetRange *sr,
GnmExprTop const *texpr);
-GOUndo * sheet_range_set_markup_undo (GnmSheetRange *sr,
+GOUndo * sheet_range_set_markup_undo (GnmSheetRange *sr,
PangoAttrList *markup);
void sheet_apply_style (Sheet *sheet, GnmRange const *range, GnmStyle *mstyle);
-GOUndo * sheet_apply_style_undo (GnmSheetRange *sr,
+GOUndo * sheet_apply_style_undo (GnmSheetRange *sr,
GnmStyle *style);
void sheet_apply_border (Sheet *sheet, GnmRange const *range, GnmBorder **borders);
void sheet_queue_respan (Sheet const *sheet, int start_row, int end_row);
@@ -368,7 +368,7 @@ void sheet_clear_region (Sheet *sheet,
int end_col, int end_row,
int clear_flags, GOCmdContext *cc);
-GOUndo *sheet_clear_region_undo (GnmSheetRange *sr,
+GOUndo *sheet_clear_region_undo (GnmSheetRange *sr,
int clear_flags);
SheetView *sheet_get_view (Sheet const *sheet, WorkbookView const *wbv);
diff --git a/src/sort.c b/src/sort.c
index 5aeb211..59e6b98 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -335,7 +335,7 @@ gnm_sort_data_copy (GnmSortData *data)
result = g_memdup (data, sizeof (GnmSortData));
result->range = g_memdup (result->range, sizeof (GnmRange));
- result->clauses = g_memdup (result->clauses,
+ result->clauses = g_memdup (result->clauses,
result->num_clause * sizeof (GnmSortClause));
result->locale = g_strdup (result->locale);
diff --git a/src/stf-parse.c b/src/stf-parse.c
index 9df2796..be066a9 100644
--- a/src/stf-parse.c
+++ b/src/stf-parse.c
@@ -1314,8 +1314,8 @@ stf_parse_sheet (StfParseOptions_t *parseoptions,
}
END_LOCALE_SWITCH;
- for (lcol = 0, col = start_col;
- lcol < parseoptions->col_import_array_len && col < gnm_sheet_get_max_cols (sheet);
+ for (lcol = 0, col = start_col;
+ lcol < parseoptions->col_import_array_len && col < gnm_sheet_get_max_cols (sheet);
lcol++)
if (parseoptions->col_import_array == NULL ||
parseoptions->col_import_array_len <= lcol ||
diff --git a/src/style.c b/src/style.c
index c4c266e..bc09bd7 100644
--- a/src/style.c
+++ b/src/style.c
@@ -514,12 +514,12 @@ gnm_style_default_halign (GnmStyle const *mstyle, GnmCell const *c)
return HALIGN_RIGHT;
}
-PangoUnderline
+PangoUnderline
gnm_translate_underline_to_pango (GnmUnderline ul)
{
g_return_val_if_fail (ul >= UNDERLINE_NONE, PANGO_UNDERLINE_NONE);
g_return_val_if_fail (ul <= UNDERLINE_DOUBLE_LOW, PANGO_UNDERLINE_NONE);
-
+
switch (ul) {
case UNDERLINE_SINGLE:
return PANGO_UNDERLINE_SINGLE;
@@ -534,12 +534,12 @@ gnm_translate_underline_to_pango (GnmUnderline ul)
}
}
-GnmUnderline
+GnmUnderline
gnm_translate_underline_from_pango (PangoUnderline pul)
{
g_return_val_if_fail (pul >= PANGO_UNDERLINE_NONE, UNDERLINE_NONE);
g_return_val_if_fail (pul <= PANGO_UNDERLINE_LOW, UNDERLINE_NONE);
-
+
switch (pul) {
case PANGO_UNDERLINE_SINGLE:
return UNDERLINE_SINGLE;
@@ -551,5 +551,5 @@ gnm_translate_underline_from_pango (PangoUnderline pul)
default:
return UNDERLINE_NONE;
}
-
+
}
diff --git a/src/tools/ChangeLog b/src/tools/ChangeLog
index 7a03d94..16a3dcb 100644
--- a/src/tools/ChangeLog
+++ b/src/tools/ChangeLog
@@ -1,7 +1,7 @@
2010-10-02 Andreas J. Guelzow <aguelzow pyrshep ca>
- * analysis-tools.c (analysis_tool_fourier_engine_run): use new
- FOURIER argument
+ * analysis-tools.c (analysis_tool_fourier_engine_run): use new
+ FOURIER argument
2010-10-01 Morten Welinder <terra gnome org>
@@ -31,7 +31,7 @@
2010-07-19 Andreas J. Guelzow <aguelzow pyrshep ca>
- * dao.c: delete HAVE_G_DATE_SET_TIME_T throughout
+ * dao.c: delete HAVE_G_DATE_SET_TIME_T throughout
2010-07-12 Jean Brefort <jean brefort normalesup org>
diff --git a/src/tools/analysis-auto-expression.c b/src/tools/analysis-auto-expression.c
index 9b0db26..a956702 100644
--- a/src/tools/analysis-auto-expression.c
+++ b/src/tools/analysis-auto-expression.c
@@ -100,7 +100,7 @@ analysis_tool_auto_expression_engine (data_analysis_output_t *dao, gpointer spec
case TOOL_ENGINE_UPDATE_DAO:
prepare_input_range (&info->base.input, info->base.group_by);
if (info->below)
- dao_adjust (dao,
+ dao_adjust (dao,
(info->multiple ? 1 : 0) + g_slist_length (info->base.input),
1);
else
diff --git a/src/tools/analysis-normality.c b/src/tools/analysis-normality.c
index c34ffd8..e96b2d4 100644
--- a/src/tools/analysis-normality.c
+++ b/src/tools/analysis-normality.c
@@ -89,10 +89,10 @@ analysis_tool_normality_engine_run (data_analysis_output_t *dao,
g_assert_not_reached();
}
- fd = gnm_func_lookup_or_add_placeholder
+ fd = gnm_func_lookup_or_add_placeholder
(fdname, dao->sheet ? dao->sheet->workbook : NULL, FALSE);
gnm_func_ref (fd);
- fd_if = gnm_func_lookup_or_add_placeholder
+ fd_if = gnm_func_lookup_or_add_placeholder
("IF", dao->sheet ? dao->sheet->workbook : NULL, FALSE);
gnm_func_ref (fd_if);
@@ -137,34 +137,34 @@ analysis_tool_normality_engine_run (data_analysis_output_t *dao,
/* Note that analysis_tools_write_label may modify val_org */
dao_set_italic (dao, col, 0, col, 0);
- analysis_tools_write_label (val_org, dao, &info->base,
+ analysis_tools_write_label (val_org, dao, &info->base,
col, 0, col);
if (info->graph) {
GogSeries *series;
series = gog_plot_new_series (plot);
- gog_series_set_dim (series, 0,
- gnm_go_data_vector_new_expr
+ gog_series_set_dim (series, 0,
+ gnm_go_data_vector_new_expr
(val_org->v_range.cell.a.sheet,
- gnm_expr_top_new (gnm_expr_new_constant (value_dup (val_org)))),
+ gnm_expr_top_new (gnm_expr_new_constant (value_dup (val_org)))),
NULL);
}
if (col == 1)
dao_set_cell_float (dao, col, 1, info->alpha);
else
- dao_set_cell_expr (dao, col, 1,
+ dao_set_cell_expr (dao, col, 1,
make_cellref (1 - col, 0));
- dao_set_array_expr (dao, col, 2, 1, 3,
+ dao_set_array_expr (dao, col, 2, 1, 3,
gnm_expr_new_funcall1 (fd, gnm_expr_new_constant (val_org)));
dao_set_cell_expr (dao, col, 5,
- gnm_expr_new_funcall3
- (fd_if, gnm_expr_new_binary
- (make_cellref (0, -4),
- GNM_EXPR_OP_GTE,
+ gnm_expr_new_funcall3
+ (fd_if, gnm_expr_new_binary
+ (make_cellref (0, -4),
+ GNM_EXPR_OP_GTE,
make_cellref (0, -3)),
- gnm_expr_new_constant (value_new_string (_("Not normal"))),
+ gnm_expr_new_constant (value_new_string (_("Not normal"))),
gnm_expr_new_constant (value_new_string (_("Possibly normal")))));
}
diff --git a/src/tools/analysis-principal-components.c b/src/tools/analysis-principal-components.c
index 1272c88..11a7354 100644
--- a/src/tools/analysis-principal-components.c
+++ b/src/tools/analysis-principal-components.c
@@ -63,46 +63,46 @@ analysis_tool_principal_components_engine_run (data_analysis_output_t *dao,
if (!dao_cell_is_visible (dao, l, 9 + 3 * l)) {
dao_set_bold (dao, 0, 0, 0, 0);
dao_set_italic (dao, 0, 0, 0, 0);
- dao_set_cell (dao, 0, 0,
+ dao_set_cell (dao, 0, 0,
_("Principal components analysis has "
"insufficient space."));
return 0;
}
- fd_mean = gnm_func_lookup_or_add_placeholder
+ fd_mean = gnm_func_lookup_or_add_placeholder
("AVERAGE", dao->sheet ? dao->sheet->workbook : NULL, FALSE);
gnm_func_ref (fd_mean);
- fd_var = gnm_func_lookup_or_add_placeholder
+ fd_var = gnm_func_lookup_or_add_placeholder
("VAR", dao->sheet ? dao->sheet->workbook : NULL, FALSE);
gnm_func_ref (fd_var);
- fd_eigen = gnm_func_lookup_or_add_placeholder
+ fd_eigen = gnm_func_lookup_or_add_placeholder
("EIGEN", dao->sheet ? dao->sheet->workbook : NULL, FALSE);
gnm_func_ref (fd_eigen);
- fd_mmult = gnm_func_lookup_or_add_placeholder
+ fd_mmult = gnm_func_lookup_or_add_placeholder
("MMULT", dao->sheet ? dao->sheet->workbook : NULL, FALSE);
gnm_func_ref (fd_mmult);
- fd_munit = gnm_func_lookup_or_add_placeholder
+ fd_munit = gnm_func_lookup_or_add_placeholder
("MUNIT", dao->sheet ? dao->sheet->workbook : NULL, FALSE);
gnm_func_ref (fd_munit);
- fd_sqrt = gnm_func_lookup_or_add_placeholder
+ fd_sqrt = gnm_func_lookup_or_add_placeholder
("SQRT", dao->sheet ? dao->sheet->workbook : NULL, FALSE);
gnm_func_ref (fd_sqrt);
- fd_count = gnm_func_lookup_or_add_placeholder
+ fd_count = gnm_func_lookup_or_add_placeholder
("COUNT", dao->sheet ? dao->sheet->workbook : NULL, FALSE);
gnm_func_ref (fd_count);
- fd_sum = gnm_func_lookup_or_add_placeholder
+ fd_sum = gnm_func_lookup_or_add_placeholder
("SUM", dao->sheet ? dao->sheet->workbook : NULL, FALSE);
gnm_func_ref (fd_sum);
- fd_and = gnm_func_lookup_or_add_placeholder
+ fd_and = gnm_func_lookup_or_add_placeholder
("AND", dao->sheet ? dao->sheet->workbook : NULL, FALSE);
gnm_func_ref (fd_and);
- fd_if = gnm_func_lookup_or_add_placeholder
+ fd_if = gnm_func_lookup_or_add_placeholder
("IF", dao->sheet ? dao->sheet->workbook : NULL, FALSE);
gnm_func_ref (fd_if);
dao_set_bold (dao, 0, 0, 0, 0);
dao_set_italic (dao, 0, 0, 0, 11 + 3 * l);
- dao_set_format (dao, 0, 0, 0, 0,
+ dao_set_format (dao, 0, 0, 0, 0,
_("\"Principal Components Analysis\";"
"[Red]\"Principal Components Analysis is invalid.\""));
dao_set_align (dao, 0, 0, 0, 0,
@@ -115,24 +115,24 @@ analysis_tool_principal_components_engine_run (data_analysis_output_t *dao,
for (i = 1, inputdata = info->input; inputdata != NULL; i++, inputdata = inputdata->next)
analysis_tools_write_label (inputdata->data, dao, info, 0, 9 + 2 * l + i, i);
- data_points = value_area_get_width (info->input->data, NULL) *
+ data_points = value_area_get_width (info->input->data, NULL) *
value_area_get_height (info->input->data, NULL);
for (i = 0; i < l; i++)
- and_args = gnm_expr_list_prepend
- (and_args,
- gnm_expr_new_binary
+ and_args = gnm_expr_list_prepend
+ (and_args,
+ gnm_expr_new_binary
(gnm_expr_new_constant (value_new_int (data_points)),
GNM_EXPR_OP_EQUAL,
make_cellref (1 + i, 3 + l)));
expr_and = gnm_expr_new_funcall (fd_and, and_args);
- dao_set_cell_expr (dao, 0, 0,
- gnm_expr_new_funcall3
+ dao_set_cell_expr (dao, 0, 0,
+ gnm_expr_new_funcall3
(fd_if,
expr_and,
gnm_expr_new_constant (value_new_int (1)),
gnm_expr_new_constant (value_new_int (-1))));
dao_set_merge (dao,0,0,2,0);
- set_cell_text_col (dao, 0, 3 + l,
+ set_cell_text_col (dao, 0, 3 + l,
_("/Count:"
"/Mean:"
"/Variance:"
@@ -145,9 +145,9 @@ analysis_tool_principal_components_engine_run (data_analysis_output_t *dao,
for (i = 1, inputdata = info->input; inputdata != NULL; i++, inputdata = inputdata->next) {
expr = gnm_expr_new_constant (value_dup (inputdata->data));
- dao_set_cell_expr (dao, i, 3 + l,
+ dao_set_cell_expr (dao, i, 3 + l,
gnm_expr_new_funcall1 (fd_count, gnm_expr_copy (expr)));
- dao_set_cell_expr (dao, i, 4 + l,
+ dao_set_cell_expr (dao, i, 4 + l,
gnm_expr_new_funcall1 (fd_mean, gnm_expr_copy (expr)));
dao_set_cell_expr (dao, i, 5 + l,
gnm_expr_new_funcall1 (fd_var, expr));
@@ -156,8 +156,8 @@ analysis_tool_principal_components_engine_run (data_analysis_output_t *dao,
expr_count = gnm_expr_new_binary (make_cellref (0,-4), GNM_EXPR_OP_DIV,
gnm_expr_new_binary (make_cellref (0,-4), GNM_EXPR_OP_SUB,
gnm_expr_new_constant (value_new_int (1))));
- expr = gnm_expr_new_funcall1
- (fd_eigen, gnm_expr_new_binary
+ expr = gnm_expr_new_funcall1
+ (fd_eigen, gnm_expr_new_binary
(expr_count, GNM_EXPR_OP_MULT, make_rangeref (0, - (5 + l), l - 1, - 6)));
dao_set_array_expr (dao, 1, 7 + l, l, l + 1, expr);
@@ -165,28 +165,28 @@ analysis_tool_principal_components_engine_run (data_analysis_output_t *dao,
dao_set_align (dao, i, 9 + 2 * l, i, 9 + 2 * l,
HALIGN_CENTER, VALIGN_BOTTOM);
dao_set_cell_printf (dao, i, 9 + 2 * l, "\xce\xbe%i", i);
- dao_set_cell_expr (dao, i, 11 + 3 * l,
+ dao_set_cell_expr (dao, i, 11 + 3 * l,
gnm_expr_new_binary (make_cellref (0,- 4 - 2 * l),
GNM_EXPR_OP_DIV,
- gnm_expr_new_funcall1
+ gnm_expr_new_funcall1
(fd_sum,
dao_get_rangeref (dao, 1, 7 + l, l, 7 + l))));
}
expr_munit = gnm_expr_new_funcall1 (fd_munit, gnm_expr_new_constant (value_new_int (l)));
expr = gnm_expr_new_funcall2 (fd_mmult,
- gnm_expr_new_binary
- (gnm_expr_new_funcall1
- (fd_sqrt, gnm_expr_new_binary
+ gnm_expr_new_binary
+ (gnm_expr_new_funcall1
+ (fd_sqrt, gnm_expr_new_binary
(gnm_expr_new_constant (value_new_int (1)),
- GNM_EXPR_OP_DIV,
+ GNM_EXPR_OP_DIV,
make_rangeref (0, - 5 - l, l - 1, - 5 - l))),
GNM_EXPR_OP_MULT,
gnm_expr_copy (expr_munit)),
make_rangeref (0, - 2 - l, l - 1, - 3));
expr = gnm_expr_new_funcall2 (fd_mmult, expr,
- gnm_expr_new_binary
- (gnm_expr_new_funcall1
+ gnm_expr_new_binary
+ (gnm_expr_new_funcall1
(fd_sqrt, make_rangeref (0, - 3 - l, l - 1, - 3 - l)),
GNM_EXPR_OP_MULT,
expr_munit));
@@ -215,7 +215,7 @@ analysis_tool_principal_components_engine (data_analysis_output_t *dao, gpointer
switch (selector) {
case TOOL_ENGINE_UPDATE_DESCRIPTOR:
- return (dao_command_descriptor
+ return (dao_command_descriptor
(dao, _("Principal Components Analysis (%s)"), result)
== NULL);
case TOOL_ENGINE_UPDATE_DAO:
diff --git a/src/tools/analysis-sign-test.c b/src/tools/analysis-sign-test.c
index 7f9029e..c879814 100644
--- a/src/tools/analysis-sign-test.c
+++ b/src/tools/analysis-sign-test.c
@@ -101,7 +101,7 @@ analysis_tool_sign_test_engine_run (data_analysis_output_t *dao,
expr_isnumber = gnm_expr_new_funcall3
(fd_if, gnm_expr_new_funcall1
(fd_isnumber, gnm_expr_copy (expr_org)),
- gnm_expr_new_constant (value_new_int (1)),
+ gnm_expr_new_constant (value_new_int (1)),
gnm_expr_new_constant (value_new_int (0)));
expr = gnm_expr_new_funcall1
@@ -111,26 +111,26 @@ analysis_tool_sign_test_engine_run (data_analysis_output_t *dao,
expr_neg = gnm_expr_new_funcall1
(fd_sum,
- gnm_expr_new_binary
+ gnm_expr_new_binary
(gnm_expr_copy (expr_isnumber), GNM_EXPR_OP_MULT,
gnm_expr_new_funcall2
- (fd_iferror,
+ (fd_iferror,
gnm_expr_new_funcall3
- (fd_if, gnm_expr_new_binary (gnm_expr_copy (expr_org),
- GNM_EXPR_OP_LT, make_cellref (0,-1)),
- gnm_expr_new_constant (value_new_int (1)),
+ (fd_if, gnm_expr_new_binary (gnm_expr_copy (expr_org),
+ GNM_EXPR_OP_LT, make_cellref (0,-1)),
+ gnm_expr_new_constant (value_new_int (1)),
gnm_expr_new_constant (value_new_int (0))),
gnm_expr_new_constant (value_new_int (0)))));
expr_pos = gnm_expr_new_funcall1
(fd_sum,
- gnm_expr_new_binary
+ gnm_expr_new_binary
(gnm_expr_copy (expr_isnumber), GNM_EXPR_OP_MULT,
gnm_expr_new_funcall2
- (fd_iferror,
+ (fd_iferror,
gnm_expr_new_funcall3
- (fd_if, gnm_expr_new_binary (gnm_expr_copy (expr_org),
- GNM_EXPR_OP_GT, make_cellref (0,-1)),
- gnm_expr_new_constant (value_new_int (1)),
+ (fd_if, gnm_expr_new_binary (gnm_expr_copy (expr_org),
+ GNM_EXPR_OP_GT, make_cellref (0,-1)),
+ gnm_expr_new_constant (value_new_int (1)),
gnm_expr_new_constant (value_new_int (0))),
gnm_expr_new_constant (value_new_int (0)))));
expr = gnm_expr_new_funcall2
@@ -138,23 +138,23 @@ analysis_tool_sign_test_engine_run (data_analysis_output_t *dao,
dao_set_cell_array_expr (dao, col + 1, 3, expr);
expr = gnm_expr_new_funcall1
- (fd_sum, gnm_expr_new_binary
- (expr_isnumber, GNM_EXPR_OP_MULT,
+ (fd_sum, gnm_expr_new_binary
+ (expr_isnumber, GNM_EXPR_OP_MULT,
gnm_expr_new_funcall2
(fd_iferror, gnm_expr_new_funcall3
- (fd_if, gnm_expr_new_binary (expr_org,
- GNM_EXPR_OP_NOT_EQUAL, make_cellref (0,-2)),
- gnm_expr_new_constant (value_new_int (1)),
- gnm_expr_new_constant (value_new_int (0))),
+ (fd_if, gnm_expr_new_binary (expr_org,
+ GNM_EXPR_OP_NOT_EQUAL, make_cellref (0,-2)),
+ gnm_expr_new_constant (value_new_int (1)),
+ gnm_expr_new_constant (value_new_int (0))),
gnm_expr_new_constant (value_new_int (0)))));
dao_set_cell_array_expr (dao, col + 1, 4, expr);
- expr = gnm_expr_new_funcall4 (fd_binomdist, make_cellref (0,-3), make_cellref (0,-2),
- gnm_expr_new_constant (value_new_float (0.5)),
+ expr = gnm_expr_new_funcall4 (fd_binomdist, make_cellref (0,-3), make_cellref (0,-2),
+ gnm_expr_new_constant (value_new_float (0.5)),
gnm_expr_new_constant (value_new_bool (TRUE)));
dao_set_cell_array_expr (dao, col + 1, 6, expr);
- expr = gnm_expr_new_binary (gnm_expr_new_constant (value_new_int (2)),
+ expr = gnm_expr_new_binary (gnm_expr_new_constant (value_new_int (2)),
GNM_EXPR_OP_MULT, make_cellref (0,-1));
dao_set_cell_array_expr (dao, col + 1, 7, expr);
}
@@ -248,7 +248,7 @@ analysis_tool_sign_test_two_engine_run (data_analysis_output_t *dao,
gnm_expr_copy (expr_2));
dao_set_cell_expr (dao, 2, 1, expr);
- expr_diff = gnm_expr_new_binary (gnm_expr_copy (expr_1),
+ expr_diff = gnm_expr_new_binary (gnm_expr_copy (expr_1),
GNM_EXPR_OP_SUB,
gnm_expr_copy (expr_2));
@@ -312,11 +312,11 @@ analysis_tool_sign_test_two_engine_run (data_analysis_output_t *dao,
expr = gnm_expr_new_funcall4 (fd_binomdist, make_cellref (0,-3), make_cellref (0,-2),
gnm_expr_new_constant (value_new_float (0.5)),
gnm_expr_new_constant (value_new_bool (TRUE)));
- dao_set_cell_array_expr (dao, 1, 6,
- gnm_expr_new_funcall2
+ dao_set_cell_array_expr (dao, 1, 6,
+ gnm_expr_new_funcall2
(fd_min,
gnm_expr_copy (expr),
- gnm_expr_new_binary
+ gnm_expr_new_binary
(gnm_expr_new_constant (value_new_int (1)),
GNM_EXPR_OP_SUB,
expr)));
diff --git a/src/tools/analysis-signed-rank-test.c b/src/tools/analysis-signed-rank-test.c
index aa136a6..ee52cec 100644
--- a/src/tools/analysis-signed-rank-test.c
+++ b/src/tools/analysis-signed-rank-test.c
@@ -108,7 +108,7 @@ analysis_tool_signed_rank_test_engine_run (data_analysis_output_t *dao,
expr_isnumber = gnm_expr_new_funcall3
(fd_if, gnm_expr_new_funcall1
(fd_isnumber, gnm_expr_copy (expr_org)),
- make_int (1),
+ make_int (1),
make_int (0));
expr = gnm_expr_new_funcall1
@@ -130,29 +130,29 @@ analysis_tool_signed_rank_test_engine_run (data_analysis_output_t *dao,
gnm_expr_new_funcall1
(fd_isnumber, gnm_expr_copy (expr_org)),
gnm_expr_new_funcall3
- (fd_if,
+ (fd_if,
gnm_expr_new_binary
(gnm_expr_copy (expr_org),
GNM_EXPR_OP_EQUAL,
make_cellref (0,-2)),
- gnm_expr_copy (expr_big),
+ gnm_expr_copy (expr_big),
expr_abs),
expr_big);
- expr = gnm_expr_new_funcall3
+ expr = gnm_expr_new_funcall3
(fd_rank,
- gnm_expr_new_unary (GNM_EXPR_OP_UNARY_NEG,
+ gnm_expr_new_unary (GNM_EXPR_OP_UNARY_NEG,
expr_diff),
expr,
make_int (1));
- dao_set_cell_array_expr
+ dao_set_cell_array_expr
(dao, col + 1, 4,
gnm_expr_new_funcall1
(fd_sum,
gnm_expr_new_binary
(gnm_expr_copy (expr_isnumber),
GNM_EXPR_OP_MULT,
- gnm_expr_new_funcall3
+ gnm_expr_new_funcall3
(fd_if,
gnm_expr_new_binary
(gnm_expr_copy (expr_org),
@@ -162,41 +162,41 @@ analysis_tool_signed_rank_test_engine_run (data_analysis_output_t *dao,
make_int (0)))));
expr = gnm_expr_new_funcall1
- (fd_sum, gnm_expr_new_binary
- (expr_isnumber, GNM_EXPR_OP_MULT,
+ (fd_sum, gnm_expr_new_binary
+ (expr_isnumber, GNM_EXPR_OP_MULT,
gnm_expr_new_funcall2
(fd_iferror, gnm_expr_new_funcall3
- (fd_if, gnm_expr_new_binary (expr_org,
- GNM_EXPR_OP_NOT_EQUAL, make_cellref (0,-1)),
- make_int (1),
- make_int (0)),
+ (fd_if, gnm_expr_new_binary (expr_org,
+ GNM_EXPR_OP_NOT_EQUAL, make_cellref (0,-1)),
+ make_int (1),
+ make_int (0)),
make_int (0))));
dao_set_cell_array_expr (dao, col + 1, 3, expr);
- dao_set_cell_expr (dao, col + 1, 5,
- gnm_expr_new_binary
- (gnm_expr_new_binary
- (gnm_expr_new_binary
- (make_cellref (0,-2),
+ dao_set_cell_expr (dao, col + 1, 5,
+ gnm_expr_new_binary
+ (gnm_expr_new_binary
+ (gnm_expr_new_binary
+ (make_cellref (0,-2),
GNM_EXPR_OP_MULT,
- gnm_expr_new_binary
- (make_cellref (0,-2),
+ gnm_expr_new_binary
+ (make_cellref (0,-2),
GNM_EXPR_OP_ADD,
make_int (1))),
GNM_EXPR_OP_DIV,
make_int (2)),
- GNM_EXPR_OP_SUB,
+ GNM_EXPR_OP_SUB,
make_cellref (0,-1)));
dao_set_cell_expr (dao, col + 1, 6,
gnm_expr_new_funcall2
(fd_min, make_cellref (0,-1), make_cellref (0,-2)));
- expr_expect = gnm_expr_new_binary
- (gnm_expr_new_binary
- (make_cellref (0,-5),
+ expr_expect = gnm_expr_new_binary
+ (gnm_expr_new_binary
+ (make_cellref (0,-5),
GNM_EXPR_OP_MULT,
- gnm_expr_new_binary
- (make_cellref (0,-5),
+ gnm_expr_new_binary
+ (make_cellref (0,-5),
GNM_EXPR_OP_ADD,
make_int (1))),
GNM_EXPR_OP_DIV,
@@ -206,7 +206,7 @@ analysis_tool_signed_rank_test_engine_run (data_analysis_output_t *dao,
(gnm_expr_copy (expr_expect),
GNM_EXPR_OP_MULT,
gnm_expr_new_binary
- (gnm_expr_new_binary
+ (gnm_expr_new_binary
(make_int (2),
GNM_EXPR_OP_MULT,
make_cellref (0,-5)),
@@ -214,28 +214,28 @@ analysis_tool_signed_rank_test_engine_run (data_analysis_output_t *dao,
make_int (1))),
GNM_EXPR_OP_DIV,
make_int (6));
- expr = gnm_expr_new_funcall4
- (fd_normdist, gnm_expr_new_binary
+ expr = gnm_expr_new_funcall4
+ (fd_normdist, gnm_expr_new_binary
(make_cellref (0,-2),
GNM_EXPR_OP_ADD,
make_float (0.5)),
expr_expect,
gnm_expr_new_funcall1 (fd_sqrt, expr_var),
gnm_expr_new_constant (value_new_bool (TRUE)));
- dao_set_cell_expr (dao, col + 1, 8,
- gnm_expr_new_funcall3
- (fd_if,
- gnm_expr_new_binary
+ dao_set_cell_expr (dao, col + 1, 8,
+ gnm_expr_new_funcall3
+ (fd_if,
+ gnm_expr_new_binary
(make_cellref (0,-5),
GNM_EXPR_OP_LT,
- make_int (12)),
+ make_int (12)),
gnm_expr_new_constant (value_new_error_NA (NULL)),
expr));
dao_set_cell_comment (dao, col + 1, 8,
_("This p-value is calculated by a normal approximation.\n"
"It is only valid if the sample size is at least 12."));
- expr = gnm_expr_new_binary (make_int (2),
+ expr = gnm_expr_new_binary (make_int (2),
GNM_EXPR_OP_MULT, make_cellref (0,-1));
dao_set_cell_expr (dao, col + 1, 9, expr);
}
@@ -329,8 +329,8 @@ analysis_tool_signed_rank_test_two_engine_run (data_analysis_output_t *dao,
make_int (1),
make_int (0));
expr_isnumber = gnm_expr_new_binary
- (expr_isnumber_1,
- GNM_EXPR_OP_MULT,
+ (expr_isnumber_1,
+ GNM_EXPR_OP_MULT,
expr_isnumber_2);
expr = gnm_expr_new_funcall1
@@ -357,11 +357,11 @@ analysis_tool_signed_rank_test_two_engine_run (data_analysis_output_t *dao,
gnm_expr_new_constant (value_new_string(""))));
dao_set_cell_array_expr (dao, 2, 1, expr);
- expr_diff = gnm_expr_new_binary (gnm_expr_copy (expr_1),
+ expr_diff = gnm_expr_new_binary (gnm_expr_copy (expr_1),
GNM_EXPR_OP_SUB,
gnm_expr_copy (expr_2));
- dao_set_cell_array_expr
- (dao, 1, 2,
+ dao_set_cell_array_expr
+ (dao, 1, 2,
gnm_expr_new_funcall1
(fd_median,
gnm_expr_new_funcall3
@@ -375,11 +375,11 @@ analysis_tool_signed_rank_test_two_engine_run (data_analysis_output_t *dao,
expr = gnm_expr_new_funcall1
(fd_sum, gnm_expr_new_binary
- (gnm_expr_copy (expr_isnumber),
+ (gnm_expr_copy (expr_isnumber),
GNM_EXPR_OP_MULT,
gnm_expr_new_funcall2
(fd_iferror, gnm_expr_new_funcall3
- (fd_if, gnm_expr_new_binary
+ (fd_if, gnm_expr_new_binary
(gnm_expr_copy (expr_diff),
GNM_EXPR_OP_NOT_EQUAL, make_cellref (0,-2)),
make_int (1),
@@ -388,8 +388,8 @@ analysis_tool_signed_rank_test_two_engine_run (data_analysis_output_t *dao,
dao_set_cell_array_expr (dao, 1, 4, expr);
expr_diff_pred = gnm_expr_new_binary
- (gnm_expr_copy (expr_diff),
- GNM_EXPR_OP_SUB,
+ (gnm_expr_copy (expr_diff),
+ GNM_EXPR_OP_SUB,
make_cellref (0,-2));
expr_abs = gnm_expr_new_funcall1
(fd_abs, gnm_expr_copy (expr_diff_pred));
@@ -407,18 +407,18 @@ analysis_tool_signed_rank_test_two_engine_run (data_analysis_output_t *dao,
gnm_expr_new_funcall1
(fd_isnumber, expr_2),
gnm_expr_new_funcall3
- (fd_if,
+ (fd_if,
gnm_expr_new_binary
(gnm_expr_copy (expr_diff),
GNM_EXPR_OP_EQUAL,
make_cellref (0,-2)),
- gnm_expr_copy (expr_big),
+ gnm_expr_copy (expr_big),
expr_abs),
gnm_expr_copy (expr_big)),
expr_big);
- expr = gnm_expr_new_funcall3
+ expr = gnm_expr_new_funcall3
(fd_rank,
- gnm_expr_new_unary (GNM_EXPR_OP_UNARY_NEG,
+ gnm_expr_new_unary (GNM_EXPR_OP_UNARY_NEG,
expr_diff_pred),
expr,
make_int (1));
@@ -427,7 +427,7 @@ analysis_tool_signed_rank_test_two_engine_run (data_analysis_output_t *dao,
gnm_expr_new_binary
(expr_isnumber,
GNM_EXPR_OP_MULT,
- gnm_expr_new_funcall3
+ gnm_expr_new_funcall3
(fd_if,
gnm_expr_new_binary
(expr_diff,
@@ -438,32 +438,32 @@ analysis_tool_signed_rank_test_two_engine_run (data_analysis_output_t *dao,
dao_set_cell_array_expr (dao, 1, 5, expr);
- dao_set_cell_expr (dao, 1, 6,
- gnm_expr_new_binary
- (gnm_expr_new_binary
- (gnm_expr_new_binary
- (make_cellref (0,-2),
+ dao_set_cell_expr (dao, 1, 6,
+ gnm_expr_new_binary
+ (gnm_expr_new_binary
+ (gnm_expr_new_binary
+ (make_cellref (0,-2),
GNM_EXPR_OP_MULT,
- gnm_expr_new_binary
- (make_cellref (0,-2),
+ gnm_expr_new_binary
+ (make_cellref (0,-2),
GNM_EXPR_OP_ADD,
make_int (1))),
GNM_EXPR_OP_DIV,
make_int (2)),
- GNM_EXPR_OP_SUB,
+ GNM_EXPR_OP_SUB,
make_cellref (0,-1)));
- dao_set_cell_expr
+ dao_set_cell_expr
(dao, 1, 7,
gnm_expr_new_funcall2
(fd_min, make_cellref (0,-1), make_cellref (0,-2)));
- expr_expect = gnm_expr_new_binary
- (gnm_expr_new_binary
- (make_cellref (0,-5),
+ expr_expect = gnm_expr_new_binary
+ (gnm_expr_new_binary
+ (make_cellref (0,-5),
GNM_EXPR_OP_MULT,
- gnm_expr_new_binary
- (make_cellref (0,-5),
+ gnm_expr_new_binary
+ (make_cellref (0,-5),
GNM_EXPR_OP_ADD,
make_int (1))),
GNM_EXPR_OP_DIV,
@@ -473,7 +473,7 @@ analysis_tool_signed_rank_test_two_engine_run (data_analysis_output_t *dao,
(gnm_expr_copy (expr_expect),
GNM_EXPR_OP_MULT,
gnm_expr_new_binary
- (gnm_expr_new_binary
+ (gnm_expr_new_binary
(make_int (2),
GNM_EXPR_OP_MULT,
make_cellref (0,-5)),
@@ -481,24 +481,24 @@ analysis_tool_signed_rank_test_two_engine_run (data_analysis_output_t *dao,
make_int (1))),
GNM_EXPR_OP_DIV,
make_int (6));
- expr = gnm_expr_new_funcall4
- (fd_normdist, gnm_expr_new_binary
+ expr = gnm_expr_new_funcall4
+ (fd_normdist, gnm_expr_new_binary
(make_cellref (0,-2),
GNM_EXPR_OP_ADD,
make_float (0.5)),
expr_expect,
gnm_expr_new_funcall1 (fd_sqrt, expr_var),
gnm_expr_new_constant (value_new_bool (TRUE)));
- dao_set_cell_expr (dao, 1, 9,
- gnm_expr_new_funcall3
- (fd_if,
- gnm_expr_new_binary
+ dao_set_cell_expr (dao, 1, 9,
+ gnm_expr_new_funcall3
+ (fd_if,
+ gnm_expr_new_binary
(make_cellref (0,-5),
GNM_EXPR_OP_LT,
- make_int (12)),
+ make_int (12)),
gnm_expr_new_constant (value_new_error_NA (NULL)),
expr));
- dao_set_cell_comment
+ dao_set_cell_comment
(dao, 1, 9,
_("This p-value is calculated by a normal approximation.\n"
"It is only valid if the sample size is at least 12."));
diff --git a/src/tools/analysis-signed-rank-test.h b/src/tools/analysis-signed-rank-test.h
index 717c7b4..bb0de58 100644
--- a/src/tools/analysis-signed-rank-test.h
+++ b/src/tools/analysis-signed-rank-test.h
@@ -37,16 +37,16 @@
/* note: specs is a pointer to a analysis_tools_data_sign_test_t */
-gboolean analysis_tool_signed_rank_test_engine (data_analysis_output_t *dao,
+gboolean analysis_tool_signed_rank_test_engine (data_analysis_output_t *dao,
gpointer specs,
- analysis_tool_engine_t selector,
+ analysis_tool_engine_t selector,
gpointer result);
/* note: specs is a pointer to a analysis_tools_data_sign_test_two_t */
-gboolean analysis_tool_signed_rank_test_two_engine (data_analysis_output_t *dao,
+gboolean analysis_tool_signed_rank_test_two_engine (data_analysis_output_t *dao,
gpointer specs,
- analysis_tool_engine_t selector,
+ analysis_tool_engine_t selector,
gpointer result);
#endif
diff --git a/src/tools/analysis-tools.c b/src/tools/analysis-tools.c
index bf795ed..5723e7f 100644
--- a/src/tools/analysis-tools.c
+++ b/src/tools/analysis-tools.c
@@ -199,7 +199,7 @@ analysis_tools_write_label (GnmValue *val, data_analysis_output_t *dao,
* analysis_tools_write_label:
* @val: range to extract label from
* @dao: data_analysis_output_t, where to write to
- * @labels: analysis_tools_data_generic_t infowhether the
+ * @labels: analysis_tools_data_generic_t infowhether the
* @val contains label info
* @group_by: grouping info
* @x: output col number
@@ -572,12 +572,12 @@ int analysis_tool_calc_length (analysis_tools_data_generic_t *info)
}
GnmFunc *
-analysis_tool_get_function (char const *name,
+analysis_tool_get_function (char const *name,
data_analysis_output_t *dao)
{
GnmFunc *fd;
- fd = gnm_func_lookup_or_add_placeholder
+ fd = gnm_func_lookup_or_add_placeholder
(name, dao->sheet ? dao->sheet->workbook : NULL, FALSE);
gnm_func_ref (fd);
return fd;
@@ -666,7 +666,7 @@ static gboolean
analysis_tool_correlation_engine_run (data_analysis_output_t *dao,
analysis_tools_data_generic_t *info)
{
- return analysis_tool_table (dao, info, _("Correlations"),
+ return analysis_tool_table (dao, info, _("Correlations"),
"CORREL", FALSE);
}
@@ -721,7 +721,7 @@ static gboolean
analysis_tool_covariance_engine_run (data_analysis_output_t *dao,
analysis_tools_data_generic_t *info)
{
- return analysis_tool_table (dao, info, _("Covariances"),
+ return analysis_tool_table (dao, info, _("Covariances"),
"COVAR", FALSE);
}
@@ -3293,7 +3293,7 @@ analysis_tool_regression_simple_engine_run (data_analysis_output_t *dao,
guint row;
GnmValue *val_dep = value_dup (info->base.range_2);
- GnmExpr const *expr_intercept
+ GnmExpr const *expr_intercept
= gnm_expr_new_constant (value_new_bool (info->intercept));
GnmExpr const *expr_observ;
GnmExpr const *expr_val_dep;
@@ -3366,7 +3366,7 @@ analysis_tool_regression_simple_engine_run (data_analysis_output_t *dao,
gnm_expr_new_constant (value_new_int (1))));
dao_set_array_expr (dao, 2, row, 2, 1, expr_linest);
- dao_set_cell_expr (dao, 5, row, gnm_expr_new_funcall3
+ dao_set_cell_expr (dao, 5, row, gnm_expr_new_funcall3
(fd_fdist,
make_cellref (-1, 0),
gnm_expr_new_constant (value_new_int (1)),
@@ -4111,7 +4111,7 @@ analysis_tool_anova_single_engine_run (data_analysis_output_t *dao, gpointer spe
GnmExpr const *expr_one;
GnmExpr const *expr_count_one;
- analysis_tools_remove_label (val_org,
+ analysis_tools_remove_label (val_org,
info->base.labels,
info->base.group_by);
expr_one = gnm_expr_new_constant (value_dup (val_org));
diff --git a/src/tools/analysis-tools.h b/src/tools/analysis-tools.h
index b9d2347..2d47b26 100644
--- a/src/tools/analysis-tools.h
+++ b/src/tools/analysis-tools.h
@@ -233,15 +233,15 @@ void analysis_tools_write_label (GnmValue *val, /* depreceated */
int x, int y, int i);
void analysis_tools_write_label_ftest (GnmValue *val, /* depreceated */
data_analysis_output_t *dao,
- int x, int y,
+ int x, int y,
gboolean labels, int i);
-void analysis_tools_write_a_label (GnmValue *val,
+void analysis_tools_write_a_label (GnmValue *val,
data_analysis_output_t *dao,
- gboolean labels,
+ gboolean labels,
group_by_t group_by,
int x, int y);
void analysis_tools_remove_label (GnmValue *val,
- gboolean labels,
+ gboolean labels,
group_by_t group_by);
gboolean analysis_tool_table (data_analysis_output_t *dao,
@@ -261,7 +261,7 @@ void set_cell_text_row (data_analysis_output_t *dao,
void set_cell_text_col (data_analysis_output_t *dao,
int col, int row, const char *text);
-GnmFunc *analysis_tool_get_function (char const *name,
+GnmFunc *analysis_tool_get_function (char const *name,
data_analysis_output_t *dao);
#endif
diff --git a/src/tools/analysis-wilcoxon-mann-whitney.c b/src/tools/analysis-wilcoxon-mann-whitney.c
index d41a9d8..5e2b2ff 100644
--- a/src/tools/analysis-wilcoxon-mann-whitney.c
+++ b/src/tools/analysis-wilcoxon-mann-whitney.c
@@ -141,11 +141,11 @@ analysis_tool_wilcoxon_mann_whitney_engine_run (data_analysis_output_t *dao,
gnm_expr_copy (expr_pop_2));
dao_set_cell_array_expr (dao, 1, 2,
- gnm_expr_new_binary
+ gnm_expr_new_binary
(gnm_expr_new_funcall1
(fd_sum,
gnm_expr_new_funcall3
- (fd_rank_avg,
+ (fd_rank_avg,
expr_pop_1_adj,
gnm_expr_copy (expr_total),
gnm_expr_new_constant (value_new_int (1)))),
@@ -159,11 +159,11 @@ analysis_tool_wilcoxon_mann_whitney_engine_run (data_analysis_output_t *dao,
(fd_rows,
gnm_expr_copy (expr_pop_1)))));
dao_set_cell_array_expr (dao, 2, 2,
- gnm_expr_new_binary
+ gnm_expr_new_binary
(gnm_expr_new_funcall1
(fd_sum,
gnm_expr_new_funcall3
- (fd_rank_avg,
+ (fd_rank_avg,
expr_pop_2_adj,
gnm_expr_copy (expr_total),
gnm_expr_new_constant (value_new_int (1)))),
@@ -180,7 +180,7 @@ analysis_tool_wilcoxon_mann_whitney_engine_run (data_analysis_output_t *dao,
expr_count_total = gnm_expr_new_funcall1
(fd_count, gnm_expr_copy (expr_total));
dao_set_cell_expr (dao, 3, 2,
- gnm_expr_new_binary
+ gnm_expr_new_binary
(gnm_expr_new_binary
(gnm_expr_copy (expr_count_total),
GNM_EXPR_OP_MULT,
@@ -204,31 +204,31 @@ analysis_tool_wilcoxon_mann_whitney_engine_run (data_analysis_output_t *dao,
(fd_count,
gnm_expr_copy (expr_total)));
- expr_u = gnm_expr_new_binary
+ expr_u = gnm_expr_new_binary
(make_cellref (0,- 2), GNM_EXPR_OP_SUB,
- gnm_expr_new_binary
- (gnm_expr_new_binary
+ gnm_expr_new_binary
+ (gnm_expr_new_binary
(make_cellref (0,- 1),
GNM_EXPR_OP_MULT,
- gnm_expr_new_binary
+ gnm_expr_new_binary
(make_cellref (0,- 1),
GNM_EXPR_OP_ADD,
gnm_expr_new_constant (value_new_int (1)))),
GNM_EXPR_OP_DIV,
gnm_expr_new_constant (value_new_int (2))));
-
+
dao_set_cell_expr (dao, 1, 4, gnm_expr_copy (expr_u));
dao_set_cell_expr (dao, 2, 4, expr_u);
- dao_set_cell_expr (dao, 3, 4,
- gnm_expr_new_binary
- (make_cellref (-2,-1),
+ dao_set_cell_expr (dao, 3, 4,
+ gnm_expr_new_binary
+ (make_cellref (-2,-1),
GNM_EXPR_OP_MULT,
make_cellref (-1,-1)));
dao_set_cell_array_expr (dao, 1, 5,
gnm_expr_new_funcall1
(fd_sum,
- gnm_expr_new_binary
+ gnm_expr_new_binary
(gnm_expr_new_funcall2
(fd_rank_avg,
gnm_expr_copy (expr_total),
@@ -250,8 +250,8 @@ analysis_tool_wilcoxon_mann_whitney_engine_run (data_analysis_output_t *dao,
make_cellref (1,-5));
expr_sqrt = gnm_expr_new_funcall1
(fd_sqrt,
- gnm_expr_new_binary
- (gnm_expr_new_binary
+ gnm_expr_new_binary
+ (gnm_expr_new_binary
(gnm_expr_copy(expr_prod),
GNM_EXPR_OP_MULT,
gnm_expr_new_binary
@@ -266,26 +266,26 @@ analysis_tool_wilcoxon_mann_whitney_engine_run (data_analysis_output_t *dao,
expr_normdist = gnm_expr_new_funcall4
(fd_normdist,
make_cellref (0,-1),
- gnm_expr_new_binary
+ gnm_expr_new_binary
(expr_prod,
GNM_EXPR_OP_DIV,
gnm_expr_new_constant (value_new_int (2))),
expr_sqrt,
gnm_expr_new_constant (value_new_bool (TRUE)));
- dao_set_cell_expr (dao, 1, 6,
+ dao_set_cell_expr (dao, 1, 6,
gnm_expr_new_funcall2
- (fd_min,
+ (fd_min,
make_cellref (0,-4),
make_cellref (1,-4)));
- dao_set_cell_expr (dao, 1, 7,
+ dao_set_cell_expr (dao, 1, 7,
gnm_expr_new_funcall2
- (fd_min,
+ (fd_min,
make_cellref (0,-3),
make_cellref (1,-3)));
- dao_set_cell_expr (dao, 1, 8,
- gnm_expr_new_binary
+ dao_set_cell_expr (dao, 1, 8,
+ gnm_expr_new_binary
(gnm_expr_new_constant (value_new_int (2)),
GNM_EXPR_OP_MULT,
expr_normdist));
@@ -334,13 +334,13 @@ analysis_tool_wilcoxon_mann_whitney_engine_run (data_analysis_output_t *dao,
}
gboolean
-analysis_tool_wilcoxon_mann_whitney_engine
+analysis_tool_wilcoxon_mann_whitney_engine
(data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
switch (selector) {
case TOOL_ENGINE_UPDATE_DESCRIPTOR:
- return (dao_command_descriptor
+ return (dao_command_descriptor
(dao, _("Wilcoxon-Mann-Whitney Test (%s)"), result)
== NULL);
case TOOL_ENGINE_UPDATE_DAO:
diff --git a/src/tools/analysis-wilcoxon-mann-whitney.h b/src/tools/analysis-wilcoxon-mann-whitney.h
index 1814b60..f1ee595 100644
--- a/src/tools/analysis-wilcoxon-mann-whitney.h
+++ b/src/tools/analysis-wilcoxon-mann-whitney.h
@@ -34,7 +34,7 @@
#include "analysis-tools.h"
#include "sheet.h"
-gboolean analysis_tool_wilcoxon_mann_whitney_engine
+gboolean analysis_tool_wilcoxon_mann_whitney_engine
(data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
diff --git a/src/tools/auto-correct.c b/src/tools/auto-correct.c
index 6bb6314..85aadff 100644
--- a/src/tools/auto-correct.c
+++ b/src/tools/auto-correct.c
@@ -237,11 +237,11 @@ autocorrect_first_letter (const char *src)
if (seen_white) {
gunichar new = g_unichar_totitle (this_char);
- if ((this_char != new) &&
+ if ((this_char != new) &&
!autocorrect_first_letter_exception (src, last_end)) {
if (gstr == NULL)
gstr = g_string_new (NULL);
- g_string_append_len (gstr, last_copy,
+ g_string_append_len (gstr, last_copy,
this - last_copy);
g_string_append_unichar (gstr, new);
last_copy = g_utf8_next_char (this);
@@ -253,7 +253,7 @@ autocorrect_first_letter (const char *src)
}
if (gstr != NULL) {
- g_string_append_len (gstr, last_copy,
+ g_string_append_len (gstr, last_copy,
strlen (last_copy));
return g_string_free (gstr, FALSE);
}
diff --git a/src/tools/filter.c b/src/tools/filter.c
index b749efa..2d9efd0 100644
--- a/src/tools/filter.c
+++ b/src/tools/filter.c
@@ -248,7 +248,7 @@ finish:
else if (err == analysis_tools_invalid_field)
dao_set_cell (dao, 0, 0, _("The given criteria are invalid."));
else
- dao_set_cell_printf (dao, 0, 0,
+ dao_set_cell_printf (dao, 0, 0,
_("An unexpected error has occurred: "
"%d."), err);
}
@@ -270,9 +270,9 @@ analysis_tool_advanced_filter_engine (data_analysis_output_t *dao, gpointer spec
== NULL);
case TOOL_ENGINE_UPDATE_DAO: {
int rows, cols;
- rows = info->base.range_1->v_range.cell.b.row
+ rows = info->base.range_1->v_range.cell.b.row
- info->base.range_1->v_range.cell.a.row + 1;
- cols = info->base.range_1->v_range.cell.b.col
+ cols = info->base.range_1->v_range.cell.b.col
- info->base.range_1->v_range.cell.a.col + 1;
if (cols < 2)
cols = 2;
diff --git a/src/tools/gnm-solver.h b/src/tools/gnm-solver.h
index 70a90e7..ee21c8c 100644
--- a/src/tools/gnm-solver.h
+++ b/src/tools/gnm-solver.h
@@ -146,7 +146,7 @@ GnmSolverParameters *gnm_solver_param_dup (GnmSolverParameters *src_param,
gboolean gnm_solver_param_equal (GnmSolverParameters const *a,
GnmSolverParameters const *b);
-
+
GnmValue const *gnm_solver_param_get_input (GnmSolverParameters const *sp);
void gnm_solver_param_set_input (GnmSolverParameters *sp, GnmValue *v);
GSList *gnm_solver_param_get_input_cells (GnmSolverParameters const *sp);
diff --git a/src/tools/random-generator-cor.c b/src/tools/random-generator-cor.c
index 0939f5a..870c0df 100644
--- a/src/tools/random-generator-cor.c
+++ b/src/tools/random-generator-cor.c
@@ -53,18 +53,18 @@ tool_random_cor_engine_run (data_analysis_output_t *dao,
GnmFunc *fd_cholesky;
GnmExpr const *expr_cholesky;
- fd_cholesky = gnm_func_lookup_or_add_placeholder
+ fd_cholesky = gnm_func_lookup_or_add_placeholder
("CHOLESKY", dao->sheet ? dao->sheet->workbook : NULL, FALSE);
gnm_func_ref (fd_cholesky);
- expr_cholesky = gnm_expr_new_funcall1
+ expr_cholesky = gnm_expr_new_funcall1
(fd_cholesky, expr_matrix);
dao_set_merge (dao, 0, 0, 2 * info->variables, 0);
dao_set_italic (dao, 0, 0, 0, 0);
dao_set_cell (dao, 0, 0, _("Cholesky Decomposition of the Covariance Matrix"));
- dao_set_array_expr (dao, 0, 1, info->variables, info->variables,
+ dao_set_array_expr (dao, 0, 1, info->variables, info->variables,
expr_cholesky);
-
+
gnm_func_unref (fd_cholesky);
expr_matrix = dao_get_rangeref (dao, 0, 1, info->variables - 1, info->variables);
@@ -75,11 +75,11 @@ tool_random_cor_engine_run (data_analysis_output_t *dao,
dao_set_italic (dao, 0, 0, 0, 0);
dao_set_cell (dao, 0, 0, _("Uncorrelated Random Variables"));
- fd_rand = gnm_func_lookup_or_add_placeholder
+ fd_rand = gnm_func_lookup_or_add_placeholder
("RANDNORM", dao->sheet ? dao->sheet->workbook : NULL, FALSE);
gnm_func_ref (fd_rand);
- expr_rand = gnm_expr_new_funcall2 (fd_rand,
- gnm_expr_new_constant (value_new_int (0)),
+ expr_rand = gnm_expr_new_funcall2 (fd_rand,
+ gnm_expr_new_constant (value_new_int (0)),
gnm_expr_new_constant (value_new_int (1)));
for (i = 0; i < info->variables; i++)
for (j = 1; j <= info->count; j++)
@@ -89,10 +89,10 @@ tool_random_cor_engine_run (data_analysis_output_t *dao,
dao->offset_col += info->variables + 1;
- fd_mmult = gnm_func_lookup_or_add_placeholder
+ fd_mmult = gnm_func_lookup_or_add_placeholder
("MMULT", dao->sheet ? dao->sheet->workbook : NULL, FALSE);
gnm_func_ref (fd_mmult);
- fd_transpose = gnm_func_lookup_or_add_placeholder
+ fd_transpose = gnm_func_lookup_or_add_placeholder
("TRANSPOSE", dao->sheet ? dao->sheet->workbook : NULL, FALSE);
gnm_func_ref (fd_transpose);
@@ -102,12 +102,12 @@ tool_random_cor_engine_run (data_analysis_output_t *dao,
expr_rand = gnm_expr_new_funcall2 (fd_mmult,
make_rangeref (-4, 0, -2, 0),
- gnm_expr_new_funcall1
+ gnm_expr_new_funcall1
(fd_transpose,
expr_matrix));
for (j = 1; j <= info->count; j++)
- dao_set_array_expr (dao, 0, j, info->variables, 1,
+ dao_set_array_expr (dao, 0, j, info->variables, 1,
gnm_expr_copy (expr_rand));
gnm_expr_free (expr_rand);
@@ -139,11 +139,11 @@ tool_random_cor_engine (data_analysis_output_t *dao, gpointer specs,
switch (selector) {
case TOOL_ENGINE_UPDATE_DESCRIPTOR:
- return (dao_command_descriptor
+ return (dao_command_descriptor
(dao,_("Correlated Random Numbers (%s)"), result)
== NULL);
case TOOL_ENGINE_UPDATE_DAO:
- dao_adjust (dao, 2 * data->variables + 1,
+ dao_adjust (dao, 2 * data->variables + 1,
data->variables + data->count + 3 );
return FALSE;
case TOOL_ENGINE_CLEAN_UP:
diff --git a/src/tools/random-generator-cor.h b/src/tools/random-generator-cor.h
index a104e0f..e4c0934 100644
--- a/src/tools/random-generator-cor.h
+++ b/src/tools/random-generator-cor.h
@@ -12,16 +12,16 @@ typedef enum {
} random_gen_cor_type_t;
typedef struct {
- WorkbookControl *wbc;
+ WorkbookControl *wbc;
GnmValue *matrix;
random_gen_cor_type_t matrix_type;
gint count;
gint variables;
} tools_data_random_cor_t;
-gboolean tool_random_cor_engine (data_analysis_output_t *dao,
- gpointer specs,
- analysis_tool_engine_t selector,
+gboolean tool_random_cor_engine (data_analysis_output_t *dao,
+ gpointer specs,
+ analysis_tool_engine_t selector,
gpointer result);
#endif
diff --git a/src/tools/simulation.c b/src/tools/simulation.c
index 33386f0..35de04b 100644
--- a/src/tools/simulation.c
+++ b/src/tools/simulation.c
@@ -212,7 +212,7 @@ create_stats (simulation_t *sim, gnm_float **outputs, simstats_t *stats)
stats->range[i] = stats->max[i] - stats->min[i];
/* Confidence (95%) */
- stats->confidence[i] = 2 * qt (0.025, sim->n_iterations - 1,
+ stats->confidence[i] = 2 * qt (0.025, sim->n_iterations - 1,
FALSE, FALSE)
* (stats->stddev[i] / gnm_sqrt (sim->n_iterations));
diff --git a/src/undo.c b/src/undo.c
index c08304a..2ea488f 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -113,7 +113,7 @@ gnm_undo_colrow_set_sizes_undo (GOUndo *u, gpointer data)
GNMUndoColrowSetSizes *ua = (GNMUndoColrowSetSizes *)u;
ColRowStateGroup *group;
- group = colrow_set_sizes (ua->sheet, ua->is_cols, ua->selection, ua->new_size,
+ group = colrow_set_sizes (ua->sheet, ua->is_cols, ua->selection, ua->new_size,
ua->from, ua->to);
colrow_state_group_destroy (group);
}
@@ -155,7 +155,7 @@ gnm_undo_colrow_set_sizes_new (Sheet *sheet, gboolean is_cols,
ua->sheet = sheet;
ua->is_cols = is_cols;
ua->new_size = new_size;
-
+
if (r == NULL || new_size >= 0) {
ua->selection = selection;
ua->from = 0;
@@ -207,7 +207,7 @@ cb_filter_set_condition_undo_set_pb (SheetControl *control, char *text)
SheetControlGUI *scg = (SheetControlGUI *) control;
WBCGtk *wbcg = scg_wbcg (scg);
if (wbcg != NULL)
- gtk_progress_bar_set_text
+ gtk_progress_bar_set_text
(GTK_PROGRESS_BAR (wbcg->progress_bar), text);
}
@@ -219,7 +219,7 @@ gnm_undo_filter_set_condition_undo (GOUndo *u, gpointer data)
char const *format;
char *text;
- gnm_filter_set_condition (ua->filter, ua->i,
+ gnm_filter_set_condition (ua->filter, ua->i,
gnm_filter_condition_dup (ua->cond), TRUE);
sheet_update (ua->filter->sheet);
@@ -231,12 +231,12 @@ gnm_undo_filter_set_condition_undo (GOUndo *u, gpointer data)
format = ngettext ("%d row of %d match",
"%d rows of %d match",
count);
- text = g_strdup_printf (format, count,
- ua->filter->r.end.row -
+ text = g_strdup_printf (format, count,
+ ua->filter->r.end.row -
ua->filter->r.start.row);
SHEET_FOREACH_CONTROL (ua->filter->sheet, view, control, cb_filter_set_condition_undo_set_pb (control, text););
-
+
g_free (text);
}
@@ -245,7 +245,7 @@ gnm_undo_filter_set_condition_class_init (GObjectClass *gobject_class)
{
GOUndoClass *uclass = (GOUndoClass *)gobject_class;
- gnm_undo_filter_set_condition_parent_class = g_type_class_peek_parent
+ gnm_undo_filter_set_condition_parent_class = g_type_class_peek_parent
(gobject_class);
gobject_class->finalize = gnm_undo_filter_set_condition_finalize;
@@ -265,8 +265,8 @@ GSF_CLASS (GNMUndoFilterSetCondition, gnm_undo_filter_set_condition,
**/
GOUndo *
-gnm_undo_filter_set_condition_new (GnmFilter *filter, unsigned i,
- GnmFilterCondition *cond,
+gnm_undo_filter_set_condition_new (GnmFilter *filter, unsigned i,
+ GnmFilterCondition *cond,
gboolean retrieve_from_filter)
{
GNMUndoFilterSetCondition *ua;
@@ -280,7 +280,7 @@ gnm_undo_filter_set_condition_new (GnmFilter *filter, unsigned i,
ua->i = i;
if (retrieve_from_filter)
- ua->cond = gnm_filter_condition_dup
+ ua->cond = gnm_filter_condition_dup
(gnm_filter_get_condition (filter, i));
else
ua->cond = cond;
diff --git a/src/undo.h b/src/undo.h
index f62c51a..1e17e58 100644
--- a/src/undo.h
+++ b/src/undo.h
@@ -78,7 +78,7 @@ typedef struct _GNMUndoFilterSetConditionClass GNMUndoFilterSetConditionClass;
struct _GNMUndoFilterSetCondition {
GOUndo base;
- GnmFilter *filter;
+ GnmFilter *filter;
unsigned i;
GnmFilterCondition *cond;
};
@@ -87,8 +87,8 @@ struct _GNMUndoFilterSetConditionClass {
GOUndoClass base;
};
-GOUndo *gnm_undo_filter_set_condition_new (GnmFilter *filter, unsigned i,
- GnmFilterCondition *cond,
+GOUndo *gnm_undo_filter_set_condition_new (GnmFilter *filter, unsigned i,
+ GnmFilterCondition *cond,
gboolean retrieve_from_filter);
/* ------------------------------------------------------------------------- */
diff --git a/src/validation.c b/src/validation.c
index 9abfd6a..5608654 100644
--- a/src/validation.c
+++ b/src/validation.c
@@ -510,7 +510,7 @@ validation_eval (WorkbookControl *wbc, GnmStyle const *mstyle,
#undef BARF
typedef struct {
- WorkbookControl *wbc;
+ WorkbookControl *wbc;
Sheet *sheet;
GnmCellPos const *pos;
gboolean *showed_dialog;
@@ -522,12 +522,12 @@ validation_eval_range_cb (GnmCellIter const *iter, validation_eval_t *closure)
{
ValidationStatus status;
gboolean showed_dialog;
- GnmStyle const *mstyle = sheet_style_get
+ GnmStyle const *mstyle = sheet_style_get
(closure->sheet, iter->pp.eval.col, iter->pp.eval.row);
if (mstyle != NULL) {
status = validation_eval (closure->wbc, mstyle,
- closure->sheet, &iter->pp.eval,
+ closure->sheet, &iter->pp.eval,
&showed_dialog);
if (closure->showed_dialog)
*closure->showed_dialog = *closure->showed_dialog || showed_dialog;
@@ -541,7 +541,7 @@ validation_eval_range_cb (GnmCellIter const *iter, validation_eval_t *closure)
return NULL;
}
-ValidationStatus
+ValidationStatus
validation_eval_range (WorkbookControl *wbc,
Sheet *sheet, GnmCellPos const *pos, GnmRange const *r,
gboolean *showed_dialog)
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index 4f71c58..f7674b6 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -278,13 +278,13 @@ static GNM_ACTION_DEF (cb_file_print_area_show)
static GNM_ACTION_DEF (cb_file_print_area_toggle_col)
{
- cmd_page_break_toggle (WORKBOOK_CONTROL (wbcg),
+ cmd_page_break_toggle (WORKBOOK_CONTROL (wbcg),
wbcg_cur_sheet (wbcg),
TRUE);
}
static GNM_ACTION_DEF (cb_file_print_area_toggle_row)
{
- cmd_page_break_toggle (WORKBOOK_CONTROL (wbcg),
+ cmd_page_break_toggle (WORKBOOK_CONTROL (wbcg),
wbcg_cur_sheet (wbcg),
FALSE);
}
@@ -764,7 +764,7 @@ static GNM_ACTION_DEF (cb_view_freeze_panes)
unfrozen_tl.col = first->end.col + 1;
}
}
- }
+ }
/* If edit pos is out of visible range */
if (unfrozen_tl.col < pane->first.col ||
@@ -783,9 +783,9 @@ static GNM_ACTION_DEF (cb_view_freeze_panes)
unfrozen_tl.row = frozen_tl.row = 0;
if (center) {
- unfrozen_tl.col = (pane->first.col +
+ unfrozen_tl.col = (pane->first.col +
pane->last_visible.col) / 2;
- unfrozen_tl.row = (pane->first.row +
+ unfrozen_tl.row = (pane->first.row +
pane->last_visible.row) / 2;
}
@@ -1217,7 +1217,7 @@ sort_by_rows (WBCGtk *wbcg, gboolean descending)
}
}
- not_acceptable = (cnt_non_singletons > 1 ||
+ not_acceptable = (cnt_non_singletons > 1 ||
(cnt_non_singletons == 0 && cnt_singletons > 1));
if (!not_acceptable && cnt_singletons > 0 && cnt_non_singletons == 1) {
@@ -1239,7 +1239,7 @@ sort_by_rows (WBCGtk *wbcg, gboolean descending)
if (!t_b || !l_r) {
if (first) {
first = FALSE;
- top_to_bottom = t_b;
+ top_to_bottom = t_b;
} else {
if ((top_to_bottom && !t_b) ||
(!top_to_bottom && !l_r)) {
@@ -1253,7 +1253,7 @@ sort_by_rows (WBCGtk *wbcg, gboolean descending)
if (not_acceptable) {
GError *msg = g_error_new (go_error_invalid(), 0,
- _("%s does not support multiple ranges"),
+ _("%s does not support multiple ranges"),
_("Sort"));
go_cmd_context_error (GO_CMD_CONTEXT (wbcg), msg);
g_error_free (msg);
@@ -1296,7 +1296,7 @@ sort_by_rows (WBCGtk *wbcg, gboolean descending)
if (!range_is_singleton (r))
continue;
if (i >= 0) {
- clause[i].offset = (top_to_bottom) ?
+ clause[i].offset = (top_to_bottom) ?
r->start.col - sel->start.col
: r->start.row - sel->start.row;
clause[i].asc = descending;
@@ -1536,7 +1536,7 @@ toggle_font_attr (WBCGtk *wbcg, GtkToggleAction *act,
attr = pango_attr_style_new (val ? PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL);
break;
case MSTYLE_FONT_UNDERLINE:
- attr = pango_attr_underline_new
+ attr = pango_attr_underline_new
(gnm_translate_underline_to_pango (val));
break;
case MSTYLE_FONT_STRIKETHROUGH:
@@ -1824,15 +1824,15 @@ static GNM_ACTION_DEF (cb_copyright)
static GNM_ACTION_DEF (cb_format_cells_auto_fit_height)
{
WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
- workbook_cmd_autofit_selection
- (wbc, wb_control_cur_sheet (wbc), FALSE);
+ workbook_cmd_autofit_selection
+ (wbc, wb_control_cur_sheet (wbc), FALSE);
}
static GNM_ACTION_DEF (cb_format_cells_auto_fit_width)
{
WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
- workbook_cmd_autofit_selection
- (wbc, wb_control_cur_sheet (wbc), TRUE);
+ workbook_cmd_autofit_selection
+ (wbc, wb_control_cur_sheet (wbc), TRUE);
}
static GNM_ACTION_DEF (cb_format_column_auto_fit)
@@ -1902,7 +1902,7 @@ static GtkActionEntry const permanent_actions[] = {
{ "MenuViewToolbars", NULL, N_("_Toolbars") },
{ "MenuInsert", NULL, N_("_Insert") },
{ "MenuInsertSpecial", NULL, N_("S_pecial") },
- { "MenuInsertFormulaWrap", "Gnumeric_FormulaGuru",
+ { "MenuInsertFormulaWrap", "Gnumeric_FormulaGuru",
N_("Func_tion Wrapper") },
{ "MenuFormat", NULL, N_("F_ormat") },
{ "MenuFormatCells", NULL, N_("_Cells") },
@@ -1921,7 +1921,7 @@ static GtkActionEntry const permanent_actions[] = {
{ "MenuStatisticsTwoSamples", NULL, N_("_Two Sample Tests") },
{ "MenuToolTwoMedians", NULL, N_("Two Me_dians") },
{ "MenuToolTTest", NULL, N_("Two _Means") },
- { "MenuStatisticsMultipleSamples", NULL, N_("_Multiple Sample Tests") },
+ { "MenuStatisticsMultipleSamples", NULL, N_("_Multiple Sample Tests") },
{ "MenuANOVA", NULL, N_("_ANOVA") },
{ "MenuContingencyTests", NULL, N_("Contin_gency Table") },
{ "MenuData", NULL, N_("_Data") },
@@ -2259,7 +2259,7 @@ static GtkActionEntry const actions[] = {
{ "InsertSortIncreasing", GTK_STOCK_SORT_ASCENDING, N_("Sort (_Ascending)"),
NULL, N_("Wrap with SORT (ascending)"),
G_CALLBACK (cb_insert_sort_ascending) },
-
+
/* Insert -> Special */
{ "InsertCurrentDate", NULL, N_("Current _date"),
"<control>semicolon", N_("Insert the current date into the selected cell(s)"),
@@ -2293,13 +2293,13 @@ static GtkActionEntry const actions[] = {
{ "FormatCells", NULL, N_("_Format..."),
"<control>1", N_("Modify the formatting of the selected cells"),
G_CALLBACK (cb_format_cells) },
- { "FormatCellsFitHeight", "Gnumeric_RowSize", N_("Auto Fit _Height"), NULL,
+ { "FormatCellsFitHeight", "Gnumeric_RowSize", N_("Auto Fit _Height"), NULL,
N_("Ensure rows are just tall enough to display content of selection"),
G_CALLBACK (cb_format_cells_auto_fit_height) },
- { "FormatCellsFitWidth", "Gnumeric_ColumnSize", N_("Auto Fit _Width"), NULL,
+ { "FormatCellsFitWidth", "Gnumeric_ColumnSize", N_("Auto Fit _Width"), NULL,
N_("Ensure columns are just wide enough to display content of selection"),
G_CALLBACK (cb_format_cells_auto_fit_width) },
-
+
/* Format -> Col */
{ "ColumnSize", "Gnumeric_ColumnSize", N_("_Width..."),
@@ -2399,7 +2399,7 @@ static GtkActionEntry const actions[] = {
{ "ToolsFourier", NULL, N_("_Fourier Analysis..."),
NULL, N_("Fourier Analysis"),
G_CALLBACK (cb_tools_fourier) },
- { "ToolsPrincipalComponents", NULL,
+ { "ToolsPrincipalComponents", NULL,
N_("Principal Components Analysis..."),
NULL, N_("Principal Components Analysis"),
G_CALLBACK (cb_tools_principal_components) },
@@ -2528,9 +2528,9 @@ static GtkActionEntry const actions[] = {
{ "RandomGeneratorCorrelated", NULL, N_("_Correlated..."),
NULL, N_("Generate variates for correlated normal distributed random variables"),
G_CALLBACK (cb_tools_random_generator_correlated) },
- { "CopyDown", NULL, N_("Fill downwards"), "<control>D",
+ { "CopyDown", NULL, N_("Fill downwards"), "<control>D",
N_("Copy the content from the top row to the cells below"), G_CALLBACK (cb_copydown) },
- { "CopyRight", NULL, N_("Fill to right"), "<control>R",
+ { "CopyRight", NULL, N_("Fill to right"), "<control>R",
N_("Copy the content from the left column to the cells on the right"), G_CALLBACK (cb_copyright) },
@@ -2722,9 +2722,9 @@ static GtkToggleActionEntry const toggle_actions[] = {
{ "SheetOutlineRight", NULL, N_("Outlines _Right"),
NULL, N_("Toggle whether to display column outlines on the left or right"),
G_CALLBACK (cb_sheet_pref_outline_symbols_right) },
- { "SheetDisplayFormulas", "Gnumeric_FormulaGuru",
+ { "SheetDisplayFormulas", "Gnumeric_FormulaGuru",
N_("Display _Formulas"),
- "<control>quoteleft",
+ "<control>quoteleft",
N_("Display the value of a formula or the formula itself"),
G_CALLBACK (cb_sheet_pref_display_formulas) },
{ "SheetHideZeros", NULL, N_("_Hide Zeros"),
diff --git a/src/wbc-gtk-edit.c b/src/wbc-gtk-edit.c
index 88a28aa..0019398 100644
--- a/src/wbc-gtk-edit.c
+++ b/src/wbc-gtk-edit.c
@@ -162,7 +162,7 @@ wbcg_edit_finish (WBCGtk *wbcg, WBCEditResult result,
break;
}
case (WBC_EDIT_ACCEPT): {
- GnmCell const *cell = sheet_cell_get
+ GnmCell const *cell = sheet_cell_get
(sheet, sv->edit_pos.col, sv->edit_pos.row);
if (gnm_cell_is_nonsingleton_array (cell)) {
gnm_cmd_context_error_splits_array (GO_CMD_CONTEXT (wbc),
@@ -275,7 +275,7 @@ wbcg_edit_finish (WBCGtk *wbcg, WBCEditResult result,
GTK_EDITABLE (wbcg_get_entry (wbcg)), -1);
reedit = wb_control_validation_msg (WORKBOOK_CONTROL (wbcg),
- VALIDATION_STYLE_PARSE_ERROR, NULL,
+ VALIDATION_STYLE_PARSE_ERROR, NULL,
perr.err->message);
if (showed_dialog != NULL)
*showed_dialog = TRUE;
@@ -346,7 +346,7 @@ wbcg_edit_finish (WBCGtk *wbcg, WBCEditResult result,
u = go_undo_combine (u, clipboard_copy_range_undo (sheet, r));
if (texpr) {
- gnm_expr_top_ref (texpr);
+ gnm_expr_top_ref (texpr);
gnm_cell_set_array_formula (sheet,
r->start.col, r->start.row,
r->end.col, r->end.row,
@@ -393,7 +393,7 @@ wbcg_edit_finish (WBCGtk *wbcg, WBCEditResult result,
(GtkWidget *) wbcg_get_entry (wbcg));
g_free (free_txt);
if (texpr != NULL)
- gnm_expr_top_unref (texpr);
+ gnm_expr_top_unref (texpr);
return FALSE;
}
} else {
@@ -413,7 +413,7 @@ wbcg_edit_finish (WBCGtk *wbcg, WBCEditResult result,
}
}
if (texpr != NULL)
- gnm_expr_top_unref (texpr);
+ gnm_expr_top_unref (texpr);
g_free (free_txt);
} else {
if (sv == wb_control_cur_sheet_view (wbc)) {
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 48a1120..699e6af 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -1571,7 +1571,7 @@ wbcg_menu_state_update (WorkbookControl *wbc, int flags)
new_label = _("Add Column Page Break");
new_tip = _("Add a page break to the left of the current column");
}
- wbc_gtk_set_action_label (wbcg, "FilePrintAreaToggleColPageBreak",
+ wbc_gtk_set_action_label (wbcg, "FilePrintAreaToggleColPageBreak",
NULL, new_label, new_tip);
if (pi->page_breaks.h != NULL &&
gnm_page_breaks_get_break (pi->page_breaks.h, col) == GNM_PAGE_BREAK_MANUAL) {
@@ -1581,17 +1581,17 @@ wbcg_menu_state_update (WorkbookControl *wbc, int flags)
new_label = _("Add Row Page Break");
new_tip = _("Add a page break above current row");
}
- wbc_gtk_set_action_label (wbcg, "FilePrintAreaToggleRowPageBreak",
+ wbc_gtk_set_action_label (wbcg, "FilePrintAreaToggleRowPageBreak",
NULL, new_label, new_tip);
- wbc_gtk_set_action_sensitivity (wbcg, "FilePrintAreaToggleRowPageBreak",
+ wbc_gtk_set_action_sensitivity (wbcg, "FilePrintAreaToggleRowPageBreak",
row != 0);
- wbc_gtk_set_action_sensitivity (wbcg, "FilePrintAreaToggleColPageBreak",
+ wbc_gtk_set_action_sensitivity (wbcg, "FilePrintAreaToggleColPageBreak",
col != 0);
- wbc_gtk_set_action_sensitivity (wbcg, "FilePrintAreaClearAllPageBreak",
+ wbc_gtk_set_action_sensitivity (wbcg, "FilePrintAreaClearAllPageBreak",
print_info_has_manual_breaks (sheet->print_info));
}
if (MS_SELECT_OBJECT & flags) {
- wbc_gtk_set_action_sensitivity (wbcg, "EditSelectObject",
+ wbc_gtk_set_action_sensitivity (wbcg, "EditSelectObject",
sheet->sheet_objects != NULL);
}
@@ -1619,23 +1619,23 @@ wbcg_menu_state_update (WorkbookControl *wbc, int flags)
gchar *nlabel = NULL;
if (NULL != (r = sv_selection_extends_filter (sv, f))) {
active = TRUE;
- nlabel = g_strdup_printf
- (_("Extend _Auto Filter to %s"),
+ nlabel = g_strdup_printf
+ (_("Extend _Auto Filter to %s"),
range_as_string (r));
new_tip = _("Extend the existing filter.");
- wbc_gtk_set_action_label
- (wbcg, "DataAutoFilter", NULL,
+ wbc_gtk_set_action_label
+ (wbcg, "DataAutoFilter", NULL,
nlabel, new_tip);
g_free (r);
} else {
active = FALSE;
- nlabel = g_strdup_printf
- (_("Auto Filter blocked by %s"),
+ nlabel = g_strdup_printf
+ (_("Auto Filter blocked by %s"),
range_as_string (&f->r));
new_tip = _("The selection intersects an "
"existing auto filter.");
- wbc_gtk_set_action_label
- (wbcg, "DataAutoFilter", NULL,
+ wbc_gtk_set_action_label
+ (wbcg, "DataAutoFilter", NULL,
nlabel, new_tip);
}
g_free (nlabel);
@@ -1652,16 +1652,16 @@ wbcg_menu_state_update (WorkbookControl *wbc, int flags)
wbc_gtk_set_action_sensitivity (wbcg, "DataAutoFilter", active);
}
if (MS_COMMENT_LINKS & flags) {
- gboolean has_comment
+ gboolean has_comment
= (sheet_get_comment (sheet, &sv->edit_pos) != NULL);
gboolean has_link;
GnmRange rge;
range_init_cellpos (&rge, &sv->edit_pos);
- has_link = (NULL !=
+ has_link = (NULL !=
sheet_style_region_contains_link (sheet, &rge));
- wbc_gtk_set_action_sensitivity
+ wbc_gtk_set_action_sensitivity
(wbcg, "EditComment", has_comment);
- wbc_gtk_set_action_sensitivity
+ wbc_gtk_set_action_sensitivity
(wbcg, "EditHyperlink", has_link);
}
@@ -1671,19 +1671,19 @@ wbcg_menu_state_update (WorkbookControl *wbc, int flags)
gboolean has_links = FALSE, has_comments = FALSE;
gboolean sel_is_vector = FALSE;
SheetView *sv = scg_view (scg);
- for (l = sv->selections;
+ for (l = sv->selections;
l != NULL; l = l->next) {
GnmRange const *r = l->data;
GSList *objs;
GnmStyleList *styles;
if (!has_links) {
- styles = sheet_style_collect_hlinks
+ styles = sheet_style_collect_hlinks
(sheet, r);
has_links = (styles != NULL);
style_list_free (styles);
}
if (!has_comments) {
- objs = sheet_objects_get
+ objs = sheet_objects_get
(sheet, r, CELL_COMMENT_TYPE);
has_comments = (objs != NULL);
g_slist_free (objs);
@@ -1691,9 +1691,9 @@ wbcg_menu_state_update (WorkbookControl *wbc, int flags)
if((count++ > 1) && has_comments && has_links)
break;
}
- wbc_gtk_set_action_sensitivity
+ wbc_gtk_set_action_sensitivity
(wbcg, "EditClearHyperlinks", has_links);
- wbc_gtk_set_action_sensitivity
+ wbc_gtk_set_action_sensitivity
(wbcg, "EditClearComments", has_comments);
if (count == 1) {
GnmRange const *r = sv->selections->data;
@@ -1701,9 +1701,9 @@ wbcg_menu_state_update (WorkbookControl *wbc, int flags)
range_height (r) == 1) &&
!range_is_singleton (r);
}
- wbc_gtk_set_action_sensitivity
+ wbc_gtk_set_action_sensitivity
(wbcg, "InsertSortDecreasing", sel_is_vector);
- wbc_gtk_set_action_sensitivity
+ wbc_gtk_set_action_sensitivity
(wbcg, "InsertSortIncreasing", sel_is_vector);
}
{
@@ -1965,7 +1965,7 @@ cb_accept_input_selected_merged (WBCGtk *wbcg)
Sheet *sheet = wbcg->editing_sheet;
#warning FIXME: this creates 2 undo items!
- if (wbcg_is_editing (wbcg) &&
+ if (wbcg_is_editing (wbcg) &&
wbcg_edit_finish (wbcg, WBC_EDIT_ACCEPT, NULL)) {
WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
WorkbookView *wbv = wb_control_view (wbc);
@@ -1991,13 +1991,13 @@ cb_accept_input_selected_merged (WBCGtk *wbcg)
/* GSList *sheets = workbook_sheets */
/* (wb_control_get_workbook (WORKBOOK_CONTROL (wbcg))); */
/* GSList *vis_sheets = NULL; */
-
+
/* g_slist_foreach (sheets, */
/* (GFunc) cb_accept_input_sheets_collector, */
/* &vis_sheets); */
/* wbcg_edit_multisheet_finish (wbcg, WBC_EDIT_ACCEPT, NULL, vis_sheets); */
-
+
/* g_slist_free (sheets); */
/* g_slist_free (vis_sheets); */
/* } */
@@ -2037,8 +2037,8 @@ cb_accept_input_selected_merged (WBCGtk *wbcg)
/* return (n > 2); */
/* } */
-static gboolean
-cb_accept_input_menu_sensitive_selected_cells (WBCGtk *wbcg)
+static gboolean
+cb_accept_input_menu_sensitive_selected_cells (WBCGtk *wbcg)
{
WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
WorkbookView *wbv = wb_control_view (wbc);
@@ -2048,7 +2048,7 @@ cb_accept_input_menu_sensitive_selected_cells (WBCGtk *wbcg)
for (l = selection; l != NULL; l = l->next) {
GnmRange const *sel = l->data;
- if (sheet_range_splits_array
+ if (sheet_range_splits_array
(wbcg->editing_sheet, sel, NULL, NULL, NULL)) {
result = FALSE;
break;
@@ -2058,18 +2058,18 @@ cb_accept_input_menu_sensitive_selected_cells (WBCGtk *wbcg)
return result;
}
-static gboolean
-cb_accept_input_menu_sensitive_selected_merged (WBCGtk *wbcg)
+static gboolean
+cb_accept_input_menu_sensitive_selected_merged (WBCGtk *wbcg)
{
WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
WorkbookView *wbv = wb_control_view (wbc);
SheetView *sv = sheet_get_view (wbcg->editing_sheet, wbv);
GnmRange const *sel = selection_first_range (sv, NULL, NULL);
-
- return (sel && !range_is_singleton (sel) &&
- sv->edit_pos.col == sel->start.col &&
+
+ return (sel && !range_is_singleton (sel) &&
+ sv->edit_pos.col == sel->start.col &&
sv->edit_pos.row == sel->start.row &&
- !sheet_range_splits_array
+ !sheet_range_splits_array
(wbcg->editing_sheet, sel, NULL, NULL, NULL));
}
@@ -2077,7 +2077,7 @@ static void
cb_accept_input_menu (GtkMenuToolButton *button, WBCGtk *wbcg)
{
GtkWidget *menu = gtk_menu_tool_button_get_menu (button);
- GList *l, *children
+ GList *l, *children
= gtk_container_get_children (GTK_CONTAINER (menu));
struct AcceptInputMenu {
@@ -2085,7 +2085,7 @@ cb_accept_input_menu (GtkMenuToolButton *button, WBCGtk *wbcg)
void (*function) (WBCGtk *wbcg);
gboolean (*sensitive) (WBCGtk *wbcg);
} const accept_input_actions [] = {
- { N_("Enter in current cell"), cb_accept_input,
+ { N_("Enter in current cell"), cb_accept_input,
NULL },
/* { N_("Enter on all non-hidden sheets"), cb_accept_input_sheets, */
/* cb_accept_input_menu_sensitive_sheets}, */
@@ -2097,7 +2097,7 @@ cb_accept_input_menu (GtkMenuToolButton *button, WBCGtk *wbcg)
{ NULL, NULL, NULL },
{ N_("Enter in selected ranges"), cb_accept_input_selected_cells,
cb_accept_input_menu_sensitive_selected_cells },
- { N_("Enter in selected ranges as array"), cb_accept_input_array,
+ { N_("Enter in selected ranges as array"), cb_accept_input_array,
cb_accept_input_menu_sensitive_selected_cells },
};
unsigned int ui;
@@ -2107,17 +2107,17 @@ cb_accept_input_menu (GtkMenuToolButton *button, WBCGtk *wbcg)
if (children == NULL)
for (ui = 0; ui < G_N_ELEMENTS (accept_input_actions); ui++) {
it = accept_input_actions + ui;
-
+
if (it->text) {
- item = gtk_image_menu_item_new_with_label
+ item = gtk_image_menu_item_new_with_label
(_(it->text));
if (it->function)
- g_signal_connect_swapped
+ g_signal_connect_swapped
(G_OBJECT (item), "activate",
- G_CALLBACK (it->function),
+ G_CALLBACK (it->function),
wbcg);
if (it->sensitive)
- gtk_widget_set_sensitive
+ gtk_widget_set_sensitive
(item, (it->sensitive) (wbcg));
else
gtk_widget_set_sensitive (item, TRUE);
@@ -2127,16 +2127,16 @@ cb_accept_input_menu (GtkMenuToolButton *button, WBCGtk *wbcg)
gtk_widget_show (item);
}
else
- for (ui = 0, l = children;
- ui < G_N_ELEMENTS (accept_input_actions) && l != NULL;
+ for (ui = 0, l = children;
+ ui < G_N_ELEMENTS (accept_input_actions) && l != NULL;
ui++, l = l->next) {
it = accept_input_actions + ui;
if (it->sensitive)
- gtk_widget_set_sensitive
- (GTK_WIDGET (l->data),
+ gtk_widget_set_sensitive
+ (GTK_WIDGET (l->data),
(it->sensitive) (wbcg));
else
- gtk_widget_set_sensitive
+ gtk_widget_set_sensitive
(GTK_WIDGET (l->data), TRUE);
}
@@ -2663,7 +2663,7 @@ cb_wbcg_drag_data_received (GtkWidget *widget, GdkDragContext *context,
#ifdef HAVE_GTK_ENTRY_SET_ICON_FROM_STOCK
-static void cb_cs_go_up (WBCGtk *wbcg)
+static void cb_cs_go_up (WBCGtk *wbcg)
{ wb_control_navigate_to_cell (WORKBOOK_CONTROL (wbcg), navigator_top); }
static void cb_cs_go_down (WBCGtk *wbcg)
{ wb_control_navigate_to_cell (WORKBOOK_CONTROL (wbcg), navigator_bottom); }
@@ -2696,7 +2696,7 @@ wbc_gtk_cell_selector_popup (G_GNUC_UNUSED GtkEntry *entry,
};
unsigned int ui;
GtkWidget *item, *menu = gtk_menu_new ();
- gboolean active = (!wbcg_is_editing (wbcg) &&
+ gboolean active = (!wbcg_is_editing (wbcg) &&
NULL == wbc_gtk_get_guru (wbcg));
for (ui = 0; ui < G_N_ELEMENTS (cell_selector_actions); ui++) {
@@ -2704,18 +2704,18 @@ wbc_gtk_cell_selector_popup (G_GNUC_UNUSED GtkEntry *entry,
cell_selector_actions + ui;
if (it->text) {
if (it->stock_id) {
- item = gtk_image_menu_item_new_from_stock
+ item = gtk_image_menu_item_new_from_stock
(it->stock_id, NULL);
- gtk_menu_item_set_label
+ gtk_menu_item_set_label
(GTK_MENU_ITEM (item), _(it->text));
} else
- item = gtk_image_menu_item_new_with_label
+ item = gtk_image_menu_item_new_with_label
(_(it->text));
} else
item = gtk_separator_menu_item_new ();
if (it->function)
- g_signal_connect_swapped
+ g_signal_connect_swapped
(G_OBJECT (item), "activate",
G_CALLBACK (it->function), wbcg);
gtk_widget_set_sensitive (item, active);
@@ -2766,7 +2766,7 @@ wbc_gtk_create_edit_area (WBCGtk *wbcg)
_("Cancel change"));
wbcg->ok_button = edit_area_button_menu
(wbcg, tb, FALSE,
- G_CALLBACK (cb_accept_input),
+ G_CALLBACK (cb_accept_input),
G_CALLBACK (cb_accept_input_menu), GTK_STOCK_OK,
_("Accept change"), _("Accept change in multiple cells"));
wbcg->func_button = edit_area_button
@@ -2808,7 +2808,7 @@ wbc_gtk_create_edit_area (WBCGtk *wbcg)
#ifdef HAVE_GTK_ENTRY_SET_ICON_FROM_STOCK
- gtk_entry_set_icon_from_stock
+ gtk_entry_set_icon_from_stock
(GTK_ENTRY (wbcg->selection_descriptor),
GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_JUMP_TO);
gtk_entry_set_icon_sensitive
@@ -4704,10 +4704,10 @@ cb_auto_expr_insert_formula (WBCGtk *wbcg, gboolean below)
specs->multiple = multiple;
specs->below = below;
specs->func = NULL;
- g_object_get (G_OBJECT (wb_control_view (WORKBOOK_CONTROL (wbcg))),
+ g_object_get (G_OBJECT (wb_control_view (WORKBOOK_CONTROL (wbcg))),
"auto-expr-func", &(specs->func), NULL);
if (specs->func == NULL)
- specs->func = gnm_func_lookup_or_add_placeholder
+ specs->func = gnm_func_lookup_or_add_placeholder
("sum", dao->sheet ? dao->sheet->workbook : NULL, FALSE);
gnm_func_ref (specs->func);
@@ -5565,7 +5565,7 @@ wbcg_error_error_info (GOCmdContext *cc, GOErrorInfo *error)
static void
wbcg_error_error_info_list (GOCmdContext *cc, GSList *errs)
{
- gnumeric_go_error_info_list_dialog_show
+ gnumeric_go_error_info_list_dialog_show
(wbcg_toplevel (WBC_GTK (cc)), errs);
}
diff --git a/src/widgets/gnm-filter-combo-view.c b/src/widgets/gnm-filter-combo-view.c
index 6b175f5..dc75677 100644
--- a/src/widgets/gnm-filter-combo-view.c
+++ b/src/widgets/gnm-filter-combo-view.c
@@ -97,8 +97,8 @@ fcombo_activate (SheetObject *so, GtkTreeView *list, WBCGtk *wbcg,
}
if (set_condition)
- cmd_autofilter_set_condition
- (WORKBOOK_CONTROL (wbcg),
+ cmd_autofilter_set_condition
+ (WORKBOOK_CONTROL (wbcg),
fcombo->filter, field_num, cond);
}
return TRUE;
diff --git a/src/widgets/gnumeric-expr-entry.c b/src/widgets/gnumeric-expr-entry.c
index d4b4d9e..9990c13 100644
--- a/src/widgets/gnumeric-expr-entry.c
+++ b/src/widgets/gnumeric-expr-entry.c
@@ -578,7 +578,7 @@ gee_scan_for_range (GnmExprEntry *gee)
gnm_pane_expr_cursor_bound_set
(pane, &r, FALSE););
}
-
+
go_slist_free_custom (list, (GFreeFunc)value_release);
}
gnm_expr_entry_find_range (gee);
@@ -589,7 +589,7 @@ gee_scan_for_range (GnmExprEntry *gee)
NULL != (merge = gnm_sheet_merge_is_corner
(parse_sheet, &range.start)))
range = *merge;
-
+
SCG_FOREACH_PANE (gee->scg, pane,
gnm_pane_expr_cursor_bound_set
(pane, &range, TRUE););
@@ -650,7 +650,7 @@ cb_gee_focus_out_event (GtkWidget *widget,
gpointer user_data);
static GtkWidget *
-gee_create_tooltip (GnmExprEntry *gee, gchar const *str,
+gee_create_tooltip (GnmExprEntry *gee, gchar const *str,
gchar const *marked_str, gboolean set_tabs)
{
GtkWidget *toplevel, *label, *tip;
@@ -670,7 +670,7 @@ gee_create_tooltip (GnmExprEntry *gee, gchar const *str,
label = gnumeric_create_tooltip (toplevel);
tip = gtk_widget_get_toplevel (label);
- if (str)
+ if (str)
markup = gnm_func_convert_markup_to_pango (str);
string = g_string_new (markup);
if (marked_str)
@@ -682,9 +682,9 @@ gee_create_tooltip (GnmExprEntry *gee, gchar const *str,
if (set_tabs) {
PangoLayout *pl = gtk_label_get_layout (GTK_LABEL (label));
PangoTabArray *tabs;
- tabs = pango_tab_array_new_with_positions
- (2, TRUE,
- PANGO_TAB_LEFT, 120,
+ tabs = pango_tab_array_new_with_positions
+ (2, TRUE,
+ PANGO_TAB_LEFT, 120,
PANGO_TAB_LEFT, 140);
pango_layout_set_tabs (pl, tabs);
pango_tab_array_free (tabs);
@@ -723,7 +723,7 @@ gee_set_tooltip (GnmExprEntry *gee, GnmFunc *fd, gint args, gboolean had_stuff)
gnm_func_load_if_stub (fd);
function_def_count_args (fd, &min, &max);
- if ((gee->tooltip.fd)
+ if ((gee->tooltip.fd)
&& (gee->tooltip.fd == fd && gee->tooltip.args == args
&& gee->tooltip.had_stuff == (max == 0 && args == 0 && had_stuff)))
return;
@@ -807,12 +807,12 @@ gee_set_tooltip_completion (GnmExprEntry *gee, GSList *list, guint start, guint
if ((end - start) < (guint) g_utf8_strlen (name, -1))
/* xgettext: the first %s is a function name and */
/* the second %s the function description */
- g_string_append_printf (str, _("%s : \t%s\n"), name,
+ g_string_append_printf (str, _("%s : \t%s\n"), name,
gnm_func_get_description (fd));
else {
/* xgettext: the first %s is a function name and */
/* the second %s the function description */
- g_string_append_printf (str, _("[%s : \t%s]\n"), name,
+ g_string_append_printf (str, _("[%s : \t%s]\n"), name,
gnm_func_get_description (fd));
i--;
}
@@ -822,7 +822,7 @@ gee_set_tooltip_completion (GnmExprEntry *gee, GSList *list, guint start, guint
if (i == max)
g_string_append (str_marked, UNICODE_ELLIPSIS_VERT "\n");
if (i == 1) {
- gee->tooltip.completion
+ gee->tooltip.completion
= g_strdup (name);
/*xgettext: short form for: "type F4-key to complete the name"*/
g_string_append (str_marked, _("\n<i>F4 to complete</i>"));
@@ -836,7 +836,7 @@ gee_set_tooltip_completion (GnmExprEntry *gee, GSList *list, guint start, guint
gee->tooltip.completion_se_valid = TRUE;
show_tool_tip = gnm_conf_get_core_gui_editing_function_name_tooltips ();
if (show_tool_tip)
- gee->tooltip.tooltip = gee_create_tooltip
+ gee->tooltip.tooltip = gee_create_tooltip
(gee, str->str, str_marked->str, TRUE);
g_string_free (str, TRUE);
g_string_free (str_marked, TRUE);
@@ -848,17 +848,17 @@ static void
gee_dump_lexer (GnmLexerItem *gli) {
g_print ("************\n");
do {
- g_print ("%2" G_GSIZE_FORMAT " to %2" G_GSIZE_FORMAT ": %d\n",
+ g_print ("%2" G_GSIZE_FORMAT " to %2" G_GSIZE_FORMAT ": %d\n",
gli->start, gli->end, gli->token);
} while (gli++->token != 0);
g_print ("************\n");
-
+
}
static int
func_def_cmp (gconstpointer a, gconstpointer b)
{
- return g_utf8_collate (gnm_func_get_name (a),
+ return g_utf8_collate (gnm_func_get_name (a),
gnm_func_get_name (b));
}
@@ -888,14 +888,14 @@ gee_update_lexer_items (GnmExprEntry *gee)
gee->tooltip.is_expr = (NULL != gnm_expr_char_start_p (str));
if (!(gee->flags & GNM_EE_SINGLE_RANGE)) {
- gee->lexer_items = gnm_expr_lex_all
+ gee->lexer_items = gnm_expr_lex_all
(str, &gee->pp,
GNM_EXPR_PARSE_UNKNOWN_NAMES_ARE_STRINGS,
NULL);
if (gnm_debug_flag ("functooltip"))
gee_dump_lexer (gee->lexer_items);
}
- g_free (str);
+ g_free (str);
}
static GnmLexerItem *
@@ -922,7 +922,7 @@ gee_check_tooltip (GnmExprEntry *gee)
gboolean stuff = FALSE, completion_se_set = FALSE;
GnmLexerItem *gli, *gli_c;
- if (gee->lexer_items == NULL || !gee->tooltip.enabled ||
+ if (gee->lexer_items == NULL || !gee->tooltip.enabled ||
(!gee->tooltip.is_expr && !gee->is_cell_renderer)) {
gee_delete_tooltip (gee, TRUE);
return;
@@ -945,7 +945,7 @@ gee_check_tooltip (GnmExprEntry *gee)
* If we have an open string at the end of the entry, we
* need to adjust.
*/
-
+
for (; gli->token != 0; gli++) {
if (gli->start >= end_t) {
gli->token = 0;
@@ -970,14 +970,14 @@ gee_check_tooltip (GnmExprEntry *gee)
end_t = gli->end;
prefix = g_strndup (str + start_t, end_t - start_t);
- list = gnm_func_lookup_prefix
+ list = gnm_func_lookup_prefix
(prefix, gee->sheet->workbook);
g_free (prefix);
if (list != NULL) {
- list = g_slist_sort
- (list,
+ list = g_slist_sort
+ (list,
(GCompareFunc)func_def_cmp);
- if (gee_set_tooltip_completion
+ if (gee_set_tooltip_completion
(gee, list, start_t, end_t)) {
g_free (str);
g_free (gli_c);
@@ -990,22 +990,22 @@ gee_check_tooltip (GnmExprEntry *gee)
gee->tooltip.completion_end = end_t;
gee->tooltip.completion_se_valid = TRUE;
}
- completion_se_set = TRUE;
+ completion_se_set = TRUE;
} else {
g_free (gee->tooltip.completion);
gee->tooltip.completion = NULL;
- gee->tooltip.completion_se_valid = FALSE;
+ gee->tooltip.completion_se_valid = FALSE;
}
-
+
if (!gnm_conf_get_core_gui_editing_function_argument_tooltips ())
goto not_found;
if (gnm_debug_flag ("functooltip"))
- g_print ("last token consider is %d from %2"
- G_GSIZE_FORMAT " to %2" G_GSIZE_FORMAT "\n",
+ g_print ("last token consider is %d from %2"
+ G_GSIZE_FORMAT " to %2" G_GSIZE_FORMAT "\n",
gli->token, gli->start, gli->end);
-
+
while (gli->start > 1) {
switch (gli->token) {
@@ -1013,7 +1013,7 @@ gee_check_tooltip (GnmExprEntry *gee)
if ((gli - 1)->token == STRING) {
gint start_t = (gli - 1)->start;
gint end_t = (gli - 1)->end;
- char *name = g_strndup (str + start_t,
+ char *name = g_strndup (str + start_t,
end_t - start_t);
GnmFunc *fd = gnm_func_lookup (name, NULL);
g_free (name);
@@ -1040,7 +1040,7 @@ gee_check_tooltip (GnmExprEntry *gee)
para++;
break;
case TOKEN_PARENTHESIS_OPEN:
- para--;
+ para--;
break;
default:
break;
@@ -1060,7 +1060,7 @@ gee_check_tooltip (GnmExprEntry *gee)
para++;
break;
case TOKEN_BRACE_OPEN:
- para--;
+ para--;
break;
default:
break;
@@ -1143,12 +1143,12 @@ cb_gee_key_press_event (GtkEntry *entry,
if (state == GDK_SHIFT_MASK) {
if (gee->tooltip.completion_se_valid)
- dialog_function_select_paste
- (gee->wbcg,
+ dialog_function_select_paste
+ (gee->wbcg,
gee->tooltip.completion_start,
gee->tooltip.completion_end);
else
- dialog_function_select_paste
+ dialog_function_select_paste
(gee->wbcg, -1, -1);
return TRUE;
}
@@ -1699,7 +1699,7 @@ gee_rangesel_update_text (GnmExprEntry *gee)
}
static void
-gee_find_lexer_token (GnmLexerItem const *gli, guint token_pos,
+gee_find_lexer_token (GnmLexerItem const *gli, guint token_pos,
GnmLexerItem const **gli_before, GnmLexerItem const **gli_after)
{
*gli_before = *gli_after = NULL;
@@ -1781,7 +1781,7 @@ gnm_expr_entry_find_range (GnmExprEntry *gee)
return TRUE;
}
- cursor = g_utf8_offset_to_pointer
+ cursor = g_utf8_offset_to_pointer
(text, gtk_editable_get_position (GTK_EDITABLE (gee->entry)));
ptr = gnm_expr_char_start_p (text);
@@ -1792,8 +1792,8 @@ gnm_expr_entry_find_range (GnmExprEntry *gee)
g_printerr ("text: >%s< -- cursor: >%s<\n", text, cursor);
if (ptr[0] == '\0') {
- rs->text_end = rs->text_start =
- g_utf8_pointer_to_offset
+ rs->text_end = rs->text_start =
+ g_utf8_pointer_to_offset
(text, ptr);
return TRUE;
}
@@ -1807,14 +1807,14 @@ gnm_expr_entry_find_range (GnmExprEntry *gee)
gli++;
if (gli->token == 0) {
- rs->text_start = g_utf8_pointer_to_offset
+ rs->text_start = g_utf8_pointer_to_offset
(text, ptr);
rs->text_end = len;
- return TRUE;
+ return TRUE;
}
token_pos = cursor - text;
-
+
gee_find_lexer_token (gli, (guint)token_pos, &gli_before, &gli_after);
if (gnm_debug_flag ("rangeselection")) {
@@ -1827,7 +1827,7 @@ gnm_expr_entry_find_range (GnmExprEntry *gee)
if (gli_before == NULL && gli_after == NULL)
return FALSE;
-
+
if (gli_before == gli_after) {
if ((gli_after + 1)->token == TOKEN_PARENTHESIS_OPEN ||
(gli_after + 1)->token == TOKEN_BRACE_OPEN)
@@ -1836,9 +1836,9 @@ gnm_expr_entry_find_range (GnmExprEntry *gee)
((gli_before - 1)->token == TOKEN_PARENTHESIS_CLOSED ||
(gli_before - 1)->token == TOKEN_BRACE_CLOSED))
return FALSE;
- rs->text_start = g_utf8_pointer_to_offset
+ rs->text_start = g_utf8_pointer_to_offset
(text, text + gli_before->start);
- rs->text_end = g_utf8_pointer_to_offset
+ rs->text_end = g_utf8_pointer_to_offset
(text, text + gli_before->end);
} else if (gli_before != NULL && gli_after != NULL) {
switch (gli_before->token) {
@@ -1850,9 +1850,9 @@ gnm_expr_entry_find_range (GnmExprEntry *gee)
if (gli_after->token == TOKEN_PARENTHESIS_OPEN ||
gli_after->token == TOKEN_BRACE_OPEN)
return FALSE;
- rs->text_start = g_utf8_pointer_to_offset
+ rs->text_start = g_utf8_pointer_to_offset
(text, text + gli_before->start);
- rs->text_end = g_utf8_pointer_to_offset
+ rs->text_end = g_utf8_pointer_to_offset
(text, text + gli_before->end);
break;
default:
@@ -1862,15 +1862,15 @@ gnm_expr_entry_find_range (GnmExprEntry *gee)
case CONSTANT:
case RANGEREF:
case INVALID_TOKEN:
- rs->text_start = g_utf8_pointer_to_offset
+ rs->text_start = g_utf8_pointer_to_offset
(text, text + gli_after->start);
- rs->text_end = g_utf8_pointer_to_offset
+ rs->text_end = g_utf8_pointer_to_offset
(text, text + gli_after->end);
break;
default:
- rs->text_start = g_utf8_pointer_to_offset
+ rs->text_start = g_utf8_pointer_to_offset
(text, text + gli_before->end);
- rs->text_end = g_utf8_pointer_to_offset
+ rs->text_end = g_utf8_pointer_to_offset
(text, text + gli_after->start);
break;
}
@@ -1885,14 +1885,14 @@ gnm_expr_entry_find_range (GnmExprEntry *gee)
if ((gli_after + 1)->token == TOKEN_PARENTHESIS_OPEN ||
(gli_after + 1)->token == TOKEN_BRACE_OPEN)
return FALSE;
- rs->text_start = g_utf8_pointer_to_offset
+ rs->text_start = g_utf8_pointer_to_offset
(text, text + gli_after->start);
- rs->text_end = g_utf8_pointer_to_offset
+ rs->text_end = g_utf8_pointer_to_offset
(text, text + gli_after->end);
break;
default:
- rs->text_end = rs->text_start =
- g_utf8_pointer_to_offset
+ rs->text_end = rs->text_start =
+ g_utf8_pointer_to_offset
(text, text + gli_after->start);
break;
}
@@ -1906,23 +1906,23 @@ gnm_expr_entry_find_range (GnmExprEntry *gee)
((gli_before - 1)->token == TOKEN_PARENTHESIS_CLOSED ||
(gli_before - 1)->token == TOKEN_BRACE_CLOSED))
return FALSE;
- rs->text_start = g_utf8_pointer_to_offset
+ rs->text_start = g_utf8_pointer_to_offset
(text, text + gli_before->start);
- rs->text_end = g_utf8_pointer_to_offset
+ rs->text_end = g_utf8_pointer_to_offset
(text, text + gli_before->end);
break;
case TOKEN_PARENTHESIS_CLOSED:
case TOKEN_BRACE_CLOSED:
return FALSE;
default:
- rs->text_end = rs->text_start =
- g_utf8_pointer_to_offset
+ rs->text_end = rs->text_start =
+ g_utf8_pointer_to_offset
(text, text + gli_before->start);
break;
}
if (gnm_debug_flag ("rangeselection"))
- g_print ("characters from %d to %d\n",
+ g_print ("characters from %d to %d\n",
rs->text_start, rs->text_end);
rs_text = gtk_editable_get_chars (GTK_EDITABLE (gee->entry),
diff --git a/src/workbook-cmd-format.c b/src/workbook-cmd-format.c
index da39327..767f798 100644
--- a/src/workbook-cmd-format.c
+++ b/src/workbook-cmd-format.c
@@ -133,16 +133,16 @@ cb_get_cell_content (GnmCellIter const *iter, struct workbook_cmd_wrap_sort_t *c
GnmParsePos pp;
GnmExprTop const *texpr;
- parse_pos_init (&pp, cl->wb, iter->pp.sheet,
+ parse_pos_init (&pp, cl->wb, iter->pp.sheet,
cl->r->start.col, cl->r->start.row);
- text = gnm_expr_as_string ((iter->cell)->base.texpr->expr,
+ text = gnm_expr_as_string ((iter->cell)->base.texpr->expr,
&iter->pp, NULL);
texpr = gnm_expr_parse_str (text, &pp, GNM_EXPR_PARSE_DEFAULT,
NULL, NULL);
g_free (text);
expr = gnm_expr_copy (texpr->expr);
gnm_expr_top_unref (texpr);
-
+
} else if (iter->cell->value != NULL)
expr = gnm_expr_new_constant (value_dup (iter->cell->value));
else
@@ -152,7 +152,7 @@ cb_get_cell_content (GnmCellIter const *iter, struct workbook_cmd_wrap_sort_t *c
return NULL;
}
-void
+void
workbook_cmd_wrap_sort (WorkbookControl *wbc, int type)
{
WorkbookView const *wbv = wb_control_view (wbc);
@@ -164,25 +164,25 @@ workbook_cmd_wrap_sort (WorkbookControl *wbc, int type)
GnmExprTop const *texpr;
struct workbook_cmd_wrap_sort_t cl = {NULL, NULL};
- cl.r = selection_first_range
+ cl.r = selection_first_range
(sv, GO_CMD_CONTEXT (wbc), _("Wrap SORT"));;
cl.wb = wb_control_get_workbook (wbc);
if (g_slist_length (l) > 1) {
go_cmd_context_error_invalid (GO_CMD_CONTEXT (wbc), _("Wrap SORT"),
_("A single selection is required."));
-
+
return;
}
if (range_height (cl.r) > 1 && range_width (cl.r) > 1) {
- go_cmd_context_error_invalid
+ go_cmd_context_error_invalid
(GO_CMD_CONTEXT (wbc), _("Wrap SORT"),
_("An n\xe2\xa8\xaf""1 or 1\xe2\xa8\xaf"
"n selection is required."));
return;
}
if (range_height (cl.r) == 1 && range_width (cl.r) == 1) {
- go_cmd_context_error_invalid
+ go_cmd_context_error_invalid
(GO_CMD_CONTEXT (wbc), _("Wrap SORT"),
_("There is no point in sorting a single cell."));
return;
@@ -190,24 +190,24 @@ workbook_cmd_wrap_sort (WorkbookControl *wbc, int type)
merges = gnm_sheet_merge_get_overlap (sv->sheet, cl.r);
if (merges != NULL) {
g_slist_free (merges);
- go_cmd_context_error_invalid
+ go_cmd_context_error_invalid
(GO_CMD_CONTEXT (wbc), _("Wrap SORT"),
_("The range to be sorted may not contain any merged cells."));
- return;
+ return;
}
fd_sort = gnm_func_lookup_or_add_placeholder ("sort", cl.wb, TRUE);
fd_array = gnm_func_lookup_or_add_placeholder ("array", cl.wb, TRUE);
-
- sheet_foreach_cell_in_range
+
+ sheet_foreach_cell_in_range
(sv->sheet, CELL_ITER_ALL,
- cl.r->start.col, cl.r->start.row,
+ cl.r->start.col, cl.r->start.row,
cl.r->end.col, cl.r->end.row,
(CellIterFunc)&cb_get_cell_content, &cl);
cl.args = g_slist_reverse (cl.args);
expr = gnm_expr_new_funcall (fd_array, cl.args);
- expr = gnm_expr_new_funcall2
- (fd_sort, expr, gnm_expr_new_constant (value_new_int (type)));
+ expr = gnm_expr_new_funcall2
+ (fd_sort, expr, gnm_expr_new_constant (value_new_int (type)));
texpr = gnm_expr_top_new (expr);
cmd_area_set_array_expr (wbc, sv, texpr);
gnm_expr_top_unref (texpr);
diff --git a/src/workbook-cmd-format.h b/src/workbook-cmd-format.h
index 73ab07b..c7535e1 100644
--- a/src/workbook-cmd-format.h
+++ b/src/workbook-cmd-format.h
@@ -7,7 +7,7 @@
G_BEGIN_DECLS
void workbook_cmd_resize_selected_colrow (WorkbookControl *wbc, Sheet *sheet,
- gboolean is_cols,
+ gboolean is_cols,
int new_size_pixels);
void workbook_cmd_autofit_selection (WorkbookControl *wbc, Sheet *sheet,
gboolean is_cols);
diff --git a/src/workbook-control.c b/src/workbook-control.c
index 55abad8..777d04c 100644
--- a/src/workbook-control.c
+++ b/src/workbook-control.c
@@ -307,7 +307,7 @@ wb_control_parse_and_jump (WorkbookControl *wbc, char const *text)
return wb_control_jump (wbc, sheet, &range);
}
-void
+void
wb_control_navigate_to_cell (WorkbookControl *wbc, wb_control_navigator_t to)
{
Sheet *sheet = wb_control_cur_sheet (wbc);
diff --git a/src/workbook-view.c b/src/workbook-view.c
index 55d963b..a47209c 100644
--- a/src/workbook-view.c
+++ b/src/workbook-view.c
@@ -536,7 +536,7 @@ wb_view_auto_expr_recalc (WorkbookView *wbv)
format_value_gstring (str, format, v, &color,
/* Note that we created a label large enough for */
/* "Sumerage=-012345678901234" */
- 25 - g_utf8_strlen (str->str, -1),
+ 25 - g_utf8_strlen (str->str, -1),
workbook_date_conv (wb_view_get_workbook (wbv)));
go_format_unref (tmp_format);
diff --git a/src/xml-sax-write.c b/src/xml-sax-write.c
index de913b8..80c1fd8 100644
--- a/src/xml-sax-write.c
+++ b/src/xml-sax-write.c
@@ -1159,9 +1159,9 @@ xml_write_objects (GnmOutputXML *state, GSList *objects)
gsf_xml_out_add_int (state->output, "Direction",
so->anchor.base.direction);
- gsf_xml_out_add_int
- (state->output, "Print",
- ((so->flags & SHEET_OBJECT_PRINT) != 0 )
+ gsf_xml_out_add_int
+ (state->output, "Print",
+ ((so->flags & SHEET_OBJECT_PRINT) != 0 )
? 1 : 0);
(*klass->write_xml_sax) (so, state->output, state->convs);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
