Kaydet (Commit) 7df7e69d authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: tdf#121238 format welded metricspinbuttons the same as historically

i.e. not with the UI Language, but with the Locale setting.

Change-Id: I5146ece3356fdb67c3c715c6d17e608ec92e739a
Reviewed-on: https://gerrit.libreoffice.org/63088
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 2c614b4b
...@@ -222,7 +222,7 @@ namespace weld ...@@ -222,7 +222,7 @@ namespace weld
{ {
OUString aStr; OUString aStr;
const LocaleDataWrapper& rLocaleData = Application::GetSettings().GetUILocaleDataWrapper(); const LocaleDataWrapper& rLocaleData = Application::GetSettings().GetLocaleDataWrapper();
unsigned int nDecimalDigits = m_xSpinButton->get_digits(); unsigned int nDecimalDigits = m_xSpinButton->get_digits();
//pawn percent off to icu to decide whether percent is separated from its number for this locale //pawn percent off to icu to decide whether percent is separated from its number for this locale
...@@ -251,7 +251,7 @@ namespace weld ...@@ -251,7 +251,7 @@ namespace weld
IMPL_LINK(MetricSpinButton, spin_button_input, int*, result, bool) IMPL_LINK(MetricSpinButton, spin_button_input, int*, result, bool)
{ {
const LocaleDataWrapper& rLocaleData = Application::GetSettings().GetUILocaleDataWrapper(); const LocaleDataWrapper& rLocaleData = Application::GetSettings().GetLocaleDataWrapper();
double fResult(0.0); double fResult(0.0);
bool bRet = MetricFormatter::TextToValue(get_text(), fResult, 0, m_xSpinButton->get_digits(), rLocaleData, m_eSrcUnit); bool bRet = MetricFormatter::TextToValue(get_text(), fResult, 0, m_xSpinButton->get_digits(), rLocaleData, m_eSrcUnit);
if (bRet) if (bRet)
...@@ -264,7 +264,7 @@ namespace weld ...@@ -264,7 +264,7 @@ namespace weld
int nStartPos, nEndPos; int nStartPos, nEndPos;
m_xSpinButton->get_selection_bounds(nStartPos, nEndPos); m_xSpinButton->get_selection_bounds(nStartPos, nEndPos);
const LocaleDataWrapper& rLocaleData = Application::GetSettings().GetUILocaleDataWrapper(); const LocaleDataWrapper& rLocaleData = Application::GetSettings().GetLocaleDataWrapper();
const int nTimeArea = TimeFormatter::GetTimeArea(m_eFormat, m_xSpinButton->get_text(), nEndPos, const int nTimeArea = TimeFormatter::GetTimeArea(m_eFormat, m_xSpinButton->get_text(), nEndPos,
rLocaleData); rLocaleData);
...@@ -298,7 +298,7 @@ namespace weld ...@@ -298,7 +298,7 @@ namespace weld
int nStartPos, nEndPos; int nStartPos, nEndPos;
m_xSpinButton->get_selection_bounds(nStartPos, nEndPos); m_xSpinButton->get_selection_bounds(nStartPos, nEndPos);
const LocaleDataWrapper& rLocaleData = Application::GetSettings().GetUILocaleDataWrapper(); const LocaleDataWrapper& rLocaleData = Application::GetSettings().GetLocaleDataWrapper();
tools::Time aResult(0); tools::Time aResult(0);
bool bRet = TimeFormatter::TextToTime(m_xSpinButton->get_text(), aResult, m_eFormat, true, rLocaleData); bool bRet = TimeFormatter::TextToTime(m_xSpinButton->get_text(), aResult, m_eFormat, true, rLocaleData);
if (bRet) if (bRet)
...@@ -330,7 +330,7 @@ namespace weld ...@@ -330,7 +330,7 @@ namespace weld
OUString TimeSpinButton::format_number(int nValue) const OUString TimeSpinButton::format_number(int nValue) const
{ {
const LocaleDataWrapper& rLocaleData = Application::GetSettings().GetUILocaleDataWrapper(); const LocaleDataWrapper& rLocaleData = Application::GetSettings().GetLocaleDataWrapper();
return TimeFormatter::FormatTime(ConvertValue(nValue), m_eFormat, TimeFormat::Hour24, true, rLocaleData); return TimeFormatter::FormatTime(ConvertValue(nValue), m_eFormat, TimeFormat::Hour24, true, rLocaleData);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment