Resync to trunk, windows non-pro build aoo/aw080

13 files changed, 28 insertions, 28 deletions

diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
index 0c5535cad260..a5d71dbbc5bd 100644
--- a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
+++ b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
@@ -163,7 +163,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/comp/helper/ComponentContextEntry.java b/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
index d76160397c0e..623402da5c30 100644
--- a/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
+++ b/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
@@ -44,7 +44,7 @@ public class ComponentContextEntry
 
     /** Creating a late-init singleton entry component context entry.
         The second parameter will be ignored and overwritten during
-        instanciation of the singleton instance.
+        instantiation of the singleton instance.
 
         @param lateInit
                object factory or service string
diff --git a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java b/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
index 329a103ff97c..90157249be94 100644
--- a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
+++ b/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
@@ -113,7 +113,7 @@ public class SharedLibraryLoader {
     /**
      * Registers the SharedLibraryLoader under a RegistryKey.
      * <p>
-     * @return  true if the registration was successfull - otherwise false
+     * @return  true if the registration was successful - otherwise false
      * @param   smgr    the ServiceManager
      * @param   regKey  the root key under that the component should be registered
      * @see     com.sun.star.loader.SharedLibrary
@@ -132,7 +132,7 @@ public class SharedLibraryLoader {
     /**
      * Registers the SharedLibraryLoader under a RegistryKey.
      * <p>
-     * @return  true if the registration was successfull - otherwise false
+     * @return  true if the registration was successful - otherwise false
      * @param   libName name of the shared library
      * @param   smgr    the ServiceManager
      * @param   regKey  the root key under that the component should be registered
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
index 44ce6850bc49..d5cf73a1c744 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
@@ -77,7 +77,7 @@ import com.sun.star.uno.UnoRuntime;
  *  is removed.
  *  ListIterator.set is not supported.
  *
- * A lot of  methods resemble those of the  to java.util.List interface, allthough
+ * A lot of  methods resemble those of the  to java.util.List interface, although
  * this class does not implement it. However, the list iterators returned, for example by
  * the listIterator method implement the java.util.ListIterator interface.
  * Implementing the List interface would mean to support all none - optional methods as
@@ -86,9 +86,9 @@ import com.sun.star.uno.UnoRuntime;
  * list have to cause changes in the main list. This is a problem, since this class is to be
  * used in a multi-threaded environment. The sub list could work on a copy as the iterators
  * do, but all the functions which work on an given index could not be properly supported.
- * Unfortunatly, the List interface documentation states that all optional methods implemented
+ * Unfortunately, the List interface documentation states that all optional methods implemented
  * by the list have to be implemented in the sub list. That would mean to do without all those
- * critical methods, allthough they might work well in the "main list" (as opposed to sub list).
+ * critical methods, although they might work well in the "main list" (as opposed to sub list).
  */
 public class InterfaceContainer implements Cloneable
 {
@@ -348,7 +348,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/MultiTypeInterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
index bfae2711e791..0350e4eccc96 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
@@ -113,7 +113,7 @@ public class MultiTypeInterfaceContainer
         // equals. For example:
         // Type a= new Type(XInterface.class);
         // Type b= new Type(XInterface.class);
-        // Allthough a != b , the map interprets both as being the same.
+        // Although a != b , the map interprets both as being the same.
         InterfaceContainer cont= (InterfaceContainer) map.get(ckey);
         if (cont != null)
         {
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
index 767f09b17ad5..20e997bc809b 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
@@ -404,7 +404,7 @@ XMultiPropertySet
 
     //XPropertySet ----------------------------------------------------
     synchronized public void removePropertyChangeListener(String propName, XPropertyChangeListener listener) throws UnknownPropertyException, WrappedTargetException
-    {   // all listeners are automaticly released in a dispose call
+    {   // all listeners are automatically released in a dispose call
         if (!bInDispose && !bDisposed)
         {
             if (propName.length() > 0)
@@ -421,7 +421,7 @@ XMultiPropertySet
 
     //XPropertySet ----------------------------------------------------
     synchronized public void removeVetoableChangeListener(String propName, XVetoableChangeListener listener) throws UnknownPropertyException, WrappedTargetException
-    {// all listeners are automaticly released in a dispose call
+    {// all listeners are automatically released in a dispose call
         if (!bInDispose && !bDisposed)
         {
             if (propName.length() > 0)
@@ -613,7 +613,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)
@@ -795,7 +795,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
@@ -866,7 +866,7 @@ XMultiPropertySet
      *  a XVetoableChangeListener is meant. For XPropertyChangeListener and XPropertiesChangeListener
      *  it is to be set to false.
      *
-     * @param properties    Properties wich will be or have been affected.
+     * @param properties    Properties which will be or have been affected.
      * @param newValues the new values of the properties.
      * @param oldValues the old values of the properties.
      * @param bVetoable true means fire to VetoableChangeListener, false means fire to
@@ -1054,7 +1054,7 @@ XMultiPropertySet
         listenerContainer.removeInterface(XPropertiesChangeListener.class, xPropertiesChangeListener);
     }
     // XMultiPropertySet -----------------------------------------------------------------------------------
-    /** If the array of property names containes an unknown property then it will be ignored.
+    /** If the array of property names contains an unknown property then it will be ignored.
      */
     public void setPropertyValues(String[] propNames, Object[] values) throws PropertyVetoException, com.sun.star.lang.IllegalArgumentException, com.sun.star.lang.WrappedTargetException
     {
diff --git a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
index 1aff646c17bd..8f62696378f1 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
@@ -67,7 +67,7 @@ public class SharedLibraryLoader_Test {
         sharedLibraryLoaderFactory = SharedLibraryLoader.getServiceFactory(null, null);
 
         System.out.print("Test - ");
-        System.out.println(sharedLibraryLoaderFactory == null? "failed" : "successfull");
+        System.out.println(sharedLibraryLoaderFactory == null? "failed" : "successful");
         System.out.println("*******************************************************************");
         System.out.println();
 
@@ -88,7 +88,7 @@ public class SharedLibraryLoader_Test {
                 XImplementationLoader.class, sharedLibraryLoaderFactory.createInstance() );
 
         System.out.print("Test - ");
-        System.out.println(sharedLibraryLoader == null? "failed" : "successfull");
+        System.out.println(sharedLibraryLoader == null? "failed" : "successful");
         System.out.println("*******************************************************************");
         System.out.println();
 
@@ -115,7 +115,7 @@ public class SharedLibraryLoader_Test {
         nativeServiceManager = UnoRuntime.queryInterface( XMultiServiceFactory.class, aSMgrFac.createInstance() );
 
         System.out.print("Test - ");
-        System.out.println(nativeServiceManager == null? "failed" : "successfull");
+        System.out.println(nativeServiceManager == null? "failed" : "successful");
 
         System.out.println("*******************************************************************");
         System.out.println();
@@ -141,7 +141,7 @@ public class SharedLibraryLoader_Test {
         simpleRegistry =
             UnoRuntime.queryInterface( XSimpleRegistry.class, aRegFac.createInstance() );
         System.out.print("Test - ");
-        System.out.println(simpleRegistry == null? "failed" : "successfull");
+        System.out.println(simpleRegistry == null? "failed" : "successful");
         System.out.println("*******************************************************************");
         System.err.println();
         return true;
@@ -162,7 +162,7 @@ public class SharedLibraryLoader_Test {
         result = SharedLibraryLoader.writeRegistryServiceInfo( null,  regKey );
 
         System.out.print("Test - ");
-        System.out.println( result==false ? "failed" : "successfull");
+        System.out.println( result==false ? "failed" : "successful");
         System.out.println("*******************************************************************");
         System.out.println();
         return result;
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 67b8e39a022f..bb6eeb00af93 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
@@ -79,7 +79,7 @@ public class ComponentBase_Test
         obj1.nDisposingCalled= 0;
         obj2.nDisposingCalled= 0;
         obj3.nDisposingCalled= 0;
-        comp.dispose(); // allready disposed;
+        comp.dispose(); // already disposed;
         r[i++]= obj1.nDisposingCalled == 0;
 
         boolean bOk= true;
@@ -139,7 +139,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 e2e9540cec50..f51a1a365ca0 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
@@ -194,7 +194,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 2f3cf1b2b49b..290f069fc940 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
@@ -979,7 +979,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 85f3ff831d26..17934ecccec1 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
@@ -357,7 +357,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 83f3de5a995d..69c092035a6a 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
@@ -1075,7 +1075,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;
@@ -1121,7 +1121,7 @@ class TestClass extends PropertySet
     public Property propEnum =
         new Property("PropEnum", 14, new Type("com.sun.star.beans.PropertyState", TypeClass.ENUM), (short)0);
     public com.sun.star.beans.PropertyState enumPropertyState = com.sun.star.beans.PropertyState.DEFAULT_VALUE;
-    // Test private, protected, package access, Anys as arguments and members, members whith a value
+    // Test private, protected, package access, Anys as arguments and members, members with a value
 
     public Property propBoolB= new Property("PropBoolB", 101, new Type(Boolean.TYPE), (short) 0);
     protected boolean boolPropB;
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 944f8552c190..89685a285d74 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
@@ -195,7 +195,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.");