diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-07-23 13:06:10 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-07-23 13:06:10 +0000 |
| commit | 2b27c04eedf119e9c7acf078435c7f169801e3c5 (patch) | |
| tree | d808fc2b8232224b7e26e80c9152f1870d62d442 | |
| parent | ec924c21faca66e8693ec603ec71c0e7f7ba32cb (diff) | |
INTEGRATION: CWS scriptingf7 (1.6.14); FILE MERGED
2004/06/12 08:43:52 npower 1.6.14.1: i25269 as part of changes to support pkgchk context from MSP is now passed as sting ( user/hare or tdoc url )
| -rw-r--r-- | scripting/source/basprov/basmethnode.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx index ab2b915cad48..f2c6a975f729 100644 --- a/scripting/source/basprov/basmethnode.cxx +++ b/scripting/source/basprov/basmethnode.cxx @@ -2,9 +2,9 @@ * * $RCSfile: basmethnode.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: svesik $ $Date: 2004-04-19 23:13:31 $ + * last change: $Author: hr $ $Date: 2004-07-23 14:06:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,13 +92,15 @@ #include <basic/sbmod.hxx> #endif +#include <util/MiscUtils.hxx> + using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::comphelper; using namespace ::drafts::com::sun::star::script; - +using namespace ::sf_misc; #define BASPROV_PROPERTY_ID_URI 1 #define BASPROV_PROPERTY_ID_EDITABLE 2 @@ -119,11 +121,11 @@ namespace basprov // ============================================================================= BasicMethodNodeImpl::BasicMethodNodeImpl( const Reference< XComponentContext >& rxContext, - const Reference< XPropertySet >& rxScriptingContext, SbMethod* pMethod, bool isAppScript ) + const ::rtl::OUString& sScriptingContext, SbMethod* pMethod, bool isAppScript ) : ::scripting_helper::OBroadcastHelperHolder( StarBASIC::GetGlobalMutex() ) ,OPropertyContainer( GetBroadcastHelper() ) ,m_xContext( rxContext ) - ,m_xScriptingContext( rxScriptingContext ) + ,m_sScriptingContext( sScriptingContext ) ,m_pMethod( pMethod ) ,m_bIsAppScript( isAppScript ) ,m_bEditable( sal_True ) @@ -266,11 +268,9 @@ namespace basprov ::rtl::OUString sDocURL, sLibName, sModName; USHORT nLine1, nLine2; - if ( !m_bIsAppScript && m_xScriptingContext.is() ) + if ( !m_bIsAppScript ) { - Reference< frame::XModel > xModel; - // TODO: use ScriptingContantsPool for SCRIPTING_DOC_REF - m_xScriptingContext->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SCRIPTING_DOC_REF" ) ) ) >>= xModel; + Reference< frame::XModel > xModel = MiscUtils::tDocUrlToModel( m_sScriptingContext ); if ( xModel.is() ) { |