sw/source/uibase/dochdl/swdtflvr.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 458c8ef1fa78ac57cc5593a61c64d6049307d21e
Author: László Németh <nem...@numbertext.org>
AuthorDate: Wed Dec 4 08:50:41 2019 +0100
Commit: László Németh <nem...@numbertext.org>
CommitDate: Thu Dec 5 10:25:56 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
(tdf#116685 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 <nem...@numbertext.org>
(cherry picked from commit 84a6d8b79455291f35211e4bd6aad3c7a0fcc9bc)
Reviewed-on: https://gerrit.libreoffice.org/84398
Tested-by: László Németh <nem...@numbertext.org>
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx
b/sw/source/uibase/dochdl/swdtflvr.cxx
index bcb5f60babe1..b05bfb2f229b 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -1386,11 +1386,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?
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
