commit 836b4f1ad8b1921123949328a6f910cf4cc46b5a
author Caolán McNamara <caolanm@redhat.com> Wed Aug 07 10:13:08 2019 +0100
committer Xisco Faulí <xiscofauli@libreoffice.org> Thu Aug 08 11:10:01 2019 +0200
tree 003d552594ad32d5693e73bffa66e18fe9e801be
parent dda72e5088a20360ebf18900e608994311fa0f5c

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/77087
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>

cui/source/options/optgdlg.cxx

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 87138e3..7ec79c6 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1163,6 +1163,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 );

@@ -1794,7 +1797,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);

cui/source/options/optgdlg.hxx

diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index f5c02d2..e048cc3 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -159,6 +159,7 @@ class OfaLanguagesTabPage : public SfxTabPage

    OUString        m_sUserLocaleValue;
    OUString        m_sSystemDefaultString;
    OUString        m_sDecimalSeparatorLabel;

    bool            m_bDatePatternsValid;