diff options
| -rw-r--r-- | include/vcl/settings.hxx | 2 | ||||
| -rw-r--r-- | svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/app/settings.cxx | 12 | ||||
| -rw-r--r-- | vcl/source/control/field.cxx | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index fedb39ccaa09..c3567e4120d9 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -707,7 +707,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/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 38d49e88ec67..248675f7ee1f 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -801,7 +801,7 @@ void PosSizePropertyPanel::GetControlState(const sal_uInt16 nSID, boost::propert if (pControl && !pControl->get_text().isEmpty()) { - OUString sValue = Application::GetSettings().GetNeutroLocaleDataWrapper(). + OUString sValue = Application::GetSettings().GetNeutralLocaleDataWrapper(). getNum(pControl->get_value(pControl->get_unit()), pControl->get_digits(), false, false); rState.put(pControl->get_buildable_name().getStr(), sValue.toUtf8().getStr()); } diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 00889abe3dfb..8e18213f412a 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -238,7 +238,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; @@ -2756,7 +2756,7 @@ ImplAllSettingsData::~ImplAllSettingsData() { mpLocaleDataWrapper.reset(); mpUILocaleDataWrapper.reset(); - mpNeutroLocaleDataWrapper.reset(); + mpNeutralLocaleDataWrapper.reset(); mpI18nHelper.reset(); mpUII18nHelper.reset(); } @@ -2993,12 +2993,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 c10e6a409855..f443abdd2ad7 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -631,7 +631,7 @@ void NumericFormatter::SetValueFromString(const OUString& rStr) sal_Int64 nValue; if (ImplNumericGetValue(rStr, nValue, GetDecimalDigits(), - Application::GetSettings().GetNeutroLocaleDataWrapper())) + Application::GetSettings().GetNeutralLocaleDataWrapper())) { SetValue(nValue); } @@ -1712,7 +1712,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()); |