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

[Jean-Pierre Ledure]

 wizards/source/access2base/Field.xba |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 35c970839e1372e454e9e4357908f965f7853329
Author: Jean-Pierre Ledure <jp at ledure.be>
Date:   Sun Aug 31 15:44:08 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: Icdfd660dfa52ea7434959f0d87ac2d989c1910ab
    Reviewed-on: https://gerrit.libreoffice.org/11216
    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 39fbfec..afd0e40 100644
--- a/wizards/source/access2base/Field.xba
+++ b/wizards/source/access2base/Field.xba
@@ -485,7 +485,13 @@ Dim oParent As Object
 			If Application._CurrentDb().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
@@ -740,4 +746,4 @@ Property Set Value(ByVal pvValue As Variant)
 	Call _PropertySet("Value", pvValue)
 End Property		'	Value (set)
 
-</script:module>
\ No newline at end of file
+</script:module>