[gnumeric] Paste Special: allow from clipboard too, not just in-process.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Paste Special: allow from clipboard too, not just in-process.
- Date: Fri, 20 Apr 2018 18:31:39 +0000 (UTC)
commit ea83a565f3217d0c77cc92ef806426b8e09fb91c
Author: Morten Welinder <terra gnome org>
Date: Fri Apr 20 14:31:05 2018 -0400
Paste Special: allow from clipboard too, not just in-process.
NEWS | 1 +
src/clipboard.c | 2 +-
src/wbc-gtk.c | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index 4f994f8..5a7ea24 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ Morten:
* Avoid most punting for object properties.
* Fix paste from LibreOffice.
* Fix paste to LibreOffice -- use Biff8. [#795280]
+ * Allow inter-process paste-special. [#346630]
--------------------------------------------------------------------------
Gnumeric 1.12.39
diff --git a/src/clipboard.c b/src/clipboard.c
index ad99426..5753541 100644
--- a/src/clipboard.c
+++ b/src/clipboard.c
@@ -290,7 +290,7 @@ paste_cell (int target_col, int target_row,
value_dup (src->val), TRUE);
if (NULL != relo)
gnm_expr_top_unref (relo);
- } else {
+ } else if (src->val) {
GnmValue *newval = NULL;
GnmValue const *oldval = src->val;
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index fac5ebc..f6c9467 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -1532,7 +1532,7 @@ wbcg_menu_state_update (WorkbookControl *wbc, int flags)
}
if (MS_PASTE_SPECIAL & flags)
wbc_gtk_set_action_sensitivity (wbcg, "EditPasteSpecial",
- !gnm_app_clipboard_is_empty () &&
+ // Inter-process paste special is now allowed
!gnm_app_clipboard_is_cut () &&
!edit_object);
if (MS_PRINT_SETUP & flags)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]