diff options
author | Lionel Elie Mamane <lionel@mamane.lu> | 2013-06-23 17:56:09 +0200 |
---|---|---|
committer | Lionel Elie Mamane <lionel@mamane.lu> | 2013-06-23 18:02:05 +0200 |
commit | 8e824b11b694ceaaf28ff87b5e363387ee5bb5b4 (patch) | |
tree | f19824d02453ef71276f067760357769195851cd | |
parent | Data-aware ListBox: use entry for NULL if the *bound* value is NULL (diff) | |
download | core-8e824b11b694ceaaf28ff87b5e363387ee5bb5b4.tar.gz core-8e824b11b694ceaaf28ff87b5e363387ee5bb5b4.zip |
Don't second-guess the database
If it gives us a NULL as bound value,
use it, even if the underlying column
has constraint NOT NULL.
This can happen e.g. in OUTER JOIN,
with UNION, ...
Change-Id: I1fc0d9366764b90e0cdb443cd34c32b52f059e0b
-rw-r--r-- | forms/source/component/ListBox.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 90decec5d2ad..3ac34f89cb45 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -915,7 +915,7 @@ namespace frm aBoundValue = static_cast<sal_Int16>(xListCursor->getRow()-1); aValueList.push_back( aBoundValue ); - if ( bUseNULL && ( m_nNULLPos == -1 ) && aBoundValue.isNull() ) + if ( m_nNULLPos == -1 && aBoundValue.isNull() ) m_nNULLPos = sal_Int16( aDisplayList.size() - 1 ); if ( bUseNULL && ( m_nNULLPos == -1 ) && aStr.isEmpty() ) // There is already a non-NULL entry with empty display string; |