forms/source/component/ListBox.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8e824b11b694ceaaf28ff87b5e363387ee5bb5b4
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Sun Jun 23 17:56:09 2013 +0200
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
diff --git a/forms/source/component/ListBox.cxx
b/forms/source/component/ListBox.cxx
index 90decec..3ac34f8 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
