]> git.lyx.org Git - lyx.git/commitdiff
Amend cf1c506d644
authorJuergen Spitzmueller <spitz@lyx.org>
Mon, 22 Apr 2019 09:10:07 +0000 (11:10 +0200)
committerJuergen Spitzmueller <spitz@lyx.org>
Mon, 22 Apr 2019 09:10:07 +0000 (11:10 +0200)
Get direct copying fro LibreOffice working

src/insets/InsetTabular.cpp

index a0bfec8882a1efa081e7f90f5208b9521acfe8ed..5122e8fab757519edeb2d71db6165f7fa0e87ef9 100644 (file)
@@ -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);