Commit 5dadf2b9 authored by James R. Van Zandt's avatar James R. Van Zandt Committed by Jody Goldberg

Update to HEAD gnome-print

Lots of little pending fixes.

2000-07-16  James R. Van Zandt  <jrv@vanzandt.mv.com>

	* src/functions/fn-math.c: Misc. documentation cleanups.

	* src/functions/fn-stat.c: Misc. documentation cleanups.

	* src/functions/fn-eng.c: Fix nomenclature in erf and Bessel
	  function documentation.  erf() accepts negative arguments.

2000-07-24  Jody Goldberg <jgoldberg@home.com>

	* src/colrow.c (col_row_set_visibility_list) : Fix typo in name.

	* src/sheet.c (sheet_set_zoom_factor) : Set the default zoom to 1.
	  (rather than the hackish -1) and add a 'force' flag to force an
	  update even if the new zoom is close to the current zoom.

	* src/workbook.c (change_zoom_in_current_sheet_cb) : Adjust to changes
	  in sheet_set_zoom_factor.
	* src/dialogs/dialog-zoom.c (dialog_zoom_impl) : Ditto.
	* src/xml-io.c (xml_sheet_read) : Ditto.
parent 6427a34e
2000-07-16 James R. Van Zandt <jrv@vanzandt.mv.com>
* src/functions/fn-math.c: Misc. documentation cleanups.
* src/functions/fn-stat.c: Misc. documentation cleanups.
* src/functions/fn-eng.c: Fix nomenclature in erf and Bessel
function documentation. erf() accepts negative arguments.
2000-07-24 Jody Goldberg <jgoldberg@home.com>
* src/colrow.c (col_row_set_visibility_list) : Fix typo in name.
* src/sheet.c (sheet_set_zoom_factor) : Set the default zoom to 1.
(rather than the hackish -1) and add a 'force' flag to force an
update even if the new zoom is close to the current zoom.
* src/workbook.c (change_zoom_in_current_sheet_cb) : Adjust to changes
in sheet_set_zoom_factor.
* src/dialogs/dialog-zoom.c (dialog_zoom_impl) : Ditto.
* src/xml-io.c (xml_sheet_read) : Ditto.
2000-07-21 JP Rosevear <jpr@arcavia.com>
* src/sort.c (sort_contents): Add another level of indirection
......
2000-07-16 James R. Van Zandt <jrv@vanzandt.mv.com>
* src/functions/fn-math.c: Misc. documentation cleanups.
* src/functions/fn-stat.c: Misc. documentation cleanups.
* src/functions/fn-eng.c: Fix nomenclature in erf and Bessel
function documentation. erf() accepts negative arguments.
2000-07-24 Jody Goldberg <jgoldberg@home.com>
* src/colrow.c (col_row_set_visibility_list) : Fix typo in name.
* src/sheet.c (sheet_set_zoom_factor) : Set the default zoom to 1.
(rather than the hackish -1) and add a 'force' flag to force an
update even if the new zoom is close to the current zoom.
* src/workbook.c (change_zoom_in_current_sheet_cb) : Adjust to changes
in sheet_set_zoom_factor.
* src/dialogs/dialog-zoom.c (dialog_zoom_impl) : Ditto.
* src/xml-io.c (xml_sheet_read) : Ditto.
2000-07-21 JP Rosevear <jpr@arcavia.com>
* src/sort.c (sort_contents): Add another level of indirection
......
2000-07-16 James R. Van Zandt <jrv@vanzandt.mv.com>
* src/functions/fn-math.c: Misc. documentation cleanups.
* src/functions/fn-stat.c: Misc. documentation cleanups.
* src/functions/fn-eng.c: Fix nomenclature in erf and Bessel
function documentation. erf() accepts negative arguments.
2000-07-24 Jody Goldberg <jgoldberg@home.com>
* src/colrow.c (col_row_set_visibility_list) : Fix typo in name.
* src/sheet.c (sheet_set_zoom_factor) : Set the default zoom to 1.
(rather than the hackish -1) and add a 'force' flag to force an
update even if the new zoom is close to the current zoom.
* src/workbook.c (change_zoom_in_current_sheet_cb) : Adjust to changes
in sheet_set_zoom_factor.
* src/dialogs/dialog-zoom.c (dialog_zoom_impl) : Ditto.
* src/xml-io.c (xml_sheet_read) : Ditto.
2000-07-21 JP Rosevear <jpr@arcavia.com>
* src/sort.c (sort_contents): Add another level of indirection
......
2000-07-16 James R. Van Zandt <jrv@vanzandt.mv.com>
* src/functions/fn-math.c: Misc. documentation cleanups.
* src/functions/fn-stat.c: Misc. documentation cleanups.
* src/functions/fn-eng.c: Fix nomenclature in erf and Bessel
function documentation. erf() accepts negative arguments.
2000-07-24 Jody Goldberg <jgoldberg@home.com>
* src/colrow.c (col_row_set_visibility_list) : Fix typo in name.
* src/sheet.c (sheet_set_zoom_factor) : Set the default zoom to 1.
(rather than the hackish -1) and add a 'force' flag to force an
update even if the new zoom is close to the current zoom.
* src/workbook.c (change_zoom_in_current_sheet_cb) : Adjust to changes
in sheet_set_zoom_factor.
* src/dialogs/dialog-zoom.c (dialog_zoom_impl) : Ditto.
* src/xml-io.c (xml_sheet_read) : Ditto.
2000-07-21 JP Rosevear <jpr@arcavia.com>
* src/sort.c (sort_contents): Add another level of indirection
......
2000-07-16 James R. Van Zandt <jrv@vanzandt.mv.com>
* src/functions/fn-math.c: Misc. documentation cleanups.
* src/functions/fn-stat.c: Misc. documentation cleanups.
* src/functions/fn-eng.c: Fix nomenclature in erf and Bessel
function documentation. erf() accepts negative arguments.
2000-07-24 Jody Goldberg <jgoldberg@home.com>
* src/colrow.c (col_row_set_visibility_list) : Fix typo in name.
* src/sheet.c (sheet_set_zoom_factor) : Set the default zoom to 1.
(rather than the hackish -1) and add a 'force' flag to force an
update even if the new zoom is close to the current zoom.
* src/workbook.c (change_zoom_in_current_sheet_cb) : Adjust to changes
in sheet_set_zoom_factor.
* src/dialogs/dialog-zoom.c (dialog_zoom_impl) : Ditto.
* src/xml-io.c (xml_sheet_read) : Ditto.
2000-07-21 JP Rosevear <jpr@arcavia.com>
* src/sort.c (sort_contents): Add another level of indirection
......
2000-07-16 James R. Van Zandt <jrv@vanzandt.mv.com>
* src/functions/fn-math.c: Misc. documentation cleanups.
* src/functions/fn-stat.c: Misc. documentation cleanups.
* src/functions/fn-eng.c: Fix nomenclature in erf and Bessel
function documentation. erf() accepts negative arguments.
2000-07-24 Jody Goldberg <jgoldberg@home.com>
* src/colrow.c (col_row_set_visibility_list) : Fix typo in name.
* src/sheet.c (sheet_set_zoom_factor) : Set the default zoom to 1.
(rather than the hackish -1) and add a 'force' flag to force an
update even if the new zoom is close to the current zoom.
* src/workbook.c (change_zoom_in_current_sheet_cb) : Adjust to changes
in sheet_set_zoom_factor.
* src/dialogs/dialog-zoom.c (dialog_zoom_impl) : Ditto.
* src/xml-io.c (xml_sheet_read) : Ditto.
2000-07-21 JP Rosevear <jpr@arcavia.com>
* src/sort.c (sort_contents): Add another level of indirection
......
2000-07-16 James R. Van Zandt <jrv@vanzandt.mv.com>
* src/functions/fn-math.c: Misc. documentation cleanups.
* src/functions/fn-stat.c: Misc. documentation cleanups.
* src/functions/fn-eng.c: Fix nomenclature in erf and Bessel
function documentation. erf() accepts negative arguments.
2000-07-24 Jody Goldberg <jgoldberg@home.com>
* src/colrow.c (col_row_set_visibility_list) : Fix typo in name.
* src/sheet.c (sheet_set_zoom_factor) : Set the default zoom to 1.
(rather than the hackish -1) and add a 'force' flag to force an
update even if the new zoom is close to the current zoom.
* src/workbook.c (change_zoom_in_current_sheet_cb) : Adjust to changes
in sheet_set_zoom_factor.
* src/dialogs/dialog-zoom.c (dialog_zoom_impl) : Ditto.
* src/xml-io.c (xml_sheet_read) : Ditto.
2000-07-21 JP Rosevear <jpr@arcavia.com>
* src/sort.c (sort_contents): Add another level of indirection
......
......@@ -27,13 +27,15 @@ Requirements
You need:
gnome-libs >= 1.0.57 (gnome-libs 2.0 is not supported)
libole2 == 0.1.6
NOTE : libole2 is also known as libgnomeole2
gnome-print == 0.20
gnome-xml == 1.8.7 (gnome-xml 2.x not supported yet)
libglade == 0.13
libole2 == 0.1.6
glib >= 1.2.7 (glib-libs 1.3 is not supported)
gtk+ >= 1.2.7 (gnome-libs 1.3 is not supported)
libglade == 0.13
gnome-libs >= 1.0.57 (gnome-libs 2.0 is not supported)
glib >= 1.2.7 (glib-libs 1.3 is not supported)
gtk+ >= 1.2.7 (gnome-libs 1.3 is not supported)
gnome-xml == 1.8.7 (gnome-xml 2.x not supported yet)
NOTE : gnome-xml is also known as libxml
Optionally:
bonobo == 0.16 (Still in CVS)
......
2000-07-24 Jody Goldberg <jgoldberg@home.com>
* applix-read.c (applix_get_sheet) : Adjust to changes in sheet_set_zoom_factor.
2000-07-08 Jody Goldberg <jgoldberg@home.com>
* applix-read.c (applix_read_views) : Fix. The Current view uses a
......
......@@ -654,7 +654,7 @@ applix_get_sheet (ApplixReadState *state, char **buffer,
if (sheet == NULL) {
sheet = sheet_new (state->wb, *buffer);
workbook_attach_sheet (state->wb, sheet);
sheet_set_zoom_factor (sheet, (double )(state->zoom) / 100.);
sheet_set_zoom_factor (sheet, (double )(state->zoom) / 100., FALSE);
}
*buffer = tmp+1;
......@@ -874,7 +874,11 @@ applix_read_cells (ApplixReadState *state)
cell = sheet_cell_fetch (sheet, col, row);
/* Apply the formating */
#if 0
sheet_style_attach_single (sheet, col, row, style);
#else
cell_set_mstyle (cell, style);
#endif
if (mstyle_is_element_set (style, MSTYLE_BORDER_BOTTOM)) {
Range r;
MStyle *tmp = mstyle_new ();
......
2000-07-24 Jody Goldberg <jgoldberg@home.com>
* ms-excel-read.c (ms_excel_read_sheet) : Adjust to changes in sheet_set_zoom_factor.
(ms_excel_sheet_new) : Ditto.
2000-07-13 Jody Goldberg <jgoldberg@home.com>
* ms-container.c : Beginings of a some support for workbooks, and charts holding objects.
......
......@@ -2400,7 +2400,7 @@ ms_excel_sheet_new (ExcelWorkbook *wb, const char *name)
ExcelSheet *ans = (ExcelSheet *) g_malloc (sizeof (ExcelSheet));
ans->gnum_sheet = sheet_new (wb->gnum_wb, name);
sheet_set_zoom_factor (ans->gnum_sheet, 1.);
sheet_set_zoom_factor (ans->gnum_sheet, 1., FALSE);
ms_container_init (&ans->container, &vtbl);
......@@ -2457,21 +2457,60 @@ ms_excel_sheet_set_comment (ExcelSheet *sheet, int col, int row, const char *tex
}
}
/* FIXME : ick, need a somewhat less ugly way to handle this */
static void
ms_excel_sheet_append_comment (ExcelSheet *sheet, const char *text)
ms_excel_read_comment (BiffQuery *q, ExcelSheet *sheet)
{
if (text) {
Cell *cell = sheet_cell_fetch (sheet->gnum_sheet,
sheet->comment_prev_col,
sheet->comment_prev_row);
if (!cell->value)
cell_set_value (cell, value_new_empty(), NULL);
if (cell->comment && cell->comment->comment &&
cell->comment->comment->str) {
char *txt = g_strconcat (cell->comment->comment->str, text, NULL);
cell_set_comment (cell, txt);
g_free (txt);
guint16 row = EX_GETROW(q);
guint16 col = EX_GETCOL(q);
if (sheet->container.ver >= MS_BIFF_V8) {
guint16 options = MS_OLE_GET_GUINT16(q->data+4);
guint16 obj_id = MS_OLE_GET_GUINT16(q->data+6);
guint16 author_len = MS_OLE_GET_GUINT16(q->data+8);
char *author=biff_get_text(author_len%2?q->data+11:q->data+10,
author_len, NULL);
int hidden;
if (options&0xffd)
printf ("FIXME: Error in options\n");
hidden = (options&0x2)==0;
#ifndef NO_DEBUG_EXCEL
if (ms_excel_read_debug > 1) {
printf ("Comment at %d,%d id %d options"
" 0x%x hidden %d by '%s'\n",
col, row, obj_id, options,
hidden, author);
}
#endif
} else {
guint16 author_len = MS_OLE_GET_GUINT16(q->data+4);
char *text=biff_get_text(q->data+6, author_len, NULL);
#ifndef NO_DEBUG_EXCEL
if (ms_excel_read_debug > 1) {
printf ("Comment at %d,%d '%s'\n",
col, row, text);
}
#endif
if (row != 0xffff || col != 0) {
ms_excel_sheet_set_comment (sheet, col, row, text);
sheet->comment_prev_col = col;
sheet->comment_prev_row = row;
} else if (text) {
Cell *cell = sheet_cell_fetch (sheet->gnum_sheet,
sheet->comment_prev_col,
sheet->comment_prev_row);
if (!cell->value)
cell_set_value (cell, value_new_empty(), NULL);
if (cell->comment && cell->comment->comment &&
cell->comment->comment->str) {
char *txt = g_strconcat (cell->comment->comment->str, text, NULL);
cell_set_comment (cell, txt);
g_free (txt);
}
}
g_free (text);
}
}
......@@ -2663,8 +2702,12 @@ biff_get_rk (const guint8 *ptr)
}
/* FIXME: S59DA9.HTM */
/*
* ms_excel_read_name :
* read a Name. The workbook must be present, the sheet is optional.
*/
static void
ms_excel_read_name (BiffQuery *q, ExcelSheet *sheet)
ms_excel_read_name (BiffQuery *q, ExcelWorkbook *wb, ExcelSheet *sheet)
{
guint16 fn_grp_idx;
guint16 flags = MS_OLE_GET_GUINT16 (q->data);
......@@ -2687,11 +2730,11 @@ ms_excel_read_name (BiffQuery *q, ExcelSheet *sheet)
#endif
/* FIXME FIXME FIXME : Offsets have moved alot between versions.
* track down the details */
if (sheet->container.ver >= MS_BIFF_V8) {
if (wb->container.ver >= MS_BIFF_V8) {
name_def_len = MS_OLE_GET_GUINT16 (q->data + 4);
name_def_data = q->data + 15 + name_len;
ptr = q->data + 14;
} else if (sheet->container.ver >= MS_BIFF_V7) {
} else if (wb->container.ver >= MS_BIFF_V7) {
name_def_len = MS_OLE_GET_GUINT16 (q->data + 4);
name_def_data = q->data + 14 + name_len;
ptr = q->data + 14;
......@@ -2763,7 +2806,7 @@ ms_excel_read_name (BiffQuery *q, ExcelSheet *sheet)
}
#endif
biff_name_data_new (sheet->wb, name, sheet_idx,
biff_name_data_new (wb, name, sheet_idx,
name_def_data, name_def_len,
FALSE, (sheet_idx != 0));
......@@ -2779,12 +2822,12 @@ ms_excel_read_name (BiffQuery *q, ExcelSheet *sheet)
/* S59D7E.HTM */
static void
ms_excel_externname (BiffQuery *q, ExcelSheet *sheet)
ms_excel_externname (BiffQuery *q, ExcelWorkbook *wb, ExcelSheet *sheet)
{
char const *name;
guint8 *defn;
guint16 defnlen;
if (sheet->container.ver >= MS_BIFF_V7) {
if (wb->container.ver >= MS_BIFF_V7) {
guint16 flags = MS_OLE_GET_GUINT8(q->data);
guint32 namelen = MS_OLE_GET_GUINT8(q->data+6);
......@@ -2816,7 +2859,7 @@ ms_excel_externname (BiffQuery *q, ExcelSheet *sheet)
MS_OLE_GET_GUINT8(q->data), NULL);
}
biff_name_data_new (sheet->wb, name, 0, defn, defnlen, TRUE, FALSE);
biff_name_data_new (wb, name, 0, defn, defnlen, TRUE, FALSE);
}
/**
......@@ -3215,14 +3258,6 @@ ms_excel_read_cell (BiffQuery *q, ExcelSheet *sheet)
break;
}
case BIFF_EXTERNNAME:
ms_excel_externname(q, sheet);
break;
case BIFF_NAME:
ms_excel_read_name (q, sheet);
break;
case BIFF_IMDATA :
#ifndef NO_DEBUG_EXCEL
if (ms_excel_read_debug > 1) {
......@@ -3464,7 +3499,7 @@ ms_excel_read_mergecells (BiffQuery *q, ExcelSheet *sheet)
}
static gboolean
ms_excel_read_sheet (ExcelSheet *sheet, BiffQuery *q, ExcelWorkbook *wb)
ms_excel_read_sheet (BiffQuery *q, ExcelWorkbook *wb, ExcelSheet *sheet)
{
PrintInformation *pi;
......@@ -3513,48 +3548,8 @@ ms_excel_read_sheet (ExcelSheet *sheet, BiffQuery *q, ExcelWorkbook *wb)
break;
case BIFF_NOTE: /* See: S59DAB.HTM */
{
/* FIXME : ick, need a somewhat less */
guint16 row = EX_GETROW(q);
guint16 col = EX_GETCOL(q);
if (sheet->container.ver >= MS_BIFF_V8) {
guint16 options = MS_OLE_GET_GUINT16(q->data+4);
guint16 obj_id = MS_OLE_GET_GUINT16(q->data+6);
guint16 author_len = MS_OLE_GET_GUINT16(q->data+8);
char *author=biff_get_text(author_len%2?q->data+11:q->data+10,
author_len, NULL);
int hidden;
if (options&0xffd)
printf ("FIXME: Error in options\n");
hidden = (options&0x2)==0;
#ifndef NO_DEBUG_EXCEL
if (ms_excel_read_debug > 1) {
printf ("Comment at %d,%d id %d options"
" 0x%x hidden %d by '%s'\n",
col, row, obj_id, options,
hidden, author);
}
#endif
} else {
guint16 author_len = MS_OLE_GET_GUINT16(q->data+4);
char *text=biff_get_text(q->data+6, author_len, NULL);
#ifndef NO_DEBUG_EXCEL
if (ms_excel_read_debug > 1) {
printf ("Comment at %d,%d '%s'\n",
col, row, text);
}
#endif
if (row != 0xffff || col != 0) {
ms_excel_sheet_set_comment (sheet, col, row, text);
sheet->comment_prev_col = col;
sheet->comment_prev_row = row;
} else
ms_excel_sheet_append_comment (sheet, text);
g_free (text);
}
ms_excel_read_comment (q, sheet);
break;
}
case BIFF_PRINTGRIDLINES :
pi->print_line_divisions = (MS_OLE_GET_GUINT16 (q->data) == 1);
......@@ -3726,7 +3721,7 @@ ms_excel_read_sheet (ExcelSheet *sheet, BiffQuery *q, ExcelWorkbook *wb)
double const zoom = (double)MS_OLE_GET_GUINT16 (q->data) /
MS_OLE_GET_GUINT16 (q->data + 2);
sheet_set_zoom_factor (sheet->gnum_sheet, zoom);
sheet_set_zoom_factor (sheet->gnum_sheet, zoom, FALSE);
} else
g_warning ("Duff BIFF_SCL record");
break;
......@@ -3743,6 +3738,13 @@ ms_excel_read_sheet (ExcelSheet *sheet, BiffQuery *q, ExcelWorkbook *wb)
ms_excel_read_mergecells (q, sheet);
break;
case BIFF_EXTERNNAME:
ms_excel_externname (q, sheet->wb, sheet);
break;
case (BIFF_NAME & 0xff) : /* Why here and not as 18 */
ms_excel_read_name (q, sheet->wb, sheet);
break;
default:
switch (q->opcode) {
case BIFF_CODENAME :
......@@ -4009,7 +4011,7 @@ ms_excel_read_workbook (CommandContext *context, Workbook *workbook,
gboolean kill = FALSE;
ms_excel_sheet_set_version (sheet, ver->version);
if (ms_excel_read_sheet (sheet, q, wb)) {
if (ms_excel_read_sheet (q, wb, sheet)) {
ms_container_realize_objs (&sheet->container);
#if 0
......@@ -4220,20 +4222,11 @@ ms_excel_read_workbook (CommandContext *context, Workbook *workbook,
break;
case BIFF_EXTERNNAME :
ms_excel_externname (q, wb, NULL);
break;
case (BIFF_NAME & 0xff) : /* Why here and not as 18 */
{
/* Create a pseudo-sheet */
ExcelSheet sheet;
sheet.wb = wb;
sheet.container.ver = ver->version;
sheet.gnum_sheet = NULL;
sheet.shared_formulae = NULL;
if (q->ls_op == (BIFF_EXTERNNAME&0xff))
ms_excel_externname (q, &sheet);
else
ms_excel_read_name (q, &sheet);
ms_excel_read_name (q, wb, NULL);
break;
}
case BIFF_BACKUP :
break;
......
......@@ -330,13 +330,13 @@ gnumeric_rank (FunctionEvalInfo *ei, Value **argv)
static char *help_trimmean = {
N_("@FUNCTION=TRIMMEAN\n"
"@SYNTAX=TRIMMEAN(ref,percent)\n"
"@SYNTAX=TRIMMEAN(ref,fraction)\n"
"@DESCRIPTION="
"TRIMMEAN returns the mean of the interior of a data set. @ref "
"is the list of numbers whose mean you want to calculate and "
"@percent is the percentage of number excluded from the mean. "
"For example, if @percent=0.2 and the data set contains 40 "
"@fraction is the fraction of the data set excluded from the mean. "
"For example, if @fraction=0.2 and the data set contains 40 "
"numbers, 8 numbers are trimmed from the data set (40 x 0.2), 4 "
"from the top and 4 from the bottom of the set. "
"This function is Excel compatible. "
......@@ -423,7 +423,7 @@ static char *help_correl = {
"@SYNTAX=CORREL(array1,array2)\n"
"@DESCRIPTION="
"CORREL returns the correllation coefficient of two data sets."
"CORREL returns the correlation coefficient of two data sets."
"\n"
"Strings and empty cells are simply ignored. "
"This function is Excel compatible. "
......@@ -751,7 +751,9 @@ static char *help_harmean = {
"@SYNTAX=HARMEAN(b1, b2, ...)\n"
"@DESCRIPTION="
"HARMEAN returns the harmonic mean of the N data points. "
"HARMEAN returns the harmonic mean of the N data points "
"(that is, N divided by the sum of the inverses of "
"the data points). "
"This function is Excel compatible. "
"\n"
"@EXAMPLES=\n"
......@@ -2268,7 +2270,7 @@ static char *help_pearson = {
"@SYNTAX=PEARSON(array1,array2)\n"
"@DESCRIPTION="
"PEARSON returns the Pearson correllation coefficient of two data "
"PEARSON returns the Pearson correlation coefficient of two data "
"sets."
"\n"
"Strings and empty cells are simply ignored. "
......@@ -2293,7 +2295,7 @@ static char *help_rsq = {
"@SYNTAX=RSQ(array1,array2)\n"
"@DESCRIPTION="
"RSQ returns the square of the Pearson correllation coefficient "
"RSQ returns the square of the Pearson correlation coefficient "
"of two data sets."
"\n"
"Strings and empty cells are simply ignored. "
......@@ -3214,8 +3216,9 @@ static char *help_percentile = {
"@SYNTAX=PERCENTILE(array,k)\n"
"@DESCRIPTION="
"PERCENTILE function returns the k-th percentile of the given data "
"points. "
"PERCENTILE function returns the 100*@k-th percentile "
"of the given data points (that is, a number x such "
"that a fraction @k of the data points are less than x). "
"\n"
"If @array is empty, PERCENTILE returns #NUM! error. "
"If @k < 0 or @k > 1, PERCENTILE returns #NUM! error. "
......
2000-07-24 Jody Goldberg <jgoldberg@home.com>
* xml2.c (xml2ParseSheetZoom) : Adjust to changes in sheet_set_zoom_factor.
2000-07-07 Jody Goldberg <jgoldberg@home.com>
* xml2.c (xml2ParseStyleRegionBorders) : Make border color is optional
......
......@@ -487,7 +487,7 @@ xml2ParseSheetZoom (XML2ParseState *state)
g_return_if_fail (state->sheet != NULL);
if (xmlParseDouble (content, &zoom))
sheet_set_zoom_factor (state->sheet, zoom);
sheet_set_zoom_factor (state->sheet, zoom, FALSE);
}
static void
......
2000-07-24 Jody Goldberg <jgoldberg@home.com>
* xml2.c (xml2ParseSheetZoom) : Adjust to changes in sheet_set_zoom_factor.
2000-07-07 Jody Goldberg <jgoldberg@home.com>
* xml2.c (xml2ParseStyleRegionBorders) : Make border color is optional
......
......@@ -487,7 +487,7 @@ xml2ParseSheetZoom (XML2ParseState *state)
g_return_if_fail (state->sheet != NULL);
if (xmlParseDouble (content, &zoom))
sheet_set_zoom_factor (state->sheet, zoom);
sheet_set_zoom_factor (state->sheet, zoom, FALSE);
}
static void
......
......@@ -26,7 +26,7 @@ void application_history_write_config (void);
float application_display_dpi_get (gboolean const horizontal);
void application_display_dpi_set (gboolean const horizontal, float const);
double application_dpi_to_pixels ();
double application_dpi_to_pixels (void);
gboolean application_use_auto_complete_get (void);
void application_use_auto_complete_set (gboolean use_auto_complete);
......
......@@ -354,14 +354,14 @@ col_row_vis_list_destroy (ColRowVisList *list)
}
/*
* col_row_set_visiblity :
* col_row_set_visibility_list :
*
* This is the high level command that is wrapped by undo and redo.
* It should not be called by other commands.
*/
void
col_row_set_visiblity (Sheet *sheet, gboolean const is_cols,
gboolean const visible, ColRowVisList *list)
col_row_set_visibility_list (Sheet *sheet, gboolean const is_cols,
gboolean const visible, ColRowVisList *list)
{
/* Trivial optimization */
if (list == NULL)
......
......@@ -62,7 +62,7 @@ void col_row_set_visibility (Sheet *sheet, gboolean const is_col,
ColRowVisList *col_row_get_visiblity_toggle (Sheet *sheet, gboolean const is_col,
gboolean const visible);
ColRowVisList *col_row_vis_list_destroy (ColRowVisList *list);
void col_row_set_visiblity (Sheet *sheet, gboolean const is_col,
void col_row_set_visibility_list (Sheet *sheet, gboolean const is_col,
gboolean const visible,
ColRowVisList *list);
......
......@@ -1603,8 +1603,8 @@ cmd_hide_row_col_undo (GnumericCommand *cmd, CommandContext *context)
g_return_val_if_fail (me != NULL, TRUE);
col_row_set_visiblity (me->sheet, me->is_cols,
!me->visible, me->elements);
col_row_set_visibility_list (me->sheet, me->is_cols,
!me->visible, me->elements);
sheet_set_dirty (me->sheet, TRUE);
sheet_update (me->sheet);
......@@ -1619,8 +1619,8 @@ cmd_hide_row_col_redo (GnumericCommand *cmd, CommandContext *context)
g_return_val_if_fail (me != NULL, TRUE);
col_row_set_visiblity (me->sheet, me->is_cols,
me->visible, me->elements);
col_row_set_visibility_list (me->sheet, me->is_cols,
me->visible, me->elements);
sheet_set_dirty (me->sheet, TRUE);
sheet_update (me->sheet);
......
......@@ -1146,19 +1146,18 @@ static void
cb_font_changed (GtkWidget *widget, GtkStyle *previous_style, FormatState *state)
{
FontSelector *font_sel;
GnomeDisplayFont *gnome_display_font;
GnomeFont const *gnome_font;
g_return_if_fail (state != NULL);
font_sel = state->font.selector;
g_return_if_fail (font_sel != NULL);
gnome_display_font = font_sel->display_font;
if (!gnome_display_font)
gnome_font = font_sel->gnome_font;
if (!gnome_font)
return;
if (state->enable_edit && font_sel->size >= 1.) {
GnomeFont const * const gnome_font = gnome_display_font->gnome_font;
gchar const * const family_name = gnome_font_get_family_name (gnome_font);
GnomeFontWeight const weight_code = gnome_font_get_weight_code (gnome_font);
......
......@@ -143,7 +143,7 @@ dialog_zoom_impl (Workbook *wb, Sheet *cur_sheet, GladeXML *gui)
float const new_zoom = gtk_spin_button_get_value_as_int(zoom) / 100.;
for (l = list->selection; l != NULL ; l = l->next) {
Sheet * s = gtk_clist_get_row_data (list, GPOINTER_TO_INT(l->data));
sheet_set_zoom_factor (s, new_zoom);
sheet_set_zoom_factor (s, new_zoom, FALSE);
}
}
......
......@@ -330,13 +330,13 @@ gnumeric_rank (FunctionEvalInfo *ei, Value **argv)
static char *help_trimmean = {
N_("@FUNCTION=TRIMMEAN\n"
"@SYNTAX=TRIMMEAN(ref,percent)\n"
"@SYNTAX=TRIMMEAN(ref,fraction)\n"
"@DESCRIPTION="
"TRIMMEAN returns the mean of the interior of a data set. @ref "
"is the list of numbers whose mean you want to calculate and "
"@percent is the percentage of number excluded from the mean. "
"For example, if @percent=0.2 and the data set contains 40 "
"@fraction is the fraction of the data set excluded from the mean. "
"For example, if @fraction=0.2 and the data set contains 40 "
"numbers, 8 numbers are trimmed from the data set (40 x 0.2), 4 "
"from the top and 4 from the bottom of the set. "
"This function is Excel compatible. "
......@@ -423,7 +423,7 @@ static char *help_correl = {
"@SYNTAX=CORREL(array1,array2)\n"