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

[Caolán McNamara (via logerrit)]

 svx/source/fmcomp/gridcell.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ef6d2181cb426abc2187341cc271d1d72f3c12aa
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed May 13 15:40:02 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed May 13 20:31:36 2020 +0200

    surround switch is keyed on m_nControlClass so set directly to known true/false
    
    Change-Id: Ia1fa2439a88912a933bc90e3b16bea3b30a403f8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94142
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index de8c41262e35..24eebf68fba2 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2730,7 +2730,7 @@ void DbFilterField::CreateControl(vcl::Window* pParent, const Reference< css::be
             m_pWindow = VclPtr<ListBoxControl>::Create(pParent);
             sal_Int16  nLines       = ::comphelper::getINT16(xModel->getPropertyValue(FM_PROP_LINECOUNT));
             Any  aItems      = xModel->getPropertyValue(FM_PROP_STRINGITEMLIST);
-            SetList(aItems, m_nControlClass == css::form::FormComponentType::COMBOBOX);
+            SetList(aItems, false);
             static_cast<ListBox*>(m_pWindow.get())->SetDropDownLineCount(nLines);
         }   break;
         case css::form::FormComponentType::COMBOBOX:
@@ -2748,7 +2748,7 @@ void DbFilterField::CreateControl(vcl::Window* pParent, const Reference< css::be
             {
                 sal_Int16  nLines       = ::comphelper::getINT16(xModel->getPropertyValue(FM_PROP_LINECOUNT));
                 Any  aItems      = xModel->getPropertyValue(FM_PROP_STRINGITEMLIST);
-                SetList(aItems, m_nControlClass == css::form::FormComponentType::COMBOBOX);
+                SetList(aItems, true);
                 static_cast<ComboBox*>(m_pWindow.get())->SetDropDownLineCount(nLines);
             }
             else