diff options
| author | Henry Castro <hcastro@collabora.com> | 2020-05-07 17:53:40 -0400 |
|---|---|---|
| committer | Henry Castro <hcastro@collabora.com> | 2020-05-09 14:38:25 +0200 |
| commit | 64169ba94d969c631afe1afddaca924c7cac5bfd (patch) | |
| tree | 47a30339ce29ce10102de02a0e57d0370824a4ff /vcl | |
| parent | 303577c66c7084fc061cf61d6567a1cb42213d57 (diff) | |
lok: replace name Neutro to Neutral
This commit was split because it has to
be in sync with cp-6.2 branch
Change-Id: I849b63f34297a6876d5a3ab83bb6ce551bb156d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93775
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Henry Castro <hcastro@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/settings.cxx | 12 | ||||
| -rw-r--r-- | vcl/source/control/field.cxx | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 0388beedc754..f8ad5c7c4f3f 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -233,7 +233,7 @@ struct ImplAllSettingsData LanguageTag maUILocale; std::unique_ptr<LocaleDataWrapper> mpLocaleDataWrapper; std::unique_ptr<LocaleDataWrapper> mpUILocaleDataWrapper; - std::unique_ptr<LocaleDataWrapper> mpNeutroLocaleDataWrapper; + std::unique_ptr<LocaleDataWrapper> mpNeutralLocaleDataWrapper; std::unique_ptr<vcl::I18nHelper> mpI18nHelper; std::unique_ptr<vcl::I18nHelper> mpUII18nHelper; SvtSysLocale maSysLocale; @@ -2640,7 +2640,7 @@ ImplAllSettingsData::~ImplAllSettingsData() { mpLocaleDataWrapper.reset(); mpUILocaleDataWrapper.reset(); - mpNeutroLocaleDataWrapper.reset(); + mpNeutralLocaleDataWrapper.reset(); mpI18nHelper.reset(); mpUII18nHelper.reset(); } @@ -2877,12 +2877,12 @@ const LocaleDataWrapper& AllSettings::GetUILocaleDataWrapper() const return *mxData->mpUILocaleDataWrapper; } -const LocaleDataWrapper& AllSettings::GetNeutroLocaleDataWrapper() const +const LocaleDataWrapper& AllSettings::GetNeutralLocaleDataWrapper() const { - if ( !mxData->mpNeutroLocaleDataWrapper ) - const_cast<AllSettings*>(this)->mxData->mpNeutroLocaleDataWrapper.reset( new LocaleDataWrapper( + if ( !mxData->mpNeutralLocaleDataWrapper ) + const_cast<AllSettings*>(this)->mxData->mpNeutralLocaleDataWrapper.reset( new LocaleDataWrapper( comphelper::getProcessComponentContext(), LanguageTag("en-US") ) ); - return *mxData->mpNeutroLocaleDataWrapper; + return *mxData->mpNeutralLocaleDataWrapper; } const vcl::I18nHelper& AllSettings::GetLocaleI18nHelper() const diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 5735c000b47c..b180175b36a3 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -647,7 +647,7 @@ void NumericFormatter::SetValueFromString(const OUString& rStr) sal_Int64 nValue; if (ImplNumericGetValue(rStr, nValue, GetDecimalDigits(), - Application::GetSettings().GetNeutroLocaleDataWrapper())) + Application::GetSettings().GetNeutralLocaleDataWrapper())) { SetValue(nValue); } @@ -1725,7 +1725,7 @@ boost::property_tree::ptree MetricField::DumpAsPropertyTree() aTree.put("min", GetMin()); aTree.put("max", GetMax()); aTree.put("unit", FieldUnitToString(GetUnit())); - OUString sValue = Application::GetSettings().GetNeutroLocaleDataWrapper(). + OUString sValue = Application::GetSettings().GetNeutralLocaleDataWrapper(). getNum(GetValue(), GetDecimalDigits(), false, false); aTree.put("value", sValue.toUtf8().getStr()); |