mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Parcel.getByName apparently wants to return ScriptMetaData

Browse Source 
Change-Id: I4a710384ec3a0d719f2ad1fbbe7b43b0be1fa1d9
This commit is contained in:
Stephan Bergmann
2016-03-04 15:09:14 +01:00
parent 0cb71c1017
commit cf6e5f5b6d
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
View File

@@ -75,7 +75,7 @@ public class ScriptBrowseNode extends PropertySet implements
XMultiComponentFactory xFac = xCtx.getServiceManager();
try {
data = (ScriptMetaData)parent.getByName( name );
data = parent.getByName( name );
XSimpleFileAccess xSFA = UnoRuntime.queryInterface(
XSimpleFileAccess.class,
xFac.createInstanceWithContext(
@@ -146,7 +146,7 @@ public class ScriptBrowseNode extends PropertySet implements
parent = p;
try {
ScriptMetaData data = (ScriptMetaData)parent.getByName(name);
ScriptMetaData data = parent.getByName(name);
uri = data.getShortFormScriptURL();
}
// TODO fix exception types to be caught here, should we rethrow?
@@ -189,7 +189,7 @@ public class ScriptBrowseNode extends PropertySet implements
ScriptMetaData data = null;
try {
data = (ScriptMetaData)parent.getByName(name);
data = parent.getByName(name);
} catch (NoSuchElementException nse) {
throw new com.sun.star.lang.IllegalArgumentException(nse,
name + " does not exist or can't be found ");
@@ -236,7 +236,7 @@ public class ScriptBrowseNode extends PropertySet implements
try {
String newName = AnyConverter.toString(aParams[0]);
ScriptMetaData oldData = (ScriptMetaData)parent.getByName(name);
ScriptMetaData oldData = parent.getByName(name);
oldData.loadSource();
String oldSource = oldData.getSource();

10
scripting/java/com/sun/star/script/framework/container/Parcel.java
View File

@@ -69,7 +69,7 @@ public class Parcel implements XNameContainer {
return name;
}
public java.lang.Object getByName(String aName) throws
public ScriptMetaData getByName(String aName) throws
com.sun.star.container.NoSuchElementException,
com.sun.star.lang.WrappedTargetException {
@@ -126,7 +126,7 @@ public class Parcel implements XNameContainer {
public boolean hasByName(String aName) {
boolean result = true;
Object containee = null;
ScriptMetaData containee = null;
try {
containee = getByName(aName);
@@ -162,7 +162,7 @@ public class Parcel implements XNameContainer {
// if not ok, throw IllegalArgument
if (m_descriptor != null) {
try {
ScriptEntry script = (ScriptEntry)getByName(aName);
ScriptMetaData script = getByName(aName);
if (script != null) {
//m_descriptor.removeScriptEntry( script );
@@ -253,7 +253,7 @@ public class Parcel implements XNameContainer {
com.sun.star.lang.WrappedTargetException {
try {
ScriptMetaData script = (ScriptMetaData)getByName(Name);
ScriptMetaData script = getByName(Name);
if (script != null) {
if (!script.removeSourceFile()) {
@@ -299,4 +299,4 @@ public class Parcel implements XNameContainer {
return path;
}
}
}

2
scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
View File

@@ -644,7 +644,7 @@ public class ParcelContainer implements XNameAccess {
com.sun.star.lang.WrappedTargetException {
Parcel p = (Parcel)getByName(parsedUri.parcel);
ScriptMetaData scriptData = (ScriptMetaData)p.getByName(parsedUri.function);
ScriptMetaData scriptData = p.getByName(parsedUri.function);
LogUtils.DEBUG("** found script data for " + parsedUri.function + " script is "
+ scriptData);