Commit a20da02b authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

Improve help text.

2003-07-16  Jody Goldberg <jody@gnome.org>

	* sample_datasource.c : Improve help text.

2003-07-16  Jody Goldberg <jody@gnome.org>

	* ms-excel-read.c (ms_biff_get_chars) : make public.
	* ms-obj.c (ms_read_TXO) : use ms_biff_get_chars.

2003-07-16  Jody Goldberg <jody@gnome.org>

	* src/workbook-control-gui.c : include gog-data-set.h

	* src/stf.c (csv_tsv_probe) : probe content must be true or we won't
	  accept the match.

	* src/sheet-view.c (sv_init_sc) : set the zoom early to avoid problems
	  when attaching an existing control to a new sheet.
parent 9cd94298
......@@ -281,6 +281,7 @@ Pending Patches
6.9.4.1) XL95 (DONE)
6.9.4.2) Escher (DONE)
6.10) hlink export
6.11) Comment import for XL97 (DONE)
14) Polish up Open and Save
14.1) merge open and import dialogs (DONE)
......
2003-07-16 Jody Goldberg <jody@gnome.org>
* src/workbook-control-gui.c : include gog-data-set.h
* src/stf.c (csv_tsv_probe) : probe content must be true or we won't
accept the match.
* src/sheet-view.c (sv_init_sc) : set the zoom early to avoid problems
when attaching an existing control to a new sheet.
2003-07-16 Morten Welinder <terra@gnome.org>
* src/io-context-gtk.c (icg_show_gui): Load splash from
......
2003-07-16 Jody Goldberg <jody@gnome.org>
* src/workbook-control-gui.c : include gog-data-set.h
* src/stf.c (csv_tsv_probe) : probe content must be true or we won't
accept the match.
* src/sheet-view.c (sv_init_sc) : set the zoom early to avoid problems
when attaching an existing control to a new sheet.
2003-07-16 Morten Welinder <terra@gnome.org>
* src/io-context-gtk.c (icg_show_gui): Load splash from
......
2003-07-16 Jody Goldberg <jody@gnome.org>
* src/workbook-control-gui.c : include gog-data-set.h
* src/stf.c (csv_tsv_probe) : probe content must be true or we won't
accept the match.
* src/sheet-view.c (sv_init_sc) : set the zoom early to avoid problems
when attaching an existing control to a new sheet.
2003-07-16 Morten Welinder <terra@gnome.org>
* src/io-context-gtk.c (icg_show_gui): Load splash from
......
2003-07-16 Jody Goldberg <jody@gnome.org>
* ms-excel-read.c (ms_biff_get_chars) : make public.
* ms-obj.c (ms_read_TXO) : use ms_biff_get_chars.
2003-07-16 Jody Goldberg <jody@gnome.org>
* ms-obj.c (ms_read_OBJ) : always register the object.
......
......@@ -745,8 +745,8 @@ get_xtn_lens (guint32 *pre_len, guint32 *end_len, guint8 const *ptr, gboolean ex
}
}
static char *
get_chars (char const *ptr, guint length, gboolean use_utf16)
char *
ms_biff_get_chars (char const *ptr, guint length, gboolean use_utf16)
{
char* ans;
unsigned i;
......@@ -838,7 +838,7 @@ biff_get_text (guint8 const *pos, guint32 length, guint32 *byte_length)
g_warning ("Warning unterminated string floating.");
} else {
(*byte_length) += (use_utf16 ? 2 : 1)*length;
ans = get_chars ((char *) ptr, length, use_utf16);
ans = ms_biff_get_chars ((char *) ptr, length, use_utf16);
}
return ans;
}
......@@ -922,7 +922,7 @@ sst_read_string (char **output, BiffQuery *q, guint32 offset)
g_assert (get_len >= 0);
/* FIXME: split this simple bit out of here, it makes more sense damnit */
str = get_chars ((char *)(q->data + new_offset + pre_len), get_len, use_utf16);
str = ms_biff_get_chars ((char *)(q->data + new_offset + pre_len), get_len, use_utf16);
new_offset += pre_len + get_len * (use_utf16 ? 2 : 1);
if (!(*output))
......@@ -2414,7 +2414,8 @@ excel_read_NOTE (BiffQuery *q, ExcelReadSheet *esheet)
cell_comment_author_set (CELL_COMMENT (obj->gnum_obj), author);
obj->comment_pos = pos;
} else {
g_warning ("DOH!");
/* hmm, how did this happen ? we should have seen
* some escher records earlier */
cell_set_comment (esheet->sheet, &pos, author, NULL);
}
g_free (author);
......@@ -3696,7 +3697,7 @@ excel_read_PANE (BiffQuery *q, ExcelReadSheet *esheet, WorkbookView *wb_view)
sv_freeze_panes (sv, &frozen, &unfrozen);
sv_set_initial_top_left (sv, colLeft, rwTop);
} else {
g_warning ("EXCEL : no support for split panes yet");
g_warning ("EXCEL : no support for split panes yet (%s)", esheet->sheet->name_unquoted);
}
}
......
......@@ -127,8 +127,10 @@ Sheet *excel_externsheet_v7 (MSContainer const *container, gint16 i);
ExcelExternSheetV8 const *excel_externsheet_v8 (ExcelWorkbook const *wb, gint16 i);
void excel_read_EXTERNSHEET_v7 (BiffQuery const *q, MSContainer *container);
MsBiffBofData *ms_biff_bof_data_new (BiffQuery * q);
void ms_biff_bof_data_destroy (MsBiffBofData * data);
MsBiffBofData *ms_biff_bof_data_new (BiffQuery * q);
void ms_biff_bof_data_destroy (MsBiffBofData * data);
char *ms_biff_get_chars (char const *ptr, guint length,
gboolean use_utf16);
StyleColor *excel_palette_get (ExcelPalette const *pal, gint idx);
......
......@@ -333,36 +333,26 @@ ms_read_TXO (BiffQuery *q)
g_return_val_if_fail (1 <= halign && halign <= 4, NULL);
g_return_val_if_fail (1 <= valign && valign <= 4, NULL);
text = g_new (char, text_len + 1);
text [0] = '\0';
if (ms_biff_query_peek_next (q, &peek_op) &&
peek_op == BIFF_CONTINUE) {
guint8 *data;
int i, increment = 1;
if (ms_biff_query_peek_next (q, &peek_op) && peek_op == BIFF_CONTINUE) {
ms_biff_query_next (q);
increment = (GSF_LE_GET_GUINT8 (q->data)) ? 2 : 1;
data = q->data + 1;
/*
* FIXME: Use biff_get_text or something ?
*/
if ((int)q->length < increment * text_len) {
g_free (text);
if ((int)q->length < text_len) {
g_warning ("Broken continue in TXO record");
text = g_strdup ("Broken continue");
} else {
for (i = 0; i < text_len ; ++i)
text [i] = data [i * increment];
text [text_len] = '\0';
}
} else
text = ms_biff_get_chars (q->data + 1, text_len,
*(q->data) != 0);
if (ms_biff_query_peek_next (q, &peek_op) &&
peek_op == BIFF_CONTINUE)
ms_biff_query_next (q);
else
g_warning ("Unusual, TXO text with no formatting has 0x%x @ 0x%x", peek_op, q->streamPos);
} else if (text_len > 0)
g_warning ("TXO len of %d but no continue", text_len);
} else {
if (text_len > 0)
g_warning ("TXO len of %d but no continue", text_len);
text = g_strdup ("");
}
#ifndef NO_DEBUG_EXCEL
if (ms_excel_object_debug > 0) {
......
2003-07-16 Jody Goldberg <jody@gnome.org>
* sample_datasource.c : Improve help text.
2003-06-26 Andreas J. Guelzow <aguelzow@taliesin.ca>
* plugin.xml.in: change category Financial to Finance
......
......@@ -262,10 +262,16 @@ atl_last_unlink (FunctionEvalInfo *ei)
static const char *help_atl_last = {
/* xgettext:no-c-format */
N_("@FUNCTION=atl_last\n"
"@SYNTAX=atl_last(tag)\n"
"@SYNTAX=ATL_LAST (tag)\n"
"@DESCRIPTION="
"ATL_LAST is a sample implemention of a real time data source. "
"It takes a string tag and monitors the named pipe /tmp/atl "
"for changes to the value of that tag.\n"
"\n"
"* This is no intended to be generally enabled and is OFF by default.\n"
"\n"
"@EXAMPLES=\n"
"ATL_LAST(\"IBM\")"
"\n"
"@SEEALSO=")
};
......
......@@ -3103,8 +3103,8 @@ foo_canvas_set_pixels_per_unit (FooCanvas *canvas, double n)
cy = (canvas->layout.vadjustment->value + center_y) / canvas->pixels_per_unit + canvas->scroll_y1 + canvas->zoom_yofs;
/* Now calculate the new offset of the upper left corner. */
x1 = ((cx - canvas->scroll_x1) * n) - center_x;
y1 = ((cy - canvas->scroll_y1) * n) - center_y;
x1 = ((cx - canvas->scroll_x1) * n) - center_x + .5;
y1 = ((cy - canvas->scroll_y1) * n) - center_y + .5;
canvas->pixels_per_unit = n;
......
......@@ -83,8 +83,12 @@ sv_wbv (SheetView const *sv)
static void
sv_init_sc (SheetView const *sv, SheetControl *sc)
{
CellPos initial;
sc_set_zoom_factor (sc);
/* set_panes will change the initial so cache it */
CellPos initial = sv->initial_top_left;
initial = sv->initial_top_left;
sc_set_panes (sc);
/* And this will restore it */
......
......@@ -436,7 +436,8 @@ csv_tsv_probe (GnmFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
return (name != NULL &&
(g_ascii_strcasecmp (name, "csv") == 0 ||
g_ascii_strcasecmp (name, "tsv") == 0));
}
} else if (pl == FILE_PROBE_CONTENT)
return TRUE;
return FALSE;
}
......
......@@ -3222,6 +3222,7 @@ cb_sort_descending (GtkWidget *widget, WorkbookControlGUI *wbcg)
#include <goffice/graph/gog-guru.h>
#include <goffice/graph/gog-data-allocator.h>
#include <goffice/graph/gog-data-set.h>
#include <sheet-object-graph.h>
static void
cb_add_graph (GogGraph *graph, gpointer wbcg)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment