From 91fe6b97952aa6f7cef58327fd085a17db38ad95 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 11:44:47 +0200 Subject: Merging upstream version 4:24.2.2. Signed-off-by: Daniel Baumann --- sw/qa/uitest/data/tdf150443.docx | Bin 27927 -> 27855 bytes sw/qa/uitest/writer_tests7/tdf150443.py | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'sw/qa/uitest') diff --git a/sw/qa/uitest/data/tdf150443.docx b/sw/qa/uitest/data/tdf150443.docx index 162aec01f9..f1897c4712 100644 Binary files a/sw/qa/uitest/data/tdf150443.docx and b/sw/qa/uitest/data/tdf150443.docx differ diff --git a/sw/qa/uitest/writer_tests7/tdf150443.py b/sw/qa/uitest/writer_tests7/tdf150443.py index fb39bd8a03..91937551a4 100644 --- a/sw/qa/uitest/writer_tests7/tdf150443.py +++ b/sw/qa/uitest/writer_tests7/tdf150443.py @@ -26,7 +26,9 @@ class tdf150443(UITestCase): xsearch = xDialog.getChild("search") xsearch.executeAction("CLICK", tuple()) #first search xToolkit.processEventsToIdle() - self.assertEqual(get_state_as_dict(xWriterEdit)["CurrentPage"], "4") + page = get_state_as_dict(xWriterEdit)["CurrentPage"] + # page may depend on font subsitution, just check it moved + self.assertTrue(page == "4" or page == "5") # reject the tracked table row in Manage Changes dialog window with self.ui_test.execute_modeless_dialog_through_command(".uno:AcceptTrackedChanges", close_button="close") as xTrackDlg: -- cgit v1.2.3