[gnumeric] xls: don't export empty textboxes.
- From: Morten Welinder <mortenw src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnumeric] xls: don't export empty textboxes.
- Date: Wed, 7 Oct 2009 14:36:12 +0000 (UTC)
commit 6425619cad7bf02417da4a700edfdfdffe05c693
Author: Morten Welinder <terra gnome org>
Date: Wed Oct 7 10:35:56 2009 -0400
xls: don't export empty textboxes.
plugins/excel/ms-excel-write.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/plugins/excel/ms-excel-write.c b/plugins/excel/ms-excel-write.c
index 3555ea3..4638ef0 100644
--- a/plugins/excel/ms-excel-write.c
+++ b/plugins/excel/ms-excel-write.c
@@ -4182,7 +4182,7 @@ excel_write_image_v8 (ExcelWriteSheet *esheet, BlipInf *bi)
static gsize
excel_write_ClientTextbox (ExcelWriteState *ewb, SheetObject *so)
{
- guint8 buf [18];
+ guint8 buf[18];
int txo_len = 18;
int draw_len = 0;
int char_len;
@@ -4206,6 +4206,10 @@ excel_write_ClientTextbox (ExcelWriteState *ewb, SheetObject *so)
g_warning ("Not sure why label is NULL here for %s at %p.",
g_type_name (G_OBJECT_TYPE (so)), so);
label = g_strdup ("?");
+ } else if (label[0] == 0) {
+ g_free (label);
+ /* XL gets very unhappy with empty strings. */
+ label = g_strdup (" ");
}
char_len = excel_strlen (label, NULL);
GSF_LE_SET_GUINT16 (buf + 10, char_len);
@@ -4295,14 +4299,14 @@ excel_write_textbox_v8 (ExcelWriteSheet *esheet, SheetObject *so)
anchor = *real_anchor;
type = 6;
flags = 0x6011; /* autofilled */
-
+
g_object_get (so,
"is-oval", &is_oval,
"text", &label,
"name", &name,
"style", &style,
NULL);
- do_textbox = (label != NULL);
+ do_textbox = (label != NULL && label[0] != 0);
if (is_oval) {
shape = 3;
type = 3;
@@ -4378,7 +4382,7 @@ excel_write_textbox_v8 (ExcelWriteSheet *esheet, SheetObject *so)
ms_biff_put_commit (bp);
- if (1 || do_textbox) {
+ if (do_textbox) {
gsize this_len = excel_write_ClientTextbox (ewb, so);
draw_len += this_len;
splen += this_len;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]