cui/source/options/optgdlg.cxx | 5 ++++- cui/source/options/optgdlg.hxx | 1 + 2 files changed, 5 insertions(+), 1 deletion(-)
New commits: commit 4d45200945462fda2ed3ae906106b5c6df6466e0 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Wed Aug 7 10:13:08 2019 +0100 Commit: Xisco Faulí <xiscofa...@libreoffice.org> CommitDate: Tue Aug 13 10:25:23 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/77088 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org> diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 535262f022a8..082919e25768 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1170,6 +1170,9 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet& get(m_pCTLSupportCB, "ctlsupport"); get(m_pIgnoreLanguageChangeCB, "ignorelanguagechange"); + // tdf#125483 save original default label + m_sDecimalSeparatorLabel = m_pDecimalSeparatorCB->GetText(); + // initialize user interface language selection m_sSystemDefaultString = SvtLanguageTable::GetLanguageString( LANGUAGE_SYSTEM ); @@ -1801,7 +1804,7 @@ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, ListBox&, rListBox, void ) LocaleDataWrapper aLocaleWrapper( aLanguageTag ); // update the decimal separator key of the related CheckBox - OUString sTempLabel(m_pDecimalSeparatorCB->GetText()); + OUString sTempLabel(m_sDecimalSeparatorLabel); sTempLabel = sTempLabel.replaceFirst("%1", aLocaleWrapper.getNumDecimalSep() ); m_pDecimalSeparatorCB->SetText(sTempLabel); diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 08d5634a889e..890c2efce3e3 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -163,6 +163,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