I think I've translated most of the german stuff correctly (I speak german somewhat, and used babelfish to help) .
>From f203be2f74f8ea4df960876434f8e55cd7973ab9 Mon Sep 17 00:00:00 2001 From: Wol <[email protected]> Date: Sun, 7 Nov 2010 01:52:20 +0000 Subject: [PATCH] Miscellaneous spelling mistakes, german, and commented code --- dbaccess/source/core/api/KeySet.cxx | 6 ++-- dbaccess/source/core/api/RowSet.cxx | 10 +++--- dbaccess/source/core/api/RowSetCache.cxx | 14 ++++---- .../source/core/api/SingleSelectQueryComposer.cxx | 32 ++++++++----------- 4 files changed, 29 insertions(+), 33 deletions(-) diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 17ec5df..0edf976 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -400,7 +400,7 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows aSql.append(m_aComposedTableName); aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE "))); - // list all cloumns that should be set + // list all columns that should be set const ::rtl::OUString aQuote = getIdentifierQuoteString(); static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); static ::rtl::OUString aOr(RTL_CONSTASCII_USTRINGPARAM(" OR ")); @@ -435,7 +435,7 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows } aSql.setLength(aSql.getLength()-3); - // now create end execute the prepared statement + // now create and execute the prepared statement Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(aSql.makeStringAndClear())); Reference< XParameters > xParameter(xPrep,UNO_QUERY); @@ -1064,7 +1064,7 @@ void SAL_CALL OKeySet::moveToCurrentRow( ) throw(SQLException, RuntimeException Reference<XNameAccess> OKeySet::getKeyColumns() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "[email protected]", "OKeySet::getKeyColumns" ); - // use keys and indexes for excat postioning + // use keys and indexes for exact postioning // first the keys Reference<XIndexAccess> xKeys = m_xTableKeys; diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 8f6dbd2..07ecf38 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -545,7 +545,7 @@ void SAL_CALL ORowSet::disposing() xComponent->removeEventListener(xEvt); } - m_aActiveConnection = Any(); // the any conatains a reference too + m_aActiveConnection = Any(); // the any contains a reference too if(m_bOwnConnection) ::comphelper::disposeComponent(m_xActiveConnection); m_xActiveConnection = NULL; @@ -678,7 +678,7 @@ void SAL_CALL ORowSet::close( ) throw(SQLException, RuntimeException) MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); } - // additionals things to set + // additional things to set freeResources( true ); } @@ -873,10 +873,10 @@ void SAL_CALL ORowSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, void SAL_CALL ORowSet::insertRow( ) throw(SQLException, RuntimeException) { ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); - // insertRow is not allowd when + // insertRow is not allowed when // standing not on the insert row nor // when the row isn't modified - // or the concurency is read only + // or the concurrency is read only ::osl::ResettableMutexGuard aGuard( *m_pMutex ); if(!m_pCache || !m_bNew || !m_bModified || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY) @@ -2281,7 +2281,7 @@ sal_Bool ORowSet::impl_initComposer_throw( ::rtl::OUString& _out_rCommandToExecu if ( m_bIgnoreResult ) { // append a "0=1" filter // don't simply overwrite an existent filter, this would lead to problems if this existent - // filter contains paramters (since a keyset may add parameters itself) + // filter contains parameters (since a keyset may add parameters itself) // 2003-12-12 - #23418# - [email protected] m_xComposer->setElementaryQuery( m_xComposer->getQuery( ) ); m_xComposer->setFilter( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "0 = 1" ) ) ); diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 6ff4fda..dabc520 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -469,7 +469,7 @@ Any ORowSetCache::getBookmark( ) if ( m_aMatrixIter >= m_pMatrix->end() || m_aMatrixIter < m_pMatrix->begin() || !(*m_aMatrixIter).is()) { - return Any(); // this is allowed here because the rowset knowns what it is doing + return Any(); // this is allowed here because the rowset knows what it is doing } return lcl_getBookmark(((*m_aMatrixIter)->get())[0],m_pCacheSet); @@ -765,7 +765,7 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos,sal_Int32 _nNewEndPos bCheck = m_pCacheSet->next(); } // m_nStartPos = _nNewStartPos; - // we have to read one row forward to enshure that we know when we are on last row + // we have to read one row forward to ensure that we know when we are on last row // but only when we don't know it already if(!m_bRowCountFinal) { @@ -942,12 +942,12 @@ sal_Bool ORowSetCache::moveWindow() sal_Int32 nPos = m_nStartPos + m_nFetchSize + 1; sal_Bool bCheck = m_pCacheSet->absolute(nPos); - bCheck = fill(aIter,aEnd,nPos,bCheck); // refill the region wew don't need anymore + bCheck = fill(aIter,aEnd,nPos,bCheck); // refill the region we don't need anymore // // we know that this is the current maximal rowcount here // if ( !m_bRowCountFinal && bCheck ) // m_nRowCount = std::max(nPos,m_nRowCount); - // we have to read one row forward to enshure that we know when we are on last row + // we have to read one row forward to ensure that we know when we are on last row // but only when we don't know it already sal_Bool bOk = sal_True; if(bCheck && !m_bRowCountFinal) @@ -1460,7 +1460,7 @@ void ORowSetCache::checkUpdateConditions(sal_Int32 columnIndex) sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode,const Reference< XConnection>& _xConnection,const ::rtl::OUString& _sUpdateTableName) { sal_Bool bOk = sal_False; - if (pNode->count() == 3 && // Ausdruck is geklammert + if (pNode->count() == 3 && // ?Expression is clasped? SQL_ISPUNCTUATION(pNode->getChild(0),"(") && SQL_ISPUNCTUATION(pNode->getChild(2),")")) { @@ -1469,7 +1469,7 @@ sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode else if ((SQL_ISRULE(pNode,search_condition) || SQL_ISRULE(pNode,boolean_term)) && // AND/OR-Verknuepfung: pNode->count() == 3) { - // nur AND Verknüpfung zulassen + // only allow an AND link if ( SQL_ISTOKEN(pNode->getChild(1),AND) ) bOk = checkInnerJoin(pNode->getChild(0),_xConnection,_sUpdateTableName) && checkInnerJoin(pNode->getChild(2),_xConnection,_sUpdateTableName); @@ -1514,7 +1514,7 @@ sal_Bool ORowSetCache::checkJoin(const Reference< XConnection>& _xConnection, // we found only one element so it must some kind of join here OSQLParseNode* pJoin = pTableRefCommalist->getByRule(::connectivity::OSQLParseNode::qualified_join); if(pJoin) - { // we are only intereseted in qualified joins like RIGHT or LEFT + { // we are only interested in qualified joins like RIGHT or LEFT OSQLParseNode* pJoinType = pJoin->getChild(1); OSQLParseNode* pOuterType = NULL; if(SQL_ISRULE(pJoinType,join_type) && pJoinType->count() == 2) diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index 1ab9fec..5e056d3 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -505,8 +505,8 @@ void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference< throw SQLException(sError,*this,SQLSTATE_GENERAL,1000,Any() ); } - // filter anhaengen - // select ohne where und order by aufbauen + // attach filter + // select without where and order by construct ::rtl::OUString aQuote = m_xMetaData->getIdentifierQuoteString(); if ( m_aCurrentColumns[SelectColumns]->hasByName(aName) ) { @@ -974,23 +974,23 @@ sal_Bool OSingleSelectQueryComposer::setORCriteria(OSQLParseNode* pCondition, OS ::std::vector< ::std::vector < PropertyValue > >& rFilters, const Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "[email protected]", "OSingleSelectQueryComposer::setORCriteria" ); - // Runde Klammern um den Ausdruck + // Parentheses around the expression if (pCondition->count() == 3 && SQL_ISPUNCTUATION(pCondition->getChild(0),"(") && SQL_ISPUNCTUATION(pCondition->getChild(2),")")) { return setORCriteria(pCondition->getChild(1), _rIterator, rFilters, xFormatter); } - // oder Verknuepfung + // OR link // a searchcondition can only look like this: search_condition SQL_TOKEN_OR boolean_term else if (SQL_ISRULE(pCondition,search_condition)) { sal_Bool bResult = sal_True; for (int i = 0; bResult && i < 3; i+=2) { - // Ist das erste Element wieder eine OR-Verknuepfung? - // Dann rekursiv absteigen ... - //if (!i && SQL_ISRULE(pCondition->getChild(i),search_condition)) + // is the first element another OR link + // then descend recursively ... + // if (!i && SQL_ISRULE(pCondition->getChild(i),search_condition)) if (SQL_ISRULE(pCondition->getChild(i),search_condition)) bResult = setORCriteria(pCondition->getChild(i), _rIterator, rFilters, xFormatter); else @@ -1012,14 +1012,14 @@ sal_Bool OSingleSelectQueryComposer::setANDCriteria( OSQLParseNode * pCondition, OSQLParseTreeIterator& _rIterator, ::std::vector < PropertyValue >& rFilter, const Reference< XNumberFormatter > & xFormatter) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "[email protected]", "OSingleSelectQueryComposer::setANDCriteria" ); - // Runde Klammern + // Parentheses if (SQL_ISRULE(pCondition,boolean_primary)) { // this should not occur DBG_ERROR("boolean_primary in And-Criteria"); return sal_False; } - // Das erste Element ist (wieder) eine AND-Verknuepfung + // The first element is an AND link again else if ( SQL_ISRULE(pCondition,boolean_term) && pCondition->count() == 3 ) { return setANDCriteria(pCondition->getChild(0), _rIterator, rFilter, xFormatter) && @@ -1230,7 +1230,7 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon aItem.Handle = pCondition->getNodeType(); rFilter.push_back(aItem); } - else // kann sich nur um einen Expr. Ausdruck handeln + else // can itself only around a Expr. Expression act (kann sich nur um einen Expr. Ausdruck handeln) { PropertyValue aItem; ::rtl::OUString aName, aValue; @@ -1238,12 +1238,12 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon OSQLParseNode *pLhs = pCondition->getChild(0); OSQLParseNode *pRhs = pCondition->getChild(2); - // Feldnamen + // Fieldnames sal_uInt16 i; for (i=0;i< pLhs->count();i++) pLhs->getChild(i)->parseNodeToPredicateStr( aName, m_xConnection, xFormatter, m_aLocale, static_cast<sal_Char>( m_sDecimalSep.toChar() ) ); - // Kriterium + // Criteria aItem.Handle = pCondition->getChild(1)->getNodeType(); aValue = pCondition->getChild(1)->getTokenValue(); for(i=0;i< pRhs->count();i++) @@ -1322,10 +1322,6 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon if(xColumnsSupp.is() && xColumnsSupp->getColumns()->hasByName(aColumnName)) { -// Reference<XPropertySet> xTableProp(xColumnsSupp,UNO_QUERY); -// xTableProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= aCatalog; -// xTableProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema; -// xTableProp->getPropertyValue(PROPERTY_NAME) >>= aTable; aTable = *pBegin; break; } @@ -1685,8 +1681,8 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert lcl_addFilterCriteria_throw(nFilterOp,sEmpty,aSQL); } - // filter anhaengen - // select ohne where und order by aufbauen + // attach filter + // select without where and order by construct ::rtl::OUString sFilter = getFilter(); if ( sFilter.getLength() && aSQL.getLength() ) -- 1.7.2.2
_______________________________________________ LibreOffice mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice
