diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-05-02 12:13:41 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2017-05-04 12:48:34 +0200 |
commit | 6a8cb8e60b74fea993bf81465552043cbd6ee2f7 (patch) | |
tree | eda6de437d1b4fad56c1a6c0f67b6570cc8c8ab0 /vcl | |
parent | 59c6acd1f8df1ddf00a35de2332d03bc6904d409 (diff) |
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@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit a090322721222c98f7ccd194eac84e5a76579f8e)
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
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) |