From: Juergen Spitzmueller <spitz@lyx.org>
Date: Mon, 22 Apr 2019 09:10:07 +0000 (+0200)
Subject: Amend cf1c506d644
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~2117
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=302796ade168b275f61a150b804a43986d45d779;p=lyx.git

Amend cf1c506d644

Get direct copying fro LibreOffice working
---

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index a0bfec8882..5122e8fab7 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -4984,11 +4984,10 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 		if (!tabularStackDirty()) {
 			// Check if we have plain text or HTML with rows/columns.
 			// and if so, pass over to LFUN_CLIPBOARD_PASTE
-			if (!theClipboard().hasGraphicsContents()
-			    && theClipboard().hasTextContents(Clipboard::AnyTextType)
+			if (theClipboard().hasTextContents(Clipboard::AnyTextType)
 			    && !theClipboard().hasTextContents(Clipboard::LyXTextType)) {
 				docstring const clip =
-					theClipboard().getAsText(Clipboard::PlainTextType);
+					theClipboard().getAsText(Clipboard::AnyTextType);
 				if (clip.find_first_of(from_ascii("\t\n")) != docstring::npos) {
 					FuncRequest ncmd = FuncRequest(LFUN_CLIPBOARD_PASTE, cmd.argument());
 					doDispatch(cur, ncmd);