diff --git a/sd/inc/pageformatpanel.hrc b/sd/inc/pageformatpanel.hrc index 7dd031314d94..ba5268f3a6b9 100644 --- a/sd/inc/pageformatpanel.hrc +++ b/sd/inc/pageformatpanel.hrc @@ -24,12 +24,12 @@ const std::pair 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 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 } }; diff --git a/sw/inc/pageformatpanel.hrc b/sw/inc/pageformatpanel.hrc index fdb6e18a72cd..5a8e1a4d703c 100644 --- a/sw/inc/pageformatpanel.hrc +++ b/sw/inc/pageformatpanel.hrc @@ -25,8 +25,8 @@ const std::pair 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 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) diff --git a/sw/qa/uitest/sidebar/tdf133189.py b/sw/qa/uitest/sidebar/tdf133189.py index bc050cb7e108..5fe2f01cd41d 100644 --- a/sw/qa/uitest/sidebar/tdf133189.py +++ b/sw/qa/uitest/sidebar/tdf133189.py @@ -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")