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

4 files changed, 8 insertions, 8 deletions

diff --git a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
index 3c233f70f272..d25f2930a7c0 100644
--- a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
+++ b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
@@ -119,7 +119,7 @@ public class ServiceManager implements XMultiServiceFactory,
      * @return     the factory for the <code>ServiceManager</code>.
      * @param      implName     the implementation name of the of the service.
      *                          Must be equal to <code>com.sun.star.comp.servicemanager.ServicManager</code>
-     * @param      multiFactory refernce of the <code>MultiServiceFactory</code>. This parameter will be ignored.
+     * @param      multiFactory references of the <code>MultiServiceFactory</code>. This parameter will be ignored.
      * @param      regKey       the root key of the registry. This parameter will be ignored.
      */
       public static XSingleServiceFactory getServiceFactory( String implName,
@@ -158,7 +158,7 @@ public class ServiceManager implements XMultiServiceFactory,
      * Registers a list of components given by their class names.
      * <p>
      * @param   newImpls    list of the components that should be registered, given by their class names.
-     *                      If any exception occured during the registration, the process will be canceled.
+     *                      If any exception occurred during the registration, the process will be canceled.
      * @see     com.sun.star.container.XSet
      */
     private void xaddFactories( String[] newImpls )
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java b/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java
index 268d1d48ac75..09438c845557 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java
@@ -116,7 +116,7 @@ public interface IThreadPool {
 
     /**
      * Destroys the thread pool and tries
-     * to join all created threads immediatly.
+     * to join all created threads immediately.
      */
     public void destroy();
 }
diff --git a/jurt/com/sun/star/lib/util/UrlToFileMapper.java b/jurt/com/sun/star/lib/util/UrlToFileMapper.java
index c72ed91145e2..35b65694de76 100644
--- a/jurt/com/sun/star/lib/util/UrlToFileMapper.java
+++ b/jurt/com/sun/star/lib/util/UrlToFileMapper.java
@@ -79,7 +79,7 @@ public final class UrlToFileMapper {
                                StringHelper.replace(url.getPath(), '+', "%2B")))
                 : null;
         } else {
-            // If java.net.URI is avaliable, do
+            // If java.net.URI is available, do
             //   URI uri = new URI(encodedUrl);
             //   try {
             //       return new File(uri);
diff --git a/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c b/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
index 326f9584a5a0..fae40f97bf01 100644
--- a/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
+++ b/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
@@ -342,7 +342,7 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_readJNI
     enum {
         START   = 0,
         INMONITOR,
-        AQUIRED,
+        ACQUIRED,
         GOTBUFFER
     };
 
@@ -374,9 +374,9 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_readJNI
         goto error;
     }
 
-    /* aquire pipe */
+    /* acquire pipe */
     osl_acquirePipe( npipe );
-    state = AQUIRED;
+    state = ACQUIRED;
 
     /* allocate a buffer */
     if ((nbuff = malloc(len)) == NULL)
@@ -424,7 +424,7 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_readJNI
 
     /* done */
     free(nbuff);
-    if ( state >= AQUIRED )
+    if ( state >= ACQUIRED )
         osl_releasePipe( npipe );
 
     /* exit monitor */