diff options
| author | Duncan Foster <dfoster@openoffice.org> | 2003-05-16 09:14:24 +0000 |
|---|---|---|
| committer | Duncan Foster <dfoster@openoffice.org> | 2003-05-16 09:14:24 +0000 |
| commit | 6b8d30eb75b95a293f6e13e467fe6cc6d088d972 (patch) | |
| tree | 783fa0578ed4bb8fefdd26323fe15a0ea19cb26a /scripting/source/protocolhandler | |
| parent | b115a7d0b22c3b51b2e1750bc812ad12fe7a24f0 (diff) | |
#i14018# Need to be able to bind to scripts on the filesystem
Adjusted layout of assign dialogs, and added new button to get filechooser.
Assorted changes to support filesys scripts
Fixed bug in ScriptRUntimeForBeanshell (misplaced ';')
Diffstat (limited to 'scripting/source/protocolhandler')
| -rw-r--r-- | scripting/source/protocolhandler/scripthandler.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index f0542f6f6890..3d54cd022561 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -2,9 +2,9 @@ * * $RCSfile: scripthandler.cxx,v $ * -* $Revision: 1.6 $ +* $Revision: 1.7 $ * -* last change: $Author: npower $ $Date: 2003-03-06 11:58:17 $ +* last change: $Author: dfoster $ $Date: 2003-05-16 10:14:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -329,6 +329,7 @@ throw ( RuntimeException ) } rtl::OUString documentString = rtl::OUString::createFromAscii( "location=document" ); + rtl::OUString filesystemString = rtl::OUString::createFromAscii( "location=filesystem" ); // Detect if workaround is necessary. // Problem, when FunctionProvier is created, @@ -342,9 +343,10 @@ throw ( RuntimeException ) // located script create FunctionProvider with extra paramater // which indicates to storage not to use security // - if ( ( url.indexOf( documentString ) == -1 ) ) + // workaround also applies to scripts located on the filesystem + if ( ( url.indexOf( documentString ) == -1 ) && ( url.indexOf( filesystemString ) == -1 ) ) { - // Not a document script - no need to use security + // Not a document or filesystem script - no need to use security OSL_TRACE(" Will create special FunctionProvider eg. one that doesn't user security" ); args.realloc( 2 ); args[ 1 ] <<= sal_False; |