diff options
author | Kurt Zenker <kz@openoffice.org> | 2010-10-20 16:41:18 +0200 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2010-10-20 16:41:18 +0200 |
commit | de86e3362cf4fe6f65a66b01e74f19a8d33e289b (patch) | |
tree | 41820716d45017b1a4994e96c4080a6215587830 | |
parent | CWS-TOOLING: integrate CWS native338 (diff) | |
parent | dba33k: merge (diff) | |
download | core-de86e3362cf4fe6f65a66b01e74f19a8d33e289b.tar.gz core-de86e3362cf4fe6f65a66b01e74f19a8d33e289b.zip |
CWS-TOOLING: integrate CWS dba33k
-rw-r--r-- | forms/source/component/ListBox.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index d2de4882dead..da335308933e 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -647,6 +647,8 @@ namespace frm DBG_ASSERT( m_eListSourceType != ListSourceType_VALUELIST, "OListBoxModel::loadData: cannot load value list from DB!" ); DBG_ASSERT( !hasExternalListSource(), "OListBoxModel::loadData: cannot load from DB when I have an external list source!" ); + const sal_Int16 nNULLPosBackup( m_nNULLPos ); + const sal_Int32 nBoundColumnTypeBackup( m_nBoundColumnType ); m_nNULLPos = -1; m_nBoundColumnType = DataType::SQLNULL; @@ -782,6 +784,8 @@ namespace frm // if none of the settings of the row set changed, compared to the last // invocation of loadData, then don't re-fill the list. Instead, assume // the list entries are the same. + m_nNULLPos = nNULLPosBackup; + m_nBoundColumnType = nBoundColumnTypeBackup; return; } xListCursor.reset( m_aListRowSet.execute() ); |