ooo-build r11700 - in trunk: . patches/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Mon Feb 25 17:37:01 2008
New Revision: 11700
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11700&view=rev

Log:
2088-02-25  Noel Power  <noel power novell com>

        * patches/vba/vba-brackets-params-fix.diff: updated fix for
        * n#349283 & i#86265


Modified:
   trunk/ChangeLog
   trunk/patches/vba/vba-brackets-params-fix.diff

Modified: trunk/patches/vba/vba-brackets-params-fix.diff
==============================================================================
--- trunk/patches/vba/vba-brackets-params-fix.diff	(original)
+++ trunk/patches/vba/vba-brackets-params-fix.diff	Mon Feb 25 17:37:01 2008
@@ -206,3 +206,19 @@
  };
  
  class SbiDimList : public SbiExprList {
+@@ -933,11 +968,13 @@ SbiDimList::SbiDimList( SbiParser* p ) :
+ 		SbiToken eTok;
+ 		for( ;; )
+ 		{
+-			pExpr1 = new SbiExpression( pParser );
++                        // we have already processed a LPAREN so we are already 
++			// in a nested mode, so... propagate that fact
++			pExpr1 = new SbiExpression( pParser, SbSTDEXPR, TRUE );
+ 			eTok = pParser->Next();
+ 			if( eTok == TO )
+ 			{
+-				pExpr2 = new SbiExpression( pParser );
++				pExpr2 = new SbiExpression( pParser, SbSTDEXPR, TRUE );
+ 				eTok = pParser->Next();
+ 				bConst &= pExpr1->IsIntConstant() & pExpr2->IsIntConstant();
+ 				bError |= !pExpr1->IsValid();