1 files changed, 68 insertions, 70 deletions
diff --git a/sw/qa/uitest/writer_tests7/tdf46561.py b/sw/qa/uitest/writer_tests7/tdf46561.py
index 1c90dc3c404a..1c34a89a71b4 100644
--- a/sw/qa/uitest/writer_tests7/tdf46561.py
+++ b/sw/qa/uitest/writer_tests7/tdf46561.py
@@ -26,75 +26,73 @@ class tdf46561(UITestCase):
         self.assertEqual(right, xHeaderTextRight)
 
     def test_tdf46561(self):
-        self.ui_test.load_file(get_url_for_data_file("tdf46561.odt"))
-        self.document = self.ui_test.get_component()
-        self.check_header_texts(master="right", first="1st", left="left", right="right")
-
-        xWriterDoc = self.xUITest.getTopFocusWindow()
-        xWriterEdit = xWriterDoc.getChild("writer_edit")
-        xWriterEdit.executeAction("GOTO", mkPropertyValues({"PAGE": "2"}))
-        self.xUITest.executeCommand(".uno:JumpToHeader")
-
-        # Switch "same left and right page headers" on and off a few times
-        for _ in range(4):
-            self.ui_test.execute_dialog_through_command(".uno:PageDialog")
-            PageDialog = self.xUITest.getTopFocusWindow();
-
-            xTabs = PageDialog.getChild("tabcontrol")
-            select_pos(xTabs, "4")
-
-            Button = xTabs.getChild('checkSameLR')
-            Button.executeAction("CLICK",tuple())
-            ok = PageDialog.getChild("ok")
-            self.ui_test.close_dialog_through_button(ok)
-
-        # We should be back to the starting state after 2*k on/off changes
-        self.check_header_texts(master="right", first="1st", left="left", right="right")
-
-        # Enter some additional text in the left page header
-        type_text(xWriterEdit, "XXXX")
-        self.check_header_texts(master="right", first="1st", left="XXXXleft", right="right")
-
-        # Now go back one change (before entering "XXXX")
-        self.xUITest.executeCommand(".uno:Undo")
-        self.check_header_texts(master="right", first="1st", left="left", right="right")
-
-        # Undo the fourth change
-        self.xUITest.executeCommand(".uno:Undo")
-        self.check_header_texts(master="right", first="1st", left="right", right="right")
-
-        # Undo the third change
-        self.xUITest.executeCommand(".uno:Undo")
-        self.check_header_texts(master="right", first="1st", left="left", right="right")
-
-        # Undo the second change
-        self.xUITest.executeCommand(".uno:Undo")
-        self.check_header_texts(master="right", first="1st", left="right", right="right")
-
-        # Undo the first change
-        self.xUITest.executeCommand(".uno:Undo")
-        self.check_header_texts(master="right", first="1st", left="left", right="right")
-
-        # Redo the first change
-        self.xUITest.executeCommand(".uno:Redo")
-        self.check_header_texts(master="right", first="1st", left="right", right="right")
-
-        # Redo the second change
-        self.xUITest.executeCommand(".uno:Redo")
-        self.check_header_texts(master="right", first="1st", left="left", right="right")
-
-        # Redo the third change
-        self.xUITest.executeCommand(".uno:Redo")
-        self.check_header_texts(master="right", first="1st", left="right", right="right")
-
-        # Redo the fourth change
-        self.xUITest.executeCommand(".uno:Redo")
-        self.check_header_texts(master="right", first="1st", left="left", right="right")
-
-        # Redo the final change
-        self.xUITest.executeCommand(".uno:Redo")
-        self.check_header_texts(master="right", first="1st", left="XXXXleft", right="right")
-
-        self.ui_test.close_doc()
+        with self.ui_test.load_file(get_url_for_data_file("tdf46561.odt")):
+            self.document = self.ui_test.get_component()
+            self.check_header_texts(master="right", first="1st", left="left", right="right")
+
+            xWriterDoc = self.xUITest.getTopFocusWindow()
+            xWriterEdit = xWriterDoc.getChild("writer_edit")
+            xWriterEdit.executeAction("GOTO", mkPropertyValues({"PAGE": "2"}))
+            self.xUITest.executeCommand(".uno:JumpToHeader")
+
+            # Switch "same left and right page headers" on and off a few times
+            for _ in range(4):
+                self.ui_test.execute_dialog_through_command(".uno:PageDialog")
+                PageDialog = self.xUITest.getTopFocusWindow();
+
+                xTabs = PageDialog.getChild("tabcontrol")
+                select_pos(xTabs, "4")
+
+                Button = xTabs.getChild('checkSameLR')
+                Button.executeAction("CLICK",tuple())
+                ok = PageDialog.getChild("ok")
+                self.ui_test.close_dialog_through_button(ok)
+
+            # We should be back to the starting state after 2*k on/off changes
+            self.check_header_texts(master="right", first="1st", left="left", right="right")
+
+            # Enter some additional text in the left page header
+            type_text(xWriterEdit, "XXXX")
+            self.check_header_texts(master="right", first="1st", left="XXXXleft", right="right")
+
+            # Now go back one change (before entering "XXXX")
+            self.xUITest.executeCommand(".uno:Undo")
+            self.check_header_texts(master="right", first="1st", left="left", right="right")
+
+            # Undo the fourth change
+            self.xUITest.executeCommand(".uno:Undo")
+            self.check_header_texts(master="right", first="1st", left="right", right="right")
+
+            # Undo the third change
+            self.xUITest.executeCommand(".uno:Undo")
+            self.check_header_texts(master="right", first="1st", left="left", right="right")
+
+            # Undo the second change
+            self.xUITest.executeCommand(".uno:Undo")
+            self.check_header_texts(master="right", first="1st", left="right", right="right")
+
+            # Undo the first change
+            self.xUITest.executeCommand(".uno:Undo")
+            self.check_header_texts(master="right", first="1st", left="left", right="right")
+
+            # Redo the first change
+            self.xUITest.executeCommand(".uno:Redo")
+            self.check_header_texts(master="right", first="1st", left="right", right="right")
+
+            # Redo the second change
+            self.xUITest.executeCommand(".uno:Redo")
+            self.check_header_texts(master="right", first="1st", left="left", right="right")
+
+            # Redo the third change
+            self.xUITest.executeCommand(".uno:Redo")
+            self.check_header_texts(master="right", first="1st", left="right", right="right")
+
+            # Redo the fourth change
+            self.xUITest.executeCommand(".uno:Redo")
+            self.check_header_texts(master="right", first="1st", left="left", right="right")
+
+            # Redo the final change
+            self.xUITest.executeCommand(".uno:Redo")
+            self.check_header_texts(master="right", first="1st", left="XXXXleft", right="right")
 
 # vim: set shiftwidth=4 softtabstop=4 expandtab: