INTEGRATION: CWS scriptingf7 (1.4.32); FILE MERGED

2004/06/12 08:43:51 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/baslibnode.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: baslibnode.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: tbe $ $Date: 2003-11-07 13:48:05 $
+ *  last change: $Author: hr $ $Date: 2004-07-23 14:05:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -95,10 +95,10 @@ namespace basprov
     // =============================================================================
 
     BasicLibraryNodeImpl::BasicLibraryNodeImpl( const Reference< XComponentContext >& rxContext,
-        const Reference< beans::XPropertySet >& rxScriptingContext, BasicManager* pBasicManager,
+         const ::rtl::OUString& sScriptingContext, BasicManager* pBasicManager,
         const Reference< script::XLibraryContainer >& xLibContainer, const ::rtl::OUString& sLibName, bool isAppScript )
         :m_xContext( rxContext )
-        ,m_xScriptingContext( rxScriptingContext )
+    ,m_sScriptingContext( sScriptingContext )
         ,m_pBasicManager( pBasicManager )
         ,m_xLibContainer( xLibContainer )
         ,m_sLibName( sLibName )
@@ -154,7 +154,7 @@ namespace basprov
                 {
                     SbModule* pModule = pBasic->FindModule( pNames[i] );
                     if ( pModule )
-                        pChildNodes[i] = static_cast< browse::XBrowseNode* >( new BasicModuleNodeImpl( m_xContext, m_xScriptingContext, pModule, m_bIsAppScript ) );
+                        pChildNodes[i] = static_cast< browse::XBrowseNode* >( new BasicModuleNodeImpl( m_xContext, m_sScriptingContext, pModule, m_bIsAppScript ) );
                 }
             }
         }

scripting/source/basprov/baslibnode.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: baslibnode.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: tbe $ $Date: 2003-11-07 13:46:26 $
+ *  last change: $Author: hr $ $Date: 2004-07-23 14:05:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -99,7 +99,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;
         BasicManager* m_pBasicManager;
         ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer > m_xLibContainer;
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xLibrary;
@@ -108,7 +108,7 @@ namespace basprov
 
     public:
         BasicLibraryNodeImpl( 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,
             BasicManager* pBasicManager,
             const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xLibContainer,
             const ::rtl::OUString& sLibName, bool isAppScript=true );