Resync to trunk, windows non-pro buildaoo/aw080

39 files changed, 64 insertions, 64 deletions

diff --git a/connectivity/inc/connectivity/FValue.hxx b/connectivity/inc/connectivity/FValue.hxx
index dd8d1083c405..48f63f43c3c0 100644
--- a/connectivity/inc/connectivity/FValue.hxx
+++ b/connectivity/inc/connectivity/FValue.hxx
@@ -251,7 +251,7 @@ namespace connectivity
         ORowSetValue& operator=(const ::rtl::OUString& _rRH);
         // the type isn't set it will be set to VARCHAR if the type is different change it
         ORowSetValue& operator=(const ::com::sun::star::uno::Sequence<sal_Int8>& _rRH);
-        // we the possiblity to save a any for bookmarks
+        // we the possibility to save a any for bookmarks
         ORowSetValue& operator=(const ::com::sun::star::uno::Any& _rAny);
 
         operator sal_Bool() const   {   return isNull() ? sal_False : getBool();    }
diff --git a/connectivity/inc/connectivity/dbmetadata.hxx b/connectivity/inc/connectivity/dbmetadata.hxx
index 23a4f2f164bd..bfb67d4decc0 100644
--- a/connectivity/inc/connectivity/dbmetadata.hxx
+++ b/connectivity/inc/connectivity/dbmetadata.hxx
@@ -144,7 +144,7 @@ namespace dbtools
         */
         bool shouldEscapeDateTime() const;
 
-        /** auto increment columns should be automaticly used as primary key.
+        /** auto increment columns should be automatically used as primary key.
         */
         bool isAutoIncrementPrimaryKey() const;
 
diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx
index 16ff8cddc2ab..82738108d777 100644
--- a/connectivity/inc/connectivity/dbtools.hxx
+++ b/connectivity/inc/connectivity/dbtools.hxx
@@ -255,7 +255,7 @@ namespace dbtools
             If (and only if) <arg>CommandType</arg> is CommandType.COMMAND, the fields collection which is returned
             by this function here is a temporary object. It is kept alive by another object, which is to be
             created temporarily, too. To ensure that the fields you get are valid as long as you need them,
-            the owner which controls their life time is transfered to this parameter upon return.<br/>
+            the owner which controls their life time is transferred to this parameter upon return.<br/>
 
             Your fields live as long as this component lives.<br/>
 
@@ -330,7 +330,7 @@ namespace dbtools
         const StandardSQLState _eSQLState = SQL_ERROR_UNSPECIFIED,
         const sal_Int32 _nErrorCode = 0);
 
-    /** search the parent hierachy for a data source.
+    /** search the parent hierarchy for a data source.
     */
     OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> findDataSource(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParent);
 
@@ -363,7 +363,7 @@ namespace dbtools
         @param _pAsciiSettingsName
             the ASCII name of the setting to obtain
         @param _rSettingsValue
-            the value of the setting, upon successfull return
+            the value of the setting, upon successful return
 
         @return
             <FALSE/> if the setting is not present in the <member scope="com::sun::star::sdb">DataSource::Info</member>
@@ -610,7 +610,7 @@ namespace dbtools
                             const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxHandler,
                             const ::std::bit_vector& _aParametersSet = ::std::bit_vector());
 
