ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#135572 sd/sw: use correct measurement for page margin listbox

Browse Source 
The program creates a 2cm margin
when chosing 'Normal 0.75in' from the page sidebar.

Well 2cm is 0.79in, so fix the wording to reflect reality.

In addition, for Draw, each margin is half of what the value showed.
Be consistent with Writer, and show the value
for only one margin.

make UITest_sw_sidebar \
    UITEST_TEST_NAME=tdf133189.tdf133189.test_tdf133189

Change-Id: Ice89d95464cd29e0bcad5af7a74f5db154fe9689
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207051
Reviewed-by: Justin Luth <jluth@mail.com>
Tested-by: Jenkins
This commit is contained in:
Justin Luth
2026-06-21 02:33:25 +02:00
parent 0c5f7b5d9b
commit ca804630b3
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sd/inc/pageformatpanel.hrc
+12 -12
View File
@@ -24,12 +24,12 @@ const std::pair<TranslateId, int> RID_PAGEFORMATPANEL_MARGINS_INCH[] =
{ NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "None"), 0 },
{ NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Narrow"), 0 },
{ NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Moderate"), 0 },
// Normal (0.75")
{ NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (%1)"), 75 },
// Normal (1")
{ NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (%1)"), 100 },
// Normal (1.25")
{ NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (%1)"), 125 },
// Normal (0.39")
{ NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (%1)"), 39 },
// Normal (0.5")
{ NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (%1)"), 50 },
// Normal (0.63")
{ NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (%1)"), 63 },
{ NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Wide"), 0 }
};
@@ -39,12 +39,12 @@ const std::pair<TranslateId, int> RID_PAGEFORMATPANEL_MARGINS_CM[] =
{ NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "None"), 0 },
{ NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Narrow"), 0 },
{ NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Moderate"), 0 },
// Normal (1.9 cm)
{ NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (%1)"), 190 },
// Normal (2.54 cm)
{ NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (%1)"), 254 },
// Normal (3.18 cm)
{ NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (%1)"), 318 },
// Normal (1 cm)
{ NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (%1)"), 100 },
// Normal (1.27 cm)
{ NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (%1)"), 127 },
// Normal (1.59 cm)
{ NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (%1)"), 159 },
{ NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Wide"), 0 }
};
sw/inc/pageformatpanel.hrc
+4 -4
View File
@@ -25,8 +25,8 @@ const std::pair<TranslateId, int> RID_PAGEFORMATPANEL_MARGINS_INCH[] =
{ NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "None"), 0 },
{ NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Narrow"), 0 },
{ NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Moderate"), 0 },
// Normal (0.75")
{ NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (%1)"), 75 },
// Normal (0.79")
{ NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (%1)"), 79 },
// Normal (1")
{ NC_("RID_PAGEFORMATPANEL_MARGINS_INCH", "Normal (%1)"), 100 },
// Normal (1.25")
@@ -41,8 +41,8 @@ const std::pair<TranslateId, int> RID_PAGEFORMATPANEL_MARGINS_CM[] =
{ NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "None"), 0 },
{ NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Narrow"), 0 },
{ NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Moderate"), 0 },
// Normal (1.9 cm)
{ NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (%1)"), 190 },
// Normal (2 cm)
{ NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (%1)"), 200 },
// Normal (2.54 cm)
{ NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (%1)"), 254 },
// Normal (3.18 cm)
sw/qa/uitest/sidebar/tdf133189.py
+4 -4
View File
@@ -41,8 +41,8 @@ class tdf133189(UITestCase):
xHeight.executeAction("VALUE", actionProps)
self.ui_test.wait_until_property_is_updated(xPaperMargin, "SelectEntryText", "Normal (0.75″)")
self.assertEqual(get_state_as_dict(xPaperMargin)['SelectEntryText'], "Normal (0.75″)")
self.ui_test.wait_until_property_is_updated(xPaperMargin, "SelectEntryText", "Normal (0.79″)")
self.assertEqual(get_state_as_dict(xPaperMargin)['SelectEntryText'], "Normal (0.79″)")
self.ui_test.wait_until_property_is_updated(xPaperSize, "SelectEntryText", "User")
self.assertEqual(get_state_as_dict(xPaperSize)['SelectEntryText'], "User")
self.ui_test.wait_until_property_is_updated(xPaperOrient, "SelectEntryText", "Portrait")
@@ -54,9 +54,9 @@ class tdf133189(UITestCase):
with change_measurement_unit(self, 'Centimeter'):
self.ui_test.wait_until_property_is_updated(xPaperMargin, "SelectEntryText", "Normal (1.90 cm)")
self.ui_test.wait_until_property_is_updated(xPaperMargin, "SelectEntryText", "Normal (2 cm)")
# tdf#129267
self.assertEqual(get_state_as_dict(xPaperMargin)['SelectEntryText'], "Normal (1.90 cm)")
self.assertEqual(get_state_as_dict(xPaperMargin)['SelectEntryText'], "Normal (2 cm)")
self.ui_test.wait_until_property_is_updated(xPaperSize, "SelectEntryText", "User")
self.assertEqual(get_state_as_dict(xPaperSize)['SelectEntryText'], "User")
self.ui_test.wait_until_property_is_updated(xPaperOrient, "SelectEntryText", "Portrait")