diff options
| author | Lars Langhans <lla@openoffice.org> | 2010-06-16 11:34:04 +0200 |
|---|---|---|
| committer | Lars Langhans <lla@openoffice.org> | 2010-06-16 11:34:04 +0200 |
| commit | ca1a016c5c9121a878bded25378b47c600dc0b3d (patch) | |
| tree | fb5f660c6c14cc5858ee7d16c8541029c603a3c3 /bean/com | |
| parent | 6c4b6d9b49a97c8098fc9bdfa6f03c7847c91fb9 (diff) | |
sb123:#i111449# cleanups in beans qa/complex tests
Diffstat (limited to 'bean/com')
| -rw-r--r-- | bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 13 | ||||
| -rw-r--r-- | bean/com/sun/star/comp/beans/OOoBean.java | 11 |
2 files changed, 21 insertions, 3 deletions
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index 8467f1b75812..cc7545ad3e22 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java @@ -153,7 +153,18 @@ public class LocalOfficeConnection {} } - /** + /** + * protected Constructor + * Initialise a LocalOfficeConnection with an already running office. + * This C'Tor is only used in complex tests at the moment. + * @param xContext + */ + protected LocalOfficeConnection(com.sun.star.uno.XComponentContext xContext) + { + this.mContext = xContext; + } + + /** * Sets a connection URL. * This implementation accepts a UNO URL with following format:<br /> * <pre> diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java index b10becb3ce9a..44871d2a2675 100644 --- a/bean/com/sun/star/comp/beans/OOoBean.java +++ b/bean/com/sun/star/comp/beans/OOoBean.java @@ -601,8 +601,15 @@ public class OOoBean xURLTransformer = (com.sun.star.util.XURLTransformer) UnoRuntime.queryInterface( com.sun.star.util.XURLTransformer.class, xServiceFactory.createInstance( "com.sun.star.util.URLTransformer") ); - xDispatcher = (com.sun.star.frame.XDispatchProvider)UnoRuntime.queryInterface( - com.sun.star.frame.XDispatchProvider.class, aFrame ); + + try + { + xDispatcher = UnoRuntime.queryInterface(com.sun.star.frame.XDispatchProvider.class, aFrame); + } + catch (Exception e) + { + /*ignore!*/ + } // get XComponentLoader from frame com.sun.star.frame.XComponentLoader xLoader = (com.sun.star.frame.XComponentLoader) |