diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-08-22 13:14:38 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-08-22 20:46:40 +0200 |
| commit | a701a726dc3ccc174d1323a298c3550733773df9 (patch) | |
| tree | 3ca8499373e3870c842b76c4fbf102240be6587b /sw | |
| parent | b2247336409b7b3b0ae04356a167dcd204badb04 (diff) | |
tdf#101895 don't unconditionally default to ch[ar]/line
if CJK typography is available.
Given that we choose to show cm vs inch based on
SvtSysLocaleOptions::GetRealLanguageTag() also choose to use ch[ar] and
line based on that setting when bApplyCharUnit is enabled.
Change-Id: I812d05e0639f7e214d5c3d4dcca01b0709126fd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155948
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/uitest/writer_tests2/formatParagraph.py | 10 | ||||
| -rw-r--r-- | sw/qa/uitest/writer_tests3/tdf79236.py | 20 |
2 files changed, 15 insertions, 15 deletions
diff --git a/sw/qa/uitest/writer_tests2/formatParagraph.py b/sw/qa/uitest/writer_tests2/formatParagraph.py index cd72dbf7efe7..e90d0fd7f980 100644 --- a/sw/qa/uitest/writer_tests2/formatParagraph.py +++ b/sw/qa/uitest/writer_tests2/formatParagraph.py @@ -58,12 +58,12 @@ class formatParagraph(UITestCase): xLineSpacing = xDialog.getChild("comboLB_LINEDIST") xActivate = xDialog.getChild("checkCB_REGISTER") - self.assertEqual(get_state_as_dict(xBeforeText)["Text"], "0.50 ch") - self.assertEqual(get_state_as_dict(xAfterText)["Text"], "0.50 ch") - self.assertEqual(get_state_as_dict(xFirstLine)["Text"], "0.50 ch") + self.assertEqual(get_state_as_dict(xBeforeText)["Text"], "0.02″") + self.assertEqual(get_state_as_dict(xAfterText)["Text"], "0.02″") + self.assertEqual(get_state_as_dict(xFirstLine)["Text"], "0.02″") self.assertEqual(get_state_as_dict(xAutomaticChk)["Selected"], "true") - self.assertEqual(get_state_as_dict(xAbovePar)["Text"], "0.50 line") - self.assertEqual(get_state_as_dict(xBelowPar)["Text"], "0.50 line") + self.assertEqual(get_state_as_dict(xAbovePar)["Text"], "0.02″") + self.assertEqual(get_state_as_dict(xBelowPar)["Text"], "0.02″") self.assertEqual(get_state_as_dict(xChkspace)["Selected"], "true") self.assertEqual(get_state_as_dict(xLineSpacing)["SelectEntryText"], "Double") self.assertEqual(get_state_as_dict(xActivate)["Selected"], "true") diff --git a/sw/qa/uitest/writer_tests3/tdf79236.py b/sw/qa/uitest/writer_tests3/tdf79236.py index c8e857188c9c..d7b59da19f63 100644 --- a/sw/qa/uitest/writer_tests3/tdf79236.py +++ b/sw/qa/uitest/writer_tests3/tdf79236.py @@ -59,11 +59,11 @@ class tdf79236(UITestCase): xTopSpnBtn.executeAction("UP", tuple()) - self.assertEqual(document.CurrentSelection.getByIndex(0).ParaLeftMargin, 3704) - self.assertEqual(document.CurrentSelection.getByIndex(0).ParaRightMargin, 3704) - self.assertEqual(document.CurrentSelection.getByIndex(0).ParaTopMargin, 5503) - self.assertEqual(document.CurrentSelection.getByIndex(0).ParaBottomMargin, 5503) - self.assertEqual(document.CurrentSelection.getByIndex(0).ParaFirstLineIndent, 3704) + self.assertEqual(document.CurrentSelection.getByIndex(0).ParaLeftMargin, 1016) + self.assertEqual(document.CurrentSelection.getByIndex(0).ParaRightMargin, 1016) + self.assertEqual(document.CurrentSelection.getByIndex(0).ParaTopMargin, 1016) + self.assertEqual(document.CurrentSelection.getByIndex(0).ParaBottomMargin, 1016) + self.assertEqual(document.CurrentSelection.getByIndex(0).ParaFirstLineIndent, 1016) with self.ui_test.execute_dialog_through_command(".uno:ParagraphDialog") as xParagraphDlg: @@ -98,11 +98,11 @@ class tdf79236(UITestCase): self.xUITest.executeCommand(".uno:Undo") - self.assertEqual(document.CurrentSelection.getByIndex(0).ParaLeftMargin, 3704) - self.assertEqual(document.CurrentSelection.getByIndex(0).ParaRightMargin, 3704) - self.assertEqual(document.CurrentSelection.getByIndex(0).ParaTopMargin, 5503) - self.assertEqual(document.CurrentSelection.getByIndex(0).ParaBottomMargin, 5503) - self.assertEqual(document.CurrentSelection.getByIndex(0).ParaFirstLineIndent, 3704) + self.assertEqual(document.CurrentSelection.getByIndex(0).ParaLeftMargin, 1016) + self.assertEqual(document.CurrentSelection.getByIndex(0).ParaRightMargin, 1016) + self.assertEqual(document.CurrentSelection.getByIndex(0).ParaTopMargin, 1016) + self.assertEqual(document.CurrentSelection.getByIndex(0).ParaBottomMargin, 1016) + self.assertEqual(document.CurrentSelection.getByIndex(0).ParaFirstLineIndent, 1016) self.xUITest.executeCommand(".uno:Undo") |