diff options
Diffstat (limited to 'javaunohelper')
16 files changed, 28 insertions, 10 deletions
diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java index fe3336c1dbfb..25cce2236c9a 100644 --- a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java +++ b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java @@ -167,7 +167,7 @@ public class ComponentContext implements XComponentContext, XComponent catch (com.sun.star.uno.Exception exc) { if (DEBUG) - System.err.println( "### exception occured on late init of singleton instance \"" + rName + "\": " + exc.getMessage() ); + System.err.println( "### exception occurred on late init of singleton instance \"" + rName + "\": " + exc.getMessage() ); } if (xInstance != null) diff --git a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java index 404c5a5e3f3a..a0a72b5cf616 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java @@ -354,7 +354,7 @@ public class InterfaceContainer implements Cloneable } /** - * Searches for the first occurence of the given argument, testing + * Searches for the first occurrence of the given argument, testing * for equality using the <tt>equals</tt> method. * * @param elem an object. diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java index ad2c8c7bcf88..a6db617bfe4f 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java @@ -617,7 +617,7 @@ XMultiPropertySet * @return true - Conversion was successful. <em>newVal</em> contains a valid value for the property. false - * conversion failed for some reason. * @throws com.sun.star.lang.IllegalArgumentException The value provided is unfit for the property. - * @throws com.sun.star.lang.WrappedTargetException - An exception occured during the conversion, that is to be made known + * @throws com.sun.star.lang.WrappedTargetException - An exception occurred during the conversion, that is to be made known * to the caller. */ protected boolean convertPropertyValue(Property property, Object[] newVal, Object[]curVal, Object setVal) @@ -799,7 +799,7 @@ XMultiPropertySet * @param property the property for which the new value is set * @param value the new value for the property. * @throws com.sun.star.lang.WrappedTargetException An exception, which has to be made known to the caller, - * occured during the setting of the value. + * occurred during the setting of the value. */ protected void setPropertyValueNoBroadcast(Property property, Object newVal) throws WrappedTargetException diff --git a/javaunohelper/inc/pch/precompiled_javaunohelper.cxx b/javaunohelper/inc/pch/precompiled_javaunohelper.cxx index a42d94c61f68..78f04ceafd7a 100644 --- a/javaunohelper/inc/pch/precompiled_javaunohelper.cxx +++ b/javaunohelper/inc/pch/precompiled_javaunohelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,3 +28,4 @@ #include "precompiled_javaunohelper.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/javaunohelper/inc/pch/precompiled_javaunohelper.hxx b/javaunohelper/inc/pch/precompiled_javaunohelper.hxx index 68cf575c740b..0f1ce4290d16 100644 --- a/javaunohelper/inc/pch/precompiled_javaunohelper.hxx +++ b/javaunohelper/inc/pch/precompiled_javaunohelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,3 +31,4 @@ #ifdef PRECOMPILED_HEADERS #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx index 43c7818fa4e3..d29f7bef71eb 100644 --- a/javaunohelper/source/bootstrap.cxx +++ b/javaunohelper/source/bootstrap.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -187,3 +188,4 @@ extern "C" JNIEXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstrap_cpp return 0; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx index ba0da10fba5f..e64fd7e97db9 100644 --- a/javaunohelper/source/javaunohelper.cxx +++ b/javaunohelper/source/javaunohelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -321,3 +322,5 @@ Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactor return joRegServiceFac; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/javaunohelper/source/preload.cxx b/javaunohelper/source/preload.cxx index 847597d0eea2..18ed40c16598 100644 --- a/javaunohelper/source/preload.cxx +++ b/javaunohelper/source/preload.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -156,3 +157,5 @@ Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap( return 0; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/javaunohelper/source/vm.cxx b/javaunohelper/source/vm.cxx index 56c73f86fcc2..f9c82383b9da 100644 --- a/javaunohelper/source/vm.cxx +++ b/javaunohelper/source/vm.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -145,3 +146,5 @@ css::uno::Reference< css::uno::XComponentContext > install_vm_singleton( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/javaunohelper/source/vm.hxx b/javaunohelper/source/vm.hxx index ec51839357c5..913d447aa26a 100644 --- a/javaunohelper/source/vm.hxx +++ b/javaunohelper/source/vm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,5 @@ install_vm_singleton( } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java index 86358d53cb85..412d114ab72c 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java @@ -143,7 +143,7 @@ public class ComponentBase_Test for (int c= 0; c < i; c++) bOk= bOk && r[c]; if (bOk == false) - System.out.println("Errors occured!"); + System.out.println("Errors occurred!"); else System.out.println("No errors."); diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java index c40b4c410286..111b2582f8f6 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java @@ -198,7 +198,7 @@ public class Factory_Test } catch (Exception exc) { - System.err.println( ">>>>>>>>>> exc occured: " + exc.toString() ); + System.err.println( ">>>>>>>>>> exc occurred: " + exc.toString() ); exc.printStackTrace(); } System.exit( 0 ); diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java index ba6df3038e0d..d74d2f91432e 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java @@ -983,7 +983,7 @@ public class InterfaceContainer_Test for (int c= 0; c < i; c++) bOk= bOk && r[c]; if ( ! bOk ) - System.out.println("Test finished.\nErrors occured!!!"); + System.out.println("Test finished.\nErrors occurred!!!"); else System.out.println("Test finished. \nNo errors."); diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java index 9a855db6ddb5..1b3dc45e1c39 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java @@ -361,7 +361,7 @@ public class MultiTypeInterfaceContainer_Test for (int c= 0; c < i; c++) bOk= bOk && r[c]; if ( ! bOk ) - System.out.println("Test finished.\nErrors occured!!!"); + System.out.println("Test finished.\nErrors occurred!!!"); else System.out.println("Test finished. \nNo errors."); diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java index 1a00899cbcf1..8c8c6a067852 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java @@ -1079,7 +1079,7 @@ public class PropertySet_Test for (int c= 0; c < i; c++) bOk= bOk && r[c]; if (bOk == false) - System.out.println("Errors occured!"); + System.out.println("Errors occurred!"); else System.out.println("No errors."); return bOk; diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java index ad2869c239b1..6f5c61bbbeb1 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java @@ -199,7 +199,7 @@ public class WeakBase_Test for (int c= 0; c < i; c++) bOk= bOk && r[c]; if (bOk == false) - System.out.println("Errors occured!"); + System.out.println("Errors occurred!"); else System.out.println("No errors."); |