wangxin/loongoffice
1
0
Fork 0
forked from amazingfate/loongoffice
Code Pull Requests Activity

Require XComponentContext.getServiceManager to throw instead of returning null

Browse Source 
This is such a fatal error that there is probably no point in trying to handle
it, so allow to simplify client code by removing the requirement to check for a
null return value.

Simplified some client code accordingly (modules configmgr and ure, and the code
generated by cppumaker and javamaker).

Change-Id: I51c0b270ec73409374f7439a47ee061407a46e31
This commit is contained in:
Stephan Bergmann
2012-09-17 16:56:19 +02:00
parent 6e78fd18c9
commit 543158edba
12 changed files with 56 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
codemaker/test/javamaker/java15/Test.java
View File

@ -19,7 +19,6 @@
package test.codemaker.javamaker.java15;
import com.sun.star.lang.XMultiComponentFactory;
import com.sun.star.uno.DeploymentException;
import com.sun.star.uno.XComponentContext;
import complexlib.ComplexTestCase;
@ -69,18 +68,18 @@ public final class Test extends ComplexTestCase {
}
public XMultiComponentFactory getServiceManager() {
return null;
throw new com.sun.star.uno.RuntimeException();
}
};
try {
Service.create(context);
failed();
} catch (DeploymentException e) {}
} catch (com.sun.star.uno.RuntimeException e) {}
try {
Service.create(
context, false, (byte) 1, (short) 2, Integer.valueOf(4));
failed();
} catch (DeploymentException e) {}
} catch (com.sun.star.uno.RuntimeException e) {}
}
private static final class Ifc implements XIfc {