[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - svx/source

[Libreoffice Gerrit user]

 svx/source/form/formcontroller.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 8dbcd72f83e2317dd40c0fa605fd26b3f6a2616b
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Tue Oct 2 20:40:24 2018 +0200
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Wed Oct 3 05:12:54 2018 +0200

    tdf#120245: Accept to insert empty field with 'not null' database constraint
    
    See https://bugs.documentfoundation.org/show_bug.cgi?id=120245#c4
    
    Change-Id: I9ac852a83e0a57c34ef3640bf0fb0e6a3394db63
    Reviewed-on: https://gerrit.libreoffice.org/61269
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Jenkins

diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 881f1ec84967..f3a10ee3c0da 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -3730,8 +3730,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent
             if ( rColInfo.bReadOnly )
                 continue;
 
-            if ( !rColInfo.xFirstControlWithInputRequired.is() && !rColInfo.xFirstGridWithInputRequiredColumn.is()
-                  && rColInfo.nNullable != ColumnValue::NO_NULLS )
+            if ( !rColInfo.xFirstControlWithInputRequired.is() && !rColInfo.xFirstGridWithInputRequiredColumn.is() )
             {
                 continue;
             }