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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 91e8ee86d499b759aa6639368a40528482e49fb6
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Feb 14 14:35:11 2020 +0000
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Tue Feb 25 09:35:50 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/+/88693
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index ab4711eb1a2f..ff6c597f1fe4 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -677,6 +677,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));
@@ -688,7 +690,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)
                     {