From da40cac540e7d735edbe9069b3c8ec6af4530208 Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Mon, 10 Nov 2014 15:05:25 +0100 Subject: Fix common typos. No automatic tools. Handmade… MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1ab4e23b0539f8d39974787f226e57a21f96e959 Reviewed-on: https://gerrit.libreoffice.org/12164 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- connectivity/source/drivers/dbase/dindexnode.cxx | 4 ++-- connectivity/source/drivers/firebird/Connection.cxx | 2 +- connectivity/source/drivers/firebird/DatabaseMetaData.cxx | 2 +- connectivity/source/drivers/mork/MNSFolders.cxx | 2 +- connectivity/source/drivers/mork/MQueryHelper.cxx | 2 +- connectivity/source/drivers/mork/MResultSet.hxx | 2 +- connectivity/source/drivers/mozab/MConfigAccess.cxx | 6 +++--- connectivity/source/drivers/mozab/MResultSet.hxx | 2 +- connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx | 2 +- connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 4 ++-- connectivity/source/drivers/postgresql/pq_resultset.cxx | 4 ++-- connectivity/source/inc/java/lang/Object.hxx | 2 +- connectivity/source/parse/sqliterator.cxx | 2 +- connectivity/source/parse/sqlnode.cxx | 6 +++--- 14 files changed, 21 insertions(+), 21 deletions(-) (limited to 'connectivity') diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index 5c278146c1a4..01f66a9aa859 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -434,8 +434,8 @@ bool ONDXPage::Delete(sal_uInt16 nNodePos) ONDXNode ONDXPage::Split(ONDXPage& rPage) { - DBG_ASSERT(IsFull(), "Falsches Splitting"); - /* devide one page into two + DBG_ASSERT(IsFull(), "Incorrect Splitting"); + /* divide one page into two leaf: Page 1 is (n - (n/2)) Page 2 is (n/2) diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index dfda365d7970..137f4825df9f 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -563,7 +563,7 @@ sal_Bool SAL_CALL Connection::isClosed( ) throw(SQLException, RuntimeException, { MutexGuard aGuard( m_aMutex ); - // just simple -> we are close when we are disposed taht means someone called dispose(); (XComponent) + // just simple -> we are close when we are disposed that means someone called dispose(); (XComponent) return Connection_BASE::rBHelper.bDisposed; } diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx index 5e672fdeb7d4..c2725a979120 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx @@ -258,7 +258,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers() } // ---- Unquoted Identifiers ------------------------------------------------- -// All unquoted identifers are stored upper case. +// All unquoted identifiers are stored upper case. sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers() throw(SQLException, RuntimeException, std::exception) { diff --git a/connectivity/source/drivers/mork/MNSFolders.cxx b/connectivity/source/drivers/mork/MNSFolders.cxx index ac22f7e0d1d3..aae88b5f8061 100644 --- a/connectivity/source/drivers/mork/MNSFolders.cxx +++ b/connectivity/source/drivers/mork/MNSFolders.cxx @@ -103,7 +103,7 @@ namespace if ( pProfileByEnv ) { sProductPath = OUString( pProfileByEnv, rtl_str_getLength( pProfileByEnv ), osl_getThreadTextEncoding() ); - // asume that this is fine, no further checks + // assume that this is fine, no further checks } else { diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx index 686af4e09148..3d9a9aeed384 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.cxx +++ b/connectivity/source/drivers/mork/MQueryHelper.cxx @@ -128,7 +128,7 @@ MQueryHelperResultEntry* MQueryHelper::getByIndex(sal_uInt32 nRow) { // Row numbers are from 1 to N, need to ensure this, and then - // substract 1 + // subtract 1 if ( nRow < 1 ) { return( NULL ); } diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index 7ae814ca79e4..6422c04bb742 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -228,7 +228,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTableColumns; - ::std::vector m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime + ::std::vector m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time ::std::vector m_aOrderbyColumnNumber; ::std::vector m_aOrderbyAscending; ::com::sun::star::uno::Sequence< OUString> m_aColumnNames; diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx index a4d552fe02c3..c28ddc5e1d0e 100644 --- a/connectivity/source/drivers/mozab/MConfigAccess.cxx +++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx @@ -232,7 +232,7 @@ extern "C" const sal_Char* SAL_CALL getHisDescription( void ) // Unfortunately, configuration access requires a XMultiServiceFactory - which the // mozilla side does not have. // So we create a "library-local" service factory here: Every need for a service -// factory can be fullfilled by this factory (similar to the get/setProcessServiceFactory +// factory can be fulfilled by this factory (similar to the get/setProcessServiceFactory // in comphelper). // This is halfway valid, as usually, the mozabdrv library is invoked from the mozab library // only. The latter contains the driver class (and only this class and nothing more), and @@ -240,8 +240,8 @@ extern "C" const sal_Char* SAL_CALL getHisDescription( void ) // which (by definition) can and should be used for all subsequent service requests. // And this is exactly what we're allowing with the following functions .... -/** _pFactory must point to an XMultiServiceFactory, which must be aquired once - for purpose of safely transfering it. The callee will release this interface +/** _pFactory must point to an XMultiServiceFactory, which must be acquired once + for purpose of safely transferring it. The callee will release this interface when it has stored the pointer somewhere else. */ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL setMozabServiceFactory( diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx b/connectivity/source/drivers/mozab/MResultSet.hxx index 4ae7eb127963..dfebeff19882 100644 --- a/connectivity/source/drivers/mozab/MResultSet.hxx +++ b/connectivity/source/drivers/mozab/MResultSet.hxx @@ -228,7 +228,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTableColumns; - ::std::vector m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime + ::std::vector m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time ::std::vector m_aOrderbyColumnNumber; ::std::vector m_aOrderbyAscending; ::com::sun::star::uno::Sequence< OUString> m_aColumnNames; diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx index ac22f7e0d1d3..aae88b5f8061 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx @@ -103,7 +103,7 @@ namespace if ( pProfileByEnv ) { sProductPath = OUString( pProfileByEnv, rtl_str_getLength( pProfileByEnv ), osl_getThreadTextEncoding() ); - // asume that this is fine, no further checks + // assume that this is fine, no further checks } else { diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index 6ae2d0c71c9c..de0200fe9174 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -1321,7 +1321,7 @@ sal_Int32 typeNameToDataType( const OUString &typeName, const OUString &typtype // sal_Int32 ret = com::sun::star::sdbc::DataType::DISTINCT; // map all unknown types to memo (longvarchar). This allows to show them in // string representation. Additionally, the edit-table-type-selection-box - // is not so unuseable anymore. + // is not so unusable anymore. sal_Int32 ret = com::sun::star::sdbc::DataType::LONGVARCHAR; if( typtype.equalsAscii( "b" ) ) { @@ -2400,7 +2400,7 @@ static sal_Int32 seqContains( const Sequence< sal_Int32 > &seq, sal_Int32 value 6. INDEX_NAME string -> index name; NULL when TYPE is tableIndexStatistic 7. TYPE short -> index type: * 0 - this identifies table statistics that are returned - in conjuction with a table's index descriptions + in conjunction with a table's index descriptions * CLUSTERED - this is a clustered index * HASHED - this is a hashed index * OTHER - this is some other style of index diff --git a/connectivity/source/drivers/postgresql/pq_resultset.cxx b/connectivity/source/drivers/postgresql/pq_resultset.cxx index 2000eb6da1e7..0d47c4d0fe16 100644 --- a/connectivity/source/drivers/postgresql/pq_resultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_resultset.cxx @@ -162,8 +162,8 @@ sal_Int32 ResultSet::findColumn( const OUString& columnName ) checkClosed(); sal_Int32 res = PQfnumber( m_result, OUStringToOString( columnName, (*m_ppSettings)->encoding ).getStr()); - /* PQfnumber reurn -1 for not found, which is waht we want - * otehr than that we use col number as 1-based not 0-based */ + /* PQfnumber reurn -1 for not found, which is what we want + * other than that we use col number as 1-based not 0-based */ if(res >= 0) { res += 1; diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx index 67c362a0ac12..a154d102f523 100644 --- a/connectivity/source/inc/java/lang/Object.hxx +++ b/connectivity/source/inc/java/lang/Object.hxx @@ -76,7 +76,7 @@ namespace connectivity // The Java handle to this class jobject object; - // Class definiton + // Class definition // New in SJ2: static jclass theClass; // The class needs to be requested only once! diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 1c03e35f3443..12846c9bf687 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -629,7 +629,7 @@ void OSQLParseTreeIterator::getSelect_statement(OSQLTables& _rTables,const OSQLP } else if ( SQL_ISRULE( pTableListElement, table_ref ) ) { - // Table refereneces can be made up of table names, table names (+),'('joined_table')'(+) + // Table references can be made up of table names, table names (+),'('joined_table')'(+) pTableName = pTableListElement->getChild(0); if( isTableNode( pTableName ) ) { // Found table names diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index eb2abedff3d2..37bfbdeda2a6 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -552,7 +552,7 @@ void OSQLParseNode::impl_parseNodeToString_throw(OUStringBuffer& rString, const { // skip field ++i; - // if the following node is the comparision operator'=', + // if the following node is the comparison operator'=', // we filter it as well if (SQL_ISRULE(this, comparison_predicate)) { @@ -2044,7 +2044,7 @@ void OSQLParseNode::eraseBraces(OSQLParseNode*& pSearchCondition) { OSQLParseNode* pRight = pSearchCondition->getChild(1); absorptions(pRight); - // if child is not a or or and tree then delete () around child + // if child is not an or and tree then delete () around child if(!(SQL_ISRULE(pSearchCondition->getChild(1),boolean_term) || SQL_ISRULE(pSearchCondition->getChild(1),search_condition)) || SQL_ISRULE(pSearchCondition->getChild(1),boolean_term) || // and can always stand without () (SQL_ISRULE(pSearchCondition->getChild(1),search_condition) && SQL_ISRULE(pSearchCondition->getParent(),search_condition))) @@ -2178,7 +2178,7 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition) { OSQLParseNode* pRight = pSearchCondition->getChild(1); compress(pRight); - // if child is not a or or and tree then delete () around child + // if child is not an or and tree then delete () around child if(!(SQL_ISRULE(pSearchCondition->getChild(1),boolean_term) || SQL_ISRULE(pSearchCondition->getChild(1),search_condition)) || (SQL_ISRULE(pSearchCondition->getChild(1),boolean_term) && SQL_ISRULE(pSearchCondition->getParent(),boolean_term)) || (SQL_ISRULE(pSearchCondition->getChild(1),search_condition) && SQL_ISRULE(pSearchCondition->getParent(),search_condition))) -- cgit v1.2.3