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
ure/source/uretest/JavaClient.java
View File

@ -23,7 +23,6 @@ import com.sun.star.bridge.XBridgeFactory;
import com.sun.star.comp.helper.Bootstrap;
import com.sun.star.connection.Connector;
import com.sun.star.lang.XComponent;
import com.sun.star.lang.XMultiComponentFactory;
import com.sun.star.lib.uno.helper.UnoUrl;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XComponentContext;
@ -34,13 +33,9 @@ public final class JavaClient {
public static void main(String[] arguments) throws Exception {
XComponentContext context = Bootstrap.createInitialComponentContext(
null);
XMultiComponentFactory manager = context.getServiceManager();
if (manager == null) {
throw new NullPointerException("no service manager");
}
XBridgeFactory factory = UnoRuntime.queryInterface(
XBridgeFactory.class,
manager.createInstanceWithContext(
context.getServiceManager().createInstanceWithContext(
"com.sun.star.bridge.BridgeFactory", context));
if (factory == null) {
throw new NullPointerException("no bridge factory");