[gnumeric] Paste to LO: Use Biff8.

[Morten Welinder <mortenw src gnome org>]

commit 6c3ef47bd88cf06861b159bec30028a454413d70
Author: Morten Welinder <terra gnome org>
Date:   Wed Apr 18 18:15:19 2018 -0400

    Paste to LO: Use Biff8.
    
    That's better than the old text/html in many, many ways.

 ChangeLog           |    6 ++++++
 NEWS                |    1 +
 src/gui-clipboard.c |   27 +++++++++++++++------------
 3 files changed, 22 insertions(+), 12 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index fe80718..7bd8967 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-04-18  Morten Welinder  <terra gnome org>
+
+       * src/gui-clipboard.c (gnm_x_claim_clipboard): Offer biff8,
+       including LO's weird name for that.  The don't seem to take
+       "Biff8" and they don't seem to take Citrix' variant either.
+
 2018-04-16  Morten Welinder  <terra gnome org>
 
        * src/gui-clipboard.c (gnm_x_claim_clipboard): Plug leak.  Debug
diff --git a/NEWS b/NEWS
index 64b0461..4f994f8 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ Morten:
        * Fix problems with boxed types.
        * Avoid most punting for object properties.
        * Fix paste from LibreOffice.
+       * Fix paste to LibreOffice -- use Biff8.  [#795280]
 
 --------------------------------------------------------------------------
 Gnumeric 1.12.39
diff --git a/src/gui-clipboard.c b/src/gui-clipboard.c
index 90498e5..3561658 100644
--- a/src/gui-clipboard.c
+++ b/src/gui-clipboard.c
@@ -83,6 +83,7 @@ typedef struct {
 /* From MS Excel */
 #define BIFF8_ATOM_NAME        "Biff8"
 #define BIFF8_ATOM_NAME_CITRIX "_CITRIX_Biff8"
+#define BIFF8_ATOM_NAME_OO "application/x-openoffice-biff-8;windows_formatname=\"Biff8\""
 #define BIFF5_ATOM_NAME        "Biff5"
 #define BIFF4_ATOM_NAME        "Biff4"
 #define BIFF3_ATOM_NAME        "Biff3"
@@ -773,7 +774,8 @@ table_cellregion_write (GOCmdContext *ctx, GnmCellRegion *cr,
                        }
                }
        }
-       gsf_output_close (output);
+       if (!gsf_output_is_closed (output))
+               gsf_output_close (output);
        g_object_unref (wb_view);
        g_object_unref (wb);
        g_object_unref (ioc);
@@ -948,14 +950,16 @@ x_clipboard_get_cb (GtkClipboard *gclipboard, GtkSelectionData *selection_data,
                                        target, 8,
                                        buffer, buffer_size);
                g_free (buffer);
-       } else if (target == gdk_atom_intern (OOO11_ATOM_NAME, FALSE)) {
-               const char *saver_id = "Gnumeric_OpenCalc:odf";
+       } else if (target == gdk_atom_intern (BIFF8_ATOM_NAME, FALSE) ||
+                  target == gdk_atom_intern (BIFF8_ATOM_NAME_CITRIX, FALSE) ||
+                  target == gdk_atom_intern (BIFF8_ATOM_NAME_OO, FALSE)) {
+               const char *saver_id = "Gnumeric_Excel:excel_biff8";
                int buffer_size;
                guchar *buffer = table_cellregion_write (ctx, clipboard,
                                                         saver_id,
                                                         &buffer_size);
                if (debug_clipboard ())
-                       g_message ("clipboard ods of %d bytes",
+                       g_message ("clipboard biff8 of %d bytes",
                                    buffer_size);
                gtk_selection_data_set (selection_data,
                                        target, 8,
@@ -1092,7 +1096,7 @@ set_clipman_targets (GdkDisplay *disp, GtkTargetEntry *targets, guint n_targets)
 {
        static GtkTargetEntry clipman_whitelist[] = {
                { (char *) GNUMERIC_ATOM_NAME, 0, GNUMERIC_ATOM_INFO },
-               { (char *) OOO11_ATOM_NAME, 0, 0 },
+               { (char *) BIFF8_ATOM_NAME_OO, 0, 0 },
                { (char *) HTML_ATOM_NAME, 0, 0 },
                { (char *)"UTF8_STRING", 0, 0 },
                { (char *)"application/x-goffice-graph", 0, 0 },
@@ -1143,12 +1147,11 @@ gnm_x_claim_clipboard (GdkDisplay *display)
        GObject *app = gnm_app_get_app ();
 
        static GtkTargetEntry const table_targets[] = {
-               { (char *) GNUMERIC_ATOM_NAME, 0, GNUMERIC_ATOM_INFO },
-#if 1
-               // Doesn't yet work
-               { (char *) OOO11_ATOM_NAME, 0, 0 },
-#endif
-               { (char *) HTML_ATOM_NAME, 0, 0 },
+               { (char *)GNUMERIC_ATOM_NAME, 0, GNUMERIC_ATOM_INFO },
+               { (char *)BIFF8_ATOM_NAME, 0, 0 },
+               { (char *)BIFF8_ATOM_NAME_CITRIX, 0, 0 },
+               { (char *)BIFF8_ATOM_NAME_OO, 0, 0 },
+               { (char *)HTML_ATOM_NAME, 0, 0 },
                { (char *)"UTF8_STRING", 0, 0 },
                { (char *)"COMPOUND_TEXT", 0, 0 },
                { (char *)"STRING", 0, 0 },
@@ -1168,7 +1171,7 @@ gnm_x_claim_clipboard (GdkDisplay *display)
                                imageable = candidate;
                }
                /* Currently, we can't render sheet objects as text or html */
-               // Also cuts ods
+               // Also cuts biff8
                n_targets = 1;
        }
        if (exportable) {