head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.44
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.42
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.40
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.38
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.36
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.34
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.32
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.30
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.28
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.26
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.24
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.22
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.20
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.18
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.16
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.14
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.12
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.10
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.8
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.6
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.4
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.2
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.1.0.16
	pkgsrc-2004Q4-base:1.1
	pkgsrc-2004Q3:1.1.0.14
	pkgsrc-2004Q3-base:1.1
	pkgsrc-2004Q2:1.1.0.12
	pkgsrc-2004Q2-base:1.1
	pkgsrc-2004Q1:1.1.0.10
	pkgsrc-2004Q1-base:1.1
	pkgsrc-2003Q4:1.1.0.8
	pkgsrc-2003Q4-base:1.1
	netbsd-1-6-1:1.1.0.4
	netbsd-1-6-1-base:1.1
	netbsd-1-6:1.1.0.6
	netbsd-1-6-RELEASE-base:1.1
	pkgviews:1.1.0.2
	pkgviews-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2004.12.27.11.28.05;	author wiz;	state dead;
branches;
next	1.1;

1.1
date	2002.07.15.16.51.32;	author mycroft;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Remove ancient version of gnumeric, we have two newer versions
(in separate packages) in pkgsrc now.
@
text
@$NetBSD: patch-aa,v 1.1 2002/07/15 16:51:32 mycroft Exp $

--- plugins/psiconv/psiconv-read.c.orig	Sun Jul 14 13:19:07 2002
+++ plugins/psiconv/psiconv-read.c	Sun Jul 14 13:22:50 2002
@@@@ -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,14 +429,13 @@@@
 {
 	Cell *cell;
 	Value *val;
-	ExprTree *tree;
-	psiconv_formula psi_formula;
+	ExprTree *expr;
 
 	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);
@@@@ -445,11 +444,11 @@@@
 		/* TODO : is there a notion of parse format ?
 		 * How does it store a user entered date ?
 		 */
-		if (value != NULL)
+		if (val != NULL)
 			cell_set_expr_and_value (cell, expr, val, NULL, TRUE);
 		else
 			cell_set_expr (cell, expr, NULL);
-	} else if (value != NULL) {
+	} else if (val != NULL) {
 		/* TODO : is there a notion of parse format ?
 		 * How does it store a user entered date ?
 		 */
@


1.1
log
@A package to fix obvious errors in the psiconv plugin.
@
text
@d1 1
a1 1
$NetBSD$
@