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

[Jean-Pierre Ledure]

 wizards/source/access2base/Module.xba |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6ceed2e47bf5567c3e01e2cc9bffd566958848ba
Author: Jean-Pierre Ledure <jp at ledure.be>
Date:   Tue Oct 31 17:00:24 2017 +0100

    Access2Base - Correct parsing error in Module
    
    Error occurrs when function name starts with "REM"

diff --git a/wizards/source/access2base/Module.xba b/wizards/source/access2base/Module.xba
index 64eea2f102c9..4e6156c81b9f 100644
--- a/wizards/source/access2base/Module.xba
+++ b/wizards/source/access2base/Module.xba
@@ -496,7 +496,7 @@ Dim bEndStatement As Boolean, bQuote As Boolean
 					plStart = lStart + 1
 					sMatch = Right(sMatch, Len(sMatch) - 1)
 				End If
-			Case UCase(Left(sMatch, 3)) = "REM"
+			Case UCase(Left(sMatch, 4)) = "REM " Or UCase(Left(sMatch, 4)) = "REM" & vbTab Or UCase(Left(sMatch, 4)) = "REM" & vbNewLine
 				bEndStatement = True
 			Case UCase(Left(sMatch, 4)) = "THEN" Or UCase(Left(sMatch, 4)) = "ELSE"
 				If psPattern = "%$" Then
@@ -610,7 +610,7 @@ Const cstName = "\w*"	'"[A-Za-z_][A-Za-z_0-9]*"
 			ReDim Preserve _ProcDecPositions(0 To iProc)
 			ReDim Preserve _ProcEndPositions(0 To iProc)
 			ReDim Preserve _ProcTypes(0 To iProc)
-			_ProcDecpositions(iProc) = lPosition
+			_ProcDecPositions(iProc) = lPosition
 			lPosition = lPosition + Len(sDecProc)
 			'	Identify procedure type
 			Select Case True