summaryrefslogtreecommitdiffstats
path: root/forms
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-09-28 11:45:50 +0200
committerFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-09-28 11:45:50 +0200
commitf7c9efe9c6253d809ccbe157c2ef66ff6821522f (patch)
tree3356895dac6c2173282ffbe2ae14cd78ca237109 /forms
parentdba34a: #i114752# allow setting an empty reference, not only an empty Any, as... (diff)
downloadcore-f7c9efe9c6253d809ccbe157c2ef66ff6821522f.tar.gz
core-f7c9efe9c6253d809ccbe157c2ef66ff6821522f.zip
dba34a: #i114792# restore m_nNULLPos/m_nBoundColumnType when old list data is still cached
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 7bf1885af992..909cc1f23659 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -649,6 +649,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;
@@ -788,6 +790,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() );