diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-20 11:30:12 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-20 11:30:12 +0000 |
| commit | 86184990e7b9b41aa85114122805949309a2f1fc (patch) | |
| tree | 81ddeca7e9ce55eea4a93d0ec8ce8406f359f30f /basic | |
| parent | 9649e179e7b6dab6c00e82d4f5375931daa25f56 (diff) | |
INTEGRATION: CWS gh7 (1.9.48); FILE MERGED
2004/09/15 08:39:41 gh 1.9.48.2: RESYNC: (1.9-1.10); FILE MERGED
2004/08/20 12:53:49 gh 1.9.48.1: #i26323# problems handling strings at the 64K Border
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/comp/scanner.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx index 761e87b25420..a11368cf0610 100644 --- a/basic/source/comp/scanner.cxx +++ b/basic/source/comp/scanner.cxx @@ -2,9 +2,9 @@ * * $RCSfile: scanner.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: obo $ $Date: 2004-09-09 07:43:18 $ + * last change: $Author: rt $ $Date: 2004-09-20 12:30:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -214,10 +214,13 @@ BOOL SbiScanner::NextSym() while( ( n < nLen ) && ( *p != '\n' ) && ( *p != '\r' ) ) p++, n++; aLine = aBuf.copy( nBufPos, n - nBufPos ); - if( ( n < nLen ) && *p == '\r' && *( p+1 ) == '\n' ) - n += 2; - else - n++; + if( n < nLen ) + { + if( *p == '\r' && *( p+1 ) == '\n' ) + n += 2; + else + n++; + } nBufPos = n; pLine = aLine.getStr(); nOldLine = ++nLine; |