diff options
Diffstat (limited to 'javaunohelper')
4 files changed, 10 insertions, 12 deletions
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java index e3280c1bb91b..25f1798fbada 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java +++ b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java @@ -118,7 +118,7 @@ public final class XInputStreamToInputStreamAdapter extends InputStream { throw newEx; } - return (bytesRead); + return bytesRead; } @Override diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java index 26d94649174a..ab2a38143423 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java @@ -126,14 +126,14 @@ public final class PropertySetMixin { idlClass = getReflection(type.getTypeName()); XTypeDescription ifc; try { - ifc = UnoRuntime.queryInterface( - XTypeDescription.class, - (UnoRuntime.queryInterface( + XHierarchicalNameAccess xhna = UnoRuntime.queryInterface( XHierarchicalNameAccess.class, context.getValueByName( "/singletons/com.sun.star.reflection." - + "theTypeDescriptionManager")). - getByHierarchicalName(type.getTypeName()))); + + "theTypeDescriptionManager")); + ifc = UnoRuntime.queryInterface( + XTypeDescription.class, + xhna.getByHierarchicalName(type.getTypeName())); } catch (NoSuchElementException e) { throw new RuntimeException(e); } @@ -636,9 +636,7 @@ public final class PropertySetMixin { break; } attrAttribs |= n; - t = (UnoRuntime.queryInterface( - XStructTypeDescription.class, t)). - getTypeArguments()[0]; + t = UnoRuntime.queryInterface(XStructTypeDescription.class, t).getTypeArguments()[0]; } String name = members[i].getMemberName(); boolean present = true; diff --git a/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java b/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java index 24187ffb1290..ac175d3a6d5d 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java @@ -78,7 +78,7 @@ public class WeakBase implements XWeak, XTypeProvider for(int i = 0; i < interfaces.length; ++ i) { // Test if it is a UNO interface - if (com.sun.star.uno.XInterface.class.isAssignableFrom((interfaces[i]))) + if (com.sun.star.uno.XInterface.class.isAssignableFrom(interfaces[i])) vec.add(new Type(interfaces[i])); } // get the superclass the currentClass inherits from diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java b/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java index 43decf30f388..a28794434e9f 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java @@ -74,11 +74,11 @@ class Proxy implements IQueryInterface, XEventListener if (object instanceof IQueryInterface) { IQueryInterface iquery = (IQueryInterface) object; - return (iquery.getOid().equals(oid)); + return iquery.getOid().equals(oid); } String oidObj = UnoRuntime.generateOid(object); - return (oidObj.equals(oid)); + return oidObj.equals(oid); } public Object queryInterface(Type type) { |