summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
authorJean-Pierre Ledure <jp@ledure.be>2014-05-23 17:42:39 +0200
committerLionel Elie Mamane <lionel@mamane.lu>2014-05-27 05:50:31 -0500
commit4916efd5c69684f12fa062f734345627291b49e4 (patch)
tree887dc6380a713c572c52d27174f31766a07a0a9a /wizards
parentc3fe2934ffc1d3c14c19bcb758d125a5d6df783f (diff)
Access2Base - Bug when event triggered by toolbar button
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@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
Diffstat (limited to 'wizards')
-rw-r--r--wizards/source/access2base/Application.xba2
-rw-r--r--wizards/source/access2base/DoCmd.xba4
2 files changed, 3 insertions, 3 deletions
diff --git a/wizards/source/access2base/Application.xba b/wizards/source/access2base/Application.xba
index 13504648a37d..04dceb079b0b 100644
--- a/wizards/source/access2base/Application.xba
+++ b/wizards/source/access2base/Application.xba
@@ -641,7 +641,7 @@ Const cstThisSub = &quot;Events&quot;
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 &apos; No error handling in CheckArgument
If Not Utils._hasUNOProperty(poEvent, &quot;Source&quot;) 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 2ece7005f23b..54249ef12734 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 &apos; 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)