-    /** call the appropiate set method for the specific sql type @see com::sun::star::sdbc::DataType
+    /** call the appropriate set method for the specific sql type @see com::sun::star::sdbc::DataType
         @param  _xParams        the parameters where to set the value
         @param  parameterIndex  the index of the parameter, 1 based
         @param  x               the value to set
@@ -624,7 +624,7 @@ namespace dbtools
                             sal_Int32 sqlType,
                             sal_Int32 scale=0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 
-    /** call the appropiate set method for the specific sql type @see com::sun::star::sdbc::DataType
+    /** call the appropriate set method for the specific sql type @see com::sun::star::sdbc::DataType
         @param  _xParams        the parameters where to set the value
         @param  parameterIndex  the index of the parameter, 1 based
         @param  x               the value to set
diff --git a/connectivity/inc/connectivity/parameters.hxx b/connectivity/inc/connectivity/parameters.hxx
index 4a4b79681ae2..cd51bd529630 100644
--- a/connectivity/inc/connectivity/parameters.hxx
+++ b/connectivity/inc/connectivity/parameters.hxx
@@ -84,7 +84,7 @@ namespace dbtools
             /// the column object for this parameter, as returned by the query composer
             ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
                                         xComposerColumn;
-            /// the indicies of inner parameters which need to be filled when this concrete parameter is set
+            /// the indices of inner parameters which need to be filled when this concrete parameter is set
             ::std::vector< sal_Int32 >  aInnerIndexes;
 
             /// default ctor
@@ -267,7 +267,7 @@ namespace dbtools
             @param _rxComponent
                 the database component to initialize from. Must not be <NULL/>
             @return
-                <TRUE/> if and only if the initialization was successfull
+                <TRUE/> if and only if the initialization was successful
 
             @postcond
                 if and only if <TRUE/> is returned, then <member>m_xInnerParamColumns</member> contains the collection of
diff --git a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
index 13e96b3e0c77..6ee7a9227cdd 100644
--- a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
@@ -83,7 +83,7 @@ namespace connectivity
             */
             virtual ::rtl::OUString buildName(  const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >& _xRow);
 
-            /** fills a vector with the nescessary names which can be used in combination with the collections.
+            /** fills a vector with the necessary names which can be used in combination with the collections.
                 For each row buildName will be called.
                 @param  _xResult
                     The resultset which should be used to fill the names. Will be disposed after return and set to NULL.
diff --git a/connectivity/inc/connectivity/sqlerror.hxx b/connectivity/inc/connectivity/sqlerror.hxx
index 828ef32225c3..e1d896922f09 100644
--- a/connectivity/inc/connectivity/sqlerror.hxx
+++ b/connectivity/inc/connectivity/sqlerror.hxx
@@ -173,7 +173,7 @@ namespace connectivity
                 the ErrorCondition which hit you
 
             @param  _rxContext
-                the context in which the error occured. This will be filled in as
+                the context in which the error occurred. This will be filled in as
                 <member scope="com::sun::star::uno">Exception::Context</member> member.
 
             @param _rParamValue1
@@ -210,7 +210,7 @@ namespace connectivity
 
             Note: You should prefer the version of <type>raiseException</type> which takes
             an additional <type>Context</type> parameter, since this allows clients of your
-            exception to examine where the error occured.
+            exception to examine where the error occurred.
 
             @param  _eCondition
                 the ErrorCondition which hit you
@@ -248,7 +248,7 @@ namespace connectivity
                 the ErrorCondition which hit you
 
             @param  _rxContext
-                the context in which the error occured. This will be filled in as
+                the context in which the error occurred. This will be filled in as
                 <member scope="com::sun::star::uno">Exception::Context</member> member.
 
             @param _rExceptionType
@@ -294,7 +294,7 @@ namespace connectivity
                 the ErrorCondition which hit you
 
             @param  _rxContext
-                the context in which the error occured. This will be filled in as
+                the context in which the error occurred. This will be filled in as
                 <member scope="com::sun::star::uno">Exception::Context</member> member.
 
             @param _rParamValue1
diff --git a/connectivity/inc/connectivity/sqliterator.hxx b/connectivity/inc/connectivity/sqliterator.hxx
index c7d1ed30afec..cf73a5aa5ac5 100644
--- a/connectivity/inc/connectivity/sqliterator.hxx
+++ b/connectivity/inc/connectivity/sqliterator.hxx
@@ -166,7 +166,7 @@ namespace connectivity
         const OSQLParseNode* getSimpleGroupByTree() const;
         const OSQLParseNode* getSimpleHavingTree() const;
 
-        /** returns the errors which occured during parsing.
+        /** returns the errors which occurred during parsing.
 
             The returned object contains a chain (via SQLException::NextException) of SQLExceptions.
         */
