[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - forms/source

[Lionel Elie Mamane]

 forms/source/component/ListBox.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 7173b70d665608f3823f4a3ff0653f84c0630ed3
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sat Jun 24 15:10:59 2017 +0200

    tdf#108732 ListBox: in absence of a field, treat data as string
    
    so that one meaningfully compare it; default is DataType::OTHER,
    which is not comparable
    
    Change-Id: Ifc1e1c9b801f45d0a95a83d30cc205b91e647880
    Reviewed-on: https://gerrit.libreoffice.org/39212
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 76eadaa64afa..f88c3cb77735 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -1078,7 +1078,9 @@ namespace frm
 
     sal_Int32 OListBoxModel::getValueType() const
     {
-        return (m_nBoundColumnType != css::sdbc::DataType::SQLNULL) ? m_nBoundColumnType : getFieldType();
+        return (m_nBoundColumnType != css::sdbc::DataType::SQLNULL) ?
+            m_nBoundColumnType :
+            ( hasField() ? getFieldType() : DataType::VARCHAR);
     }
 
     ValueList OListBoxModel::impl_getValues() const