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

10 files changed, 23 insertions, 23 deletions

diff --git a/sal/osl/os2/file_path_helper.h b/sal/osl/os2/file_path_helper.h
index b6a95ba75ece..d8017ea327af 100644
--- a/sal/osl/os2/file_path_helper.h
+++ b/sal/osl/os2/file_path_helper.h
@@ -155,7 +155,7 @@
 
  /*****************************************
     osl_systemPathGetParent
-    Replaces the last occurrance of a path
+    Replaces the last occurrence of a path
     separator with '\0' and returns the
     position where the '/' was replaced
 
diff --git a/sal/osl/os2/file_path_helper.hxx b/sal/osl/os2/file_path_helper.hxx
index f1fbd4862d13..385fd86d7f7d 100644
--- a/sal/osl/os2/file_path_helper.hxx
+++ b/sal/osl/os2/file_path_helper.hxx
@@ -162,7 +162,7 @@ namespace osl
 
  /*****************************************
     systemPathGetParent
-    Replaces the last occurrance of a path
+    Replaces the last occurrence of a path
     separator with '\0' and returns the
     position where the '/' was replaced
 
diff --git a/sal/osl/os2/file_url.cxx b/sal/osl/os2/file_url.cxx
index e04db43f6057..425b0c47db3d 100644
--- a/sal/osl/os2/file_url.cxx
+++ b/sal/osl/os2/file_url.cxx
@@ -739,7 +739,7 @@ oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath,
         /* adapt index to pTmp */
         nIndex += pTmp->length - ustrSystemPath->length;
 
