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

[noelpwer svn gnome org]

Author: noelpwer
Date: Tue Apr 22 11:45:17 2008
New Revision: 12280
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12280&view=rev

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

        * patches/vba/basic-caller-support-dev300.diff: attempt 3 to fix  this 
        verifying in the correct build tree would have helped


Modified:
   trunk/ChangeLog
   trunk/patches/vba/basic-caller-support-dev300.diff

Modified: trunk/patches/vba/basic-caller-support-dev300.diff
==============================================================================
--- trunk/patches/vba/basic-caller-support-dev300.diff	(original)
+++ trunk/patches/vba/basic-caller-support-dev300.diff	Tue Apr 22 11:45:17 2008
@@ -367,18 +367,29 @@
  extern RTLFUNC(Choose);
 --- /data4/Latest/ooo-build/build/ooh680-m1/sfx2/inc/sfx2/objsh.hxx	2008-01-08 09:36:27.000000000 +0000
 +++ sfx2/inc/sfx2/objsh.hxx	2008-01-10 11:25:23.000000000 +0000
-@@ -426,7 +426,8 @@ public:
+@@ -449,7 +449,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 
++        ::com::sun::star::uno::Any* aCaller = 0
+     );
+ 
+     static ErrCode  CallXScript(
+@@ -459,7 +460,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
 --- /data4/Latest/ooo-build/build/ooh680-m1/sfx2/source/doc/objmisc.cxx	2008-01-08 09:36:27.000000000 +0000
 +++ sfx2/source/doc/objmisc.cxx	2008-01-10 15:12:14.000000000 +0000
+--- /data4/Latest/ooo-build/build/ooh680-m1/sc/source/ui/drawfunc/fusel.cxx	2008-01-08 09:36:20.000000000 +0000
 @@ -1515,7 +1515,7 @@ namespace
  }
  
@@ -406,7 +417,18 @@
          aRet = xScript->invoke( aParams, aOutParamIndex, aOutParam );
      }
      catch ( const uno::Exception& )
---- /data4/Latest/ooo-build/build/ooh680-m1/sc/source/ui/drawfunc/fusel.cxx	2008-01-08 09:36:20.000000000 +0000
+@@ -1580,9 +1589,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 );
+ }
+ 
+ //-------------------------------------------------------------------------
 +++ sc/source/ui/drawfunc/fusel.cxx	2008-01-10 15:25:12.000000000 +0000
 @@ -221,13 +221,23 @@ BOOL __EXPORT FuSelection::MouseButtonDo
                         SfxObjectShell* pObjSh = SfxObjectShell::Current();