@@ -333,12 +333,12 @@ namespace connectivity
         /** appends an SQLException corresponding to the given error code to our error collection
 
             @param  _eError
-                the code of the error which occured
+                the code of the error which occurred
             @param  _pReplaceToken1
-                if not <NULL/>, the first occurance of '#' in the error message will be replaced
+                if not <NULL/>, the first occurrence of '#' in the error message will be replaced
                 with the given token
             @param  _pReplaceToken2
-                if not <NULL/>, and if _rReplaceToken1 is not <NULL/>, the second occurance of '#'
+                if not <NULL/>, and if _rReplaceToken1 is not <NULL/>, the second occurrence of '#'
                 in the error message will be replaced with _rReplaceToken2
         */
         void impl_appendError( IParseContext::ErrorCode _eError,
diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx
index ac9ffc0226e1..39475db472a8 100644
--- a/connectivity/inc/connectivity/sqlnode.hxx
+++ b/connectivity/inc/connectivity/sqlnode.hxx
@@ -301,7 +301,7 @@ namespace connectivity
                 too, to check whether they contain nested sub queries.
 
             @param _pErrorHolder
-                takes the error which occured while generating the statement, if any. Might be <NULL/>,
+                takes the error which occurred while generating the statement, if any. Might be <NULL/>,
                 in this case the error is not reported back, and can only be recognized by examing the
                 return value.
 
@@ -412,7 +412,7 @@ namespace connectivity
                                             ::rtl::OUString &_rTable
                                             ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData);
 
-        // susbtitute all occurences of :var or [name] into the dynamic parameter ?
+        // susbtitute all occurrences of :var or [name] into the dynamic parameter ?
         // _pNode will be modified if parameters exists
         static void substituteParameterNames(OSQLParseNode* _pNode);
 
diff --git a/connectivity/inc/connectivity/virtualdbtools.hxx b/connectivity/inc/connectivity/virtualdbtools.hxx
index 60d65ba3a2d1..9370bcf79a55 100644
--- a/connectivity/inc/connectivity/virtualdbtools.hxx
+++ b/connectivity/inc/connectivity/virtualdbtools.hxx
@@ -91,7 +91,7 @@ namespace comphelper {
     instance, which is acquired <em>once</em>.</p>
     @return
         a pointer to an object implementing the IDataAccessToolsFactory interface,
-        aquired exactly <em>once</em>.
+        acquired exactly <em>once</em>.
 */
 extern "C" OOO_DLLPUBLIC_DBTOOLS void* SAL_CALL createDataAccessToolsFactory();
 
diff --git a/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
index fedfcb4a72ad..3209bcce9954 100644
--- a/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
+++ b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
@@ -117,7 +117,7 @@ public class JdbcLongVarCharTest extends ComplexTestCase
         }
         catch (java.lang.Exception e)
         {
-            System.out.println("== Exception occured while testing ==");
+            System.out.println("== Exception occurred while testing ==");
             e.printStackTrace();
         } finally
         {
diff --git a/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java b/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
index 9a0471b7fad7..17589f27554b 100644
--- a/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
+++ b/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
@@ -68,7 +68,7 @@ public class DatabaseMetaData {
         } catch( java.lang.IllegalAccessException ex ) {
             assure("IllegalAccessException!",false);
         } catch( SQLException ex ) {
-            assure("SQLException occured: " + ex.getMessage() ,false);
+            assure("SQLException occurred: " + ex.getMessage() ,false);
         } catch( java.lang.reflect.InvocationTargetException ex ) {
             assure("IllegalAccessException!",false);
         } finally {
diff --git a/connectivity/source/commontools/TSkipDeletedSet.cxx b/connectivity/source/commontools/TSkipDeletedSet.cxx
index a1185f67a799..566f23c06f0b 100644
--- a/connectivity/source/commontools/TSkipDeletedSet.cxx
+++ b/connectivity/source/commontools/TSkipDeletedSet.cxx
@@ -61,7 +61,7 @@ sal_Bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPositio
             nDelOffset = 1;
             break;
         case IResultSetHelper::LAST:
-            eDelPosition = IResultSetHelper::PRIOR; // lsat row is invalid so position before
+            eDelPosition = IResultSetHelper::PRIOR; // last row is invalid so position before
             nDelOffset = 1;
             break;
         case IResultSetHelper::RELATIVE:
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 10ba937a21f0..3915b7c2e8c9 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -192,7 +192,7 @@ namespace dbtools
         }
 
         // we need to map the parameter names (which is all we get from the 's
-        // MasterFields property) to indicies, which are needed by the XParameters
+        // MasterFields property) to indices, which are needed by the XParameters
         // interface of the row set)
         Reference<XPropertySet> xParam;
         for ( sal_Int32 i = 0; i < m_nInnerCount; ++i )
@@ -205,7 +205,7 @@ namespace dbtools
                 ::rtl::OUString sName;
                 xParam->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME) ) >>= sName;
 
-                // only append additonal paramters when they are not already in the list
+                // only append additional parameters when they are not already in the list
                 ParameterInformation::iterator aExistentPos = m_aParameterInformation.find( sName );
                 OSL_ENSURE( !_bSecondRun || ( aExistentPos != m_aParameterInformation.end() ),
                     "ParameterManager::collectInnerParameters: the parameter information should already exist in the second run!" );
@@ -479,9 +479,9 @@ namespace dbtools
             ( nSmallestIndexLinkedByColumnName > nLargestIndexNotLinkedByColumnName ),
             "ParameterManager::createOuterParameters: inconsistency!" );
 
-        // for the master-detail links, where the detail field denoted a column name, we created an addtional ("artificial")
+        // for the master-detail links, where the detail field denoted a column name, we created an additional ("artificial")
         // filter, and *appended* it to all other (potentially) existing filters of the row set. This means that the indexes
-        // for the parameters resulting from the artifical filter should be larger than any other parameter index, and this
+        // for the parameters resulting from the artificial filter should be larger than any other parameter index, and this
         // is what the assertion checks.
         // If the assertion fails, then we would need another handling for the "parameters visited" flags, since they're based
         // on parameter indexes *without* the artificial filter (because this filter is not visible from the outside).
@@ -561,7 +561,7 @@ namespace dbtools
             Any aParamType, aScale, aValue;
 
             // loop through all master fields. For each of them, get the respective column from the
-            // parent , and forward it's current value as paramter value to the (inner) row set
+            // parent , and forward it's current value as parameter value to the (inner) row set
             for ( sal_Int32 i = 0; i < nMasterLen; ++i, ++pMasterFields, ++pDetailFields )
             {
                 // does the name denote a valid column in the parent?
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index 7160e2c81e1b..42b4ecaef6ef 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -68,7 +68,7 @@ namespace connectivity
     typedef struct
     {
         TPooledConnections  aConnections;
-        sal_Int32           nALiveCount; // will be decremented everytime a time says to, when will reach zero the pool will be deleted
+        sal_Int32           nALiveCount; // will be decremented every time a time says to, when will reach zero the pool will be deleted
     } TConnectionPool;
 
     struct TDigestHolder
diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index 970f3f5f892b..e1667aef594e 100644
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
@@ -53,7 +53,7 @@ namespace connectivity
                                         ::com::sun::star::beans::XPropertyChangeListener
                                         >   OPoolCollection_Base;
 
-    /// OPoolCollection: controll the whole connection pooling for oo
+    /// OPoolCollection: control the whole connection pooling for oo
     class OPoolCollection : public OPoolCollection_Base
     {
 
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index d5c6d53bf200..bc5107c26b02 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -147,7 +147,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResult
     WpADOField aField = ADOS::getField(m_pRecordSet,columnIndex);
     if((aField.GetAttributes() & adFldLong) == adFldLong)
     {
-        //Copy the data only upto the Actual Size of Field.
+        //Copy the data only up to the Actual Size of Field.
         sal_Int32 nSize = aField.GetActualSize();
         Sequence<sal_Int8> aData(nSize);
         long index = 0;
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 9e9c5610ceb7..1f57671ca037 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -179,7 +179,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL OResultSet::getBinarySt
 
     if((aField.GetAttributes() & adFldLong) == adFldLong)
     {
-        //Copy the data only upto the Actual Size of Field.
+        //Copy the data only up to the Actual Size of Field.
         sal_Int32 nSize = aField.GetActualSize();
         Sequence<sal_Int8> aData(nSize);
         long index = 0;
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 130e8a42c223..29563a668d5a 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2290,7 +2290,7 @@ void ODbaseTable::alterColumn(sal_Int32 index,
     }
     catch(const Exception&)
     {
-        OSL_ENSURE(0,"ODbaseTable::alterColumn: Exception occured!");
+        OSL_ENSURE(0,"ODbaseTable::alterColumn: Exception occurred!");
         throw;
     }
 }
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 67273c6bf533..64103fc885f6 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -628,7 +628,7 @@ sal_Bool SAL_CALL OEvoabDatabaseMetaData::allTablesAreSelectable(  ) throw(SQLEx
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
-    // For now definately read-only, no support for update/delete
+    // For now definitely read-only, no support for update/delete
     return sal_True;
 }
 // -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx
index 402ccb623c33..660c1e5d47f7 100644
--- a/connectivity/source/drivers/evoab2/NDriver.hxx
+++ b/connectivity/source/drivers/evoab2/NDriver.hxx
@@ -31,7 +31,7 @@
 #include <osl/module.h>
 
 #define EVOAB_EVOLUTION_SCHEMA  "evolution"
-/*In Future, when seperate schema is required for ldap, groupwise*/
+/*In Future, when separate schema is required for ldap, groupwise*/
 #define EVOAB_LDAP_SCHEMA   "ldap"
 #define EVOAB_GWISE_SCHEMA  "groupwise"
 
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index adc22739e5b6..fbf212517f79 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -423,7 +423,7 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree )
             m_pConnection->throwGenericSQLException(STR_QUERY_NOT_LIKE_TOO_COMPLEX,*this);
         }
         else if( (aMatchString.indexOf ( WILDCARD ) == aMatchString.lastIndexOf ( WILDCARD ) ) )
-        {   // One occurance of '%'  matches...
+        {   // One occurrence of '%'  matches...
             if ( aMatchString.indexOf ( WILDCARD ) == 0 )
                 pResult = createTest( aColumnName, E_BOOK_QUERY_ENDS_WITH, aMatchString.copy( 1 ) );
             else if ( aMatchString.indexOf ( WILDCARD ) == aMatchString.getLength() - 1 )
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index e573b72ac47f..b742049ab7dc 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -423,7 +423,7 @@ Reference<XResultSet> OPreparedStatement::initResultSet()
     m_pResultSet->clear();
     Reference<XResultSet> xRs(m_pResultSet);
 
-    // check if we got enough paramters
+    // check if we got enough parameters
     if ( (m_aParameterRow.isValid() && ( m_aParameterRow->get().size() -1 ) < m_xParamColumns->get().size()) ||
          (m_xParamColumns.isValid() && !m_aParameterRow.isValid() && !m_aParameterRow->get().empty()) )
          m_pConnection->throwGenericSQLException(STR_INVALID_PARA_COUNT,*this);
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 6cffc1afd322..37bfd7b3d8ae 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -127,7 +127,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables(
         // Java-Call absetzen
         static jmethodID mID(NULL);
         obtainMethodId(t.pEnv, cMethodName,cSignature, mID);
-        OSL_VERIFY_RES( !isExceptionOccured(t.pEnv,sal_True),"Exception occured!");
+        OSL_VERIFY_RES( !isExceptionOccured(t.pEnv,sal_True),"Exception occurred!");
         jvalue args[4];
 
         args[3].l = 0;
@@ -135,7 +135,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables(
         if ( typeFilterCount )
         {
             jobjectArray pObjArray = static_cast< jobjectArray >( t.pEnv->NewObjectArray( (jsize)typeFilterCount, java_lang_String::st_getMyClass(), 0 ) );
-            OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occured!" );
+            OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occurred!" );
             const ::rtl::OUString* typeFilter = _types.getConstArray();
             bool bIncludeAllTypes = false;
             for ( sal_Int32 i=0; i<typeFilterCount; ++i, ++typeFilter )
@@ -147,7 +147,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables(
                 }
                 jstring aT = convertwchar_tToJavaString( t.pEnv, *typeFilter );
                 t.pEnv->SetObjectArrayElement( pObjArray, (jsize)i, aT );
-                OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occured!" );
+                OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occurred!" );
             }
 
             if ( bIncludeAllTypes )
@@ -155,7 +155,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables(
                 // the SDBC API allows to pass "%" as table type filter, but in JDBC, "all table types"
                 // is represented by the table type being <null/>
                 t.pEnv->DeleteLocalRef( pObjArray );
-                OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occured!" );
+                OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occurred!" );
             }
             else
             {
@@ -183,23 +183,23 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables(
         if ( aCatalogFilter.hasValue() )
         {
             t.pEnv->DeleteLocalRef((jstring)args[0].l);
-            OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occured!" );
+            OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occurred!" );
         }
         if(args[1].l)
         {
             t.pEnv->DeleteLocalRef((jstring)args[1].l);
-            OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occured!" );
+            OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occurred!" );
         }
         if(tableNamePattern.getLength())
         {
             t.pEnv->DeleteLocalRef((jstring)args[2].l);
-            OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occured!" );
+            OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occurred!" );
         }
         //for(INT16 i=0;i<len;i++)
         if ( args[3].l )
         {
             t.pEnv->DeleteLocalRef( (jobjectArray)args[3].l );
-            OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occured!" );
+            OSL_VERIFY_RES( !isExceptionOccured( t.pEnv, sal_True ), "Exception occurred!" );
         }
 
         if ( jThrow )
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index 8b788b708b79..e499e0c9ba43 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -111,7 +111,7 @@ Reference< XConnection > SAL_CALL java_sql_Driver::connect( const ::rtl::OUStrin
         java_sql_Connection* pConnection = new java_sql_Connection( *this );
         xOut = pConnection;
         if ( !pConnection->construct(url,info) )
-            xOut.clear(); // an error occured and the java driver didn't throw an exception
+            xOut.clear(); // an error occurred and the java driver didn't throw an exception
         else
             m_aLogger.log( LogLevel::INFO, STR_LOG_DRIVER_SUCCESS );
     }
diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx
index 5042098e51ff..bfc10d17ded3 100644
--- a/connectivity/source/drivers/kab/KStatement.cxx
+++ b/connectivity/source/drivers/kab/KStatement.cxx
@@ -522,7 +522,7 @@ sal_Bool KabCommonStatement::convertFastPropertyValue(
 // -------------------------------------------------------------------------
 void KabCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any&) throw (Exception)
 {
-    // set the value to whatever is nescessary
+    // set the value to whatever is necessary
     switch (nHandle)
     {
         case PROPERTY_ID_QUERYTIMEOUT:
diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx
index ba1b9b900769..fb63663ff155 100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -934,7 +934,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT
              * scalar type, an error, or an unknown type are found.
              * Because of that, the following checks only occur for this type.
              * We store whether we have successfully placed this property
-             * into the MacabRecord (or whether an unrecoverable error occured).
+             * into the MacabRecord (or whether an unrecoverable error occurred).
              * Then, we try over and over again to place the property into the
              * record. There are three possible results:
              * 1) Success!
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index 9f4d38b33130..a85c715eca22 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -549,7 +549,7 @@ sal_Bool MacabCommonStatement::convertFastPropertyValue(
 // -------------------------------------------------------------------------
 void MacabCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any&) throw (Exception)
 {
-    // set the value to whatever is nescessary
+    // set the value to whatever is necessary
     switch (nHandle)
     {
         case PROPERTY_ID_QUERYTIMEOUT:
diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx
index 872588772419..ae3af24a1e17 100644
--- a/connectivity/source/inc/TSkipDeletedSet.hxx
+++ b/connectivity/source/inc/TSkipDeletedSet.hxx
@@ -56,7 +56,7 @@ namespace connectivity
 
         /**
             skipDeleted moves the resultset to the position defined by the parameters
-            it garantees that the row isn't deleted
+            it guarantees that the row isn't deleted
                 @param
                     IResultSetHelper::Movement  _eCursorPosition        in which direction the resultset should be moved
                     sal_Int32                   _nOffset                the position relativ to the movement
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
index 407e8d8b8670..93ff948c30eb 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
@@ -63,7 +63,7 @@ namespace connectivity
                                     public  ::cppu::OPropertySetHelper,
                                     public  ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet>
         {
-            ::std::vector<sal_Int32>        m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime
+            ::std::vector<sal_Int32>        m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time
 
             ::std::map<sal_Int32, TInt2IntMap > m_aValueRange;
             ::std::map<sal_Int32, TInt2IntMap >::iterator   m_aValueRangeIter;
diff --git a/connectivity/source/inc/file/FNumericFunctions.hxx b/connectivity/source/inc/file/FNumericFunctions.hxx
index d9bb3cf67b67..2230b88e345c 100644
--- a/connectivity/source/inc/file/FNumericFunctions.hxx
+++ b/connectivity/source/inc/file/FNumericFunctions.hxx
@@ -174,7 +174,7 @@ namespace connectivity
             > SELECT LOG(-2);
                     -> NULL
 
-                If called with two parameters, this function returns the logarithm of X for an arbitary base B:
+                If called with two parameters, this function returns the logarithm of X for an arbitrary base B:
 
             > SELECT LOG(2,65536);
                     -> 16.000000
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index 934ced70917c..6bdedc72d4d4 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -93,7 +93,7 @@ namespace connectivity
 
         protected:
             ::std::vector<void*>                    m_aBindVector;
-            ::std::vector<sal_Int32>                m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime
+            ::std::vector<sal_Int32>                m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time
 
             ::std::vector<sal_Int32>                m_aOrderbyColumnNumber;
             ::std::vector<TAscendingOrder>          m_aOrderbyAscending;
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index 01c69aed3193..f7516a59a60f 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -70,7 +70,7 @@ namespace connectivity
 
         {
         protected:
-            ::std::vector<sal_Int32>                    m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime
+            ::std::vector<sal_Int32>                    m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time
             ::std::vector<sal_Int32>                    m_aParameterIndexes; // maps the parameter index to column index
             ::std::vector<sal_Int32>                    m_aOrderbyColumnNumber;
             ::std::vector<TAscendingOrder>              m_aOrderbyAscending;
diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx
index 9525ea089711..0042e2e3d3b3 100644
--- a/connectivity/source/inc/flat/ETable.hxx
+++ b/connectivity/source/inc/flat/ETable.hxx
@@ -44,7 +44,7 @@ namespace connectivity
 
         class OFlatTable :  public OFlatTable_BASE
         {
-            // maps a row postion to a file position
+            // maps a row position to a file position
             TRowPositionsInFile             m_aFilePosToEndLinePos;
             ::std::map<sal_Int32, TRowPositionsInFile::iterator>
                                             m_aRowPosToFilePos;
diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx
index aa6493fa1a1b..3a178c9feb94 100644
--- a/connectivity/source/inc/java/ContextClassLoader.hxx
+++ b/connectivity/source/inc/java/ContextClassLoader.hxx
@@ -48,7 +48,7 @@ namespace connectivity { namespace jdbc
     {
     public:
         /** creates the instance. If isActive returns <FALSE/> afterwards, then an exception
-            happend in the JVM, which should be raised as UNO exception by the caller
+            happened in the JVM, which should be raised as UNO exception by the caller
 
             @param  environment
                 the current JNI environment
diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx
index b9a3e1871f87..1bb1bb754e74 100644
--- a/connectivity/source/inc/java/tools.hxx
+++ b/connectivity/source/inc/java/tools.hxx
@@ -70,13 +70,13 @@ namespace connectivity
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > Map2XNameAccess(JNIEnv *pEnv,jobject _pMap);
     jobject convertTypeMapToJavaMap(JNIEnv *pEnv,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & _rMap);
 
-    /** return if a exception occured
+    /** return if a exception occurred
         @param  pEnv
             The native java env
         @param  _bClear
             <TRUE/> if the execption should be cleared
         @return
-            <TRUE/> if an exception is occured
+            <TRUE/> if an exception is occurred
     */
     sal_Bool isExceptionOccured(JNIEnv *pEnv,sal_Bool _bClear);
 
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 22fdfe32085a..f7bde3ccd8a9 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -63,7 +63,7 @@ namespace connectivity
                                     public  ::cppu::OPropertySetHelper,
                                     public  ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet>
         {
-            ::connectivity::TIntVector                      m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime
+            ::connectivity::TIntVector                      m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time
 
             ::std::map<sal_Int32, ::connectivity::TInt2IntMap >                 m_aValueRange;
             ::std::map<sal_Int32, ::connectivity::TString2IntMap >              m_aStrValueRange;
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 6306fcbf76ca..e828b45444c4 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -515,7 +515,7 @@ void OSQLParseNode::impl_parseNodeToString_throw(::rtl::OUStringBuffer& rString,
                 }
 
                 // ok we found the field, if the following node is the
-                // comparision operator '=' we filter it as well
+                // comparison operator '=' we filter it as well
                 if (bFilter)
                 {
                     if (SQL_ISRULE(this, comparison_predicate))
@@ -696,7 +696,7 @@ void OSQLParseNode::impl_parseLikeNodeToString_throw( ::rtl::OUStringBuffer& rSt
         }
         catch ( Exception& )
         {
-            OSL_ENSURE( false, "OSQLParseNode::impl_parseLikeNodeToString_throw Exception occured!" );
+            OSL_ENSURE( false, "OSQLParseNode::impl_parseLikeNodeToString_throw Exception occurred!" );
         }
         if ( !m_aChildren[0]->isLeaf() )
         {
diff --git a/connectivity/workben/skeleton/SResultSet.hxx b/connectivity/workben/skeleton/SResultSet.hxx
index cd47cd4dc761..b819d56a7e5a 100644
--- a/connectivity/workben/skeleton/SResultSet.hxx
+++ b/connectivity/workben/skeleton/SResultSet.hxx
@@ -74,7 +74,7 @@ namespace connectivity
         protected:
             TVoidVector                                 m_aBindVector;
             ::std::vector<sal_Int32>                    m_aLengthVector;
-            ::std::vector<sal_Int32>                    m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime
+            ::std::vector<sal_Int32>                    m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time
             ::std::vector< ORowSetValue>                m_aRow; // only used when SQLGetData can't be called in any order
             OStatement_Base*                            m_pStatement;
             ::com::sun::star::uno::WeakReferenceHelper  m_aStatement;
diff --git a/connectivity/workben/skeleton/how_to_write_a_driver.txt b/connectivity/workben/skeleton/how_to_write_a_driver.txt
index ad4ab99bad2c..30baa17700f7 100644
--- a/connectivity/workben/skeleton/how_to_write_a_driver.txt
+++ b/connectivity/workben/skeleton/how_to_write_a_driver.txt
@@ -27,7 +27,7 @@ Pre implementation steps
 - copy all files from connectivity/workben/skeleton into your new created directory under
   connectivity/source/drivers and rename the first char of the files to one which isn't used so far
   ( please have a look at the other drivers )
-- search all occurances of skeleton and replace them to a name which you prefer
+- search all occurrences of skeleton and replace them to a name which you prefer
 
 1. Implement a class called driver or modify the existing skeleton	-> have a look at SDriver.?xx 
 2. Implement a class called connection								-> have a look at SConnection.?xx