diff options
author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-09-28 13:36:17 +0200 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-09-28 13:36:17 +0200 |
commit | 877896a2231a61823464c546c61daeb8a42148a1 (patch) | |
tree | 60dc00709dc6d7daa30a14f068525ac54795efad | |
parent | 0567b5beb387e3b76d26e43fc6d1c69df0c1de89 (diff) | |
parent | acc5e9f794ed60e49d0b146e72e86e06e6b78e86 (diff) |
dba33k: merge
-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() ); |