INTEGRATION: CWS scriptingf7 (1.4.32); FILE MERGED

2004/06/12 08:43:52 npower 1.4.32.1: i25269 as part of changes to support pkgchk context from MSP is now passed as sting ( user/hare or tdoc url )

scripting/source/basprov/basmethnode.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: basmethnode.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: tbe $ $Date: 2003-11-07 13:51:16 $
+ *  last change: $Author: hr $ $Date: 2004-07-23 14:06:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -116,7 +116,7 @@ namespace basprov
     {
     private:
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >    m_xContext;
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >       m_xScriptingContext;
+    ::rtl::OUString m_sScriptingContext;
         SbMethod* m_pMethod;
         bool m_bIsAppScript;
 
@@ -133,7 +133,7 @@ namespace basprov
 
     public:
         BasicMethodNodeImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rxScriptingContext,
+            const ::rtl::OUString& sScriptingContext,
             SbMethod* pMethod, bool isAppScript = true );
         virtual ~BasicMethodNodeImpl();
 

scripting/source/basprov/basmodnode.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: basmodnode.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: tbe $ $Date: 2003-11-07 13:49:39 $
+ *  last change: $Author: hr $ $Date: 2004-07-23 14:06:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -101,9 +101,9 @@ namespace basprov
     // =============================================================================
 
     BasicModuleNodeImpl::BasicModuleNodeImpl( const Reference< XComponentContext >& rxContext,
-        const Reference< beans::XPropertySet >& rxScriptingContext, SbModule* pModule, bool isAppScript )
+        const ::rtl::OUString& sScriptingContext, SbModule* pModule, bool isAppScript )
         :m_xContext( rxContext )
-        ,m_xScriptingContext( rxScriptingContext )
+        ,m_sScriptingContext( sScriptingContext )
         ,m_pModule( pModule )
         ,m_bIsAppScript( isAppScript )
     {
@@ -151,7 +151,7 @@ namespace basprov
                 {
                     SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Get( static_cast< USHORT >( i ) ) );
                     if ( pMethod )
-                        pChildNodes[i] = static_cast< browse::XBrowseNode* >( new BasicMethodNodeImpl( m_xContext, m_xScriptingContext, pMethod, m_bIsAppScript ) );
+                        pChildNodes[i] = static_cast< browse::XBrowseNode* >( new BasicMethodNodeImpl( m_xContext, m_sScriptingContext, pMethod, m_bIsAppScript ) );
                 }
             }
         }

scripting/source/basprov/basmodnode.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: basmodnode.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: tbe $ $Date: 2003-11-07 13:49:38 $
+ *  last change: $Author: hr $ $Date: 2004-07-23 14:06:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,13 +96,13 @@ namespace basprov
     {
     private:
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >    m_xContext;
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >       m_xScriptingContext;
+    ::rtl::OUString m_sScriptingContext;
         SbModule* m_pModule;
         bool m_bIsAppScript;
 
     public:
         BasicModuleNodeImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rxScriptingContext,
+            const ::rtl::OUString& sScriptingContext,
             SbModule* pModule, bool isAppScript = true );
         virtual ~BasicModuleNodeImpl();