summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenry Castro <hcastro@collabora.com>2020-05-07 17:53:40 -0400
committerHenry Castro <hcastro@collabora.com>2020-05-21 00:44:42 +0200
commitc275d167ff96941966db5ac7c42daeb0f83f774a (patch)
tree7488fe68aabd9cb6915d07c821c140e8cd583423
parentc783a05ab4551ede4236aabe83d8f894e98ab248 (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/+/93687 Tested-by: Jenkins Reviewed-by: Henry Castro <hcastro@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94523 Tested-by: Henry Castro <hcastro@collabora.com>
-rw-r--r--include/vcl/settings.hxx2
-rw-r--r--vcl/source/app/settings.cxx12
-rw-r--r--vcl/source/control/field.cxx4
3 files changed, 9 insertions, 9 deletions
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index b604efdea769..99fb9352ac21 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -682,7 +682,7 @@ public:
static bool GetMathLayoutRTL(); // returns true if UI language requires right-to-left Math Layout
const LocaleDataWrapper& GetLocaleDataWrapper() const;
const LocaleDataWrapper& GetUILocaleDataWrapper() const;
- const LocaleDataWrapper& GetNeutroLocaleDataWrapper() const;
+ const LocaleDataWrapper& GetNeutralLocaleDataWrapper() const;
const vcl::I18nHelper& GetLocaleI18nHelper() const;
const vcl::I18nHelper& GetUILocaleI18nHelper() const;
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index a21e07b0fd73..93a209b95b32 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -229,7 +229,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;
@@ -2605,7 +2605,7 @@ ImplAllSettingsData::~ImplAllSettingsData()
{
mpLocaleDataWrapper.reset();
mpUILocaleDataWrapper.reset();
- mpNeutroLocaleDataWrapper.reset();
+ mpNeutralLocaleDataWrapper.reset();
mpI18nHelper.reset();
mpUII18nHelper.reset();
}
@@ -2837,12 +2837,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 54d692e4c60a..1bc74316d8f9 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -672,7 +672,7 @@ void NumericFormatter::SetValueFromString(const OUString& rStr)
sal_Int64 nValue;
if (ImplNumericGetValue(rStr, nValue, GetDecimalDigits(),
- Application::GetSettings().GetNeutroLocaleDataWrapper()))
+ Application::GetSettings().GetNeutralLocaleDataWrapper()))
{
SetValue(nValue);
}
@@ -1790,7 +1790,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());