projects
/
pspp-builds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
19f2fd9
)
Don't append cell contents when there is none.
author
John Darrington
<john@darrington.wattle.id.au>
Sat, 3 May 2008 01:22:19 +0000
(
01:22
+0000)
committer
John Darrington
<john@darrington.wattle.id.au>
Sat, 3 May 2008 01:22:19 +0000
(
01:22
+0000)
lib/gtksheet/gtksheet.c
patch
|
blob
|
history
diff --git
a/lib/gtksheet/gtksheet.c
b/lib/gtksheet/gtksheet.c
index d2db58009a7432dbcfe70f03467489949e285b5a..eba0ea4002474f060bbd49f2c9799c0bb154792c 100644
(file)
--- a/
lib/gtksheet/gtksheet.c
+++ b/
lib/gtksheet/gtksheet.c
@@
-7849,10
+7849,21
@@
gtk_sheet_button_free (GtkSheetButton *button)
}
}
+static void
+append_cell_text (GString *string, const GtkSheet *sheet, gint r, gint c)
+{
+ gchar *celltext = gtk_sheet_cell_get_text (sheet, r, c);
+
+ if ( NULL == celltext)
+ return;
+
+ g_string_append (string, celltext);
+ g_free (celltext);
+}
+
static GString *
range_to_text (const GtkSheet *sheet)
{
static GString *
range_to_text (const GtkSheet *sheet)
{
- gchar *celltext = NULL;
gint r, c;
GString *string;
gint r, c;
GString *string;
@@
-7865,16
+7876,12
@@
range_to_text (const GtkSheet *sheet)
{
for (c = sheet->range.col0; c < sheet->range.coli; ++c)
{
{
for (c = sheet->range.col0; c < sheet->range.coli; ++c)
{
- celltext = gtk_sheet_cell_get_text (sheet, r, c);
- g_string_append (string, celltext);
+ append_cell_text (string, sheet, r, c);
g_string_append (string, "\t");
g_string_append (string, "\t");
- g_free (celltext);
}
}
- celltext = gtk_sheet_cell_get_text (sheet, r, c);
- g_string_append (string, celltext);
+ append_cell_text (string, sheet, r, c);
if ( r < sheet->range.rowi)
g_string_append (string, "\n");
if ( r < sheet->range.rowi)
g_string_append (string, "\n");
- g_free (celltext);
}
return string;
}
return string;
@@
-7883,7
+7890,6
@@
range_to_text (const GtkSheet *sheet)
static GString *
range_to_html (const GtkSheet *sheet)
{
static GString *
range_to_html (const GtkSheet *sheet)
{
- gchar *celltext = NULL;
gint r, c;
GString *string;
gint r, c;
GString *string;
@@
-7901,10
+7907,8
@@
range_to_html (const GtkSheet *sheet)
for (c = sheet->range.col0; c <= sheet->range.coli; ++c)
{
g_string_append (string, "<td>");
for (c = sheet->range.col0; c <= sheet->range.coli; ++c)
{
g_string_append (string, "<td>");
- celltext = gtk_sheet_cell_get_text (sheet, r, c);
- g_string_append (string, celltext);
+ append_cell_text (string, sheet, r, c);
g_string_append (string, "</td>\n");
g_string_append (string, "</td>\n");
- g_free (celltext);
}
g_string_append (string, "</tr>\n");
}
}
g_string_append (string, "</tr>\n");
}