cui/source/options/optgdlg.cxx | 5 ++++-
cui/source/options/optgdlg.hxx | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 18d195e7bb62eb95939411e93850a529a4e9b60c
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Aug 7 10:13:08 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Aug 7 12:04:07 2019 +0200
Resolves: tdf#125483 locale separator label needs to be derived from
original
regression from...
commit fa3d5ca1f99fe253689004a45ec2888ebbe85fd3
Date: Thu May 30 12:33:32 2013 +0200
Convert Languages tab page to .ui
Change-Id: I940269d14a0a84768c4f8e62c153cfac51cf577f
Reviewed-on: https://gerrit.libreoffice.org/77086
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 4a2fc6962d4a..f2e031d7568c 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1138,6 +1138,9 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(TabPageParent
pParent, const SfxItemSet
m_xUserInterfaceLB->make_sorted();
m_xCurrencyLB->make_sorted();
+ // tdf#125483 save original default label
+ m_sDecimalSeparatorLabel = m_xDecimalSeparatorCB->get_label();
+
// initialize user interface language selection
m_sSystemDefaultString = SvtLanguageTable::GetLanguageString(
LANGUAGE_SYSTEM );
@@ -1737,7 +1740,7 @@ IMPL_LINK_NOARG(OfaLanguagesTabPage, LocaleSettingHdl,
weld::ComboBox&, void)
LocaleDataWrapper aLocaleWrapper( aLanguageTag );
// update the decimal separator key of the related CheckBox
- OUString sTempLabel(m_xDecimalSeparatorCB->get_label());
+ OUString sTempLabel(m_sDecimalSeparatorLabel);
sTempLabel = sTempLabel.replaceFirst("%1",
aLocaleWrapper.getNumDecimalSep() );
m_xDecimalSeparatorCB->set_label(sTempLabel);
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 319d0ac74627..36b392c6e062 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -142,6 +142,7 @@ class OfaLanguagesTabPage : public SfxTabPage
OUString m_sUserLocaleValue;
OUString m_sSystemDefaultString;
+ OUString m_sDecimalSeparatorLabel;
bool m_bDatePatternsValid;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
