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

[Caolán McNamara (via logerrit)]

 cui/source/options/optdict.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 95ab6b531941bc8e1527ccfe8e5ccfc61922f5b9
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Feb 14 14:35:11 2020 +0000
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Wed Feb 19 14:38:51 2020 +0100

    Resolves: tdf#130658 there isn't a second column in non-exception mode
    
    Change-Id: I35edf263251c087976aa9a2506bb23c083e1f7c0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88689
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    Tested-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 07080a75184a..da3741a71fd5 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -682,6 +682,8 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, weld::Entry&, rEdt, void)
             bool bTmpSelEntry=false;
             CDE_RESULT eCmpRes = CDE_DIFFERENT;
 
+            bool bDoubleColumn = m_pWordsLB == m_xDoubleColumnLB.get();
+
             for (int i = 0, nCount = m_pWordsLB->n_children(); i < nCount; ++i)
             {
                 OUString aTestStr(m_pWordsLB->get_text(i, 0));
@@ -693,7 +695,8 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, weld::Entry&, rEdt, void)
                     bDoNothing=true;
                     m_pWordsLB->set_cursor(i);
                     bDoNothing=false;
-                    m_xReplaceED->set_text(m_pWordsLB->get_text(i, 1));
+                    if (bDoubleColumn)
+                        m_xReplaceED->set_text(m_pWordsLB->get_text(i, 1));
 
                     if (CDE_SIMILAR == eCmpRes)
                     {