Commit 1c9758c2 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

ahhh, I understand now. names with expr_len == 0 represent the

2002-10-04  Jody Goldberg <jody@gnome.org>

	* ms-excel-read.c (ms_excel_parse_NAME) : ahhh, I understand now.
	  names with expr_len == 0 represent the placeholders used for unknown
	  names.

2002-10-04  Jody Goldberg <jody@gnome.org>

	* dialog-define-names.c : port to TreeView.

	* dialog-analysis-tools.c : Use the control from the state rather than
	  the tool.

2002-10-04  Jody Goldberg <jody@gnome.org>

	* src/workbook-control.c (wb_control_parse_and_jump) : use the new
	  undo support and handle assigning to a placeholder.

	* src/gnumeric-canvas.h : Clean up the naming convention to use
	  GnmCanvas in all locations.

	* src/expr-name.c (expr_name_add) : its ok if the expr is NULL create
	  a placeholder.
	(expr_name_is_placeholder) : new.

	* src/commands.c (CmdChangeSummary) : this has no business being
	  control specific.
	(CmdPrintSetup) : ditto.
	(CmdDefineName) : new.

	* src/command-context.c (gnumeric_error_calc) : new.
	(gnm_error_calc) : new.

2002-10-03  Jody Goldberg <jody@gnome.org>

	* src/format.c (format_get_currency) : convert locale's currency
	  symbol to utf8.
	(gnumeric_setlocale) : clear the cache currency symbol.

2002-10-03  Jody Goldberg <jody@gnome.org>

	* src/expr.c (gnm_expr_is_err) : new util.
