[Libreoffice-commits] core.git: sw/source
László Németh (via logerrit)
logerrit at kemper.freedesktop.org
Wed Apr 10 15:15:10 UTC 2019
sw/source/uibase/dochdl/swdtflvr.cxx | 69 ++++++++++++++++++++---------------
1 file changed, 40 insertions(+), 29 deletions(-)
New commits:
commit 0c3ac02d8a3c7ea50ae262daf134c28df5c8b343
Author: László Németh <nemeth at numbertext.org>
AuthorDate: Sat Apr 6 09:27:35 2019 +0200
Commit: László Németh <nemeth at numbertext.org>
CommitDate: Wed Apr 10 17:14:45 2019 +0200
tdf#124646 Don't paste hidden rows of Calc sheets into Writer tables
The fix for tdf#37223 creates native text tables
from the RTF clipboard data to insert them cell
by cell in Writer tables instead of OLE embedding.
Unfortunately, using Calc RTF clipboard data inserts
also the cells of the hidden rows (tdf#118676).
This improvement uses the HTML clipboard data
to paste only the visible rows.
Note: first the original patch 1) converted the clipboard
data to a temporary nested text table at the cursor position,
and 2) copied its already native table content to the
clipboard, and inserts it into the original target table.
This doesn't work with the HTML format (that inserts plain
text data within a text table cell instead of a nested
table). As a workaround, the patch removes the target text
table with the insertion point temporarily, creating the
native text table from the HTML clipboard data at the place
of the removed text table. After copying the converted
native text table data to the clipboard, the removed
table is restored, and the native clipboard data is inserted
at the original cursor position.
Change-Id: Iee5bb4027729ca1eab373029f176eeadc59388a8
Reviewed-on: https://gerrit.libreoffice.org/70425
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 ab949d3635be..1526dedf44e7 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -1280,12 +1280,14 @@ bool SwTransferable::Paste(SwWrtShell& rSh, TransferableDataHelper& rData, RndSt
&nActionFlags );
}
- bool bInsertOleTable = ( EXCHG_OUT_ACTION_INSERT_OLE == nAction && ( rData.HasFormat( SotClipboardFormatId::SYLK ) ||
- rData.HasFormat( SotClipboardFormatId::SYLK_BIGCAPS ) ) );
-
- // content of 1-cell tables is inserted as simple text
- if (bInsertOleTable)
+ // tdf#37223 avoid OLE insertion of 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 ) ||
+ rData.HasFormat( SotClipboardFormatId::SYLK_BIGCAPS ) ) )
{
+ // is it a 1-cell worksheet?
OUString aExpand;
if( rData.GetString( SotClipboardFormatId::STRING, aExpand ))
{
@@ -1298,13 +1300,42 @@ bool SwTransferable::Paste(SwWrtShell& rSh, TransferableDataHelper& rData, RndSt
bSingleCellTable = true;
}
}
- }
- bool bInsertOleTableInTable = (bInsertOleTable && !bSingleCellTable &&
- (rSh.GetDoc()->IsIdxInTable(rSh.GetCursor()->GetNode()) != nullptr));
+ // convert the worksheet to a temporary native table using HTML format, and copy that into the original native table
+ if (!bSingleCellTable && rData.HasFormat( SotClipboardFormatId::HTML ) &&
+ rSh.GetDoc()->IsIdxInTable(rSh.GetCursor()->GetNode()) != nullptr && rSh.DoesUndo())
+ {
+ SfxDispatcher* pDispatch = rSh.GetView().GetViewFrame()->GetDispatcher();
+ sal_uInt32 nLevel = 0;
+ // within Writer table cells, inserting worksheets using HTML format results only plain text, not a native table,
+ // so remove all outer nested tables temporary to get a working insertion point
+ // (RTF format has no such problem, but that inserts the hidden rows of the original Calc worksheet, too)
+ do
+ {
+ // insert a random character to redo the place of the insertion at the end
+ pDispatch->Execute(FN_INSERT_NNBSP, SfxCallMode::SYNCHRON);
+ pDispatch->Execute(FN_TABLE_DELETE_TABLE, SfxCallMode::SYNCHRON);
+ nLevel++;
+ } while (rSh.GetDoc()->IsIdxInTable(rSh.GetCursor()->GetNode()) != nullptr);
+ if ( SwTransferable::PasteData( rData, rSh, EXCHG_OUT_ACTION_INSERT_STRING, nActionFlags, SotClipboardFormatId::HTML,
+ nDestination, false, false, nullptr, 0, false, nAnchorType, &aPasteContext ))
+ {
+ pDispatch->Execute(FN_CHAR_LEFT, SfxCallMode::SYNCHRON);
+ pDispatch->Execute(FN_TABLE_SELECT_ALL, SfxCallMode::SYNCHRON);
+ pDispatch->Execute(SID_COPY, SfxCallMode::SYNCHRON);
+ for(sal_uInt32 a = 0; a < 1 + (nLevel * 2); a++)
+ pDispatch->Execute(SID_UNDO, SfxCallMode::SYNCHRON);
+ pDispatch->Execute(SID_PASTE, SfxCallMode::SYNCHRON);
+ return true;
+ } else {
+ for(sal_uInt32 a = 0; a < (nLevel * 2); a++)
+ pDispatch->Execute(SID_UNDO, SfxCallMode::SYNCHRON);
+ }
+ }
+ }
// special case for tables from draw application or 1-cell tables
- if( EXCHG_OUT_ACTION_INSERT_DRAWOBJ == nAction || bSingleCellTable || bInsertOleTableInTable )
+ if( EXCHG_OUT_ACTION_INSERT_DRAWOBJ == nAction || bSingleCellTable )
{
if( rData.HasFormat( SotClipboardFormatId::RTF ) )
{
@@ -1318,26 +1349,6 @@ bool SwTransferable::Paste(SwWrtShell& rSh, TransferableDataHelper& rData, RndSt
}
}
- // tdf#37223 insert OLE table in text tables as a native text table
- // (first as an RTF nested table, and cut and paste that to get a
- // native table insertion, removing also the temporary nested table)
- // TODO set a working view lock to avoid of showing the temporary nested table for a moment
- if (bInsertOleTableInTable && EXCHG_OUT_ACTION_INSERT_STRING == nAction)
- {
- bool bPasted = SwTransferable::PasteData( rData, rSh, nAction, nActionFlags, nFormat,
- nDestination, false, false, nullptr, 0, false, nAnchorType, &aPasteContext );
- if (bPasted && rSh.DoesUndo())
- {
- SfxDispatcher* pDispatch = rSh.GetView().GetViewFrame()->GetDispatcher();
- pDispatch->Execute(FN_PREV_TABLE, SfxCallMode::SYNCHRON);
- pDispatch->Execute(FN_TABLE_SELECT_ALL, SfxCallMode::SYNCHRON);
- pDispatch->Execute(SID_COPY, SfxCallMode::SYNCHRON);
- pDispatch->Execute(SID_UNDO, SfxCallMode::SYNCHRON);
- pDispatch->Execute(SID_PASTE, SfxCallMode::SYNCHRON);
- }
- return bPasted;
- }
-
return EXCHG_INOUT_ACTION_NONE != nAction &&
SwTransferable::PasteData( rData, rSh, nAction, nActionFlags, nFormat,
nDestination, false, false, nullptr, 0, false, nAnchorType, &aPasteContext );
More information about the Libreoffice-commits
mailing list