[Libreoffice-commits] core.git: 2 commits - forms/source

[Lionel Elie Mamane]

 forms/source/component/FormComponent.cxx |    2 +-
 forms/source/component/ListBox.cxx       |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 521d8d91cd0a1eb92c50d0b9d4ae163073dbff4b
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sat Jun 24 15:09:19 2017 +0200

    janitorial; not useful; is actually used below
    
    Change-Id: I87484b04d9f3feecdac3c53bc7eb3a5ec05e7af7

diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index fc6394a70c24..212e02bbc3c8 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -2030,7 +2030,7 @@ void OBoundControlModel::impl_connectDatabaseColumn_noNotify( bool _bFromReload
     // consistency checks
     DBG_ASSERT( !( hasField() && !_bFromReload ),
         "OBoundControlModel::impl_connectDatabaseColumn_noNotify: the form is just *loaded*, but we already have a field!" );
-    (void)_bFromReload;
+
     Reference< XRowSet > xRowSet( m_xAmbientForm, UNO_QUERY );
     OSL_ENSURE( xRowSet.is(), "OBoundControlModel::impl_connectDatabaseColumn_noNotify: no row set!" );
     if ( !xRowSet.is() )
commit ecdcf38a3250536d9b7f48a8ded50e23ccfcd1df
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

diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 59e416451b96..fbd2ce67a7bd 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -1102,7 +1102,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