strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS scriptingf11 (1.7.22); FILE MERGED

Browse source 
2005/02/18 17:13:53 toconnor 1.7.22.1: #i41597# return after invoking script using editor
This commit is contained in:
Kurt Zenker 2005-03-01 12:07:38 +00:00
parent 8f4950bb80
commit e0c59e2068
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
View file

@ -2,9 +2,9 @@
*
* $RCSfile: ScriptProviderForBeanShell.java,v $
*
* $Revision: 1.7 $
* $Revision: 1.8 $
*
* last change: $Author: rt $ $Date: 2004-10-22 14:49:31 $
* last change: $Author: kz $ $Date: 2005-03-01 13:07:38 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -335,20 +335,20 @@ class ScriptImpl implements XScript
ScriptEditorForBeanShell editor =
ScriptEditorForBeanShell.getEditor(
sourceUrl );
if ( editor != null )
{
editor.execute();
result = editor.execute();
if (result == null)
{
return new Any(new Type(), null);
}
return result;
}
if (editor != null && editor.isModified())
{
source = editor.getText();
}
else
{
metaData.loadSource();
source = metaData.getSource();
}
metaData.loadSource();
source = metaData.getSource();
if ( source == null || source.length() == 0 )
{