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

[noelpwer svn gnome org]

Author: noelpwer
Date: Tue Apr 22 08:52:07 2008
New Revision: 12274
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12274&view=rev

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

        * patches/vba/basic-caller-support-dev300.diff: oops a couple of hunks
        went missing when porting



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 08:52:07 2008
@@ -1,13 +1,44 @@
 diff -up /data4/Latest/ooo-build/build/ooh680-m1/scripting/source/basprov/basscript.cxx scripting/source/basprov/basscript.cxx
 --- /data4/Latest/ooo-build/build/ooh680-m1/scripting/source/basprov/basscript.cxx	2006-09-16 13:26:29.000000000 +0100
 +++ scripting/source/basprov/basscript.cxx	2007-12-20 13:23:23.000000000 +0000
-@@ -92,11 +92,14 @@ namespace basprov
+@@ -64,7 +64,10 @@
+ #ifndef _COM_SUN_STAR_SCRIPT_PROVIDER_SCRIPTFRAMEWORKERRORTYPE_HPP_
+ #include <com/sun/star/script/provider/ScriptFrameworkErrorType.hpp>
+ #endif
+-
++#include "bcholder.hxx"
++#include <comphelper/proparrhlp.hxx>
++#include <comphelper/propertycontainer.hxx>
++#include <com/sun/star/beans/PropertyAttribute.hpp>
+ #include <map>
+ 
+ 
+@@ -73,6 +76,7 @@ using namespace ::com::sun::star::lang;
+ using namespace ::com::sun::star::uno;
+ using namespace ::com::sun::star::script;
+ using namespace ::com::sun::star::document;
++using namespace ::com::sun::star::beans;
+ 
+ extern ::com::sun::star::uno::Any sbxToUnoValue( SbxVariable* pVar );
+ extern void unoToSbxValue( SbxVariable* pVar, const ::com::sun::star::uno::Any& aValue );
+@@ -82,6 +86,10 @@ extern void unoToSbxValue( SbxVariable* 
+ namespace basprov
+ {
+ //.........................................................................
++#define BASSCRIPT_PROPERTY_ID_CALLER         1
++#define BASSCRIPT_PROPERTY_CALLER            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Caller" ) )
++
++#define BASSCRIPT_DEFAULT_ATTRIBS()       PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT
+ 
+     typedef ::std::map< sal_Int16, Any, ::std::less< sal_Int16 > > OutParamMap;
+ 
+@@ -92,18 +100,22 @@ namespace basprov
      // -----------------------------------------------------------------------------
  
      BasicScriptImpl::BasicScriptImpl( const ::rtl::OUString& funcName, SbMethodRef xMethod )
 -        :m_xMethod( xMethod )
 +        : ::scripting_helper::OBroadcastHelperHolder( m_aMutex )
-+        ,OPropertyContainer( GetBroadcastHelper() ),
++        ,OPropertyContainer( GetBroadcastHelper() )
 +        ,m_xMethod( xMethod )
          ,m_funcName( funcName )
          ,m_documentBasicManager( NULL )
@@ -17,7 +48,17 @@
      }
  
      // -----------------------------------------------------------------------------
-@@ -116,6 +119,48 @@ namespace basprov
+ 
+     BasicScriptImpl::BasicScriptImpl( const ::rtl::OUString& funcName, SbMethodRef xMethod,
+-        BasicManager& documentBasicManager, const Reference< XScriptInvocationContext >& documentScriptContext )
+-        :m_xMethod( xMethod )
++        BasicManager& documentBasicManager, const Reference< XScriptInvocationContext >& documentScriptContext ) : ::scripting_helper::OBroadcastHelperHolder( m_aMutex )
++        ,OPropertyContainer( GetBroadcastHelper() )
++        ,m_xMethod( xMethod )
+         ,m_funcName( funcName )
+         ,m_documentBasicManager( &documentBasicManager )
+         ,m_xDocumentScriptContext( documentScriptContext )
+@@ -116,6 +128,48 @@ namespace basprov
      }
  
      // -----------------------------------------------------------------------------
@@ -66,11 +107,10 @@
      // XScript
      // -----------------------------------------------------------------------------
  
-@@ -194,8 +239,15 @@ namespace basprov
+@@ -194,8 +248,14 @@ namespace basprov
                  if ( m_documentBasicManager && m_xDocumentScriptContext.is() )
                      aOldThisComponent = m_documentBasicManager->SetGlobalUNOConstant( "ThisComponent", makeAny( m_xDocumentScriptContext ) );
  
-+            ErrCode nErr = SbxERR_OK;
 +            if ( m_caller.getLength() && m_caller[ 0 ].hasValue()  )
 +            {
 +                SbxVariableRef xCallerVar = new SbxVariable( SbxVARIANT );