[Libreoffice-commits] core.git: wizards/source

[Jean-Pierre Ledure]

 wizards/source/access2base/CommandBarControl.xba |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit faa5b9602839b93fc4b82bb36fbef03e022a1924
Author: Jean-Pierre Ledure <jp at ledure.be>
Date:   Sun Jul 26 13:10:18 2015 +0200

    Access2Base - Return value of Execute method in CommandBarControl
    
    Method always returned False. Should return True when successful.
    
    Change-Id: I82c8a6e425409032ccf5217b940ec81b277a6313

diff --git a/wizards/source/access2base/CommandBarControl.xba b/wizards/source/access2base/CommandBarControl.xba
index a6bdcbc..286dc07 100644
--- a/wizards/source/access2base/CommandBarControl.xba
+++ b/wizards/source/access2base/CommandBarControl.xba
@@ -152,24 +152,25 @@ Const cstThisSub = "CommandBarControl.Execute"
 	Utils._SetCalledSub(cstThisSub)
 
 Dim sExecute As String
-	Execute = False
+
+	Execute = True
 	sExecute = _GetPropertyValue(_Element, "CommandURL", "")
 
 	Select Case True
-		Case sExecute = ""
+		Case sExecute = ""		:	Execute = False
 		Case _IsLeft(sExecute, ".uno:")
 			Execute = DoCmd.RunCommand(sExecute)
 		Case _IsLeft(sExecute, "vnd.sun.star.script:")
 			Execute = Utils._RunScript(sExecute, Array(Nothing))
 		Case Else
 	End Select
-
+	
 Exit_Function:
 	Utils._ResetCalledSub(cstThisSub)
 	Exit Function
 Error_Function:
 	TraceError(TRACEABORT, Err, cstThisSub, Erl)
-	Reset = False
+	Execute = False
 	GoTo Exit_Function
 End Function	'	Execute	V1.3.0