From 8e73111faeb9620117801fee89a838a407f0b7e5 Mon Sep 17 00:00:00 2001
From: Release Engineers <releng@openoffice.org>
Date: Thu, 6 Aug 2009 11:03:20 +0000
Subject: CWS-TOOLING: integrate CWS ab72 2009-08-03 14:57:25 +0200 jsk 
 r274581 : #i103969 - fixed f_windowfunctions.bas 2009-08-03 13:29:21 +0200
 jsk  r274577 : #i103969 - minor stability improvements and a rewrite to use
 GUI function to install extension (CLI version fails for some unknown reason)
 2009-07-16 10:43:48 +0200 ab  r274033 : #i82918# Added support to pass
 context explicitely to service ctors 2009-07-08 16:24:05 +0200 ab  r273839 :
 CWS-TOOLING: rebase CWS ab72 to trunk@273468 (milestone: DEV300:m51)
 2009-07-02 13:09:22 +0200 ab  r273641 : #i89740# Fixed resource typos
 2009-07-02 12:21:49 +0200 ab  r273635 : #i99461# Applied patch 2009-06-23
 15:56:08 +0200 ab  r273284 : #i100578# applied patch 2009-06-23 11:52:45
 +0200 ab  r273271 : #i100600# applied patch 2009-06-22 14:35:15 +0200 ab 
 r273231 : #i101603# applied patch 2009-06-22 13:24:22 +0200 ab  r273227 :
 #i100540# applied patch to remove unused code 2009-06-10 13:33:20 +0200 ab 
 r272806 : #i82918# New style service ctor support

---
 basic/source/comp/exprtree.cxx |  6 ------
 basic/source/comp/scanner.cxx  | 12 +++++++++++-
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'basic/source/comp')

diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index e69551f364e5..701ecdd7bc16 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -701,12 +701,6 @@ SbiExprNode* SbiExpression::Comp()
             pNd = new SbiExprNode( pParser, pNd, eTok, Cat() );
             nCount++;
         }
-        // Mehrere Operatoren hintereinander gehen nicht
-        if( nCount > 1 )
-        {
-            pParser->Error( SbERR_SYNTAX );
-            bError = TRUE;
-        }
     }
     return pNd;
 }
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 9cde971228d9..2cc496f9cb02 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -479,7 +479,17 @@ PrevLineCommentLbl:
 eoln:
     if( nCol && *--pLine == '_' )
     {
-        pLine = NULL; return NextSym();
+        pLine = NULL; 
+        bool bRes = NextSym();
+        if( bVBASupportOn && aSym.GetBuffer()[0] == '.' )
+        {
+            // object _
+            //    .Method
+            // ^^^  <- spaces is legal in MSO VBA
+            OSL_TRACE("*** resetting bSpaces***"); 
+            bSpaces = FALSE; 
+        }
+        return bRes;
     }
     else
     {
-- 
cgit