ooo-build r12750 - trunk/patches/test/vba

[jiaojh svn gnome org]

Author: jiaojh
Date: Mon Jun  2 07:31:37 2008
New Revision: 12750
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12750&view=rev

Log:
clear up


Modified:
   trunk/patches/test/vba/vbaevents.diff

Modified: trunk/patches/test/vba/vbaevents.diff
==============================================================================
--- trunk/patches/test/vba/vbaevents.diff	(original)
+++ trunk/patches/test/vba/vbaevents.diff	Mon Jun  2 07:31:37 2008
@@ -2447,79 +2447,6 @@
  		$(SLO)$/service.obj \
   
  
---- sfx2/inc/sfx2/objsh.hxx.orig	2008-05-07 12:09:29.000000000 +0800
-+++ sfx2/inc/sfx2/objsh.hxx	2008-05-16 16:04:06.000000000 +0800
-@@ -267,9 +267,6 @@ public:
-     sal_Bool                    Stamp_GetPrintCancelState() const;
- 
-     using SotObject::GetInterface;
--    // status, 0 before, 1 done...
--    virtual sal_Bool            processVbaEvents( USHORT nStatus, USHORT nSlotId )
--                                { (void)nSlotId; (void)nStatus; return sal_False; }
- 
-     // Document-Shell Iterator
- 	static SfxObjectShell*		GetFirst( const TypeId* pType = 0,
-@@ -407,7 +404,8 @@ public:
-         ::com::sun::star::uno::Any& aRet,
-         ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
-         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam,
--        bool bRaiseError = true
-+        bool bRaiseError = true,
-+        ::com::sun::star::uno::Any* aCaller = 0
-     );
- 
-     static ErrCode  CallXScript(
-@@ -417,7 +415,8 @@ public:
-         ::com::sun::star::uno::Any& aRet,
-         ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
-         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam,
--        bool bRaiseError = true
-+        bool bRaiseError = true,
-+        ::com::sun::star::uno::Any* aCaller = 0
-     );
- 
-     /** adjusts the internal macro mode, according to the current security settings
---- sfx2/source/doc/objmisc.cxx.orig	2008-05-07 12:09:22.000000000 +0800
-+++ sfx2/source/doc/objmisc.cxx	2008-05-07 12:09:37.000000000 +0800
-@@ -1591,7 +1591,7 @@ namespace
- }
- 
- ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const ::rtl::OUString& _rScriptURL,
--    const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError )
-+    const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError, ::com::sun::star::uno::Any* pCaller )
- {
-     OSL_TRACE( "in CallXScript" );
- 	ErrCode nErr = ERRCODE_NONE;
-@@ -1622,7 +1622,16 @@ ErrCode SfxObjectShell::CallXScript( con
- 
-         // obtain the script, and execute it
-         Reference< provider::XScript > xScript( xScriptProvider->getScript( _rScriptURL ), UNO_QUERY_THROW );
--
-+        if ( pCaller && pCaller->hasValue() )
-+        {
-+            Reference< beans::XPropertySet > xProps( xScript, uno::UNO_QUERY ); 
-+            if ( xProps.is() )
-+            {
-+                Sequence< uno::Any > aArgs( 1 );
-+                aArgs[ 0 ] = *pCaller;
-+                xProps->setPropertyValue( rtl::OUString::createFromAscii("Caller"), uno::makeAny( aArgs ) );
-+            }
-+        }
-         aRet = xScript->invoke( aParams, aOutParamIndex, aOutParam );
-     }
-     catch ( const uno::Exception& )
-@@ -1656,9 +1665,9 @@ ErrCode SfxObjectShell::CallXScript( con
-         ::com::sun::star::uno::Any& aRet,
-         ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
-         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >&
--            aOutParam, bool bRaiseError )
-+            aOutParam, bool bRaiseError, ::com::sun::star::uno::Any* pCaller )
- {
--    return CallXScript( GetModel(), rScriptURL, aParams, aRet, aOutParamIndex, aOutParam, bRaiseError );
-+    return CallXScript( GetModel(), rScriptURL, aParams, aRet, aOutParamIndex, aOutParam, bRaiseError, pCaller );
- }
- 
- //-------------------------------------------------------------------------
 --- sfx2/source/doc/objserv.cxx.orig	2008-05-07 12:06:10.000000000 +0800
 +++ sfx2/source/doc/objserv.cxx	2008-05-29 20:02:09.000000000 +0800
 @@ -28,6 +28,8 @@