Update to 0.76.
This commit is contained in:
parent
e8d5a4dc1e
commit
df13eaabdc
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=50330
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= gnumeric
|
||||
PORTVERSION= 0.75
|
||||
PORTVERSION= 0.76
|
||||
CATEGORIES?= math gnome
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME}
|
||||
MASTER_SITE_SUBDIR= stable/sources/gnumeric
|
||||
|
@ -1 +1 @@
|
||||
MD5 (gnumeric-0.75.tar.bz2) = 03253d6e6244bc3526f3755ad3c8dc30
|
||||
MD5 (gnumeric-0.76.tar.bz2) = d140088292872677c29ad76c69d97594
|
||||
|
@ -1,50 +0,0 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- plugins/psiconv/psiconv-read.c 2001/10/09 12:39:33 1.1
|
||||
+++ plugins/psiconv/psiconv-read.c 2001/10/09 12:51:24
|
||||
@@ -420,7 +420,7 @@
|
||||
|
||||
formula = psiconv_get_formula (psi_formulas, psi_cell->ref_formula);
|
||||
|
||||
- return (formula != NULL) ? return parse_subexpr (formula) : NULL;
|
||||
+ return (formula != NULL) ? parse_subexpr (formula) : NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -429,27 +429,27 @@
|
||||
{
|
||||
Cell *cell;
|
||||
Value *val;
|
||||
- ExprTree *tree;
|
||||
+ ExprTree *tree = NULL;
|
||||
psiconv_formula psi_formula;
|
||||
|
||||
cell = sheet_cell_fetch (sheet, psi_cell->column, psi_cell->row);
|
||||
if (!cell)
|
||||
return;
|
||||
|
||||
- val = value_new_from_psi_cell (psi_cell);
|
||||
+ val = value_new_from_psi_cell (cell, psi_cell);
|
||||
|
||||
if (psi_cell->calculated)
|
||||
- expr = expr_new_from_formula (psi_cell, psi_formulas);
|
||||
+ tree = expr_new_from_formula (psi_cell, psi_formulas);
|
||||
|
||||
- if (expr != NULL) {
|
||||
+ if (tree != NULL) {
|
||||
/* TODO : is there a notion of parse format ?
|
||||
* How does it store a user entered date ?
|
||||
*/
|
||||
- if (value != NULL)
|
||||
- cell_set_expr_and_value (cell, expr, val, NULL, TRUE);
|
||||
+ if (val != NULL)
|
||||
+ cell_set_expr_and_value (cell, tree, val, NULL, TRUE);
|
||||
else
|
||||
- cell_set_expr (cell, expr, NULL);
|
||||
- } else if (value != NULL) {
|
||||
+ cell_set_expr (cell, tree, NULL);
|
||||
+ } else if (val != NULL) {
|
||||
/* TODO : is there a notion of parse format ?
|
||||
* How does it store a user entered date ?
|
||||
*/
|
@ -92,6 +92,7 @@ share/gnome/gnumeric/%%VERSION%%/glade/descriptive-stats.glade
|
||||
share/gnome/gnumeric/%%VERSION%%/glade/dialog-stf-export.glade
|
||||
share/gnome/gnumeric/%%VERSION%%/glade/dialog-stf.glade
|
||||
share/gnome/gnumeric/%%VERSION%%/glade/dialog-zoom.glade
|
||||
share/gnome/gnumeric/%%VERSION%%/glade/exp-smoothing.glade
|
||||
share/gnome/gnumeric/%%VERSION%%/glade/font-sel.glade
|
||||
share/gnome/gnumeric/%%VERSION%%/glade/formula-guru.glade
|
||||
share/gnome/gnumeric/%%VERSION%%/glade/fourier-analysis.glade
|
||||
@ -143,6 +144,7 @@ share/gnome/help/gnumeric/C/data-and-time-formatting.html
|
||||
share/gnome/help/gnumeric/C/descriptive-statistics-tool.html
|
||||
share/gnome/help/gnumeric/C/editing-selections.html
|
||||
share/gnome/help/gnumeric/C/editing.html
|
||||
share/gnome/help/gnumeric/C/exp-smoothing-tool.html
|
||||
share/gnome/help/gnumeric/C/file-format.html
|
||||
share/gnome/help/gnumeric/C/files.html
|
||||
share/gnome/help/gnumeric/C/filter.html
|
||||
@ -713,13 +715,6 @@ share/locale/en_AU/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/en_CA/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/en_GB/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/es/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/es_DO/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/es_GT/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/es_HN/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/es_MX/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/es_PA/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/es_PE/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/es_SV/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/et/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/fi/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/fr/LC_MESSAGES/gnumeric.mo
|
||||
|
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= gnumeric
|
||||
PORTVERSION= 0.75
|
||||
PORTVERSION= 0.76
|
||||
CATEGORIES?= math gnome
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME}
|
||||
MASTER_SITE_SUBDIR= stable/sources/gnumeric
|
||||
|
@ -1 +1 @@
|
||||
MD5 (gnumeric-0.75.tar.bz2) = 03253d6e6244bc3526f3755ad3c8dc30
|
||||
MD5 (gnumeric-0.76.tar.bz2) = d140088292872677c29ad76c69d97594
|
||||
|
@ -1,50 +0,0 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- plugins/psiconv/psiconv-read.c 2001/10/09 12:39:33 1.1
|
||||
+++ plugins/psiconv/psiconv-read.c 2001/10/09 12:51:24
|
||||
@@ -420,7 +420,7 @@
|
||||
|
||||
formula = psiconv_get_formula (psi_formulas, psi_cell->ref_formula);
|
||||
|
||||
- return (formula != NULL) ? return parse_subexpr (formula) : NULL;
|
||||
+ return (formula != NULL) ? parse_subexpr (formula) : NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -429,27 +429,27 @@
|
||||
{
|
||||
Cell *cell;
|
||||
Value *val;
|
||||
- ExprTree *tree;
|
||||
+ ExprTree *tree = NULL;
|
||||
psiconv_formula psi_formula;
|
||||
|
||||
cell = sheet_cell_fetch (sheet, psi_cell->column, psi_cell->row);
|
||||
if (!cell)
|
||||
return;
|
||||
|
||||
- val = value_new_from_psi_cell (psi_cell);
|
||||
+ val = value_new_from_psi_cell (cell, psi_cell);
|
||||
|
||||
if (psi_cell->calculated)
|
||||
- expr = expr_new_from_formula (psi_cell, psi_formulas);
|
||||
+ tree = expr_new_from_formula (psi_cell, psi_formulas);
|
||||
|
||||
- if (expr != NULL) {
|
||||
+ if (tree != NULL) {
|
||||
/* TODO : is there a notion of parse format ?
|
||||
* How does it store a user entered date ?
|
||||
*/
|
||||
- if (value != NULL)
|
||||
- cell_set_expr_and_value (cell, expr, val, NULL, TRUE);
|
||||
+ if (val != NULL)
|
||||
+ cell_set_expr_and_value (cell, tree, val, NULL, TRUE);
|
||||
else
|
||||
- cell_set_expr (cell, expr, NULL);
|
||||
- } else if (value != NULL) {
|
||||
+ cell_set_expr (cell, tree, NULL);
|
||||
+ } else if (val != NULL) {
|
||||
/* TODO : is there a notion of parse format ?
|
||||
* How does it store a user entered date ?
|
||||
*/
|
@ -92,6 +92,7 @@ share/gnome/gnumeric/%%VERSION%%/glade/descriptive-stats.glade
|
||||
share/gnome/gnumeric/%%VERSION%%/glade/dialog-stf-export.glade
|
||||
share/gnome/gnumeric/%%VERSION%%/glade/dialog-stf.glade
|
||||
share/gnome/gnumeric/%%VERSION%%/glade/dialog-zoom.glade
|
||||
share/gnome/gnumeric/%%VERSION%%/glade/exp-smoothing.glade
|
||||
share/gnome/gnumeric/%%VERSION%%/glade/font-sel.glade
|
||||
share/gnome/gnumeric/%%VERSION%%/glade/formula-guru.glade
|
||||
share/gnome/gnumeric/%%VERSION%%/glade/fourier-analysis.glade
|
||||
@ -143,6 +144,7 @@ share/gnome/help/gnumeric/C/data-and-time-formatting.html
|
||||
share/gnome/help/gnumeric/C/descriptive-statistics-tool.html
|
||||
share/gnome/help/gnumeric/C/editing-selections.html
|
||||
share/gnome/help/gnumeric/C/editing.html
|
||||
share/gnome/help/gnumeric/C/exp-smoothing-tool.html
|
||||
share/gnome/help/gnumeric/C/file-format.html
|
||||
share/gnome/help/gnumeric/C/files.html
|
||||
share/gnome/help/gnumeric/C/filter.html
|
||||
@ -713,13 +715,6 @@ share/locale/en_AU/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/en_CA/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/en_GB/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/es/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/es_DO/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/es_GT/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/es_HN/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/es_MX/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/es_PA/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/es_PE/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/es_SV/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/et/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/fi/LC_MESSAGES/gnumeric.mo
|
||||
share/locale/fr/LC_MESSAGES/gnumeric.mo
|
||||
|
Loading…
Reference in New Issue
Block a user