sd/qa/uitest/impress_tests/tdf159927_dateTime.py | 3 +--
sd/source/ui/dlg/headerfooterdlg.cxx | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit de5816806589c6e6d1da11f50f9ceeb6f50dc3ef
Author: Justin Luth <jl...@mail.com>
AuthorDate: Fri Mar 1 10:40:23 2024 -0500
Commit: Justin Luth <jl...@mail.com>
CommitDate: Fri Mar 1 21:37:15 2024 +0100
fix build: UITest_impress_tests (re-enable date-time test)
accidental debugging change got mixed into a patch...
This reverts part of commit 99e33129346afeb0a386ffad859a9178290211a6
which shows I clearly failed to follow my normal practise of
properly reviewing the change in gerrit before submitting.
Change-Id: Iaa1d9a0eaa4f12c8a5786a29887a82b193baac38
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164223
Reviewed-by: Justin Luth <jl...@mail.com>
Tested-by: Jenkins
diff --git a/sd/qa/uitest/impress_tests/tdf159927_dateTime.py
b/sd/qa/uitest/impress_tests/tdf159927_dateTime.py
index 7225d5c96468..17c5f23caa3b 100644
--- a/sd/qa/uitest/impress_tests/tdf159927_dateTime.py
+++ b/sd/qa/uitest/impress_tests/tdf159927_dateTime.py
@@ -19,7 +19,6 @@ class tdf159927(UITestCase):
language_list = xDialog.getChild("language_list")
# Expected: the existing language of the date/time field:
Finnish
# Actual without the fix: the user's locale as specified in
tools - options.
-# comment out uitest that fails regularly both on jenkins and my local box
-#
self.assertEqual(get_state_as_dict(language_list)["SelectEntryText"], "Finnish")
+
self.assertEqual(get_state_as_dict(language_list)["SelectEntryText"], "Finnish")
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx
b/sd/source/ui/dlg/headerfooterdlg.cxx
index 8aaf7fed1e47..92f7e9be1cb0 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -536,7 +536,7 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage(
LanguageType &rLanguage, boo
}
else
{
- const sal_uInt16 nPageCount = 1;//
mpDoc->GetMasterSdPageCount(PageKind::Standard);
+ const sal_uInt16 nPageCount =
mpDoc->GetMasterSdPageCount(PageKind::Standard);
sal_uInt16 nPage;
for( nPage = 0; nPage < nPageCount; nPage++ )
{
