summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2013-06-23 17:56:09 +0200
committerDavid Tardon <dtardon@redhat.com>2013-06-24 13:10:52 +0000
commit6fd7c667db057571ce1fa9c2fbc4a78161227f5a (patch)
tree51943de200b7c68dcbc660ebabd536a9ede6942b /forms
parent51c833591bc0959b537199abd174a7dfa7e6e601 (diff)
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 Reviewed-on: https://gerrit.libreoffice.org/4462 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'forms')
-rw-r--r--forms/source/component/ListBox.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 14a67b954ac6..d4e46eb4cb6e 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -916,7 +916,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;