[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - wizards/source

[Jean-Pierre Ledure]

 wizards/source/access2base/Application.xba |    2 +-
 wizards/source/access2base/Database.xba    |    2 +-
 wizards/source/access2base/Event.xba       |    2 +-
 wizards/source/access2base/Recordset.xba   |    1 +
 wizards/source/access2base/Trace.xba       |    2 +-
 wizards/source/access2base/Utils.xba       |    2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 6cbe9c583720e8e38112dbda2335f86e9cf25742
Author: Jean-Pierre Ledure <jp at ledure.be>
Date:   Sat Mar 25 11:54:27 2017 +0100

    Access2Base Missing parentheses - tdf#106710
    
    Due to more severe Basic interpreter on final parentheses
    missing parentheses were revealed
    
    Change-Id: I84ead9ba4957ae20ed094d7ae42df436fd1f88f2
    Reviewed-on: https://gerrit.libreoffice.org/35683
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit a403671af80be1e1563eea013d155e6a0635f0f0)

diff --git a/wizards/source/access2base/Application.xba b/wizards/source/access2base/Application.xba
index 19a872007f9f..783fca73541e 100644
--- a/wizards/source/access2base/Application.xba
+++ b/wizards/source/access2base/Application.xba
@@ -915,7 +915,7 @@ Dim sOutput As String, l As Long, lLength As Long
 	If Len(pvString) > 0 Then
 		For l = 1 To Len(pvString)
 			If lLength > 0 And Len(sOutput) > lLength Then Exit For
-			sOutput = sOutput & Utils._UTF8Encode(Mid(pvString, l, 1)
+			sOutput = sOutput & Utils._UTF8Encode(Mid(pvString, l, 1))
 		Next l
 	End If
 
diff --git a/wizards/source/access2base/Database.xba b/wizards/source/access2base/Database.xba
index 72445e0f3407..63ad4e5a3431 100644
--- a/wizards/source/access2base/Database.xba
+++ b/wizards/source/access2base/Database.xba
@@ -1442,7 +1442,7 @@ Dim i As Integer, l As Long
 			lNextPattern = InStr(lCurrentChar, psString, vPatterns(i), 1)		'	Text (not case-sensitive) string comparison
 			If lNextPattern > 0 And lNextPattern < lPattern Then
 				lPattern = lNextPattern
-				sPattern = Mid(psString, lPattern, Len(vPatterns(i))
+				sPattern = Mid(psString, lPattern, Len(vPatterns(i)))
 			End If
 		Next i
 		'	Up to the next pattern or to the end of the string, UTF8-encode each character
diff --git a/wizards/source/access2base/Event.xba b/wizards/source/access2base/Event.xba
index de6aa2a6e4c6..7688668b2afd 100644
--- a/wizards/source/access2base/Event.xba
+++ b/wizards/source/access2base/Event.xba
@@ -254,7 +254,7 @@ Const cstDatabaseForm = "com.sun.star.comp.forms.ODatabaseForm"
 	Set oObject = poEvent.Source
 	_EventSource = oObject
 	sArray = Split(Utils._getUNOTypeName(poEvent), ".")
-	_EventType = UCase(sArray(UBound(sArray))
+	_EventType = UCase(sArray(UBound(sArray)))
 	If Utils._hasUNOProperty(poEvent, "EventName") Then _EventName = poEvent.EventName
 
 	Select Case _EventType
diff --git a/wizards/source/access2base/Recordset.xba b/wizards/source/access2base/Recordset.xba
index 0f7be5b01827..c4ba6ce77f82 100644
--- a/wizards/source/access2base/Recordset.xba
+++ b/wizards/source/access2base/Recordset.xba
@@ -1120,6 +1120,7 @@ Private Function _PropertiesList() As Variant
 
 	_PropertiesList = Array("AbsolutePosition", "BOF", "Bookmarkable", "Bookmark", "EditMode" _
 			, "EOF", "Filter", "LastModified", "Name", "ObjectType" , "RecordCount" _
+			)
 
 End Function	'	_PropertiesList
 
diff --git a/wizards/source/access2base/Trace.xba b/wizards/source/access2base/Trace.xba
index fdc08d4d623c..601b711fdf33 100644
--- a/wizards/source/access2base/Trace.xba
+++ b/wizards/source/access2base/Trace.xba
@@ -182,7 +182,7 @@ Public Sub TraceLevel(ByVal Optional psTraceLevel As String)
 		Case psTraceLevel = ""				:		psTraceLevel = "ERROR"
 		Case Utils._InList(UCase(psTraceLevel), Array( _
 			TRACEDEBUG, TRACEINFO, TRACEWARNING, TRACEERRORS, TRACEFATAL, TRACEABORT _
-			)
+			))
 		Case Else							:		Goto Exit_Sub
 	End Select
 	_A2B_.MinimalTraceLevel = _TraceLevel(psTraceLevel)
diff --git a/wizards/source/access2base/Utils.xba b/wizards/source/access2base/Utils.xba
index c2b6172b2484..da9e57f7ab73 100644
--- a/wizards/source/access2base/Utils.xba
+++ b/wizards/source/access2base/Utils.xba
@@ -831,7 +831,7 @@ Const cstDot = "."
 Dim sName As String
 
 	If InStr(psName, ".") > 0 Then
-		sName = Join(Split(psName, cstDot), cstSquareClose & cstDot & cstSquareOpen
+		sName = Join(Split(psName, cstDot), cstSquareClose & cstDot & cstSquareOpen)
 		_Surround = cstSquareOpen & sName & cstSquareClose
 	ElseIf InStr(psName, " ") > 0 Then
 		_Surround = cstSquareOpen & psName & cstSquareClose