diff options
Diffstat (limited to 'bean/com/sun')
| -rw-r--r-- | bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 2 | ||||
| -rw-r--r-- | bean/com/sun/star/comp/beans/OOoBean.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index 491bd0865bbd..bfcbd94b36f0 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java @@ -234,7 +234,7 @@ public class LocalOfficeConnection public void dispose() { Iterator<XEventListener> itr = mComponents.iterator(); - while (itr.hasNext() == true) { + while (itr.hasNext()) { // ignore runtime exceptions in dispose try { itr.next().disposing(null); } catch ( RuntimeException aExc ) {} diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java index 9bbf6ad07e6e..3c2c17e2ac3a 100644 --- a/bean/com/sun/star/comp/beans/OOoBean.java +++ b/bean/com/sun/star/comp/beans/OOoBean.java @@ -582,7 +582,7 @@ public class OOoBean { if ( aFrame != null && xOldController != null ) - if (xOldController.suspend(true) == false) + if (!xOldController.suspend(true)) throw new com.sun.star.util.CloseVetoException( "Dokument is still being used and cannot be closed.", this); @@ -1187,7 +1187,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); // continue to trying to connect the OOo instance long n = 0; - while ( isInterrupted() == false + while ( !isInterrupted() && iConnection != null && iConnection.getComponentContext() != null ) { |