projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9d9870d
)
Created wrappers for the ods/gnumeric functions
author
John Darrington
<john@darrington.wattle.id.au>
Mon, 4 Mar 2013 18:02:25 +0000
(19:02 +0100)
committer
John Darrington
<john@darrington.wattle.id.au>
Mon, 4 Mar 2013 18:02:25 +0000
(19:02 +0100)
src/data/spreadsheet-reader.c
patch
|
blob
|
history
src/data/spreadsheet-reader.h
patch
|
blob
|
history
src/ui/gui/page-sheet-spec.c
patch
|
blob
|
history
src/ui/gui/psppire-spreadsheet-model.c
patch
|
blob
|
history
diff --git
a/src/data/spreadsheet-reader.c
b/src/data/spreadsheet-reader.c
index 882cfac9cc02f501e02dfa8d5f7555da0fc8b7ae..da2d6ea2aeb1f4f9f86230d004d77a17a5580ec8 100644
(file)
--- a/
src/data/spreadsheet-reader.c
+++ b/
src/data/spreadsheet-reader.c
@@
-43,6
+43,26
@@
spreadsheet_close (UNUSED struct spreadsheet *spreadsheet)
{
}
{
}
+
+struct casereader *
+spreadsheet_make_reader (struct spreadsheet *s, const struct spreadsheet_read_options *opts)
+{
+ return ods_make_reader (s, opts);
+}
+
+const char *
+spreadsheet_get_sheet_name (struct spreadsheet *s, int n)
+{
+ return ods_get_sheet_name (s, n);
+}
+
+char *
+spreadsheet_get_sheet_range (struct spreadsheet *s, int n)
+{
+ return ods_get_sheet_range (s, n);
+}
+
+
#define RADIX 26
static void
#define RADIX 26
static void
diff --git
a/src/data/spreadsheet-reader.h
b/src/data/spreadsheet-reader.h
index aa4c0174529c4a142cb8111be0c431d674d581b7..a3fc9b4184027c483df53b8b1edc8e75bd68d877 100644
(file)
--- a/
src/data/spreadsheet-reader.h
+++ b/
src/data/spreadsheet-reader.h
@@
-19,6
+19,8
@@
#include <stdbool.h>
#include <stdbool.h>
+struct casereeader;
+
/* Default width of string variables. */
#define SPREADSHEET_DEFAULT_WIDTH 8
/* Default width of string variables. */
#define SPREADSHEET_DEFAULT_WIDTH 8
@@
-54,6
+56,7
@@
enum spreadsheet_type
SPREADSHEET_ODS
};
SPREADSHEET_ODS
};
+
struct spreadsheet
{
const char *file_name;
struct spreadsheet
{
const char *file_name;
@@
-68,6
+71,12
@@
struct spreadsheet
};
};
+struct casereader * spreadsheet_make_reader (struct spreadsheet *, const struct spreadsheet_read_options *);
+
+const char * spreadsheet_get_sheet_name (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, int coli, int rowi);
/*
@@
-80,8
+89,8
@@
char *create_cell_ref (int col0, int row0, int coli, int rowi);
struct spreadsheet * spreadsheet_open (const char *filename);
void spreadsheet_close (struct spreadsheet *);
struct spreadsheet * spreadsheet_open (const char *filename);
void spreadsheet_close (struct spreadsheet *);
-struct casereeader;
-struct casereader * spreadsheet_make_reader (struct spreadsheet *s);
+
+
#define SPREADSHEET_CAST(X) ((struct spreadsheet *)(X))
#define SPREADSHEET_CAST(X) ((struct spreadsheet *)(X))
diff --git
a/src/ui/gui/page-sheet-spec.c
b/src/ui/gui/page-sheet-spec.c
index 9fbba9bee49c312a9ded5139d84260007f7a69f3..3d92bfe4100929a074d6718a76c98115b23b1de0 100644
(file)
--- a/
src/ui/gui/page-sheet-spec.c
+++ b/
src/ui/gui/page-sheet-spec.c
@@
-220,14
+220,9
@@
post_sheet_spec_page (struct import_assistant *ia)
switch (ia->spreadsheet->type)
{
case SPREADSHEET_ODS:
switch (ia->spreadsheet->type)
{
case SPREADSHEET_ODS:
- {
- creader = ods_make_reader (ia->spreadsheet, &ssp->opts);
- dict = ia->spreadsheet->dict;
- }
- break;
case SPREADSHEET_GNUMERIC:
{
case SPREADSHEET_GNUMERIC:
{
- creader =
gnumeric
_make_reader (ia->spreadsheet, &ssp->opts);
+ creader =
spreadsheet
_make_reader (ia->spreadsheet, &ssp->opts);
dict = ia->spreadsheet->dict;
}
break;
dict = ia->spreadsheet->dict;
}
break;
diff --git
a/src/ui/gui/psppire-spreadsheet-model.c
b/src/ui/gui/psppire-spreadsheet-model.c
index b5ac123755714ec24f6102b4688b7ac81eead721..5c004a8446f90999e1ca17e1ab8570d1c8e3a407 100644
(file)
--- a/
src/ui/gui/psppire-spreadsheet-model.c
+++ b/
src/ui/gui/psppire-spreadsheet-model.c
@@
-18,12
+18,14
@@
#include <config.h>
#include <glib.h>
#include <config.h>
#include <glib.h>
-#include "psppire-spreadsheet-model.h"
+#include <gettext.h>
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
+#include "psppire-spreadsheet-model.h"
#include "data/spreadsheet-reader.h"
#include "data/spreadsheet-reader.h"
-#include "data/gnumeric-reader.h"
-#include "data/ods-reader.h"
static void psppire_spreadsheet_model_init (PsppireSpreadsheetModel *
spreadsheetModel);
static void psppire_spreadsheet_model_init (PsppireSpreadsheetModel *
spreadsheetModel);
@@
-246,7
+248,7
@@
tree_model_get_value (GtkTreeModel * model, GtkTreeIter * iter,
case PSPPIRE_SPREADSHEET_MODEL_COL_NAME:
{
const char *x =
case PSPPIRE_SPREADSHEET_MODEL_COL_NAME:
{
const char *x =
-
ods
_get_sheet_name (spreadsheetModel->spreadsheet,
+
spreadsheet
_get_sheet_name (spreadsheetModel->spreadsheet,
(gint) iter->user_data);
g_value_set_string (value, x);
(gint) iter->user_data);
g_value_set_string (value, x);
@@
-255,10
+257,10
@@
tree_model_get_value (GtkTreeModel * model, GtkTreeIter * iter,
case PSPPIRE_SPREADSHEET_MODEL_COL_RANGE:
{
char *x =
case PSPPIRE_SPREADSHEET_MODEL_COL_RANGE:
{
char *x =
-
ods
_get_sheet_range (spreadsheetModel->spreadsheet,
+
spreadsheet
_get_sheet_range (spreadsheetModel->spreadsheet,
(gint) iter->user_data);
(gint) iter->user_data);
- g_value_set_string (value, x ? x :
"(empty)"
);
+ g_value_set_string (value, x ? x :
_("(empty)")
);
g_free (x);
}
break;
g_free (x);
}
break;