projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added result_class parameter to tab_double and updated all callers. Removed tab_fixed
[pspp]
/
src
/
data
/
spreadsheet-reader.h
diff --git
a/src/data/spreadsheet-reader.h
b/src/data/spreadsheet-reader.h
index 5cfd81d7e1caf84b3eab536171bc98203bc878e7..5e7eaa6e4603a128ca2368934e018f0b879425b4 100644
(file)
--- a/
src/data/spreadsheet-reader.h
+++ b/
src/data/spreadsheet-reader.h
@@
-30,9
+30,9
@@
struct casereeader;
*/
struct spreadsheet_read_options
{
*/
struct spreadsheet_read_options
{
- c
onst char *sheet_name ;
/* The name of the sheet to open (in UTF-8) */
+ c
har *sheet_name ;
/* The name of the sheet to open (in UTF-8) */
int sheet_index ; /* The index of the sheet to open (only used if sheet_name is NULL) */
int sheet_index ; /* The index of the sheet to open (only used if sheet_name is NULL) */
- c
onst char *cell_range ;
/* The cell range (in UTF-8) */
+ c
har *cell_range ;
/* The cell range (in UTF-8) */
bool read_names ; /* True if the first row is to be used as the names of the variables */
int asw ; /* The width of string variables in the created dictionary */
};
bool read_names ; /* True if the first row is to be used as the names of the variables */
int asw ; /* The width of string variables in the created dictionary */
};
@@
-45,9
+45,9
@@
bool convert_cell_ref (const char *ref,
int *coli, int *rowi);
int *coli, int *rowi);
-#define _xml(X) (CHAR_CAST (const xmlChar *,
X
))
+#define _xml(X) (CHAR_CAST (const xmlChar *,
(X)
))
-#define _xmlchar_to_int(X) (
atoi(CHAR_CAST (const char *, X))
)
+#define _xmlchar_to_int(X) (
(X) ? atoi (CHAR_CAST (const char *, (X))) : -1
)
enum spreadsheet_type
{
enum spreadsheet_type
{
@@
-77,9
+77,10
@@
const char * spreadsheet_get_sheet_name (struct spreadsheet *s, int n);
char * spreadsheet_get_sheet_range (struct spreadsheet *s, int n);
char * spreadsheet_get_sheet_range (struct spreadsheet *s, int n);
-char *create_cell_ref (int col0, int row0, int coli, int rowi);
+char * create_cell_ref (int col0, int row0);
+char *create_cell_range (int col0, int row0, int coli, int rowi);
-void spreadsheet_
close
(struct spreadsheet *);
+void spreadsheet_
destroy
(struct spreadsheet *);