mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtktiledviwer: try to paste as html, then as plain text

Browse Source 
Change-Id: I8e1c93fd36fb903c0625b29f9f73825438c9e113
This commit is contained in:
Miklos Vajna
2015-10-26 14:25:26 +01:00
parent faa316e670
commit 080bd44f0b
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/source/lib/lokclipboard.cxx
View File

@@ -43,7 +43,7 @@ throw(datatransfer::UnsupportedFlavorException, io::IOException, uno::RuntimeExc
if (rFlavor.DataType == cppu::UnoType<OUString>::get()) if (rFlavor.DataType == cppu::UnoType<OUString>::get())
{ {
sal_Char* pText = reinterpret_cast<sal_Char*>(m_aSequence.getArray()); sal_Char* pText = reinterpret_cast<sal_Char*>(m_aSequence.getArray());
aRet <<= OUString(pText, rtl_str_getLength(pText), RTL_TEXTENCODING_UTF8); aRet <<= OUString(pText, m_aSequence.getLength(), RTL_TEXTENCODING_UTF8);
} }
else else
aRet <<= m_aSequence; aRet <<= m_aSequence;

28
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
View File

@@ -15,6 +15,7 @@
#include <iostream> #include <iostream>
#include <boost/property_tree/json_parser.hpp> #include <boost/property_tree/json_parser.hpp>
#include <boost/optional.hpp>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#define LOK_USE_UNSTABLE_API #define LOK_USE_UNSTABLE_API
@@ -288,6 +289,33 @@ static void doPaste(GtkWidget* pButton, gpointer /*pItem*/)
LibreOfficeKitDocument* pDocument = lok_doc_view_get_document(pLOKDocView); LibreOfficeKitDocument* pDocument = lok_doc_view_get_document(pLOKDocView);
GtkClipboard* pClipboard = gtk_clipboard_get_for_display(gtk_widget_get_display(rWindow.m_pDocView), GDK_SELECTION_CLIPBOARD); GtkClipboard* pClipboard = gtk_clipboard_get_for_display(gtk_widget_get_display(rWindow.m_pDocView), GDK_SELECTION_CLIPBOARD);
GdkAtom* pTargets;
gint nTargets;
boost::optional<GdkAtom> oTarget;
if (gtk_clipboard_wait_for_targets(pClipboard, &pTargets, &nTargets))
{
for (gint i = 0; i < nTargets; ++i)
{
gchar* pName = gdk_atom_name(pTargets[i]);
if (std::string(pName) == "text/html")
oTarget = pTargets[i];
g_free(pName);
}
g_free(pTargets);
}
if (oTarget)
{
GtkSelectionData* pSelectionData = gtk_clipboard_wait_for_contents(pClipboard, *oTarget);
gint nLength;
const guchar* pData = gtk_selection_data_get_data_with_length(pSelectionData, &nLength);
bool bSuccess = pDocument->pClass->paste(pDocument, "text/html", reinterpret_cast<const char*>(pData), nLength);
gtk_selection_data_free(pSelectionData);
if (bSuccess)
return;
}
gchar* pText = gtk_clipboard_wait_for_text(pClipboard); gchar* pText = gtk_clipboard_wait_for_text(pClipboard);
if (pText) if (pText)
pDocument->pClass->paste(pDocument, "text/plain;charset=utf-8", pText, strlen(pText)); pDocument->pClass->paste(pDocument, "text/plain;charset=utf-8", pText, strlen(pText));