INTEGRATION: CWS odbmacros2 (1.3.134); FILE MERGED

2008/01/02 14:42:12 fs 1.3.134.1: #i49133# allow script providers to be created with an XScriptInvocationContext instead of a mere TDOC URL

1 files changed, 6 insertions, 4 deletions

diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/template.bsh b/scripting/java/com/sun/star/script/framework/provider/beanshell/template.bsh
index 1dcf79a5cfc5..03cb114d79b7 100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/template.bsh
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/template.bsh
@@ -20,23 +20,25 @@ import com.sun.star.frame.XModel;
     Methods available are: 
 
         XSCRIPTCONTEXT.getDocument() returns XModel
+        XSCRIPTCONTEXT.getInvocationContext() returns XScriptInvocationContext or NULL
         XSCRIPTCONTEXT.getDesktop() returns XDesktop
         XSCRIPTCONTEXT.getComponentContext() returns XComponentContext
 
     For more information on using this class see the scripting
     developer guides at:
 
-        http://framework.openoffice.org/scripting/index.html
+        http://api.openoffice.org/docs/DevelopersGuide/ScriptingFramework/ScriptingFramework.xhtml
 */
         
-import drafts.com.sun.star.script.provider.XScriptContext;
-
 // Hello World in BeanShell
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextRange;
 
-oDoc = XSCRIPTCONTEXT.getDocument();
+oDoc = UnoRuntime.queryInterface(XModel.class,XSCRIPTCONTEXT.getInvocationContext());
+if ( oDoc == null )
+  oDoc = XSCRIPTCONTEXT.getDocument();
+
 xTextDoc = (XTextDocument) UnoRuntime.queryInterface(XTextDocument.class,oDoc);
 xText = xTextDoc.getText();
 xTextRange = xText.getEnd();