[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/unx

[Caolán McNamara]

 vcl/unx/gtk3/gtk3gtkinst.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit a090322721222c98f7ccd194eac84e5a76579f8e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 2 12:13:41 2017 +0100

    Resolves: tdf#99467 pasting text from java apps to gtk3 gives bad results
    
    Change-Id: Ib2625c900def20baa470f0a15e4f72a3f763099e
    (cherry picked from commit c881756fcfdc1fa63ff534bf4538d551b2139515)
    Reviewed-on: https://gerrit.libreoffice.org/37147
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 7148882c1796..9190ee63ca13 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -103,6 +103,10 @@ std::vector<css::datatransfer::DataFlavor> GtkTransferable::getTransferDataFlavo
         const char* pFinalName = pName;
         css::datatransfer::DataFlavor aFlavor;
 
+        // omit text/plain;charset=unicode since it is not well defined
+        if (rtl_str_compare(pName, "text/plain;charset=unicode") == 0)
+            continue;
+
         for (size_t j = 0; j < SAL_N_ELEMENTS(aConversionTab); ++j)
         {
             if (rtl_str_compare(pName, aConversionTab[j].pNativeType) == 0)