[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - include/vcl svx/source vcl/source

[Henry Castro (via logerrit)]

 include/vcl/settings.hxx                            |    2 +-
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |    2 +-
 vcl/source/app/settings.cxx                         |   12 ++++++------
 vcl/source/control/field.cxx                        |    4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 64169ba94d969c631afe1afddaca924c7cac5bfd
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Thu May 7 17:53:40 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Sat May 9 14:38:25 2020 +0200

    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 at gmail.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 61a960dacd8d..992dff13ed80 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 dc94e0d8603f..00676302ae57 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -865,7 +865,7 @@ void PosSizePropertyPanel::GetControlState(const sal_uInt16 nSID, boost::propert
 
     if (pControl && !pControl->GetText().isEmpty())
     {
-        OUString sValue = Application::GetSettings().GetNeutroLocaleDataWrapper().
+        OUString sValue = Application::GetSettings().GetNeutralLocaleDataWrapper().
             getNum(pControl->GetValue(), pControl->GetDecimalDigits(), false, false);
         rState.put(pControl->get_id().toUtf8().getStr(), sValue.toUtf8().getStr());
     }
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());