[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - cui/source

[Caolán McNamara (via logerrit)]

 cui/source/inc/autocdlg.hxx      |    2 +-
 cui/source/tabpages/autocdlg.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1afbe253c41e0157dfd4c024e427085413038d5e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Jun 6 20:27:24 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jun 9 13:31:14 2020 +0200

    Resolves: tdf#125981 use original label, not current label
    
    Change-Id: Iddc1d3e38e70d91d60947d9867dcfb03cb5128d2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95678
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    Tested-by: Jenkins

diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 083f3824713c..4a283c8229ad 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -286,7 +286,7 @@ private:
     std::unique_ptr<weld::Button> m_xDblEndQuotePB;
     std::unique_ptr<weld::Label> m_xDblEndExFT;
     std::unique_ptr<weld::Button> m_xDblStandardPB;
-    std::unique_ptr<weld::Label> m_xStandard;
+    OUString m_sStandard;
     /// For anything but writer
     std::unique_ptr<weld::TreeView> m_xCheckLB;
     /// Just for writer
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index cae7b77fdd40..0ea7f65c9b25 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1553,7 +1553,7 @@ OfaQuoteTabPage::OfaQuoteTabPage(weld::Container* pPage, weld::DialogController*
     , m_xDblEndQuotePB(m_xBuilder->weld_button("enddouble"))
     , m_xDblEndExFT(m_xBuilder->weld_label("doubleendex"))
     , m_xDblStandardPB(m_xBuilder->weld_button("defaultdouble"))
-    , m_xStandard(m_xBuilder->weld_label("singlestartex"))
+    , m_sStandard(m_xSglStartExFT->get_label())
     , m_xCheckLB(m_xBuilder->weld_tree_view("checklist"))
     , m_xSwCheckLB(m_xBuilder->weld_tree_view("list"))
 {
@@ -1830,7 +1830,7 @@ IMPL_LINK(OfaQuoteTabPage, StdQuoteHdl, weld::Button&, rBtn, void)
 OUString OfaQuoteTabPage::ChangeStringExt_Impl( sal_UCS4 cChar )
 {
     if (!cChar)
-        return m_xStandard->get_label();
+        return m_sStandard;
 
     // convert codepoint value to unicode-hex string
     sal_UCS4 aStrCodes[32] = { 0, ' ', '(', 'U', '+', '0' };