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 | 03cfe2c9032b9236d283735f95c58ba917e2786f (patch) | |
| tree | e195d25c8f96bdb7901a1b7d1b65fd28018ad6e6 | |
| parent | 6a1534819edb7276bbc18056df92bbed2015e0d3 (diff) | |
| parent | 8de8dac8d7ad32dc992ac061d8f4960b43c1436a (diff) | |
CWS-TOOLING: integrate CWS dba33kooo/OOO330_m18ooo/OOO330_m17ooo/OOO330_m16ooo/OOO330_m15ooo/OOO330_m14ooo/OOO330_m13ooo/OOO330_m12
| -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 fe24fc24c..d15125dac 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() ); |