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

[noelpwer svn gnome org]

Author: noelpwer
Date: Tue Jan 22 14:30:06 2008
New Revision: 11358
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11358&view=rev

Log:
2008-01-22  Noel Power  <noel power novell com>

        * patches/vba/vba-workbook-worksheet-events.diff: fix for
        * n#339306



Modified:
   trunk/ChangeLog
   trunk/patches/vba/vba-workbook-worksheet-events.diff

Modified: trunk/patches/vba/vba-workbook-worksheet-events.diff
==============================================================================
--- trunk/patches/vba/vba-workbook-worksheet-events.diff	(original)
+++ trunk/patches/vba/vba-workbook-worksheet-events.diff	Tue Jan 22 14:30:06 2008
@@ -46,7 +46,7 @@
 +	// passed in should be the fully specified name. 	
 +	//rtl::OUString sCodeName = getWorkbookModuleName( pShell );
 +	//rtl::OUString sUrl = sUrlPart1.concat( sCodeName ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") ) ).concat( sMacroName ).concat( sUrlPart2 );
-+	rtl::OUString sUrl = sUrlPart1.concat( sMacroName ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") ) ).concat( sUrlPart2 ) ;
++	rtl::OUString sUrl = sUrlPart0.concat( sMacroName ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") ) ).concat( sUrlPart2 ) ;
 +	uno::Sequence< sal_Int16 > aOutArgsIndex;
 +	uno::Sequence< uno::Any > aOutArgs;
 +	ErrCode nErr = pShell->CallXScript( sUrl,  aArgs, aRet,
@@ -131,7 +131,7 @@
 +	String sFullClose = docMacroExists( pShell, String(), sBeforeClose );
 +	if ( sFullClose.Len() > 0 )
 +	{ 
-+		if ( !executeWorkBookMacro( pShell, sBeforeClose, aArgs, aRet ) )
++		if ( !executeWorkBookMacro( pShell, sFullClose, aArgs, aRet ) )
 +			return false;
 +	}
 +	aArgs[ 0 ] >>= bCancel;