[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - wizards/source

[Jean-Pierre Ledure]

 wizards/source/access2base/Field.xba |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 8718bcc3d74e5eed7499ec1359aff10659faaebc
Author: Jean-Pierre Ledure <jp at ledure.be>
Date:   Fri Aug 29 22:24:06 2014 +0200

    Access2Base - PATCH-01 Field.setValue
    
    Gives erroneously an  error message when argument is Null and field is nullable
    https://forum.openoffice.org/en/forum/viewtopic.php?f=47&t=61447&sid=48e231a12084933d9da1b47e50b186ea#p323714
    
    Change-Id: I37be06e5c30f1294756d28ba88d903f9fa28d8bb
    Reviewed-on: https://gerrit.libreoffice.org/11198
    Reviewed-by: Jean-Pierre Ledure <jp at ledure.be>
    Tested-by: Jean-Pierre Ledure <jp at ledure.be>

diff --git a/wizards/source/access2base/Field.xba b/wizards/source/access2base/Field.xba
index 871133f..3e27216 100644
--- a/wizards/source/access2base/Field.xba
+++ b/wizards/source/access2base/Field.xba
@@ -514,7 +514,13 @@ Dim oParent As Object
 			If _ParentDatabase.Recordsets(_ParentName)._EditMode = dbEditNone Then Goto Trace_Error_Update
 			With com.sun.star.sdbc.DataType
 				If IsNull(pvValue) Then
-					If Column.IsNullable = com.sun.star.sdbc.ColumnValue.NULLABLE Then Column.updateNull() Else Goto Trace_Null
+REM					If Column.IsNullable = com.sun.star.sdbc.ColumnValue.NULLABLE Then Column.updateNull() Else Goto Trace_Null
+					If Column.IsNullable = com.sun.star.sdbc.ColumnValue.NULLABLE Then
+						Column.updateNull()
+						Goto Exit_Function
+					Else
+						Goto Trace_Null
+					End If
 				End If
 				Select Case Column.Type
 					Case .BIT, .BOOLEAN