mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Access2Base Missing parentheses - Bug #106710

Browse Source 
Due to more severe Basic interpreter on final parentheses
missing parentheses were revealed

Change-Id: I779b5e3d299fb9c56ecd807d28a780cc3ab9a1b5
This commit is contained in:
Jean-Pierre Ledure
2017-03-25 09:29:02 +01:00
parent 54f9a81a1c
commit 72a2f615c3
6 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wizards/source/access2base/Application.xba
View File

@@ -1069,7 +1069,7 @@ Dim sOutput As String, l As Long, lLength As Long
If Len(pvString) > 0 Then If Len(pvString) > 0 Then
For l = 1 To Len(pvString) For l = 1 To Len(pvString)
If lLength > 0 And Len(sOutput) > lLength Then Exit For 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 Next l
End If End If

2
wizards/source/access2base/Database.xba
View File

@@ -1446,7 +1446,7 @@ Dim i As Integer, l As Long
lNextPattern = InStr(lCurrentChar, psString, vPatterns(i), 1) ' Text (not case-sensitive) string comparison lNextPattern = InStr(lCurrentChar, psString, vPatterns(i), 1) ' Text (not case-sensitive) string comparison
If lNextPattern > 0 And lNextPattern < lPattern Then If lNextPattern > 0 And lNextPattern < lPattern Then
lPattern = lNextPattern lPattern = lNextPattern
sPattern = Mid(psString, lPattern, Len(vPatterns(i)) sPattern = Mid(psString, lPattern, Len(vPatterns(i)))
End If End If
Next i Next i
' Up to the next pattern or to the end of the string, UTF8-encode each character ' Up to the next pattern or to the end of the string, UTF8-encode each character

2
wizards/source/access2base/Event.xba
View File

@@ -254,7 +254,7 @@ Const cstDatabaseForm = "com.sun.star.comp.forms.ODatabaseForm"
Set oObject = poEvent.Source Set oObject = poEvent.Source
_EventSource = oObject _EventSource = oObject
sArray = Split(Utils._getUNOTypeName(poEvent), ".") sArray = Split(Utils._getUNOTypeName(poEvent), ".")
_EventType = UCase(sArray(UBound(sArray)) _EventType = UCase(sArray(UBound(sArray)))
If Utils._hasUNOProperty(poEvent, "EventName") Then _EventName = poEvent.EventName If Utils._hasUNOProperty(poEvent, "EventName") Then _EventName = poEvent.EventName
Select Case _EventType Select Case _EventType

1
wizards/source/access2base/Recordset.xba
View File

@@ -1124,6 +1124,7 @@ Private Function _PropertiesList() As Variant
_PropertiesList = Array("AbsolutePosition", "BOF", "Bookmarkable", "Bookmark", "EditMode" _ _PropertiesList = Array("AbsolutePosition", "BOF", "Bookmarkable", "Bookmark", "EditMode" _
, "EOF", "Filter", "LastModified", "Name", "ObjectType" , "RecordCount" _ , "EOF", "Filter", "LastModified", "Name", "ObjectType" , "RecordCount" _
)
End Function ' _PropertiesList End Function ' _PropertiesList

2
wizards/source/access2base/Trace.xba
View File

@@ -182,7 +182,7 @@ Public Sub TraceLevel(ByVal Optional psTraceLevel As String)
Case psTraceLevel = "" : psTraceLevel = "ERROR" Case psTraceLevel = "" : psTraceLevel = "ERROR"
Case Utils._InList(UCase(psTraceLevel), Array( _ Case Utils._InList(UCase(psTraceLevel), Array( _
TRACEDEBUG, TRACEINFO, TRACEWARNING, TRACEERRORS, TRACEFATAL, TRACEABORT _ TRACEDEBUG, TRACEINFO, TRACEWARNING, TRACEERRORS, TRACEFATAL, TRACEABORT _
) ))
Case Else : Goto Exit_Sub Case Else : Goto Exit_Sub
End Select End Select
_A2B_.MinimalTraceLevel = _TraceLevel(psTraceLevel) _A2B_.MinimalTraceLevel = _TraceLevel(psTraceLevel)

2
wizards/source/access2base/Utils.xba
View File

@@ -1059,7 +1059,7 @@ Const cstDot = "."
Dim sName As String Dim sName As String
If InStr(psName, ".") > 0 Then 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 _Surround = cstSquareOpen & sName & cstSquareClose
ElseIf InStr(psName, " ") > 0 Then ElseIf InStr(psName, " ") > 0 Then
_Surround = cstSquareOpen & psName & cstSquareClose _Surround = cstSquareOpen & psName & cstSquareClose