diff options
4 files changed, 41 insertions, 33 deletions
diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java index c3f34589425b..8582f5f24010 100644 --- a/qadevOOo/runner/util/utils.java +++ b/qadevOOo/runner/util/utils.java @@ -587,7 +587,8 @@ public class utils { } catch (com.sun.star.uno.Exception e) { } - xTrans.parseStrict(rUrl); + if (xTrans != null) + xTrans.parseStrict(rUrl); return rUrl[0]; } diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java b/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java index 971dab8ac3d2..d766c963d7e3 100644 --- a/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java +++ b/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java @@ -137,12 +137,18 @@ public class _XTreeNode extends MultiMethodTest { } log.println("try to get parrent of children"); - XTreeNode xParrent = xNode.getParent(); + if (xNode == null) { + log.println("missing xNode"); + tRes.tested("getParent()", false); + } + else { + XTreeNode xParrent = xNode.getParent(); - bOK = oObj.equals(xParrent); - log.println("original object and parrent should be the same: " + bOK); - tRes.tested("getParent()", bOK); + bOK = oObj.equals(xParrent); + log.println("original object and parrent should be the same: " + bOK); + tRes.tested("getParent()", bOK); + } } diff --git a/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java b/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java index 082babb9956b..597e44cee045 100644 --- a/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java +++ b/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java @@ -164,7 +164,8 @@ public class _DrawingDocumentDrawView extends MultiPropertyTest { } log.println("oldZoomValue: "+oldValue); log.println("newZoomValue: "+newValue); - tRes.tested("ZoomType",(!oldValue.equals(newValue))); + if (oldValue != null) + tRes.tested("ZoomType",(!oldValue.equals(newValue))); } } diff --git a/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java b/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java index 784bc7774e11..a6ee07fc8504 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java +++ b/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java @@ -60,40 +60,40 @@ public class MainThreadDialogExecutor implements XCallback private static boolean GetCallback( XComponentContext xContext, MainThreadDialogExecutor aExecutor ) { + if (aExecutor == null) + return false; + try { - if ( aExecutor != null ) - { - String aThreadName = null; - Thread aCurThread = Thread.currentThread(); - if ( aCurThread != null ) - aThreadName = aCurThread.getName(); + String aThreadName = null; + Thread aCurThread = Thread.currentThread(); + if ( aCurThread != null ) + aThreadName = aCurThread.getName(); - if ( aThreadName != null && aThreadName.equals( "com.sun.star.thread.WikiEditorSendingThread" ) ) + if ( aThreadName != null && aThreadName.equals( "com.sun.star.thread.WikiEditorSendingThread" ) ) + { + // the main thread should be accessed asynchronously + XMultiComponentFactory xFactory = xContext.getServiceManager(); + if ( xFactory == null ) + throw new com.sun.star.uno.RuntimeException(); + + XRequestCallback xRequest = UnoRuntime.queryInterface( + XRequestCallback.class, + xFactory.createInstanceWithContext( "com.sun.star.awt.AsyncCallback", xContext ) ); + if ( xRequest != null ) { - // the main thread should be accessed asynchronously - XMultiComponentFactory xFactory = xContext.getServiceManager(); - if ( xFactory == null ) - throw new com.sun.star.uno.RuntimeException(); - - XRequestCallback xRequest = UnoRuntime.queryInterface( - XRequestCallback.class, - xFactory.createInstanceWithContext( "com.sun.star.awt.AsyncCallback", xContext ) ); - if ( xRequest != null ) + xRequest.addCallback( aExecutor, Any.VOID ); + do { - xRequest.addCallback( aExecutor, Any.VOID ); - do - { - Thread.yield(); - } - while( !aExecutor.m_bCalled ); + Thread.yield(); } + while( !aExecutor.m_bCalled ); } - else - { - // handle it as a main thread - aExecutor.notify( Any.VOID ); - } + } + else + { + // handle it as a main thread + aExecutor.notify( Any.VOID ); } } catch( Exception e ) |