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

[noelpwer svn gnome org]

Author: noelpwer
Date: Wed Feb 27 12:29:16 2008
New Revision: 11720
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11720&view=rev

Log:
2008-02-27  Noel Power  <noel power novell com>

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


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	Wed Feb 27 12:29:16 2008
@@ -171,7 +171,22 @@
  			{
  				pParser->Next();
  				eTok = pParser->Peek();
-? basic/source/inc/errobject.hxx
+@@ -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();x
 Index: basic/source/inc/expr.hxx
 ===================================================================
 RCS file: /cvs/script/basic/source/inc/expr.hxx,v
@@ -206,19 +221,4 @@
  };
  
  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();
+