[Libreoffice-commits] core.git: svtools/source

[Caolán McNamara (via logerrit)]

 svtools/source/control/ctrlbox.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit fcce0642c101429247a8be886df5a469aeb390a2
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri May 22 17:05:16 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri May 22 21:39:42 2020 +0200

    tdf#133043 explicitly set the combobox edit text
    
    because earlier we set it to "" rather that set_active(-1) so its
    still at the same active pos with the wrong text so setting a new
    active pos that's the same as the old active pos is a nop from
    the vcl case
    
    the original code used Edit::SetText so leave the logic as it
    is traditionally rather than try to change that
    
    Change-Id: I520d1c0371579850d073d37295ccc7d852298aaa
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94699
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index f47408e49b60..e60494a51097 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -795,8 +795,7 @@ void FontNameBox::set_active_or_entry_text(const OUString& rText)
     const int nFound = m_xComboBox->find_text(rText);
     if (nFound != -1)
         m_xComboBox->set_active(nFound);
-    else
-        m_xComboBox->set_entry_text(rText);
+    m_xComboBox->set_entry_text(rText);
 }
 
 FontStyleBox::FontStyleBox(std::unique_ptr<weld::ComboBox> p)
@@ -984,8 +983,7 @@ void FontSizeBox::set_active_or_entry_text(const OUString& rText)
     const int nFound = m_xComboBox->find_text(rText);
     if (nFound != -1)
         m_xComboBox->set_active(nFound);
-    else
-        m_xComboBox->set_entry_text(rText);
+    m_xComboBox->set_entry_text(rText);
 }
 
 IMPL_LINK(FontSizeBox, ReformatHdl, weld::Widget&, rWidget, void)