From 922a8bd4ae026ca33c634023703b551cd465491e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 22 Nov 2019 14:27:50 +0000 Subject: Resolves: tdf#128948 double prime symbol not parsed as inch indicator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9d3e606b5158b4594f94e0f13bdf2f635bc77357 Reviewed-on: https://gerrit.libreoffice.org/83447 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- vcl/inc/units.hrc | 2 ++ vcl/source/control/field.cxx | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/vcl/inc/units.hrc b/vcl/inc/units.hrc index 2fd522723e66..b13ad4476904 100644 --- a/vcl/inc/units.hrc +++ b/vcl/inc/units.hrc @@ -33,6 +33,8 @@ std::pair SV_FUNIT_STRINGS[] = { NC_("SV_FUNIT_STRINGS", "twip"), FieldUnit::TWIP }, { NC_("SV_FUNIT_STRINGS", "pt"), FieldUnit::POINT }, { NC_("SV_FUNIT_STRINGS", "pc"), FieldUnit::PICA }, + /* To translators: double prime symbol for inch */ + { NC_("SV_FUNIT_STRINGS", "″"), FieldUnit::INCH }, { NC_("SV_FUNIT_STRINGS", "\""), FieldUnit::INCH }, { NC_("SV_FUNIT_STRINGS", "in"), FieldUnit::INCH }, { NC_("SV_FUNIT_STRINGS", "inch"), FieldUnit::INCH }, diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 1e2ab5a237c5..6307b9ae49d7 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -1045,7 +1045,7 @@ static OUString ImplMetricGetUnitText(const OUString& rStr) for (sal_Int32 i = rStr.getLength()-1; i >= 0; --i) { sal_Unicode c = rStr[i]; - if ( (c == '\'') || (c == '\"') || (c == '%' ) || unicode::isAlpha(c) || unicode::isControl(c) ) + if ( (c == '\'') || (c == '\"') || (c == '%') || (c == 0x2033) || unicode::isAlpha(c) || unicode::isControl(c) ) aStr.insert(0, c); else { -- cgit