[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - forms/source

[Lionel Elie Mamane]

 forms/source/component/ListBox.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6fd7c667db057571ce1fa9c2fbc4a78161227f5a
Author: Lionel Elie Mamane <lionel at 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
    Reviewed-on: https://gerrit.libreoffice.org/4462
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 14a67b9..d4e46eb 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;