1 files changed, 55 insertions, 62 deletions
diff --git a/sw/qa/uitest/table/sheetToTable.py b/sw/qa/uitest/table/sheetToTable.py
index 7beff37c6c8d..4f48eeb644db 100644
--- a/sw/qa/uitest/table/sheetToTable.py
+++ b/sw/qa/uitest/table/sheetToTable.py
@@ -13,58 +13,52 @@ from uitest.uihelper.calc import enter_text_to_cell
 
 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()
+        with self.ui_test.load_file(get_url_for_data_file("hiddenRow.ods")) as calc_doc:
+            xCalcDoc = self.xUITest.getTopFocusWindow()
+            self.xUITest.executeCommand(".uno:SelectAll")
+            self.xUITest.executeCommand(".uno:Copy")
+
+        with self.ui_test.load_file(get_url_for_data_file("tableToText.odt")) as writer_doc:
+            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")
 
     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()
+        with self.ui_test.load_file(get_url_for_data_file("hiddenRow.ods")) as calc_doc:
+            xCalcDoc = self.xUITest.getTopFocusWindow()
+            self.xUITest.executeCommand(".uno:SelectAll")
+            self.xUITest.executeCommand(".uno:Copy")
+
+        with self.ui_test.load_file(get_url_for_data_file("tableToText.odt")) as writer_doc:
+            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")
 
     def test_tdf129083(self):
         calc_doc = self.ui_test.create_doc_in_start_center("calc")
@@ -84,17 +78,16 @@ class sheetToTable(UITestCase):
 
         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()
+        with self.ui_test.load_file(get_url_for_data_file("tdf129083.odt")) as writer_doc:
+            document = self.ui_test.get_component()
+            xWriterDoc = self.xUITest.getTopFocusWindow()
 
-        self.xUITest.executeCommand(".uno:Paste")
+            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()
+            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")