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

[noelpwer svn gnome org]

Author: noelpwer
Date: Thu Aug 28 15:10:04 2008
New Revision: 13709
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13709&view=rev

Log:
2008-08-28  Noel Power  <noel power novell com>
        
        * patches/dev300/apply: added
        * patches/vba/variant-property.diff: fix n#417316, i#93214



Added:
   trunk/patches/vba/variant-property.diff
Modified:
   trunk/ChangeLog

Added: trunk/patches/vba/variant-property.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/variant-property.diff	Thu Aug 28 15:10:04 2008
@@ -0,0 +1,21 @@
+diff --git basic/source/comp/dim.cxx basic/source/comp/dim.cxx
+index e0c93fa..d2dc366 100644
+--- basic/source/comp/dim.cxx
++++ basic/source/comp/dim.cxx
+@@ -745,6 +745,7 @@ void SbiParser::DefEnum( BOOL bPrivate )
+ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
+ {
+ 	BOOL bFunc = BOOL( eCurTok == FUNCTION );
++	BOOL bProp = BOOL( eCurTok == GET || eCurTok == SET || eCurTok == LET );
+ 	if( !TestSymbol() ) return NULL;
+ 	String aName( aSym );
+ 	SbxDataType eType = eScanType;
+@@ -865,7 +866,7 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
+ //	if( pDef->GetType() == SbxOBJECT )
+ //		pDef->SetType( SbxVARIANT ),
+ //		Error( SbERR_SYNTAX );
+-	if( pDef->GetType() == SbxVARIANT && !bFunc )
++	if( pDef->GetType() == SbxVARIANT && !( bFunc || bProp ) )
+ 		pDef->SetType( SbxEMPTY );
+ 	return pDef;
+ }