diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-19 18:13:27 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-02-07 21:25:29 -0500 |
| commit | 1742d97dae5a0e07d58c7be1d28c0f978c634796 (patch) | |
| tree | 7c39d790d0b9360835417370b984c3be26d8fa5b | |
| parent | fde8d985dffd30e08a98db5dc10140ff5e19de08 (diff) | |
LOK: return used format in Document::getTextSelection()
This allows requesting text/html, with falling back to plain text if
necessary.
Reviewed-on: https://gerrit.libreoffice.org/16377
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit af7cbebd8eed82b81e00e6c2e0dc6c2c467ad8e2)
Change-Id: Ie6d4e0e173311ba018553043b6a869abf193bf6f
| -rw-r--r-- | libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx index 8ba17f09cbe1..3c4217bcd31f 100644 --- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx @@ -130,12 +130,14 @@ static void doCopy(GtkWidget* /*pButton*/, gpointer /*pItem*/) { LOKDocView* pLOKDocView = LOK_DOC_VIEW(pDocView); LibreOfficeKitDocument* pDocument = lok_doc_view_get_document(pLOKDocView); - char* pSelection = pDocument->pClass->getTextSelection(pDocument, "text/plain;charset=utf-8"); + char* pUsedFormat = 0; + char* pSelection = pDocument->pClass->getTextSelection(pDocument, "text/plain;charset=utf-8", &pUsedFormat); GtkClipboard* pClipboard = gtk_clipboard_get_for_display(gtk_widget_get_display(pDocView), GDK_SELECTION_CLIPBOARD); gtk_clipboard_set_text(pClipboard, pSelection, -1); free(pSelection); + free(pUsedFormat); } /// Get the visible area of the scrolled window |