1 files changed, 28 insertions, 30 deletions
diff --git a/sc/qa/uitest/sort/tdf53482.py b/sc/qa/uitest/sort/tdf53482.py
index 1e6fa01b404a..2058f1888f93 100644
--- a/sc/qa/uitest/sort/tdf53482.py
+++ b/sc/qa/uitest/sort/tdf53482.py
@@ -17,37 +17,35 @@ from libreoffice.uno.propertyvalue import mkPropertyValues
 class tdf53482(UITestCase):
 
     def test_tdf53482_Range_contains_column_headings_file(self):
-        calc_doc = self.ui_test.load_file(get_url_for_data_file("tdf53482.ods"))
-        xCalcDoc = self.xUITest.getTopFocusWindow()
-        gridwin = xCalcDoc.getChild("grid_window")
-        document = self.ui_test.get_component()
-        #1. Highlight cells to be sorted A8:J124
-        gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A8:J124"}))
-        #2. Click Data menu, Sort
-        self.ui_test.execute_dialog_through_command(".uno:DataSort")
-        xDialog = self.xUITest.getTopFocusWindow()
-        xTabs = xDialog.getChild("tabcontrol")
-        select_pos(xTabs, "1")
-        #3. On Options tab, tick 'Range contains column labels'
-        xHeader = xDialog.getChild("header")
-        xHeader.executeAction("CLICK", tuple())
-        if (get_state_as_dict(xHeader)["Selected"]) == "false":
+        with self.ui_test.load_file(get_url_for_data_file("tdf53482.ods")) as calc_doc:
+            xCalcDoc = self.xUITest.getTopFocusWindow()
+            gridwin = xCalcDoc.getChild("grid_window")
+            document = self.ui_test.get_component()
+            #1. Highlight cells to be sorted A8:J124
+            gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A8:J124"}))
+            #2. Click Data menu, Sort
+            self.ui_test.execute_dialog_through_command(".uno:DataSort")
+            xDialog = self.xUITest.getTopFocusWindow()
+            xTabs = xDialog.getChild("tabcontrol")
+            select_pos(xTabs, "1")
+            #3. On Options tab, tick 'Range contains column labels'
+            xHeader = xDialog.getChild("header")
             xHeader.executeAction("CLICK", tuple())
-        #4. On Sort Criteria tab, set appropriate criteria
-        select_pos(xTabs, "0")
-        xDown = xDialog.getChild("down")
-        xDown.executeAction("CLICK", tuple())
-        xSortKey1 = xDialog.getChild("sortlb")
-        select_by_text(xSortKey1, "Occupation")
-        #5. Click Ok
-        xOK = xDialog.getChild("ok")
-        self.ui_test.close_dialog_through_button(xOK)
-        #6. Expected behavior:  Ignore column labels when sorting
-        self.assertEqual(get_cell_by_position(document, 0, 6, 7).getString(), "Occupation")
-        self.assertEqual(get_cell_by_position(document, 0, 6, 8).getString(), "Travel Industry")
-        self.assertEqual(get_cell_by_position(document, 0, 6, 123).getString(), "13")
-
-        self.ui_test.close_doc()
+            if (get_state_as_dict(xHeader)["Selected"]) == "false":
+                xHeader.executeAction("CLICK", tuple())
+            #4. On Sort Criteria tab, set appropriate criteria
+            select_pos(xTabs, "0")
+            xDown = xDialog.getChild("down")
+            xDown.executeAction("CLICK", tuple())
+            xSortKey1 = xDialog.getChild("sortlb")
+            select_by_text(xSortKey1, "Occupation")
+            #5. Click Ok
+            xOK = xDialog.getChild("ok")
+            self.ui_test.close_dialog_through_button(xOK)
+            #6. Expected behavior:  Ignore column labels when sorting
+            self.assertEqual(get_cell_by_position(document, 0, 6, 7).getString(), "Occupation")
+            self.assertEqual(get_cell_by_position(document, 0, 6, 8).getString(), "Travel Industry")
+            self.assertEqual(get_cell_by_position(document, 0, 6, 123).getString(), "13")
 
     def test_tdf53482_Range_contains_column_headings(self):
         calc_doc = self.ui_test.create_doc_in_start_center("calc")