[Libreoffice-commits] core.git: wizards/source
Jean-Pierre Ledure
jp at ledure.be
Thu Mar 30 14:26:41 UTC 2017
wizards/source/access2base/Application.xba | 2 +-
wizards/source/access2base/Recordset.xba | 2 +-
wizards/source/access2base/UtilProperty.xba | 6 +++---
wizards/source/access2base/Utils.xba | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 53c2507bf97867011fd2bfbbac6c86b7fc494338
Author: Jean-Pierre Ledure <jp at ledure.be>
Date: Thu Mar 30 16:23:09 2017 +0200
Access2Base Missing parentheses - tdf#106710
Due to more severe Basic interpreter on final parentheses
missing parentheses were revealed
Cherry picking https://gerrit.libreoffice.org/#/c/35717/
was not sufficient as they were remaining cases in new LO5.4 code
Change-Id: I6a883ceed22ae20bb61cba8e3966c2dc680bdd0c
diff --git a/wizards/source/access2base/Application.xba b/wizards/source/access2base/Application.xba
index 6bd29a6d86f4..2c38590136d8 100644
--- a/wizards/source/access2base/Application.xba
+++ b/wizards/source/access2base/Application.xba
@@ -1624,4 +1624,4 @@ Public Sub _RootInit(Optional ByVal pbForce As Boolean)
If IsEmpty(_A2B_) Or pbForce Then _A2B_ = New Root_
End Sub ' _RootInit V1.1.0
-</script:module>
+</script:module>
\ No newline at end of file
diff --git a/wizards/source/access2base/Recordset.xba b/wizards/source/access2base/Recordset.xba
index aeb7c1aaa416..8348b0f81207 100644
--- a/wizards/source/access2base/Recordset.xba
+++ b/wizards/source/access2base/Recordset.xba
@@ -1267,4 +1267,4 @@ Error_Function:
_PropertySet = False
GoTo Exit_Function
End Function ' _PropertySet
-</script:module>
+</script:module>
\ No newline at end of file
diff --git a/wizards/source/access2base/UtilProperty.xba b/wizards/source/access2base/UtilProperty.xba
index 96e09552e948..500213fb0997 100644
--- a/wizards/source/access2base/UtilProperty.xba
+++ b/wizards/source/access2base/UtilProperty.xba
@@ -266,15 +266,15 @@ Const cstEqualArray = " = (", cstEqual = " = "
lSearch = lPosition + Len(sName) + Len(cstEqualArray) - 1
sDim = Utils._RegexSearch(vString(i), "\([0-9]+\)", lSearch) ' e.g. (10)
If sDim <> "" Then
- iCols = CInt(Mid(sDim, 2, Len(sDim) - 2)
+ iCols = CInt(Mid(sDim, 2, Len(sDim) - 2))
iRows = 0
ReDim vValue(0 To iCols - 1)
Else
lSearch = lPosition + Len(sName) + Len(cstEqualArray) - 1
sDim = Utils._RegexSearch(vString(i), "\([0-9]+,", lSearch) ' e.g. (10,
- iRows = CInt(Mid(sDim, 2, Len(sDim) - 2)
+ iRows = CInt(Mid(sDim, 2, Len(sDim) - 2))
sDim = Utils._RegexSearch(vString(i), ",[0-9]+\)", lSearch) ' e.g. ,20)
- iCols = CInt(Mid(sDim, 2, Len(sDim) - 2)
+ iCols = CInt(Mid(sDim, 2, Len(sDim) - 2))
ReDim vValue(0 To iRows - 1)
End If
iArray = 0
diff --git a/wizards/source/access2base/Utils.xba b/wizards/source/access2base/Utils.xba
index c4ec1cae71f0..7a1696f7a644 100644
--- a/wizards/source/access2base/Utils.xba
+++ b/wizards/source/access2base/Utils.xba
@@ -1264,4 +1264,4 @@ Private Function _UTF8Encode(ByVal psChar As String) As String
End Function ' _UTF8Encode V1.4.0
-</script:module>
+</script:module>
\ No newline at end of file
More information about the Libreoffice-commits
mailing list