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

[Jean-Pierre Ledure]

 wizards/source/access2base/Application.xba |    2 +-
 wizards/source/access2base/DoCmd.xba       |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fb242d587ba2aebc1940a6cf5386685ba89f7944
Author: Jean-Pierre Ledure <jp at ledure.be>
Date:   Fri May 23 17:42:39 2014 +0200

    Access2Base - Bug when event triggered by toolbar button
    
    cfr. Change 9452 on master
    
    Argument given by LO to macro triggered by toolbar button is an integer, not an object.
    This should not cause a visible error for the end-user from within the Events() Sub
    
    Change-Id: I4a307270b0d5cf2992b3bb304deb8cd30222dd95
    Reviewed-on: https://gerrit.libreoffice.org/9452
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Lionel Elie Mamane <lionel at mamane.lu>
    (cherry picked from commit 4916efd5c69684f12fa062f734345627291b49e4)
    Reviewed-on: https://gerrit.libreoffice.org/9540
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/wizards/source/access2base/Application.xba b/wizards/source/access2base/Application.xba
index 1350464..04dceb0 100644
--- a/wizards/source/access2base/Application.xba
+++ b/wizards/source/access2base/Application.xba
@@ -641,7 +641,7 @@ Const cstThisSub = "Events"
 	If IsMissing(poEvent) Then Goto Exit_Function
 	If IsNull(poEvent) Then Goto Exit_Function
 
-	If Not Utils._CheckArgument(poEvent, 1, vbObject) Then Goto Exit_Function
+	If Not Utils._CheckArgument(poEvent, 1, vbObject, , False) Then Goto Exit_Function	'	No error handling in CheckArgument
 	If Not Utils._hasUNOProperty(poEvent, "Source") Then Goto Trace_Error
 	Set vEvent = New Event
 	vEvent._Initialize(poEvent)
diff --git a/wizards/source/access2base/DoCmd.xba b/wizards/source/access2base/DoCmd.xba
index 2ece700..54249ef 100644
--- a/wizards/source/access2base/DoCmd.xba
+++ b/wizards/source/access2base/DoCmd.xba
@@ -1297,7 +1297,7 @@ Error_Function:
 	Set OpenForm = Nothing
 	GoTo Exit_Function
 Error_NotApplicable:
-	TraceError(TRACEFATAL, ERRMETHOD, Utils._CalledSub(), 0, 1, cstThisSub)
+	TraceError(TRACEFATAL, ERRACTION, Utils._CalledSub(), 0, 1, cstThisSub)
 	Goto Exit_Function
 End Function		'	Quit	V1.1.0
 
@@ -1792,7 +1792,7 @@ Exit_Function:
 	Utils._ResetCalledSub(cstThisSub)
 	Exit Function		
 Error_NotApplicable:
-	TraceError(TRACEFATAL, ERRMETHOD, Utils._CalledSub(), 0, 1, cstThisSub)
+	TraceError(TRACEFATAL, ERRACTION, Utils._CalledSub(), 0, 1, cstThisSub)
 	Goto Exit_Function
 Error_Function:
 	TraceError(TRACEABORT, Err, cstThisSub, Erl)