diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-11-07 17:30:34 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-08 10:00:02 +0100 |
commit | 1abda793895be7d9224a8cd00483497cd761476c (patch) | |
tree | 0c775bdc80c35b0a7d2e8c27f64f04564c7c6672 | |
parent | support enable-tree-lines (diff) | |
download | core-1abda793895be7d9224a8cd00483497cd761476c.tar.gz core-1abda793895be7d9224a8cd00483497cd761476c.zip |
mbDefaultLocale is always true
Change-Id: I92bcb381330a129ca42a2407a3e4db0ed044ed51
Reviewed-on: https://gerrit.libreoffice.org/63041
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | include/vcl/field.hxx | 2 | ||||
-rw-r--r-- | vcl/source/control/field.cxx | 45 | ||||
-rw-r--r-- | vcl/source/control/field2.cxx | 11 |
3 files changed, 18 insertions, 40 deletions
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index e9407fa66f32..aec107f49629 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -46,7 +46,6 @@ private: bool mbStrictFormat; bool mbEmptyFieldValue; bool mbEmptyFieldValueEnabled; - bool mbDefaultLocale; protected: SAL_DLLPRIVATE void ImplSetText( const OUString& rText, Selection const * pNewSel = nullptr ); @@ -55,7 +54,6 @@ protected: void SetEmptyFieldValueData( bool bValue ) { mbEmptyFieldValue = bValue; } SAL_DLLPRIVATE LocaleDataWrapper& ImplGetLocaleDataWrapper() const; - bool IsDefaultLocale() const { return mbDefaultLocale; } public: explicit FormatterBase(); diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 07c10c50a138..d8df6d5ff42a 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -368,7 +368,6 @@ FormatterBase::FormatterBase() mbStrictFormat = false; mbEmptyFieldValue = false; mbEmptyFieldValueEnabled = false; - mbDefaultLocale = true; } FormatterBase::~FormatterBase() @@ -410,28 +409,18 @@ void FormatterBase::SetStrictFormat( bool bStrict ) const lang::Locale& FormatterBase::GetLocale() const { - if ( !mpLocaleDataWrapper || mbDefaultLocale ) - { - if ( mpField ) - return mpField->GetSettings().GetLanguageTag().getLocale(); - else - return Application::GetSettings().GetLanguageTag().getLocale(); - } - - return mpLocaleDataWrapper->getLanguageTag().getLocale(); + if ( mpField ) + return mpField->GetSettings().GetLanguageTag().getLocale(); + else + return Application::GetSettings().GetLanguageTag().getLocale(); } const LanguageTag& FormatterBase::GetLanguageTag() const { - if ( !mpLocaleDataWrapper || mbDefaultLocale ) - { - if ( mpField ) - return mpField->GetSettings().GetLanguageTag(); - else - return Application::GetSettings().GetLanguageTag(); - } - - return mpLocaleDataWrapper->getLanguageTag(); + if ( mpField ) + return mpField->GetSettings().GetLanguageTag(); + else + return Application::GetSettings().GetLanguageTag(); } void FormatterBase::ImplSetText( const OUString& rText, Selection const * pNewSelection ) @@ -797,8 +786,7 @@ void NumericField::DataChanged( const DataChangedEvent& rDCEvt ) { OUString sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); - if ( IsDefaultLocale() ) - ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); + ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); OUString sNewDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sNewThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); ImplUpdateSeparators( sOldDecSep, sNewDecSep, sOldThSep, sNewThSep, this ); @@ -936,8 +924,7 @@ void NumericBox::DataChanged( const DataChangedEvent& rDCEvt ) { OUString sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); - if ( IsDefaultLocale() ) - ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); + ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); OUString sNewDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sNewThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); ImplUpdateSeparators( sOldDecSep, sNewDecSep, sOldThSep, sNewThSep, this ); @@ -1620,8 +1607,7 @@ void MetricField::DataChanged( const DataChangedEvent& rDCEvt ) { OUString sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); - if ( IsDefaultLocale() ) - ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); + ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); OUString sNewDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sNewThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); ImplUpdateSeparators( sOldDecSep, sNewDecSep, sOldThSep, sNewThSep, this ); @@ -1723,8 +1709,7 @@ void MetricBox::DataChanged( const DataChangedEvent& rDCEvt ) { OUString sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); - if ( IsDefaultLocale() ) - ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); + ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); OUString sNewDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sNewThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); ImplUpdateSeparators( sOldDecSep, sNewDecSep, sOldThSep, sNewThSep, this ); @@ -1892,8 +1877,7 @@ void CurrencyField::DataChanged( const DataChangedEvent& rDCEvt ) { OUString sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); - if ( IsDefaultLocale() ) - ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); + ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); OUString sNewDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sNewThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); ImplUpdateSeparators( sOldDecSep, sNewDecSep, sOldThSep, sNewThSep, this ); @@ -1976,8 +1960,7 @@ void CurrencyBox::DataChanged( const DataChangedEvent& rDCEvt ) { OUString sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); - if ( IsDefaultLocale() ) - ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); + ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); OUString sNewDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sNewThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); ImplUpdateSeparators( sOldDecSep, sNewDecSep, sOldThSep, sNewThSep, this ); diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 912b104eb56e..0adf18125322 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -1772,7 +1772,7 @@ void DateField::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & (AllSettingsFlags::LOCALE|AllSettingsFlags::MISC)) ) { - if ( IsDefaultLocale() && ( rDCEvt.GetFlags() & AllSettingsFlags::LOCALE ) ) + if (rDCEvt.GetFlags() & AllSettingsFlags::LOCALE) ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); ReformatAll(); } @@ -1841,8 +1841,7 @@ void DateBox::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::LOCALE) ) { - if ( IsDefaultLocale() ) - ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); + ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); ReformatAll(); } } @@ -2563,8 +2562,7 @@ void TimeField::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::LOCALE) ) { - if ( IsDefaultLocale() ) - ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); + ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); ReformatAll(); } } @@ -2669,8 +2667,7 @@ void TimeBox::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::LOCALE) ) { - if ( IsDefaultLocale() ) - ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); + ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); ReformatAll(); } } |