commit 6552ce0f510da67be02a5102016bd14957a25a85
author Caolán McNamara <caolanm@redhat.com> Mon Dec 09 17:18:32 2019 +0000
committer Caolán McNamara <caolanm@redhat.com> Mon Dec 09 20:45:28 2019 +0100
tree a0793119351eb5ed0b3870ee1d10588e2dcabfc4
parent c50b4cb4b69597400a8325e0a200c95cf41c62f0

Related: tdf#129267 separate cm from value in built-in en_US strings

Change-Id: Ia3821d734ffda8e873473ac15e4a4dca5404f871
Reviewed-on: https://gerrit.libreoffice.org/84782
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

svx/inc/spacing.hrc

diff --git a/svx/inc/spacing.hrc b/svx/inc/spacing.hrc
index 3d4e93d..4454842 100644
--- a/svx/inc/spacing.hrc
+++ b/svx/inc/spacing.hrc
@@ -31,13 +31,13 @@ const std::pair<const char*, int> RID_SVXSTRARY_SPACING_INCH[] =
const std::pair<const char*, int> RID_SVXSTRARY_SPACING_CM[] =
{
    { NC_("RID_SVXSTRARY_SPACING_CM", "None"),                    0 },
    { NC_("RID_SVXSTRARY_SPACING_CM", "Extra Small (0.16cm)"),   91 },
    { NC_("RID_SVXSTRARY_SPACING_CM", "Small (0.32cm)"),        181 },
    { NC_("RID_SVXSTRARY_SPACING_CM", "Small Medium (0.64cm)"), 363 },
    { NC_("RID_SVXSTRARY_SPACING_CM", "Medium (0.95cm)"),       539 },
    { NC_("RID_SVXSTRARY_SPACING_CM", "Medium Large (1.27cm)"), 720 },
    { NC_("RID_SVXSTRARY_SPACING_CM", "Large (1.9cm)"),        1077 },
    { NC_("RID_SVXSTRARY_SPACING_CM", "Extra Large (2.54cm)"), 1440 },
    { NC_("RID_SVXSTRARY_SPACING_CM", "Extra Small (0.16 cm)"),   91 },
    { NC_("RID_SVXSTRARY_SPACING_CM", "Small (0.32 cm)"),        181 },
    { NC_("RID_SVXSTRARY_SPACING_CM", "Small Medium (0.64 cm)"), 363 },
    { NC_("RID_SVXSTRARY_SPACING_CM", "Medium (0.95 cm)"),       539 },
    { NC_("RID_SVXSTRARY_SPACING_CM", "Medium Large (1.27 cm)"), 720 },
    { NC_("RID_SVXSTRARY_SPACING_CM", "Large (1.9 cm)"),        1077 },
    { NC_("RID_SVXSTRARY_SPACING_CM", "Extra Large (2.54 cm)"), 1440 },
    { nullptr, 0 }
};

@@ -59,13 +59,13 @@ const std::pair<const char*, int> RID_SVXSTRARY_MARGINS_INCH[] =
const std::pair<const char*, int> RID_SVXSTRARY_MARGINS_CM[] =
{
    { NC_("RID_SVXSTRARY_MARGINS_CM", "None"),                    0 },
    { NC_("RID_SVXSTRARY_MARGINS_CM", "Extra Small (0.16cm)"),   91 },
    { NC_("RID_SVXSTRARY_MARGINS_CM", "Small (0.32cm)"),        181 },
    { NC_("RID_SVXSTRARY_MARGINS_CM", "Small Medium (0.64cm)"), 363 },
    { NC_("RID_SVXSTRARY_MARGINS_CM", "Medium (0.95cm)"),       539 },
    { NC_("RID_SVXSTRARY_MARGINS_CM", "Medium Large (1.27cm)"), 720 },
    { NC_("RID_SVXSTRARY_MARGINS_CM", "Large (1.9cm)"),        1077 },
    { NC_("RID_SVXSTRARY_MARGINS_CM", "Extra Large (2.54cm)"), 1440 },
    { NC_("RID_SVXSTRARY_MARGINS_CM", "Extra Small (0.16 cm)"),   91 },
    { NC_("RID_SVXSTRARY_MARGINS_CM", "Small (0.32 cm)"),        181 },
    { NC_("RID_SVXSTRARY_MARGINS_CM", "Small Medium (0.64 cm)"), 363 },
    { NC_("RID_SVXSTRARY_MARGINS_CM", "Medium (0.95 cm)"),       539 },
    { NC_("RID_SVXSTRARY_MARGINS_CM", "Medium Large (1.27 cm)"), 720 },
    { NC_("RID_SVXSTRARY_MARGINS_CM", "Large (1.9 cm)"),        1077 },
    { NC_("RID_SVXSTRARY_MARGINS_CM", "Extra Large (2.54 cm)"), 1440 },
    { nullptr, 0 }
};

sw/inc/pageformatpanel.hrc

diff --git a/sw/inc/pageformatpanel.hrc b/sw/inc/pageformatpanel.hrc
index 048ff93..3d9e772 100644
--- a/sw/inc/pageformatpanel.hrc
+++ b/sw/inc/pageformatpanel.hrc
@@ -34,9 +34,9 @@ const char* RID_PAGEFORMATPANEL_MARGINS_CM[] =
    NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "None"),
    NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Narrow"),
    NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Moderate"),
    NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (1.9cm)"),
    NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (2.54cm)"),
    NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (3.18cm)"),
    NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (1.9 cm)"),
    NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (2.54 cm)"),
    NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Normal (3.18 cm)"),
    NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Wide"),
    NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Mirrored")
};