[Libreoffice-commits] core.git: sw/source

[László Németh (via logerrit)]

 sw/source/uibase/dochdl/swdtflvr.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 84a6d8b79455291f35211e4bd6aad3c7a0fcc9bc
Author:     László Németh <nemeth at numbertext.org>
AuthorDate: Wed Dec 4 08:50:41 2019 +0100
Commit:     László Németh <nemeth at numbertext.org>
CommitDate: Wed Dec 4 12:22:26 2019 +0100

    tdf#129083 Writer: fix native paste from Calc
    
    Paste the copied Calc worksheet cell by cell in a
    Writer table again instead of inserting it
    as a nested table in the actual cell.
    
    Regression from commit e9e6d4b058e13165f3dde1ca7822eec97dfe8aa7
    (Make the RICHTEXT take precedence over EMBED_SOURCE).
    
    Change-Id: I226c35f9f5ca3955b2ef498d1d0aeedfcec61987
    Reviewed-on: https://gerrit.libreoffice.org/84389
    Tested-by: Jenkins
    Reviewed-by: László Németh <nemeth at numbertext.org>

diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 51cc3ffdbaeb..ffdbd98b4538 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -1394,11 +1394,11 @@ bool SwTransferable::Paste(SwWrtShell& rSh, TransferableDataHelper& rData, RndSt
                                     &nActionFlags );
     }
 
-    // tdf#37223 avoid OLE insertion of worksheets in the following cases:
+    // tdf#37223 avoid non-native insertion of Calc worksheets in the following cases:
     // content of 1-cell worksheets are inserted as simple text using RTF format,
     // bigger worksheets within native (Writer) table cells are inserted as native tables,
     // ie. cell by cell instead of embedding the worksheet in a single cell of the Writer table
-    if ( EXCHG_OUT_ACTION_INSERT_OLE == nAction && ( rData.HasFormat( SotClipboardFormatId::SYLK ) ||
+    if ( EXCHG_IN_ACTION_COPY == nAction && ( rData.HasFormat( SotClipboardFormatId::SYLK ) ||
                   rData.HasFormat( SotClipboardFormatId::SYLK_BIGCAPS ) ) )
     {
         // is it a 1-cell worksheet?