-        /* remove all occurances of '//' */
+        /* remove all occurrences of '//' */
         for( nSrcIndex = nIndex + 1; nSrcIndex < pTmp->length; nSrcIndex++ )
         {
             if( ((sal_Unicode) '/' == pTmp->buffer[nSrcIndex]) && ((sal_Unicode) '/' == pTmp->buffer[nIndex]) )
@@ -913,7 +913,7 @@ oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *ustrFileURL, rt
         {
             nOffset += nIndex;
 
-            /* break url down in '/' devided tokens tokens */
+            /* break url down in '/' divided tokens tokens */
             nIndex = rtl_ustr_indexOfChar_WithLength( ustrFileURL->buffer + nOffset, ustrFileURL->length - nOffset, (sal_Unicode) '/' );
 
             /* copy token to new string */
diff --git a/sal/osl/os2/file_url.h b/sal/osl/os2/file_url.h
index e9010d631b12..c9d4c814a016 100644
--- a/sal/osl/os2/file_url.h
+++ b/sal/osl/os2/file_url.h
@@ -23,7 +23,7 @@
 
  /***************************************************
   * Internal header file, declares all functions
-  * that are not part of the offical API and are
+  * that are not part of the official API and are
   * not defined in the osl header files
   **************************************************/
 
diff --git a/sal/osl/os2/makefile.mk b/sal/osl/os2/makefile.mk
index 4b0e8ad80163..cb2531a8a9ec 100644
--- a/sal/osl/os2/makefile.mk
+++ b/sal/osl/os2/makefile.mk
@@ -38,7 +38,7 @@ MULTITHREAD_OBJ=TRUE
 .INCLUDE :  settings.mk
 
 # Uncomment the following line if you want to compile with -Wall 
-# it disables lots of unnecessary warnings comming from the Win32
+# it disables lots of unnecessary warnings coming from the Win32
 # header files (disabling warnings via command line only works with
 # MSVC >= 7.x)
 #
diff --git a/sal/osl/os2/pipe.cxx b/sal/osl/os2/pipe.cxx
index c12753298279..90df6b9779a2 100644
--- a/sal/osl/os2/pipe.cxx
+++ b/sal/osl/os2/pipe.cxx
@@ -468,7 +468,7 @@ oslPipeError SAL_CALL osl_getLastPipeError(oslPipe pPipe)
 
 sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32 n )
 {
-    /* loop until all desired bytes were send or an error occured */
+    /* loop until all desired bytes were send or an error occurred */
     sal_Int32 BytesSend= 0;
     sal_Int32 BytesToSend= n;
 
@@ -479,7 +479,7 @@ sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32
 
         RetVal= osl_sendPipe(pPipe, pBuffer, BytesToSend);
 
-        /* error occured? */
+        /* error occurred? */
         if(RetVal <= 0)
         {
             break;
@@ -495,7 +495,7 @@ sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32
 
 sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void *pBuffer , sal_Int32 n )
 {
-    /* loop until all desired bytes were read or an error occured */
+    /* loop until all desired bytes were read or an error occurred */
     sal_Int32 BytesRead= 0;
     sal_Int32 BytesToRead= n;
 
@@ -505,7 +505,7 @@ sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void *pBuffer , sal_Int32 n )
         sal_Int32 RetVal;
         RetVal= osl_receivePipe(pPipe, pBuffer, BytesToRead);
 
-        /* error occured? */
+        /* error occurred? */
         if(RetVal <= 0)
         {
             break;
diff --git a/sal/osl/os2/process.c b/sal/osl/os2/process.c
index 185a6ca6a57f..9fcc9bd0f1a3 100644
--- a/sal/osl/os2/process.c
+++ b/sal/osl/os2/process.c
@@ -464,11 +464,11 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
 
         OSL_TRACE( "osl_executeProcess with DosExecPgm (args: %s)\n", args );
 
-        /* calculate needed space for environment: since enviroment var search
-           is a linear scan of the current enviroment, we place new variables
+        /* calculate needed space for environment: since environment var search
+           is a linear scan of the current environment, we place new variables
            before existing ones; so the child will find new definitions before
            olders; this doesn't require us to replace existing vars */
-        // existing enviroment size
+        // existing environment size
         n = 0;
         p = environ;
         while( *p)
@@ -848,7 +848,7 @@ oslProcessError SAL_CALL osl_getCommandArgs( sal_Char* pszBuffer, sal_uInt32 Max
         {
             /*
              *  C-Runtime expects char to be unsigned and so to be
-             *  preceeded with 00 instead of FF when converting to int
+             *  preceded with 00 instead of FF when converting to int
              */
             int n = *((unsigned char *) pszCmdLine);
             if (! (isspace(n) || (*pszCmdLine == '\0')) )
diff --git a/sal/osl/os2/profile.c b/sal/osl/os2/profile.c
index f8e7874dd167..fb31bd2d169c 100644
--- a/sal/osl/os2/profile.c
+++ b/sal/osl/os2/profile.c
@@ -1923,7 +1923,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
 
             if ( pProfile->m_strFileName != 0  && pProfile->m_strFileName->buffer[0] != 0 )
                 FileURLToPath( pszFilename, PATH_MAX, pProfile->m_strFileName );
-            /* hack: usualy you have a specific HAB, but NULL works here... */
+            /* hack: usually you have a specific HAB, but NULL works here... */
             pProfile->m_hIni = PrfOpenProfile(NULL, (PCSZ)pszFilename);
             if (! pProfile->m_hIni)
                 return (NULL);
@@ -2124,7 +2124,7 @@ static sal_Bool lookupProfile(const sal_Char *pszPath, const sal_Char *pszFile,
         if (osl_getExecutableFile(Path, sizeof(Path)) != osl_Process_E_None)
             return (sal_False);
 
-        /* seperate path from filename */
+        /* separate path from filename */
         if ((pChr = strrchr(Path, '\\')) == NULL)
             if ((pChr = strrchr(Path, ':')) == NULL)
                 return (sal_False);
diff --git a/sal/osl/os2/socket.c b/sal/osl/os2/socket.c
index 3066859bb800..f0cf028e4e69 100644
--- a/sal/osl/os2/socket.c
+++ b/sal/osl/os2/socket.c
@@ -782,7 +782,7 @@ oslSocketResult SAL_CALL osl_getAddrOfSocketAddr( oslSocketAddr pAddr, sal_Seque
 
 /** try to figure out a full-qualified hostname, by adding the current domain
     as given by the domainname program to the given hostname.
-    This function MUST NOT call gethostbyname since pHostName allready points
+    This function MUST NOT call gethostbyname since pHostName already points
     to data returned by gethostname and would be garbled: use gethostname_r
     instead!
  */
@@ -2492,7 +2492,7 @@ sal_Int32 SAL_CALL osl_readSocket (
 
     OSL_ASSERT( pSocket);
 
-    /* loop until all desired bytes were read or an error occured */
+    /* loop until all desired bytes were read or an error occurred */
     while (BytesToRead > 0)
     {
         sal_Int32 RetVal;
@@ -2501,7 +2501,7 @@ sal_Int32 SAL_CALL osl_readSocket (
                                    BytesToRead,
                                    osl_Socket_MsgNormal);
 
-        /* error occured? */
+        /* error occurred? */
         if(RetVal <= 0)
         {
             break;
@@ -2521,7 +2521,7 @@ sal_Int32 SAL_CALL osl_readSocket (
 sal_Int32 SAL_CALL osl_writeSocket(
     oslSocket pSocket, const void *pBuffer, sal_Int32 n )
 {
-    /* loop until all desired bytes were send or an error occured */
+    /* loop until all desired bytes were send or an error occurred */
     sal_uInt32 BytesSend= 0;
     sal_uInt32 BytesToSend= n;
     sal_uInt8 *Ptr = ( sal_uInt8 * )pBuffer;
@@ -2534,7 +2534,7 @@ sal_Int32 SAL_CALL osl_writeSocket(
 
         RetVal= osl_sendSocket( pSocket,Ptr,BytesToSend,osl_Socket_MsgNormal);
 
-        /* error occured? */
+        /* error occurred? */
         if(RetVal <= 0)
         {
             break;
diff --git a/sal/osl/os2/system.h b/sal/osl/os2/system.h
index a815659a1a0a..6d8d204d6008 100644
--- a/sal/osl/os2/system.h
+++ b/sal/osl/os2/system.h
@@ -362,7 +362,7 @@ char *macxp_tempnam( const char *tmpdir, const char *prefix );
 #elif defined _BIG_ENDIAN_OO
 #   define _OSL_LITENDIAN
 #else
-#   error undetermined endianess
+#   error undetermined endianness
 #endif
 #else
 #if defined _LITTLE_ENDIAN
@@ -370,7 +370,7 @@ char *macxp_tempnam( const char *tmpdir, const char *prefix );
 #elif defined _BIG_ENDIAN
 #   define _OSL_LITENDIAN
 #else
-#   error undetermined endianess
+#   error undetermined endianness
 #endif
 #endif