diff options
| -rw-r--r-- | sw/qa/uitest/table/sheetToTable.py | 107 | ||||
| -rw-r--r-- | sw/qa/uitest/writer_tests/data/hiddenRow.ods | bin | 0 -> 7473 bytes | |||
| -rw-r--r-- | sw/qa/uitest/writer_tests/data/tdf129083.odt | bin | 0 -> 8581 bytes | |||
| -rw-r--r-- | sw/source/uibase/dochdl/swdtflvr.cxx | 15 |
4 files changed, 119 insertions, 3 deletions
diff --git a/sw/qa/uitest/table/sheetToTable.py b/sw/qa/uitest/table/sheetToTable.py new file mode 100644 index 000000000000..d14529d4af9e --- /dev/null +++ b/sw/qa/uitest/table/sheetToTable.py @@ -0,0 +1,107 @@ +# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*- +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +from uitest.framework import UITestCase +from uitest.uihelper.common import get_state_as_dict +from uitest.uihelper.common import select_pos +from libreoffice.uno.propertyvalue import mkPropertyValues +from uitest.uihelper.common import get_state_as_dict, type_text +from uitest.uihelper.calc import enter_text_to_cell +import org.libreoffice.unotest +import pathlib + +def get_url_for_data_file(file_name): + return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri() + +#Calc sheet to Writer table + +class sheetToTable(UITestCase): + def test_sheet_to_table_without_hidden_rows(self): + calc_doc = self.ui_test.load_file(get_url_for_data_file("hiddenRow.ods")) + xCalcDoc = self.xUITest.getTopFocusWindow() + self.xUITest.executeCommand(".uno:SelectAll") + self.xUITest.executeCommand(".uno:Copy") + gridwin = xCalcDoc.getChild("grid_window") + document = self.ui_test.get_component() + self.ui_test.close_doc() + writer_doc = self.ui_test.load_file(get_url_for_data_file("tableToText.odt")) + document = self.ui_test.get_component() + xWriterDoc = self.xUITest.getTopFocusWindow() + self.xUITest.executeCommand(".uno:Paste") + #verify (don't copy hidden cells) + self.assertEqual(document.TextTables.getCount(), 1) + table = document.getTextTables()[0] + # This was 3 (copied hidden row) + self.assertEqual(len(table.getRows()), 2) + self.assertEqual(table.getCellByName("A1").getString(), "1") + # This was "2 (hidden)" (copied hidden row) + self.assertEqual(table.getCellByName("A2").getString(), "3") + self.ui_test.close_doc() + + def test_tdf138688(self): + calc_doc = self.ui_test.load_file(get_url_for_data_file("hiddenRow.ods")) + xCalcDoc = self.xUITest.getTopFocusWindow() + self.xUITest.executeCommand(".uno:SelectAll") + self.xUITest.executeCommand(".uno:Copy") + gridwin = xCalcDoc.getChild("grid_window") + document = self.ui_test.get_component() + self.ui_test.close_doc() + writer_doc = self.ui_test.load_file(get_url_for_data_file("tableToText.odt")) + document = self.ui_test.get_component() + xWriterDoc = self.xUITest.getTopFocusWindow() + + # set numbering in the paragraph after the table + self.xUITest.executeCommand(".uno:GoDown") + self.xUITest.executeCommand(".uno:GoDown") + self.xUITest.executeCommand(".uno:DefaultNumbering") + self.xUITest.executeCommand(".uno:GoUp") + self.xUITest.executeCommand(".uno:GoUp") + + #verify (this was a freezing/crash) + self.xUITest.executeCommand(".uno:Paste") + + #verify also tdf#124646 (don't copy hidden cells) + self.assertEqual(document.TextTables.getCount(), 1) + table = document.getTextTables()[0] + # This was 3 (copied hidden row) + self.assertEqual(len(table.getRows()), 2) + self.assertEqual(table.getCellByName("A1").getString(), "1") + # This was "2 (hidden)" (copied hidden row) + self.assertEqual(table.getCellByName("A2").getString(), "3") + self.ui_test.close_doc() + + def test_tdf129083(self): + calc_doc = self.ui_test.create_doc_in_start_center("calc") + + xCalcDoc = self.xUITest.getTopFocusWindow() + gridwin = xCalcDoc.getChild("grid_window") + document = self.ui_test.get_component() + + enter_text_to_cell(gridwin, "A1", "Test 1") + enter_text_to_cell(gridwin, "A2", "Test 2") + enter_text_to_cell(gridwin, "A3", "Test 3") + enter_text_to_cell(gridwin, "A4", "Test 4") + + gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A4"})) + + self.xUITest.executeCommand(".uno:Copy") + + self.ui_test.close_doc() + + writer_doc = self.ui_test.load_file(get_url_for_data_file("tdf129083.odt")) + document = self.ui_test.get_component() + xWriterDoc = self.xUITest.getTopFocusWindow() + + self.xUITest.executeCommand(".uno:Paste") + + self.assertEqual(document.TextTables.getCount(), 1) + table = document.getTextTables()[0] + self.assertEqual(len(table.getRows()), 4) + self.assertEqual(table.getCellByName("A1").getString(), "Test 1") + self.assertEqual(table.getCellByName("A2").getString(), "Test 2") + self.assertEqual(table.getCellByName("A3").getString(), "Test 3") + self.assertEqual(table.getCellByName("A4").getString(), "Test 4") + self.ui_test.close_doc() diff --git a/sw/qa/uitest/writer_tests/data/hiddenRow.ods b/sw/qa/uitest/writer_tests/data/hiddenRow.ods Binary files differnew file mode 100644 index 000000000000..8b5d98a182fb --- /dev/null +++ b/sw/qa/uitest/writer_tests/data/hiddenRow.ods diff --git a/sw/qa/uitest/writer_tests/data/tdf129083.odt b/sw/qa/uitest/writer_tests/data/tdf129083.odt Binary files differnew file mode 100644 index 000000000000..3de65273e8a1 --- /dev/null +++ b/sw/qa/uitest/writer_tests/data/tdf129083.odt diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 27ac5dbbef58..6c07f242f6a5 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -1464,11 +1464,20 @@ bool SwTransferable::Paste(SwWrtShell& rSh, TransferableDataHelper& rData, RndSt if ( SwTransferable::PasteData( rData, rSh, EXCHG_OUT_ACTION_INSERT_STRING, nActionFlags, SotClipboardFormatId::HTML, nDestination, false, false, nullptr, 0, false, nAnchorType, bIgnoreComments, &aPasteContext, ePasteTable) ) { - pDispatch->Execute(FN_CHAR_LEFT, SfxCallMode::SYNCHRON); - pDispatch->Execute(FN_TABLE_SELECT_ALL, SfxCallMode::SYNCHRON); - pDispatch->Execute(SID_COPY, SfxCallMode::SYNCHRON); + bool bFoundTemporaryTable = false; + pDispatch->Execute(FN_LINE_UP, SfxCallMode::SYNCHRON); + if (rSh.GetDoc()->IsIdxInTable(rSh.GetCursor()->GetNode()) != nullptr) + { + bFoundTemporaryTable = true; + 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); + // clipboard content hasn't changed (limit potential infinite + // recursion with the same non-native table, as was in tdf#138688) + if (!bFoundTemporaryTable) + return false; if (ePasteTable == PasteTableType::PASTE_TABLE) pDispatch->Execute(FN_PASTE_NESTED_TABLE, SfxCallMode::SYNCHRON); else if (ePasteTable == PasteTableType::PASTE_ROW) |