summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2010-10-24 15:36:39 +0200
committerJan Holesovsky <kendy@suse.cz>2010-10-24 15:36:39 +0200
commited0080c9272f26d8c2197b74181768dc166523da (patch)
tree4d1ad5f06f68e726f84695d994aaa0e457edd1f5 /forms
parent166abea99ddd8533d5cd31e2bdb514544beebb76 (diff)
parentde86e3362cf4fe6f65a66b01e74f19a8d33e289b (diff)
Merge commit 'ooo/OOO330_m12'
Diffstat (limited to 'forms')
-rw-r--r--forms/source/component/ListBox.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index ca79697f1fa3..3be8f97f112b 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -648,6 +648,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;
@@ -783,6 +785,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() );