ooo-build r13315 - in trunk: . patches/dev300 patches/vba

[pflin svn gnome org]

Author: pflin
Date: Mon Jul 21 01:48:53 2008
New Revision: 13315
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13315&view=rev

Log:
* patches/vba/basic-not-is-nothing.diff: Fixed the issue of "IF Not r Is Nothing Then", n#407805.



Added:
   trunk/patches/vba/basic-not-is-nothing.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul 21 01:48:53 2008
@@ -1664,6 +1664,8 @@
 vba-application-union.diff, n#405313, Fong
 # Add to support Worksheet.Index, and fix for n#403974
 vba-worksheet-fix-n403974.diff, n#403974, Fong
+# Fixed for n#407805
+basic-not-is-nothing.diff, n#407805, Fong
 
 [ VBAUntested ]
 SectionOwner => noelpwer

Added: trunk/patches/vba/basic-not-is-nothing.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/basic-not-is-nothing.diff	Mon Jul 21 01:48:53 2008
@@ -0,0 +1,17 @@
+--- basic/source/comp/exprtree.cxx.orig	2008-07-16 13:59:41.000000000 +0800
++++ basic/source/comp/exprtree.cxx	2008-07-21 09:30:56.000000000 +0800
+@@ -495,6 +495,14 @@ SbiExprNode* SbiExpression::Operand()
+ 	switch( eTok = pParser->Peek() )
+ 	{
+ 		case SYMBOL:
++			pRes = Term();
++			// process something like "IF Not r Is Nothing Then .."
++			if( pParser->IsVBASupportOn() && pParser->Peek() == IS )
++			{
++				eTok = pParser->Next();
++				pRes = new SbiExprNode( pParser, pRes, eTok, Like() );
++			}
++			break;
+ 		case DOT:	// .with
+ 			pRes = Term(); break;
+ 		case NUMBER: