ooo-build r11736 - in branches/sled-10-ooo-build-2-3: . patches/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Thu Feb 28 13:17:22 2008
New Revision: 11736
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11736&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:
   branches/sled-10-ooo-build-2-3/ChangeLog
   branches/sled-10-ooo-build-2-3/patches/vba/vba-brackets-params-fix.diff

Modified: branches/sled-10-ooo-build-2-3/patches/vba/vba-brackets-params-fix.diff
==============================================================================
--- branches/sled-10-ooo-build-2-3/patches/vba/vba-brackets-params-fix.diff	(original)
+++ branches/sled-10-ooo-build-2-3/patches/vba/vba-brackets-params-fix.diff	Thu Feb 28 13:17:22 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,3 +221,4 @@
  };
  
  class SbiDimList : public SbiExprList {
+