1 files changed, 20 insertions, 22 deletions
diff --git a/sc/qa/uitest/chart/tdf98690.py b/sc/qa/uitest/chart/tdf98690.py
index 4ea448c1d0d9..f99009206bb4 100644
--- a/sc/qa/uitest/chart/tdf98690.py
+++ b/sc/qa/uitest/chart/tdf98690.py
@@ -11,35 +11,33 @@ from uitest.uihelper.common import get_url_for_data_file
 class tdf98690(UITestCase):
 
   def test_tdf98690(self):
-    calc_doc = self.ui_test.load_file(get_url_for_data_file("tdf98690.xlsx"))
-    xCalcDoc = self.xUITest.getTopFocusWindow()
-    gridwin = xCalcDoc.getChild("grid_window")
+    with self.ui_test.load_file(get_url_for_data_file("tdf98690.xlsx")) as calc_doc:
+        xCalcDoc = self.xUITest.getTopFocusWindow()
+        gridwin = xCalcDoc.getChild("grid_window")
 
-    gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Chart 2"}))
+        gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Chart 2"}))
 
-    self.xUITest.executeCommand(".uno:Copy")
+        self.xUITest.executeCommand(".uno:Copy")
 
-    self.xUITest.executeCommand(".uno:CloseDoc")
+        self.xUITest.executeCommand(".uno:CloseDoc")
 
-    self.ui_test.create_doc_in_start_center("calc")
-    xCalcDoc = self.xUITest.getTopFocusWindow()
-    gridwin = xCalcDoc.getChild("grid_window")
-    document = self.ui_test.get_component()
+        self.ui_test.create_doc_in_start_center("calc")
+        xCalcDoc = self.xUITest.getTopFocusWindow()
+        gridwin = xCalcDoc.getChild("grid_window")
+        document = self.ui_test.get_component()
 
-    self.xUITest.executeCommand(".uno:Paste")
+        self.xUITest.executeCommand(".uno:Paste")
 
-    xData = document.Sheets[0].Charts[0].getEmbeddedObject().Data
+        xData = document.Sheets[0].Charts[0].getEmbeddedObject().Data
 
-    aExpectedRowDescriptions = tuple(str(i) for i in range(1, 14))
-    aExpectedColumnDescriptions = ('Column D Column D', 'cc_girder2', 'Column S Column S',
-            'Column S Column S', 'Column D Column D', 'clexrfdon', 'Column S Column S',
-            'Column S Column S', 'Column D', 'clexrfdoff', 'Column S Column S', 'Column S Column S')
+        aExpectedRowDescriptions = tuple(str(i) for i in range(1, 14))
+        aExpectedColumnDescriptions = ('Column D Column D', 'cc_girder2', 'Column S Column S',
+                'Column S Column S', 'Column D Column D', 'clexrfdon', 'Column S Column S',
+                'Column S Column S', 'Column D', 'clexrfdoff', 'Column S Column S', 'Column S Column S')
 
-    # Without the fix in place, this test would have failed here,
-    # since the pasted chart wouldn't have had any data
-    self.assertEqual(aExpectedRowDescriptions, xData.RowDescriptions)
-    self.assertEqual(aExpectedColumnDescriptions, xData.ColumnDescriptions)
-
-    self.ui_test.close_doc()
+        # Without the fix in place, this test would have failed here,
+        # since the pasted chart wouldn't have had any data
+        self.assertEqual(aExpectedRowDescriptions, xData.RowDescriptions)
+        self.assertEqual(aExpectedColumnDescriptions, xData.ColumnDescriptions)
 
 # vim: set shiftwidth=4 softtabstop=4 expandtab: