ooo-build r12341 - in trunk: . patches/test/vba patches/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Fri Apr 25 17:00:23 2008
New Revision: 12341
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12341&view=rev

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

        * patches/vba/basic-caller-support-dev300.diff: fix sometimes not
        functioning vba button events
        * patches/test/vba/UserFormObjectModuleEventsSuperBigPatch.diff: test
        version ( still very ropey but functioning ) note: not applied



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

Modified: trunk/patches/test/vba/UserFormObjectModuleEventsSuperBigPatch.diff
==============================================================================
--- trunk/patches/test/vba/UserFormObjectModuleEventsSuperBigPatch.diff	(original)
+++ trunk/patches/test/vba/UserFormObjectModuleEventsSuperBigPatch.diff	Fri Apr 25 17:00:23 2008
@@ -3095,6 +3095,53 @@
  //	----------------------------------------------------
  //	class UnoControlListBoxModel
  //	----------------------------------------------------
+--- /data4/OOOBuildM12/ooo-build/build/ooh680-m12/toolkit/inc/toolkit/controls/unocontrols.hxx	2008-01-24 15:27:45.000000000 +0000
++++ toolkit/inc/toolkit/controls/unocontrols.hxx	2008-04-11 07:03:51.000000000 +0100
+@@ -734,6 +734,44 @@ public:
+ 
+ };
+ 
++class UnoMultiPageModel : public UnoControlModel
++{
++protected:
++	::com::sun::star::uno::Any 		ImplGetDefaultValue( sal_uInt16 nPropId ) const;
++	::cppu::IPropertyArrayHelper& 	SAL_CALL getInfoHelper();
++
++public:
++						UnoMultiPageModel();
++						UnoMultiPageModel( const UnoMultiPageModel& rModel ) : UnoControlModel( rModel ) {;}
++
++	UnoControlModel*	Clone() const { return new UnoMultiPageModel( *this ); }
++
++	// ::com::sun::star::io::XPersistObject
++    ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
++
++	// ::com::sun::star::beans::XMultiPropertySet
++    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
++
++	// ::com::sun::star::lang::XServiceInfo
++	DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageModel, UnoControlModel, szServiceName_UnoMultiPageModel )
++
++};
++//	----------------------------------------------------
++//	class UnoGroupBoxControl
++//	----------------------------------------------------
++class UnoMultiPageControl :	public UnoControlBase
++{
++public:
++						UnoMultiPageControl();
++	::rtl::OUString		GetComponentServiceName();
++
++    sal_Bool SAL_CALL isTransparent(  ) throw(::com::sun::star::uno::RuntimeException);
++
++	// ::com::sun::star::lang::XServiceInfo
++	DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageControl, UnoControlBase, szServiceName_UnoMultiPageControl )
++
++};
++
+ //  ----------------------------------------------------
+ //  class UnoFixedTextControl
+ //  ----------------------------------------------------
 --- /data4/OOOBuildM12/ooo-build/build/ooh680-m12/toolkit/inc/toolkit/helper/servicenames.hxx	2008-01-24 15:28:36.000000000 +0000
 +++ toolkit/inc/toolkit/helper/servicenames.hxx	2008-04-09 14:22:19.000000000 +0100
 @@ -50,6 +50,8 @@ extern const sal_Char __FAR_DATA szServi

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	Fri Apr 25 17:00:23 2008
@@ -1,128 +1,3 @@
-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
-@@ -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() )
-+        ,m_xMethod( xMethod )
-         ,m_funcName( funcName )
-         ,m_documentBasicManager( NULL )
-         ,m_xDocumentScriptContext()
-     {
-+        registerProperty( BASSCRIPT_PROPERTY_CALLER, BASSCRIPT_PROPERTY_ID_CALLER, BASSCRIPT_DEFAULT_ATTRIBS(), &m_caller, ::getCppuType( &m_caller ) );
-     }
- 
-     // -----------------------------------------------------------------------------
- 
-     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
-     }
- 
-     // -----------------------------------------------------------------------------
-+    // XInterface
-+    // -----------------------------------------------------------------------------
-+
-+    IMPLEMENT_FORWARD_XINTERFACE2( BasicScriptImpl, BasicScriptImpl_BASE, OPropertyContainer )
-+
-+    // -----------------------------------------------------------------------------
-+    // XTypeProvider
-+    // -----------------------------------------------------------------------------
-+
-+    IMPLEMENT_FORWARD_XTYPEPROVIDER2( BasicScriptImpl, BasicScriptImpl_BASE, OPropertyContainer )
-+
-+    // -----------------------------------------------------------------------------
-+    // OPropertySetHelper
-+    // -----------------------------------------------------------------------------
-+
-+    ::cppu::IPropertyArrayHelper& BasicScriptImpl::getInfoHelper(  )
-+    {
-+        return *getArrayHelper();
-+    }
-+
-+    // -----------------------------------------------------------------------------
-+    // OPropertyArrayUsageHelper
-+    // -----------------------------------------------------------------------------
-+
-+    ::cppu::IPropertyArrayHelper* BasicScriptImpl::createArrayHelper(  ) const
-+    {
-+        Sequence< Property > aProps;
-+        describeProperties( aProps );
-+        return new ::cppu::OPropertyArrayHelper( aProps );
-+    }
-+
-+    // -----------------------------------------------------------------------------
-+    // XPropertySet
-+    // -----------------------------------------------------------------------------
-+
-+    Reference< XPropertySetInfo > BasicScriptImpl::getPropertySetInfo(  ) throw (RuntimeException)
-+    {
-+        Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
-+        return xInfo;
-+    }
-+
-+    // -----------------------------------------------------------------------------
-     // XScript
-     // -----------------------------------------------------------------------------
- 
-@@ -194,8 +248,14 @@ namespace basprov
-                 if ( m_documentBasicManager && m_xDocumentScriptContext.is() )
-                     aOldThisComponent = m_documentBasicManager->SetGlobalUNOConstant( "ThisComponent", makeAny( m_xDocumentScriptContext ) );
- 
-+            if ( m_caller.getLength() && m_caller[ 0 ].hasValue()  )
-+            {
-+                SbxVariableRef xCallerVar = new SbxVariable( SbxVARIANT );
-+                unoToSbxValue( static_cast< SbxVariable* >( xCallerVar ), m_caller[ 0 ] );
-+                nErr = m_xMethod->Call( xReturn, xCallerVar );
-+            }
-+            else
-                 nErr = m_xMethod->Call( xReturn );
--
-                 if ( m_documentBasicManager && m_xDocumentScriptContext.is() )
-                     m_documentBasicManager->SetGlobalUNOConstant( "ThisComponent", aOldThisComponent );
-             }
 diff -up /data4/Latest/ooo-build/build/ooh680-m1/scripting/source/basprov/basscript.hxx scripting/source/basprov/basscript.hxx
 --- /data4/Latest/ooo-build/build/ooh680-m1/scripting/source/basprov/basscript.hxx	2005-09-09 03:24:12.000000000 +0100
 +++ scripting/source/basprov/basscript.hxx	2007-12-19 17:19:58.000000000 +0000
@@ -530,3 +405,133 @@
                      }
                      catch ( uno::Exception& e )
                      {
+--- scripting/source/basprov/basscript.cxx	2008-04-25 18:33:48.000000000 +0100
++++ scripting/source/basprov/basscript.cxx	2008-04-25 18:23:29.000000000 +0100
+@@ -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,22 +100,28 @@ namespace basprov
+     // -----------------------------------------------------------------------------
+ 
+     BasicScriptImpl::BasicScriptImpl( const ::rtl::OUString& funcName, SbMethodRef xMethod )
+-        :m_xMethod( xMethod )
++        : ::scripting_helper::OBroadcastHelperHolder( m_aMutex )
++        ,OPropertyContainer( GetBroadcastHelper() )
++        ,m_xMethod( xMethod )
+         ,m_funcName( funcName )
+         ,m_documentBasicManager( NULL )
+         ,m_xDocumentScriptContext()
+     {
++        registerProperty( BASSCRIPT_PROPERTY_CALLER, BASSCRIPT_PROPERTY_ID_CALLER, BASSCRIPT_DEFAULT_ATTRIBS(), &m_caller, ::getCppuType( &m_caller ) );
+     }
+ 
+     // -----------------------------------------------------------------------------
+ 
+     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 )
+     {
++	// 
++        registerProperty( BASSCRIPT_PROPERTY_CALLER, BASSCRIPT_PROPERTY_ID_CALLER, BASSCRIPT_DEFAULT_ATTRIBS(), &m_caller, ::getCppuType( &m_caller ) );
+     }
+ 
+     // -----------------------------------------------------------------------------
+@@ -116,6 +130,48 @@ namespace basprov
+     }
+ 
+     // -----------------------------------------------------------------------------
++    // XInterface
++    // -----------------------------------------------------------------------------
++
++    IMPLEMENT_FORWARD_XINTERFACE2( BasicScriptImpl, BasicScriptImpl_BASE, OPropertyContainer )
++
++    // -----------------------------------------------------------------------------
++    // XTypeProvider
++    // -----------------------------------------------------------------------------
++
++    IMPLEMENT_FORWARD_XTYPEPROVIDER2( BasicScriptImpl, BasicScriptImpl_BASE, OPropertyContainer )
++
++    // -----------------------------------------------------------------------------
++    // OPropertySetHelper
++    // -----------------------------------------------------------------------------
++
++    ::cppu::IPropertyArrayHelper& BasicScriptImpl::getInfoHelper(  )
++    {
++        return *getArrayHelper();
++    }
++
++    // -----------------------------------------------------------------------------
++    // OPropertyArrayUsageHelper
++    // -----------------------------------------------------------------------------
++
++    ::cppu::IPropertyArrayHelper* BasicScriptImpl::createArrayHelper(  ) const
++    {
++        Sequence< Property > aProps;
++        describeProperties( aProps );
++        return new ::cppu::OPropertyArrayHelper( aProps );
++    }
++
++    // -----------------------------------------------------------------------------
++    // XPropertySet
++    // -----------------------------------------------------------------------------
++
++    Reference< XPropertySetInfo > BasicScriptImpl::getPropertySetInfo(  ) throw (RuntimeException)
++    {
++        Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
++        return xInfo;
++    }
++
++    // -----------------------------------------------------------------------------
+     // XScript
+     // -----------------------------------------------------------------------------
+ 
+@@ -194,8 +250,14 @@ namespace basprov
+                 if ( m_documentBasicManager && m_xDocumentScriptContext.is() )
+                     aOldThisComponent = m_documentBasicManager->SetGlobalUNOConstant( "ThisComponent", makeAny( m_xDocumentScriptContext ) );
+ 
++            if ( m_caller.getLength() && m_caller[ 0 ].hasValue()  )
++            {
++                SbxVariableRef xCallerVar = new SbxVariable( SbxVARIANT );
++                unoToSbxValue( static_cast< SbxVariable* >( xCallerVar ), m_caller[ 0 ] );
++                nErr = m_xMethod->Call( xReturn, xCallerVar );
++            }
++            else
+                 nErr = m_xMethod->Call( xReturn );
+-
+                 if ( m_documentBasicManager && m_xDocumentScriptContext.is() )
+                     m_documentBasicManager->SetGlobalUNOConstant( "ThisComponent", aOldThisComponent );
+             }