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

9 files changed, 10 insertions, 10 deletions

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;