[Libreoffice-commits] core.git: sw/qa sw/source
László Németh (via logerrit)
logerrit at kemper.freedesktop.org
Tue Sep 24 13:42:16 UTC 2019
sw/qa/extras/uiwriter/data2/tdf118311.fodt | 19 +++++++++++++++
sw/qa/extras/uiwriter/uiwriter2.cxx | 35 +++++++++++++++++++++++++++++
sw/source/uibase/dochdl/swdtflvr.cxx | 11 ++++++---
3 files changed, 62 insertions(+), 3 deletions(-)
New commits:
commit 144bdd189d07faef0f71edbd039359665a45876c
Author: László Németh <nemeth at numbertext.org>
AuthorDate: Tue Sep 24 13:25:06 2019 +0200
Commit: László Németh <nemeth at numbertext.org>
CommitDate: Tue Sep 24 15:41:05 2019 +0200
tdf#118311 Writer: cut selected table, not only its text content
like MSO does. For example, if the text cursor in the table, press
Ctrl-A (Select All) twice (or if the cell is empty, once), and
Ctrl-X (Cut) to cut the table.
Note: This speeds up table moving and deletion significantly,
because there were only the following nonintuitive and uncomfortable
methods to cut and insert the table:
1) inserting an empty line before the table, and selecting that, too,
Ctrl-X, Ctrl-V (Paste) and deleting the empty line after table
insertion. Unfortunately, this doesn't work in the case of nested
tables.
2) or selecting only the table, Ctrl-C (Copy), Table->Delete->Table
and Ctrl-V.
Note: It's still possible to cut only the selected text content
using Copy and Delete.
See also https://bz.apache.org/ooo/show_bug.cgi?id=8931
"Deleting a table" from 2002 and https://bz.apache.org/ooo/show_bug.cgi?id=39405
"delete/cut also table, not only contents" from 2004.
Change-Id: Ib439c6337b446d8edc07276ada5405821fbb97cd
Reviewed-on: https://gerrit.libreoffice.org/79455
Reviewed-by: László Németh <nemeth at numbertext.org>
Tested-by: László Németh <nemeth at numbertext.org>
diff --git a/sw/qa/extras/uiwriter/data2/tdf118311.fodt b/sw/qa/extras/uiwriter/data2/tdf118311.fodt
new file mode 100644
index 000000000000..cf1914e51d34
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data2/tdf118311.fodt
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas
is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:
experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
+ <office:body>
+ <office:text>
+ <table:table>
+ <table:table-column table:number-columns-repeated="2"/>
+ <table:table-row>
+ <table:table-cell office:value-type="string">
+ <text:p>a</text:p>
+ </table:table-cell>
+ <table:table-cell office:value-type="string">
+ <text:p>b</text:p>
+ </table:table-cell>
+ </table:table-row>
+ </table:table>
+ <text:p/>
+ </office:text>
+ </office:body>
+</office:document>
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx b/sw/qa/extras/uiwriter/uiwriter2.cxx
index fda0561288c1..fa2a6079c8d4 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -2255,4 +2255,39 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf105330)
pWrtShell->GetVisibleCursor()->GetTextCursor().GetSize().getHeight());
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf118311)
+{
+ load(DATA_DIRECTORY, "tdf118311.fodt");
+
+ SwXTextDocument* pDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get());
+ CPPUNIT_ASSERT(pDoc);
+
+ SwDocShell* pDocShell = pDoc->GetDocShell();
+ CPPUNIT_ASSERT(pDocShell);
+
+ SwWrtShell* pWrtShell = pDocShell->GetWrtShell();
+ CPPUNIT_ASSERT(pWrtShell);
+
+ // Jump to the first cell, selecting its content
+ uno::Sequence<beans::PropertyValue> aSearch(comphelper::InitPropertySequence({
+ { "SearchItem.SearchString", uno::makeAny(OUString("a")) },
+ { "SearchItem.Backward", uno::makeAny(false) },
+ }));
+ lcl_dispatchCommand(mxComponent, ".uno:ExecuteSearch", aSearch);
+
+ // .uno:Cut doesn't remove the table, only the selected content of the first cell
+ lcl_dispatchCommand(mxComponent, ".uno:Cut", {});
+
+ xmlDocPtr pXmlDoc = parseLayoutDump();
+ assertXPath(pXmlDoc, "//page[1]//body/tab");
+
+ // .uno:SelectAll selects the whole table, and UNO command Cut cuts it
+ lcl_dispatchCommand(mxComponent, ".uno:SelectAll", {});
+ lcl_dispatchCommand(mxComponent, ".uno:Cut", {});
+
+ discardDumpedLayout();
+ pXmlDoc = parseLayoutDump();
+ assertXPath(pXmlDoc, "//page[1]//body/tab", 0);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 6e787fc8a323..3d1a27a79ca8 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -856,9 +856,14 @@ void SwTransferable::DeleteSelection()
// ask for type of selection before action-bracketing
const SelectionType nSelection = m_pWrtShell->GetSelectionType();
m_pWrtShell->StartUndo( SwUndoId::START );
- if( ( SelectionType::Text | SelectionType::Table ) & nSelection )
- m_pWrtShell->IntelligentCut( nSelection );
- m_pWrtShell->DelRight();
+ if( ( SelectionType::TableCell & nSelection ) && m_pWrtShell->HasWholeTabSelection() )
+ m_pWrtShell->DeleteTable();
+ else
+ {
+ if( ( SelectionType::Text | SelectionType::Table ) & nSelection )
+ m_pWrtShell->IntelligentCut( nSelection );
+ m_pWrtShell->DelRight();
+ }
m_pWrtShell->EndUndo( SwUndoId::END );
}
More information about the Libreoffice-commits
mailing list