[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp/lib/gtksheet gtksheet.c
From: |
John Darrington |
Subject: |
[Pspp-cvs] pspp/lib/gtksheet gtksheet.c |
Date: |
Sat, 03 May 2008 01:22:20 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 08/05/03 01:22:20
Modified files:
lib/gtksheet : gtksheet.c
Log message:
Don't append cell contents when there is none.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/gtksheet.c?cvsroot=pspp&r1=1.45&r2=1.46
Patches:
Index: gtksheet.c
===================================================================
RCS file: /sources/pspp/pspp/lib/gtksheet/gtksheet.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- gtksheet.c 25 Mar 2008 09:19:30 -0000 1.45
+++ gtksheet.c 3 May 2008 01:22:19 -0000 1.46
@@ -7849,10 +7849,21 @@
}
+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)
{
- gchar *celltext = NULL;
gint r, c;
GString *string;
@@ -7865,16 +7876,12 @@
{
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_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");
- g_free (celltext);
}
return string;
@@ -7883,7 +7890,6 @@
static GString *
range_to_html (const GtkSheet *sheet)
{
- gchar *celltext = NULL;
gint r, c;
GString *string;
@@ -7901,10 +7907,8 @@
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_free (celltext);
}
g_string_append (string, "</tr>\n");
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp/lib/gtksheet gtksheet.c,
John Darrington <=