[gnumeric] Fix clipboard related crash. [#702868]
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Fix clipboard related crash. [#702868]
- Date: Mon, 24 Jun 2013 01:23:43 +0000 (UTC)
commit 1d3d720ce913592d783c2d839921116b6f7b6923
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date: Sun Jun 23 19:23:10 2013 -0600
Fix clipboard related crash. [#702868]
2013-06-23 Andreas J. Guelzow <aguelzow pyrshep ca>
* src/gui-clipboard.c (x_clipboard_get_cb): take care of the case
without sheet
ChangeLog | 5 +++++
NEWS | 4 +++-
src/gui-clipboard.c | 5 +++--
3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c019fc5..46db596 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-23 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+ * src/gui-clipboard.c (x_clipboard_get_cb): take care of the case
+ without sheet
+
2013-06-22 Jean Brefort <jean brefort normalesup org>
* src/mstyle.c (gnm_style_set_pattern): don't accept GNM_SHEET_PATTERNS as
diff --git a/NEWS b/NEWS
index 1ebe788..fc6199e 100644
--- a/NEWS
+++ b/NEWS
@@ -29,9 +29,11 @@ Andreas:
* Some documentation improvements. [Debian #621735] [Debian #530462]
* Fix crash on xlsx import due to external references. [#702407]
* Fix reading of conditional formats from xls files. [#702612]
- * Fix reading of solid fill conditional formats from xlsx files. [#702615]
+ * Fix reading of solid fill conditional formats from xlsx files.
+ [#702615]
* Improve xlsx import of new stat function names.
* Fix export of FLOOR(x) to xlsx. [Debian #464732]
+ * Fix clipboard related crash. [#702868]
Darrell Tangman:
* Update documentation for Edit and Insert menus. [#700596]
diff --git a/src/gui-clipboard.c b/src/gui-clipboard.c
index 36ad9e6..556877d 100644
--- a/src/gui-clipboard.c
+++ b/src/gui-clipboard.c
@@ -921,7 +921,7 @@ x_clipboard_get_cb (GtkClipboard *gclipboard, GtkSelectionData *selection_data,
/* We implicitly registered this when calling
* gtk_clipboard_set_can_store. We're supposed to
* ignore it. */
- } else {
+ } else if (clipboard->origin_sheet) {
Workbook *wb = clipboard->origin_sheet->workbook;
GString *res = cellregion_to_string (clipboard,
TRUE, workbook_date_conv (wb));
@@ -937,7 +937,8 @@ x_clipboard_get_cb (GtkClipboard *gclipboard, GtkSelectionData *selection_data,
g_message ("clipboard empty text");
gtk_selection_data_set_text (selection_data, "", 0);
}
- }
+ } else
+ gtk_selection_data_set_text (selection_data, "", 0);
/*
* If this was a CUT operation we need to clear the content that
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]