parent 0cdbae91
......@@ -22,7 +22,6 @@ Release Critical
- xls export of constructed ranges
- load/save of external references
- String functions need to be UTF8ed: CHAR, CODE, SUBSTITUTE, SEARCH.
- function_category_compare needs to be made UTF8 safe.
- Evaluate mathfunc.c's use of gamma and lgamma. We use the libc lgamma
(probably ok) and have gamma(x)=exp(lgamma(x)) (questionable).
......@@ -32,23 +31,29 @@ Release Critical
3) finish hlink dialog
4) finish support for h/v only splits
5) zip based format
5.1) move existing code into plugin
5.2) work on sax style exporter
5.3) extend api for gnm_expr_as_string to handle 1.0 vs 1.1 style rangerefs
6) finish corba plugin
7) support some method of persistence when embedded in abiword
8) conditional formats -> bumped
9) pivots and scripting -> bumped
10) XL97 export
11) eggmenu
12) plugin cleanup
13) merge open and import dialogs
14) Make save-as smart enough to notice incorrect suffix saver mismatch
15) manual recalc
16) some handling of external references
17) fix highlighting of completion code
18) look into using the default gtk font rather than our own
19) audit all of the import plugins to do utf8 conversions
5.1) move existing code into plugin
5.2) work on sax style exporter
5.3) extend api for gnm_expr_as_string to handle 1.0 vs 1.1 style rangerefs
6) XL
- 97 export
- Form import
- Intersection, union and set export
- unknown name export
8) merge open and import dialogs
9) Make save-as smart enough to notice incorrect suffix saver mismatch
10) manual recalc
11) some handling of external references
12) fix highlighting of completion code
13) look into using the default gtk font rather than our own
14) audit all of the import plugins to do utf8 conversions
15) audit string functions for utf8: CHAR, CODE, SUBSTITUTE, SEARCH.
16) eggmenu
17) finish corba plugin
18) support some method of persistence when embedded in abiword
Probably Post 1.2 Targets
- conditional formats : could be done if someone wanted to work on the dialog
- pivots and scripting
Pending Patches
---------------
......
2002-10-04 Jody Goldberg <jody@gnome.org>
* src/workbook-control.c (wb_control_parse_and_jump) : use the new
undo support and handle assigning to a placeholder.
* src/gnumeric-canvas.h : Clean up the naming convention to use
GnmCanvas in all locations.
* src/expr-name.c (expr_name_add) : its ok if the expr is NULL create
a placeholder.
(expr_name_is_placeholder) : new.
* src/commands.c (CmdChangeSummary) : this has no business being
control specific.
(CmdPrintSetup) : ditto.
(CmdDefineName) : new.
* src/command-context.c (gnumeric_error_calc) : new.
(gnm_error_calc) : new.
2002-10-03 Jody Goldberg <jody@gnome.org>
* src/format.c (format_get_currency) : convert locale's currency
symbol to utf8.
(gnumeric_setlocale) : clear the cache currency symbol.
2002-10-03 Jody Goldberg <jody@gnome.org>
* src/expr.c (gnm_expr_is_err) : new util.
2002-10-03 Morten Welinder <terra@diku.dk>
* src/parse-util.c (col_name_internal): Handle larger number of
......
......@@ -10,6 +10,11 @@ Jody:
* Decrease GAL dependence.
* More work on opencalc importer.
* Start clean up of error handling routines.
* Some UTF-8 cleanup.
* Support placeholders for unknown names (incl XL import)
* Restore core <-> split for analysis and random num tools
* Undo support for defining and updating named expressions
* Port Name guru from GtkList -> TreeView
Morten:
* Port search center from gal's e-table to gtk's treeview.
......@@ -17,6 +22,9 @@ Morten:
* Reduce the number of source places that need to be changed in
order to get more than 256 columns and/or 65536 rows.
dorami@bu.iij4u.or.jp:
* Add InputMethod support for better international key support
--------------------------------------------------------------------------
Gnumeric 1.1.9
......
2002-10-04 Jody Goldberg <jody@gnome.org>
* src/workbook-control.c (wb_control_parse_and_jump) : use the new
undo support and handle assigning to a placeholder.
* src/gnumeric-canvas.h : Clean up the naming convention to use
GnmCanvas in all locations.
* src/expr-name.c (expr_name_add) : its ok if the expr is NULL create
a placeholder.
(expr_name_is_placeholder) : new.
* src/commands.c (CmdChangeSummary) : this has no business being
control specific.
(CmdPrintSetup) : ditto.
(CmdDefineName) : new.
* src/command-context.c (gnumeric_error_calc) : new.
(gnm_error_calc) : new.
2002-10-03 Jody Goldberg <jody@gnome.org>
* src/format.c (format_get_currency) : convert locale's currency
symbol to utf8.
(gnumeric_setlocale) : clear the cache currency symbol.
2002-10-03 Jody Goldberg <jody@gnome.org>
* src/expr.c (gnm_expr_is_err) : new util.
2002-10-03 Morten Welinder <terra@diku.dk>
* src/parse-util.c (col_name_internal): Handle larger number of
......
2002-10-04 Jody Goldberg <jody@gnome.org>
* src/workbook-control.c (wb_control_parse_and_jump) : use the new
undo support and handle assigning to a placeholder.
* src/gnumeric-canvas.h : Clean up the naming convention to use
GnmCanvas in all locations.
* src/expr-name.c (expr_name_add) : its ok if the expr is NULL create
a placeholder.
(expr_name_is_placeholder) : new.
* src/commands.c (CmdChangeSummary) : this has no business being
control specific.
(CmdPrintSetup) : ditto.
(CmdDefineName) : new.
* src/command-context.c (gnumeric_error_calc) : new.
(gnm_error_calc) : new.
2002-10-03 Jody Goldberg <jody@gnome.org>
* src/format.c (format_get_currency) : convert locale's currency
symbol to utf8.
(gnumeric_setlocale) : clear the cache currency symbol.
2002-10-03 Jody Goldberg <jody@gnome.org>
* src/expr.c (gnm_expr_is_err) : new util.
2002-10-03 Morten Welinder <terra@diku.dk>
* src/parse-util.c (col_name_internal): Handle larger number of
......
2002-10-04 Jody Goldberg <jody@gnome.org>
* dif.c : fix includes.
2002-09-30 Jody Goldberg <jody@gnome.org>
* Release 1.1.9
......
......@@ -22,6 +22,7 @@
#include <gsf/gsf-input-textline.h>
#include <string.h>
#include <stdlib.h>
GNUMERIC_MODULE_PLUGIN_INFO_DECL;
......
2002-10-04 Jody Goldberg <jody@gnome.org>
* ms-excel-read.c (ms_excel_parse_NAME) : ahhh, I understand now.
names with expr_len == 0 represent the placeholders used for unknown
names.
2002-10-02 Jody Goldberg <jody@gnome.org>
* ms-chart.c (BC_R) : handle empty text.
......
......@@ -2582,37 +2582,40 @@ typedef struct {
} MSDelayedNameParse;
static GnmNamedExpr *
ms_excel_parse_NAME (ExcelWorkbook *ewb, int sheet_index,
char *name, guint8 const *expr_data, unsigned expr_len)
ms_excel_parse_NAME (ExcelWorkbook *ewb, int sheet_index, char const *name,
guint8 const *expr_data, unsigned expr_len)
{
ParsePos pp;
GnmExpr const *expr = NULL;
GnmNamedExpr *nexpr;
GnmExpr const *expr = NULL;
char const *err = NULL;
/* I think it is ok to pass sheet = NULL */
if (expr_len != 0)
/* expr_len == 0 seems to indicate a placeholder for an unknown name */
if (expr_len != 0) {
expr = ms_excel_parse_formula (ewb, NULL, 0, 0,
expr_data, expr_len, FALSE, NULL);
if (expr == NULL)
expr = gnm_expr_new_constant (value_new_error (NULL,
gnumeric_err_REF));
if (expr == NULL) {
g_warning ("Failure parsing name '%s'", name);
expr = gnm_expr_new_constant (value_new_error (NULL,
gnumeric_err_REF));
}
}
parse_pos_init (&pp, ewb->gnum_wb, NULL, 0, 0);
if (sheet_index > 0)
pp.sheet = workbook_sheet_by_index (ewb->gnum_wb, sheet_index-1);
nexpr = expr_name_add (&pp, name, expr, &err);
if (nexpr != NULL) {
/* Add a ref to keep it around after the excel-sheet/wb goes
* away. externames do not get references and are unrefed
* after import finishes, which destroys them if they are not
* in use.
*/
expr_name_ref (nexpr);
return nexpr;
if (nexpr == NULL) {
gnm_io_warning (ewb->context, err);
return NULL;
}
gnm_io_warning (ewb->context, err);
/* Add a ref to keep it around after the excel-sheet/wb goes
* away. externames do not get references and are unrefed
* after import finishes, which destroys them if they are not
* in use.
*/
expr_name_ref (nexpr);
return nexpr;
}
......
2002-10-04 Jody Goldberg <jody@gnome.org>
* sample_datasource.c : fix includes.
2002-09-30 Jody Goldberg <jody@gnome.org>
* Release 1.1.9
......
......@@ -31,6 +31,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
#include <string.h>
......
......@@ -192,7 +192,7 @@ cellspan_is_empty (int col, ColRowInfo const *ri, Cell const *ok_span_cell)
* This routine returns the column interval used by a Cell.
*/
void
cell_calc_span (Cell const * const cell, int * const col1, int * const col2)
cell_calc_span (Cell const *cell, int *col1, int *col2)
{
Sheet *sheet;
int align, left, max_col, min_col;
......
......@@ -64,7 +64,15 @@ gnumeric_error_save (CommandContext *context, char const *message)
void
gnumeric_error_invalid (CommandContext *context, char const *msg, char const *val)
{
GError *err = g_error_new (gnm_error_invalid(), 0, "%s : '%s'", msg, val);
GError *err = g_error_new (gnm_error_invalid(), 0, "Invalid %s : '%s'", msg, val);
cmd_context_error (context, err);
g_error_free (err);
}
void
gnumeric_error_calc (CommandContext *context, char const *msg)
{
GError *err = format_message (gnm_error_calc (), msg);
cmd_context_error (context, err);
g_error_free (err);
}
......@@ -116,6 +124,16 @@ gnm_error_array (void)
quark = g_quark_from_static_string ("gnm_error_array");
return quark;
}
GQuark
gnm_error_calc (void)
{
static GQuark quark;
if (!quark)
quark = g_quark_from_static_string ("gnm_error_calc");
return quark;
}
GQuark
gnm_error_invalid (void)
{
......
......@@ -18,6 +18,7 @@ void cmd_context_set_sensitive (CommandContext *cc, gboolean sensitive);
void gnumeric_error_system (CommandContext *cc, char const *msg);
void gnumeric_error_read (CommandContext *cc, char const *msg);
void gnumeric_error_save (CommandContext *cc, char const *msg);
void gnumeric_error_calc (CommandContext *cc, char const *msg);
void gnumeric_error_invalid (CommandContext *cc,
char const *msg, char const *val);
void gnumeric_error_error_info (CommandContext *cc, ErrorInfo *error);
......@@ -31,6 +32,7 @@ GQuark gnm_error_system (void);
GQuark gnm_error_read (void);
GQuark gnm_error_write (void);
GQuark gnm_error_array (void);
GQuark gnm_error_calc (void);
GQuark gnm_error_invalid (void);
#endif /* GNUMERIC_COMMAND_CONTEXT_H */
......@@ -42,6 +42,7 @@
#include "dependent.h"
#include "value.h"
#include "expr.h"
#include "expr-name.h"
#include "cell.h"
#include "sheet-merge.h"
#include "parse-util.h"
......@@ -4946,7 +4947,6 @@ typedef struct
{
GnumericCommand cmd;
WorkbookControlGUI *wbcg;
GSList *new_info;
GSList *old_info;
} CmdChangeSummary;
......@@ -4959,9 +4959,9 @@ static void cb_change_summary_apply_change (SummaryItem *sit, Workbook *wb)
}
static gboolean
cmd_change_summary_apply (WorkbookControlGUI *wbcg, GSList *info)
cmd_change_summary_apply (WorkbookControl *wbc, GSList *info)
{
Workbook *wb = wb_control_workbook (WORKBOOK_CONTROL (wbcg));
Workbook *wb = wb_control_workbook (wbc);
g_slist_foreach (info, (GFunc) cb_change_summary_apply_change, wb);
......@@ -4975,7 +4975,7 @@ cmd_change_summary_undo (GnumericCommand *cmd, WorkbookControl *wbc)
{
CmdChangeSummary *me = CMD_CHANGE_SUMMARY (cmd);
return cmd_change_summary_apply (me->wbcg, me->old_info);
return cmd_change_summary_apply (wbc, me->old_info);
}
static gboolean
......@@ -4983,7 +4983,7 @@ cmd_change_summary_redo (GnumericCommand *cmd, WorkbookControl *wbc)
{
CmdChangeSummary *me = CMD_CHANGE_SUMMARY (cmd);
return cmd_change_summary_apply (me->wbcg, me->new_info);
return cmd_change_summary_apply (wbc, me->new_info);
}
static void
......@@ -5009,12 +5009,11 @@ cmd_change_summary_finalize (GObject *cmd)
}
gboolean
cmd_change_summary (WorkbookControlGUI *wbcg, GSList *sin_changes)
cmd_change_summary (WorkbookControl *wbc, GSList *sin_changes)
{
GObject *obj;
CmdChangeSummary *me;
GSList *sit_l;
WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
SummaryInfo const *sin = wb_control_workbook (wbc)->summary_info;
if (sin_changes == NULL)
......@@ -5028,7 +5027,6 @@ cmd_change_summary (WorkbookControlGUI *wbcg, GSList *sin_changes)
me->cmd.cmd_descriptor =
g_strdup_printf (_("Changing summary info"));
me->wbcg = wbcg;
me->new_info = sin_changes;
me->old_info = NULL;
......@@ -5137,24 +5135,23 @@ cmd_object_raise (WorkbookControl *wbc, SheetObject *so, CmdObjectRaiseSelector
/******************************************************************/
#define CMD_PRINT_SET_UP_TYPE (cmd_print_set_up_get_type ())
#define CMD_PRINT_SET_UP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CMD_PRINT_SET_UP_TYPE, CmdPrintSetUp))
#define CMD_PRINT_SETUP_TYPE (cmd_print_setup_get_type ())
#define CMD_PRINT_SETUP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CMD_PRINT_SETUP_TYPE, CmdPrintSetup))
typedef struct
{
GnumericCommand cmd;
WorkbookControlGUI *wbcg;
GSList *old_pi;
PrintInformation *new_pi;
} CmdPrintSetUp;
} CmdPrintSetup;
GNUMERIC_MAKE_COMMAND (CmdPrintSetUp, cmd_print_set_up);
GNUMERIC_MAKE_COMMAND (CmdPrintSetup, cmd_print_setup);
static gboolean
cmd_print_set_up_undo (GnumericCommand *cmd, WorkbookControl *wbc)
cmd_print_setup_undo (GnumericCommand *cmd, WorkbookControl *wbc)
{
CmdPrintSetUp *me = CMD_PRINT_SET_UP (cmd);
CmdPrintSetup *me = CMD_PRINT_SETUP (cmd);
guint n, i;
Workbook *book;
GSList *infos;
......@@ -5186,9 +5183,9 @@ cmd_print_set_up_undo (GnumericCommand *cmd, WorkbookControl *wbc)
}
static gboolean
cmd_print_set_up_redo (GnumericCommand *cmd, WorkbookControl *wbc)
cmd_print_setup_redo (GnumericCommand *cmd, WorkbookControl *wbc)
{
CmdPrintSetUp *me = CMD_PRINT_SET_UP (cmd);
CmdPrintSetup *me = CMD_PRINT_SETUP (cmd);
int n, i;
Workbook *book;
gboolean save_pis = (me->old_pi == NULL);
......@@ -5217,9 +5214,9 @@ cmd_print_set_up_redo (GnumericCommand *cmd, WorkbookControl *wbc)
}
static void
cmd_print_set_up_finalize (GObject *cmd)
cmd_print_setup_finalize (GObject *cmd)
{
CmdPrintSetUp *me = CMD_PRINT_SET_UP (cmd);
CmdPrintSetup *me = CMD_PRINT_SETUP (cmd);
GSList *list = me->old_pi;
if (me->new_pi)
......@@ -5231,14 +5228,13 @@ cmd_print_set_up_finalize (GObject *cmd)
}
gboolean
cmd_print_set_up (WorkbookControlGUI *wbcg, Sheet *sheet, PrintInformation const *pi)
cmd_print_setup (WorkbookControl *wbc, Sheet *sheet, PrintInformation const *pi)
{
GObject *obj;
CmdPrintSetUp *me;
WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
CmdPrintSetup *me;
obj = g_object_new (CMD_PRINT_SET_UP_TYPE, NULL);
me = CMD_PRINT_SET_UP (obj);
obj = g_object_new (CMD_PRINT_SETUP_TYPE, NULL);
me = CMD_PRINT_SETUP (obj);
me->cmd.sheet = sheet;
me->cmd.size = 10;
......@@ -5249,10 +5245,132 @@ cmd_print_set_up (WorkbookControlGUI *wbcg, Sheet *sheet, PrintInformation const
me->cmd.cmd_descriptor = g_strdup (_("Page Setup For All Sheets"));
me->old_pi = NULL;
me->new_pi = print_info_dup (pi);
me->wbcg = wbcg;
/* Register the command object */
return command_push_undo (wbc, obj);
}
/******************************************************************/
#define CMD_DEFINE_NAME_TYPE (cmd_define_name_get_type ())
#define CMD_DEFINE_NAME(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CMD_DEFINE_NAME_TYPE, CmdDefineName))
typedef struct
{
GnumericCommand cmd;
ParsePos pp;
char *name;
GnmExpr const *expr;
GnmNamedExpr *nexpr;
gboolean create_name;
} CmdDefineName;
GNUMERIC_MAKE_COMMAND (CmdDefineName, cmd_define_name);
static gboolean
cmd_define_name_undo (GnumericCommand *cmd, WorkbookControl *wbc)
{
CmdDefineName *me = CMD_DEFINE_NAME (cmd);
GnmExpr const *expr;
expr = me->nexpr->t.expr_tree;
gnm_expr_ref (expr);
if (me->create_name) {
expr_name_remove (me->nexpr);
me->nexpr = NULL;
} else
expr_name_set_expr (me->nexpr, me->expr, NULL);
me->expr = expr;
return FALSE;
}
static gboolean
cmd_define_name_redo (GnumericCommand *cmd, WorkbookControl *wbc)
{
CmdDefineName *me = CMD_DEFINE_NAME (cmd);
if (me->nexpr == NULL) { /* create a new name */
char const *err = NULL;
me->nexpr = expr_name_add (&me->pp, me->name, me->expr, &err);
if (me->nexpr == NULL) {
gnumeric_error_invalid (COMMAND_CONTEXT (wbc), _("Name"), err);
return TRUE;
}
me->expr = NULL;
} else {/* assigning a value to a placeholder */
GnmExpr const *tmp = me->nexpr->t.expr_tree;
gnm_expr_ref (tmp);
expr_name_set_expr (me->nexpr, me->expr, NULL);
me->expr = tmp;
}
return FALSE;
}
static void
cmd_define_name_finalize (GObject *cmd)
{
CmdDefineName *me = CMD_DEFINE_NAME (cmd);
g_free (me->name); me->name = NULL;
if (me->expr != NULL) {
gnm_expr_unref (me->expr);
me->expr = NULL;
}
if (me->nexpr != NULL) {
expr_name_unref (me->nexpr);
me->nexpr = NULL;
}
gnumeric_command_finalize (cmd);
}
/**
* cmd_define_name :
* @wbc :
* @name :
* @pp :
* @expr : absorbs a ref to the expr.
* @nexpr : an optional named expression to assign the expr to.
* absorb a ref to this too.
*
* Returns TRUE on error
**/
gboolean
cmd_define_name (WorkbookControl *wbc, char const *name, ParsePos const *pp,
GnmExpr const *expr, GnmNamedExpr *nexpr)
{
GObject *obj;
CmdDefineName *me;
g_return_val_if_fail (name != NULL, TRUE);
g_return_val_if_fail (pp != NULL, TRUE);
g_return_val_if_fail (expr != NULL, TRUE);
obj = g_object_new (CMD_DEFINE_NAME_TYPE, NULL);
me = CMD_DEFINE_NAME (obj);
me->name = g_strdup (name);
me->pp = *pp;
me->expr = expr;
me->nexpr = nexpr;
me->create_name = nexpr == NULL;
if (nexpr != NULL)
expr_name_ref (me->nexpr);
me->cmd.sheet = wb_control_cur_sheet (wbc);
me->cmd.size = 1;
if (me->create_name)
me->cmd.cmd_descriptor =
g_strdup_printf (_("Define Name %s"), name);
else
me->cmd.cmd_descriptor =
g_strdup_printf (_("Update Name %s"), name);
return command_push_undo (wbc, obj);
}
......@@ -2,8 +2,8 @@
#ifndef GNUMERIC_COMMANDS_H
#define GNUMERIC_COMMANDS_H
#include "consolidate.h"
#include "gnumeric.h"
#include "consolidate.h"
#include "sort.h"
#include "tools/tools.h"
......@@ -89,26 +89,28 @@ gboolean cmd_object_move (WorkbookControl *wbc, SheetObject *so,
SheetObjectAnchor const *old_anchor,
gboolean resize);
gboolean cmd_reorganize_sheets (WorkbookControl *wbc, GSList *old_order, GSList *new_order,
GSList *changed_names, GSList *new_names, GSList *deleted_sheets,
GSList *color_changed, GSList *new_colors_back,
GSList *new_colors_fore,
GSList *protection_changed, GSList *new_locks);
gboolean cmd_rename_sheet (WorkbookControl *wbc, Sheet *sheet,
char const *old_name, char const *new_name);
gboolean cmd_reorganize_sheets (WorkbookControl *wbc, GSList *old_order, GSList *new_order,
GSList *changed_names, GSList *new_names, GSList *deleted_sheets,
GSList *color_changed, GSList *new_colors_back,
GSList *new_colors_fore,
GSList *protection_changed, GSList *new_locks);
gboolean cmd_rename_sheet (WorkbookControl *wbc, Sheet *sheet,
char const *old_name, char const *new_name);
gboolean cmd_set_comment (WorkbookControl *wbc, Sheet *sheet,
gboolean cmd_set_comment (WorkbookControl *wbc, Sheet *sheet,
CellPos const *pos, const char *new_text);
gboolean cmd_analysis_tool (WorkbookControl *wbc, Sheet *sheet,
data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine engine);
gboolean cmd_analysis_tool (WorkbookControl *wbc, Sheet *sheet,
data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine engine);
gboolean cmd_merge_data (WorkbookControl *wbc, Sheet *sheet,
Value *merge_zone, GSList *merge_fields, GSList *merge_data);
gboolean cmd_merge_data (WorkbookControl *wbc, Sheet *sheet,
Value *merge_zone, GSList *merge_fields, GSList *merge_data);
gboolean cmd_change_summary (WorkbookControlGUI *wbcg, GSList *sin_changes);
gboolean cmd_print_set_up (WorkbookControlGUI *wbcg, Sheet *sheet, PrintInformation const *pi);
gboolean cmd_change_summary (WorkbookControl *wbc, GSList *sin_changes);
gboolean cmd_print_setup (WorkbookControl *wbc, Sheet *sheet, PrintInformation const *pi);
gboolean cmd_define_name (WorkbookControl *wbc, char const *name, ParsePos const *pp,
GnmExpr const *expr, GnmNamedExpr *nexpr);
typedef enum {
cmd_object_raise_up ,
......
2002-10-04 Jody Goldberg <jody@gnome.org>
* dialog-define-names.c : port to TreeView.
* dialog-analysis-tools.c : Use the control from the state rather than
the tool.
2002-10-02 Chris Benedict <deadeyedan@hotmail.com>
* dialog-sheet-order.c (cb_ok_clicked) : Do not allow all sheets to
......
......@@ -1178,7 +1178,7 @@ ttest_tool_ok_clicked_cb (GtkWidget *button, TTestState *state)
data = g_new0 (analysis_tools_data_ttests_t, 1);
dao = parse_output ((GenericToolState *)state, NULL);
data->base.wbcg = state->base.wbcg;
data->base.wbc = WORKBOOK_CONTROL (state->base.wbcg);
if (state->base.warning_dialog != NULL)
gtk_widget_destroy (state->base.warning_dialog);
......@@ -1559,7 +1559,7 @@ ftest_tool_ok_clicked_cb (GtkWidget *button, FTestToolState *state)
data = g_new0 (analysis_tools_data_ftest_t, 1);
dao = parse_output ((GenericToolState *)state, NULL);
data->wbcg = state->base.wbcg;
data->wbc = WORKBOOK_CONTROL (state->base.wbcg);
if (state->base.warning_dialog != NULL)
gtk_widget_destroy (state->base.warning_dialog);
......@@ -1756,7 +1756,7 @@ sampling_tool_ok_clicked_cb (GtkWidget *button, SamplingState *state)
data = g_new0 (analysis_tools_data_sampling_t, 1);
dao = parse_output ((GenericToolState *)state, NULL);
data->base.wbcg = state->base.wbcg;
data->base.wbc = WORKBOOK_CONTROL (state->base.wbcg);
data->base.input = gnm_expr_entry_parse_as_list (
GNUMERIC_EXPR_ENTRY (state->base.input_entry), state->base.sheet);
......@@ -1941,7 +1941,7 @@ regression_tool_ok_clicked_cb (GtkWidget *button, RegressionToolState *state)
data = g_new0 (analysis_tools_data_regression_t, 1);
dao = parse_output ((GenericToolState *)state, NULL);
data->base.wbcg = state->base.wbcg;
data->base.wbc = WORKBOOK_CONTROL (state->base.wbcg);
data->base.input = gnm_expr_entry_parse_as_list (
GNUMERIC_EXPR_ENTRY (state->base.input_entry), state->base.sheet);
......@@ -2802,7 +2802,7 @@ anova_two_factor_tool_ok_clicked_cb (GtkWidget *button,