diff options
| -rw-r--r-- | bean/com/sun/star/comp/beans/OOoBean.java | 3 | ||||
| -rw-r--r-- | odk/source/com/sun/star/lib/loader/Loader.java | 4 | ||||
| -rw-r--r-- | qadevOOo/tests/java/ifc/form/binding/_XBindableValue.java | 9 |
3 files changed, 3 insertions, 13 deletions
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java index 36d622dc3b7b..dd2a93bf0518 100644 --- a/bean/com/sun/star/comp/beans/OOoBean.java +++ b/bean/com/sun/star/comp/beans/OOoBean.java @@ -1350,8 +1350,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); new com.sun.star.beans.PropertyValue[ nNumArgs + 1 ]; // copy current arguments - for ( int n = 0; n < nNumArgs; ++n ) - aExtendedArguments[n] = aArguments[n]; + System.arraycopy(aArguments, 0, aExtendedArguments, 0, nNumArgs); // add new argument aExtendedArguments[ nNumArgs ] = aArgument; diff --git a/odk/source/com/sun/star/lib/loader/Loader.java b/odk/source/com/sun/star/lib/loader/Loader.java index 787ccbb48b33..750f0b792048 100644 --- a/odk/source/com/sun/star/lib/loader/Loader.java +++ b/odk/source/com/sun/star/lib/loader/Loader.java @@ -218,9 +218,7 @@ public final class Loader { return; } byte[] buf2 = new byte[2 * n]; - for (int i = 0; i < n; ++i) { - buf2[i] = buf[i]; - } + System.arraycopy(buf, 0, buf2, 0, n); buf = buf2; } int k = s.read(buf, n, buf.length - n); diff --git a/qadevOOo/tests/java/ifc/form/binding/_XBindableValue.java b/qadevOOo/tests/java/ifc/form/binding/_XBindableValue.java index 2c0869dc5645..11bcb3476842 100644 --- a/qadevOOo/tests/java/ifc/form/binding/_XBindableValue.java +++ b/qadevOOo/tests/java/ifc/form/binding/_XBindableValue.java @@ -82,11 +82,10 @@ public class _XBindableValue extends MultiMethodTest { } class MyValueBinding implements XValueBinding { - private Type[] TypeArray; private final ArrayList<Type> types = new ArrayList<Type>(); public com.sun.star.uno.Type[] getSupportedValueTypes() { - return TypeArray; + return types.toArray(new Type[types.size()]); } public Object getValue(com.sun.star.uno.Type type) @@ -101,12 +100,6 @@ public class _XBindableValue extends MultiMethodTest { public boolean supportsType(com.sun.star.uno.Type type) { types.add(type); - TypeArray = new Type[types.size()]; - - for (int i = 0; i < types.size(); i++) { - TypeArray[i] = (Type) types.toArray()[i]; - } - return true; } } |