diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-11-08 11:52:43 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-08 22:06:45 +0100 |
| commit | 7df7e69db0b70b552db3a62d3301e0ba46e299be (patch) | |
| tree | 8f0612d3b2a266319007f2b52fb8533a46e50915 /vcl | |
| parent | 2c614b4b2537997aece7ba0aa7ecd38e55fcffaa (diff) | |
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: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/builder.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 63da9929989c..8c0e98154a37 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -222,7 +222,7 @@ namespace weld { OUString aStr; - const LocaleDataWrapper& rLocaleData = Application::GetSettings().GetUILocaleDataWrapper(); + const LocaleDataWrapper& rLocaleData = Application::GetSettings().GetLocaleDataWrapper(); unsigned int nDecimalDigits = m_xSpinButton->get_digits(); //pawn percent off to icu to decide whether percent is separated from its number for this locale @@ -251,7 +251,7 @@ namespace weld 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); bool bRet = MetricFormatter::TextToValue(get_text(), fResult, 0, m_xSpinButton->get_digits(), rLocaleData, m_eSrcUnit); if (bRet) @@ -264,7 +264,7 @@ namespace weld int 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, rLocaleData); @@ -298,7 +298,7 @@ namespace weld int 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); bool bRet = TimeFormatter::TextToTime(m_xSpinButton->get_text(), aResult, m_eFormat, true, rLocaleData); if (bRet) @@ -330,7 +330,7 @@ namespace weld 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); } |