[ooo-build-commit] patches/dev300 patches/vba

[Tor Lillqvist]

 patches/dev300/apply              |    3 ---
 patches/vba/fix-lineconintue.diff |   23 -----------------------
 2 files changed, 26 deletions(-)

New commits:
commit d6115966c2230ad89490de831ef4dc92b8710ce2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 27 12:05:43 2009 +0300

    fix-lineconintue.diff is upstream
    
    * patches/dev300/apply: Drop it.
    * patches/vba/fix-lineconintue.diff: Delete, is upstream.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 55799d1..e7522f2 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1643,9 +1643,6 @@ vba-worksheet-change-event-fix.diff, Fong
 vba-toolbar-menufilter-core-fix.diff
 # enhancement to above to read new menus added to the builtin menubar
 word-read-builtinmenubar-filter.diff
-# fix compiler error to do with leading spaces and object 'DOT' operator
-# when occuring after a line continue '_'
-fix-lineconintue.diff, i#100578
 # allow private/public modifier for DECLARE
 vba-fix-private-declare.diff
 # import customization and macros from global templates ( if defined ) when 
diff --git a/patches/vba/fix-lineconintue.diff b/patches/vba/fix-lineconintue.diff
deleted file mode 100644
index a3fe0c3..0000000
--- a/patches/vba/fix-lineconintue.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git basic/source/comp/scanner.cxx basic/source/comp/scanner.cxx
-index c7fb06c..49e512e 100644
---- basic/source/comp/scanner.cxx
-+++ 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
- 	{