projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
304322d
)
Rename sheets to n_sheets
author
John Darrington
<john@darrington.wattle.id.au>
Thu, 14 Feb 2013 19:36:31 +0000
(20:36 +0100)
committer
John Darrington
<john@darrington.wattle.id.au>
Sat, 16 Feb 2013 14:04:13 +0000
(15:04 +0100)
src/data/gnumeric-reader.c
patch
|
blob
|
history
src/data/ods-reader.c
patch
|
blob
|
history
src/data/spreadsheet-reader.h
patch
|
blob
|
history
src/ui/gui/psppire-spreadsheet-model.c
patch
|
blob
|
history
diff --git
a/src/data/gnumeric-reader.c
b/src/data/gnumeric-reader.c
index 69dd23689fc6b979d54540c23ae65511b46a885f..fa00804293a04bc2078e4ae36d5cd3e880a6553e 100644
(file)
--- a/
src/data/gnumeric-reader.c
+++ b/
src/data/gnumeric-reader.c
@@
-138,7
+138,7
@@
const char *
gnumeric_get_sheet_name (struct spreadsheet *s, int n)
{
struct gnumeric_reader *gr = (struct gnumeric_reader *) s;
gnumeric_get_sheet_name (struct spreadsheet *s, int n)
{
struct gnumeric_reader *gr = (struct gnumeric_reader *) s;
- assert (n < s->sheets);
+ assert (n < s->
n_
sheets);
return gr->sheets[n].name;
}
return gr->sheets[n].name;
}
@@
-153,7
+153,7
@@
gnumeric_get_sheet_range (struct spreadsheet *s, int n)
int ret;
struct gnumeric_reader *gr = (struct gnumeric_reader *) s;
int ret;
struct gnumeric_reader *gr = (struct gnumeric_reader *) s;
- assert (n < s->sheets);
+ assert (n < s->
n_
sheets);
while (
(gr->sheets[n].stop_col == -1)
while (
(gr->sheets[n].stop_col == -1)
@@
-189,7
+189,7
@@
gnm_file_casereader_destroy (struct casereader *reader UNUSED, void *r_)
caseproto_unref (r->proto);
caseproto_unref (r->proto);
- for (i = 0; i < r->spreadsheet.sheets; ++i)
+ for (i = 0; i < r->spreadsheet.
n_
sheets; ++i)
{
xmlFree (r->sheets[i].name);
}
{
xmlFree (r->sheets[i].name);
}
@@
-217,7
+217,7
@@
process_node (struct gnumeric_reader *r)
XML_READER_TYPE_ELEMENT == r->node_type)
{
r->state = STATE_SHEET_COUNT;
XML_READER_TYPE_ELEMENT == r->node_type)
{
r->state = STATE_SHEET_COUNT;
- r->spreadsheet.sheets = 0;
+ r->spreadsheet.
n_
sheets = 0;
}
break;
}
break;
@@
-226,9
+226,9
@@
process_node (struct gnumeric_reader *r)
XML_READER_TYPE_ELEMENT == r->node_type)
{
struct sheet_detail *sd ;
XML_READER_TYPE_ELEMENT == r->node_type)
{
struct sheet_detail *sd ;
- r->spreadsheet.sheets++;
- r->sheets = xrealloc (r->sheets, r->spreadsheet.sheets * sizeof *r->sheets);
- sd = &r->sheets[r->spreadsheet.sheets - 1];
+ r->spreadsheet.
n_
sheets++;
+ r->sheets = xrealloc (r->sheets, r->spreadsheet.
n_
sheets * sizeof *r->sheets);
+ sd = &r->sheets[r->spreadsheet.
n_
sheets - 1];
sd->start_col = sd->stop_col = sd->start_row = sd->stop_row = -1;
}
else if (0 == xmlStrcasecmp (name, _xml("gnm:SheetNameIndex")) &&
sd->start_col = sd->stop_col = sd->start_row = sd->stop_row = -1;
}
else if (0 == xmlStrcasecmp (name, _xml("gnm:SheetNameIndex")) &&
@@
-238,7
+238,7
@@
process_node (struct gnumeric_reader *r)
}
else if (XML_READER_TYPE_TEXT == r->node_type)
{
}
else if (XML_READER_TYPE_TEXT == r->node_type)
{
- r->sheets [r->spreadsheet.sheets - 1].name = xmlTextReaderValue (r->xtr);
+ r->sheets [r->spreadsheet.
n_
sheets - 1].name = xmlTextReaderValue (r->xtr);
}
break;
}
break;
@@
-462,7
+462,7
@@
gnumeric_reopen (struct gnumeric_reader *r, const char *filename)
if (r == NULL)
{
r = xzalloc (sizeof *r);
if (r == NULL)
{
r = xzalloc (sizeof *r);
- r->spreadsheet.sheets = -1;
+ r->spreadsheet.
n_
sheets = -1;
r->spreadsheet.file_name = filename;
}
r->spreadsheet.file_name = filename;
}
diff --git
a/src/data/ods-reader.c
b/src/data/ods-reader.c
index d12223013c79367b22cdd87d717c47c57a2ffe63..d6ed43e8f64257db79ad48bd7fbc0ad451bfb523 100644
(file)
--- a/
src/data/ods-reader.c
+++ b/
src/data/ods-reader.c
@@
-404,7
+404,7
@@
struct spreadsheet *ods_probe (const char *filename)
r = xzalloc (sizeof *r);
r->xtr = xtr;
r->spreadsheet.type = SPREADSHEET_ODS;
r = xzalloc (sizeof *r);
r->xtr = xtr;
r->spreadsheet.type = SPREADSHEET_ODS;
- r->spreadsheet.sheets = sheet_count;
+ r->spreadsheet.
n_
sheets = sheet_count;
ds_destroy (&errs);
ds_destroy (&errs);
diff --git
a/src/data/spreadsheet-reader.h
b/src/data/spreadsheet-reader.h
index 9f84fa1abeb9eab212e9f6c7af13585c8191095a..765f3ca953705af2cfe849f5a445cad1b6d41790 100644
(file)
--- a/
src/data/spreadsheet-reader.h
+++ b/
src/data/spreadsheet-reader.h
@@
-66,7
+66,7
@@
struct spreadsheet
enum spreadsheet_type type;
/* The total number of sheets in the "workbook" */
enum spreadsheet_type type;
/* The total number of sheets in the "workbook" */
- int sheets;
+ int
n_
sheets;
/* The dictionary */
struct dictionary *dict;
/* The dictionary */
struct dictionary *dict;
diff --git
a/src/ui/gui/psppire-spreadsheet-model.c
b/src/ui/gui/psppire-spreadsheet-model.c
index 240356f294cb87f3b6239e752bcafed70314b2c5..f64f35ad096141bb0914ae56a6b580d126a8228b 100644
(file)
--- a/
src/ui/gui/psppire-spreadsheet-model.c
+++ b/
src/ui/gui/psppire-spreadsheet-model.c
@@
-217,7
+217,7
@@
tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter)
if (iter == NULL)
return FALSE;
if (iter == NULL)
return FALSE;
- if ((gint) iter->user_data >= spreadsheetModel->spreadsheet->sheets - 1)
+ if ((gint) iter->user_data >= spreadsheetModel->spreadsheet->
n_
sheets - 1)
{
iter->user_data = NULL;
iter->stamp = 0;
{
iter->user_data = NULL;
iter->stamp = 0;
@@
-276,7
+276,7
@@
tree_model_nth_child (GtkTreeModel * model, GtkTreeIter * iter,
if (parent)
return FALSE;
if (parent)
return FALSE;
- if (n >= spreadsheetModel->spreadsheet->sheets)
+ if (n >= spreadsheetModel->spreadsheet->
n_
sheets)
return FALSE;
iter->stamp = spreadsheetModel->stamp;
return FALSE;
iter->stamp = spreadsheetModel->stamp;
@@
-292,7
+292,7
@@
tree_model_n_children (GtkTreeModel * model, GtkTreeIter * iter)
PSPPIRE_SPREADSHEET_MODEL (model);
if (iter == NULL)
PSPPIRE_SPREADSHEET_MODEL (model);
if (iter == NULL)
- return spreadsheetModel->spreadsheet->sheets;
+ return spreadsheetModel->spreadsheet->
n_
sheets;
return 0;
}
return 0;
}