Date: prev next · Thread: first prev next last
2010 Archives by date, by thread · List index


Cheers,
Wol
From cb03ee788ea81661ae83ae611806c6050d16af57 Mon Sep 17 00:00:00 2001
From: Wol <anthony@youngman.org.uk>
Date: Tue, 9 Nov 2010 22:15:21 +0000
Subject: [PATCH] Spelling mistakes, and deleting unwanted comments and commented code

---
 dbaccess/source/core/api/BookmarkSet.cxx           |    1 -
 dbaccess/source/core/api/CacheSet.cxx              |    8 ++--
 dbaccess/source/core/api/FilteredContainer.cxx     |    4 +-
 dbaccess/source/core/api/OptimisticSet.cxx         |    2 +-
 dbaccess/source/core/api/RowSet.cxx                |    9 ++----
 dbaccess/source/core/api/RowSetBase.cxx            |    2 +-
 dbaccess/source/core/api/RowSetCache.cxx           |   32 +++++++------------
 .../source/core/api/SingleSelectQueryComposer.cxx  |    2 +-
 dbaccess/source/core/api/TableDeco.cxx             |    2 +-
 dbaccess/source/core/api/querycontainer.cxx        |    2 +-
 dbaccess/source/core/api/tablecontainer.cxx        |    4 +-
 dbaccess/source/core/api/viewcontainer.cxx         |    4 +-
 dbaccess/source/core/dataaccess/ContentHelper.cxx  |    2 +-
 .../source/core/dataaccess/bookmarkcontainer.cxx   |    2 +-
 .../source/core/dataaccess/databasedocument.cxx    |    2 +-
 dbaccess/source/core/dataaccess/datasource.cxx     |   18 +++++-----
 .../source/core/dataaccess/definitioncontainer.cxx |    2 +-
 .../source/core/dataaccess/documentcontainer.cxx   |    2 +-
 .../source/core/dataaccess/documentdefinition.cxx  |    7 ++--
 19 files changed, 47 insertions(+), 60 deletions(-)

diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx
index 412c2d7..f41d103 100644
--- a/dbaccess/source/core/api/BookmarkSet.cxx
+++ b/dbaccess/source/core/api/BookmarkSet.cxx
@@ -133,7 +133,6 @@ void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const conne
 void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& 
_rOrginalRow,const connectivity::OSQLTable& /*_xTable*/  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", 
"OBookmarkSet::updateRow" );
-    // OCacheSet::updateRow( _rInsertRow,_rOrginalRow,_xTable);
     Reference<XRowUpdate> xUpdRow(m_xRowLocate,UNO_QUERY);
     if(!xUpdRow.is())
         ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XROWUPDATE ), 
SQL_GENERAL_ERROR, *this );
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index 56b0459..e793b25 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -273,7 +273,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow
             _sCondition.append(aAnd);
             _rOrgValues.push_back(nCheckCount);
 
-        } // if(xPrimaryKeyColumns.is() && xPrimaryKeyColumns->hasByName(aColumnName))
+        }
         ::std::vector< Reference<XNameAccess> >::const_iterator aIndexEnd = aAllIndexColumns.end();
         for( ::std::vector< Reference<XNameAccess> >::const_iterator aIndexIter = 
aAllIndexColumns.begin();
                 aIndexIter != aIndexEnd;++aIndexIter)
@@ -336,7 +336,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetR
             
setParameter(i,xParameter,*aIter,m_xSetMetaData->getColumnType(i),m_xSetMetaData->getScale(i));
             ++i;
         }
-    } // for(ORowVector< ORowSetValue >::Vector::const_iterator aIter = 
_rInsertRow->get().begin()+1; aIter != aEnd;++aIter)
+    }
     ::std::list< sal_Int32>::const_iterator aOrgValueEnd = aOrgValues.end();
     for(::std::list< sal_Int32>::const_iterator aOrgValue = aOrgValues.begin(); aOrgValue != 
aOrgValueEnd;++aOrgValue,++i)
     {
@@ -360,7 +360,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti
     ::rtl::OUString aQuote     = getIdentifierQuoteString();
     static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
 
-    // use keys and indexes for excat postioning
+    // use keys and indexes for exact postioning
     // first the keys
     const Reference<XNameAccess> xPrimaryKeyColumns = getPrimaryKeyColumns_throw(xSet);
     // second the indexes
@@ -392,7 +392,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti
 
     aSql.setLength(aSql.getLength()-5);
 
-    // 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);
     sal_Int32 i = 1;
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx 
b/dbaccess/source/core/api/FilteredContainer.cxx
index 757e44a..01b132b 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -189,7 +189,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
         }
         else
         {
-            // for wildcard search : remove all table filters which are a wildcard expression and 
build a WilCard
+            // for wildcard search : remove all table filters which are a wildcard expression and 
build a WildCard
             // for them
             ::std::vector< WildCard > aWildCardTableFilter;
             Sequence< ::rtl::OUString > aNonWildCardTableFilter = _tableFilter;
@@ -313,7 +313,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
         Sequence< ::rtl::OUString > aTableFilter(_rTableFilter);
         sal_Int32      nTableFilterLen = aTableFilter.getLength();
 
-        // for wildcard search : remove all table filters which are a wildcard expression and 
build a WilCard
+        // for wildcard search : remove all table filters which are a wildcard expression and 
build a WildCard
         // for them
         ::std::vector< WildCard > aWCSearch;
         nTableFilterLen = createWildCardVector(aTableFilter,aWCSearch);
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 3609068..c6f2c98 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -430,7 +430,7 @@ void OptimisticSet::executeDelete(const ORowSetRow& _rDeleteRow,const ::rtl::OUS
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", 
"OptimisticSet::executeDelete" );
 
-    // now create end execute the prepared statement
+    // now create and execute the prepared statement
     Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(i_sSQL));
     Reference< XParameters > xParameter(xPrep,UNO_QUERY);
 
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 5a63c24..5a973be 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -2678,8 +2678,8 @@ void ORowSet::checkUpdateIterator()
         m_pCache->setUpdateIterator(m_aCurrentRow);
         m_aCurrentRow = m_pCache->m_aInsertRow;
         m_bModified = sal_True;
-    } // if(!m_bModified && !m_bNew)
-    else if ( m_bNew ) // here we are modifing a value
+    }
+    else if ( m_bNew ) // here we are modifying a value
         m_bModified = sal_True;
 }
 
@@ -2756,9 +2756,6 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, 
ORo
     ::std::vector< ::rtl::OUString> aNames;
 
     ::rtl::OUString aDescription;
-    // ConfigManager*  pConfigMgr = ConfigManager::GetConfigManager();
-    // Locale aLocale;
-    // pConfigMgr->GetDirectConfigProperty(ConfigManager::LOCALE) >>= aLocale;
     Locale aLocale = SvtSysLocale().GetLocaleData().getLocale();
 
     if ( rParent.m_pColumns )
@@ -2801,7 +2798,7 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, 
ORo
             
pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_HELPTEXT,xColumn->getPropertyValue(PROPERTY_HELPTEXT));
             
pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_CONTROLDEFAULT,xColumn->getPropertyValue(PROPERTY_CONTROLDEFAULT));
 
-        } // for(sal_Int32 i=1;pIter != pEnd ;++pIter,++i)
+        }
     }
     Reference<XDatabaseMetaData> xMeta = rParent.m_xActiveConnection->getMetaData();
     m_pColumns = new ORowSetDataColumns(xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index efb3320..ea7b55d 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -608,7 +608,7 @@ sal_Int32 SAL_CALL ORowSetBase::findColumn( const ::rtl::OUString& columnName )
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
-    // it is possible to save some time her when we remember the names - position relation in a map
+    // it is possible to save some time here when we remember the names - position relation in a 
map
     return m_pColumns ? m_pColumns->findColumn(columnName) : sal_Int32(0);
 }
 
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index dabc520..90ca9dc 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -170,7 +170,7 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
             OSL_ENSURE(xTabSup.is(),"ORowSet::execute composer isn't a tablesupplier!");
             Reference<XNameAccess> xTables = xTabSup->getTables();
             Sequence< ::rtl::OUString> aTableNames = xTables->getElementNames();
-            if ( aTableNames.getLength() > 1 && !_rUpdateTableName.getLength() && bNeedKeySet ) 
+            if ( aTableNames.getLength() > 1 && !_rUpdateTableName.getLength() && bNeedKeySet )
             {// here we have a join or union and nobody told us which table to update, so we 
update them all
                 m_nPrivileges = 
Privilege::SELECT|Privilege::DELETE|Privilege::INSERT|Privilege::UPDATE;
                 OptimisticSet* pCursor = new 
OptimisticSet(m_aContext,xConnection,_xAnalyzer,_aParameterValueForCache);
@@ -413,7 +413,7 @@ void ORowSetCache::setMaxRowSize(sal_Int32 _nSize)
             m_aMatrixIter = m_pMatrix->end();
         m_aMatrixEnd = m_pMatrix->end();
 
-        // now adjust their positions because a resize invalid all iterators
+        // now adjust their positions because a resize invalidates all iterators
         ::std::vector<sal_Int32>::const_iterator aIter = aPositions.begin();
         ::std::map<sal_Int32,sal_Bool>::const_iterator aPosChangeIter = aCacheIterToChange.begin();
         for(   aCacheIter = m_aCacheIterators.begin();
@@ -512,7 +512,6 @@ sal_Bool ORowSetCache::moveRelativeToBookmark( const Any& bookmark, sal_Int32 ro
     {
         m_nPosition = m_pCacheSet->getRow() + rows;
         absolute(m_nPosition);
-        //     for(sal_Int32 i=0;i<rows && m_aMatrixIter != m_pMatrix->end();++i,++m_aMatrixIter) ;
 
         bRet = m_aMatrixIter != m_pMatrix->end() && (*m_aMatrixIter).is();
     }
@@ -592,7 +591,7 @@ void ORowSetCache::updateCharacterStream( sal_Int32 columnIndex, const Reference
 
 void ORowSetCache::updateObject( sal_Int32 columnIndex, const Any& x
                                 ,ORowSetValueVector::Vector& io_aRow
-                                ,::std::vector<sal_Int32>& o_ChangedColumns 
+                                ,::std::vector<sal_Int32>& o_ChangedColumns
                                 )
 {
     checkUpdateConditions(columnIndex);
@@ -676,7 +675,6 @@ sal_Bool ORowSetCache::isLast(  )
 sal_Bool ORowSetCache::beforeFirst(  )
 {
 
-
     if(!m_bBeforeFirst)
     {
         m_bAfterLast   = sal_False;
@@ -692,7 +690,6 @@ sal_Bool ORowSetCache::beforeFirst(  )
 sal_Bool ORowSetCache::afterLast(  )
 {
 
-
     if(!m_bAfterLast)
     {
         m_bBeforeFirst = sal_False;
@@ -789,7 +786,6 @@ sal_Bool ORowSetCache::moveWindow()
 
     sal_Int32 nDiff = (sal_Int32)(m_nFetchSize*0.5 -0.5);
     sal_Int32 nNewStartPos     = (m_nPosition - nDiff);
-    // sal_Int32 nNewEndPos    = (m_nPosition+m_nFetchSize*0.5);
     sal_Int32 nNewEndPos       = nNewStartPos + m_nFetchSize;
 
     if ( m_nPosition <= m_nStartPos )
@@ -808,7 +804,6 @@ sal_Bool ORowSetCache::moveWindow()
             if ( nNewStartPos < 1 )
             {
                 bCheck = m_pCacheSet->first();
-                //     aEnd = m_pMatrix->begin() + (sal_Int32)(m_nFetchSize*0.5);
                 OSL_ENSURE((nNewEndPos - m_nStartPos - nNewStartPos) < 
(sal_Int32)m_pMatrix->size(),"Position is behind end()!");
                 aEnd = m_pMatrix->begin() + (nNewEndPos - m_nStartPos - nNewStartPos);
                 aIter = aEnd;
@@ -864,7 +859,7 @@ sal_Bool ORowSetCache::moveWindow()
                 }
             }
             else
-            { // normaly this should never happen
+            { // normally this should never happen
                 OSL_ENSURE(0,"What the hell is happen here!");
                 return sal_False;
             }
@@ -973,7 +968,6 @@ sal_Bool ORowSetCache::moveWindow()
             {  // the end was reached before end() so we can set the start before nNewStartPos
 
                 m_nStartPos += (aIter - m_pMatrix->begin());
-                //     m_nStartPos = (aIter - m_pMatrix->begin());
                 ::std::rotate(m_pMatrix->begin(),aIter,m_pMatrix->end());
                 // now correct the iterator in our iterator vector
                 rotateCacheIterator( (sal_Int16)( aIter - m_pMatrix->begin() ) );
@@ -1273,7 +1267,7 @@ void ORowSetCache::cancelRowModification()
     {
         if ( aCacheIter->second.pRowSet->isInsertRow() && aCacheIter->second.aIterator == 
m_aInsertRow )
             aCacheIter->second.aIterator = m_pMatrix->end();
-    } // for(;aCacheIter != aCacheEnd;++aCacheIter)
+    }
     resetInsertRow(sal_False);
 }
 
@@ -1290,7 +1284,7 @@ void ORowSetCache::updateRow( ORowSetMatrix::iterator& 
_rUpdateRow,::std::vector
     m_pCacheSet->updateRow(*_rUpdateRow,*m_aMatrixIter,m_aUpdateTable);
     // refetch the whole row
     (*m_aMatrixIter) = NULL;
-    
+
     if ( moveToBookmark(aBookmark) )
     {
         // update the cached values
@@ -1313,7 +1307,6 @@ bool ORowSetCache::deleteRow(  )
     if(isAfterLast() || isBeforeFirst())
         throw 
SQLException(DBACORE_RESSTRING(RID_STR_NO_DELETEROW),NULL,SQLSTATE_GENERAL,1000,Any() );
 
-    // m_pCacheSet->absolute(m_nPosition);
     m_pCacheSet->deleteRow(*m_aMatrixIter,m_aUpdateTable);
     if ( !m_pCacheSet->rowDeleted() )
         return false;
@@ -1392,7 +1385,7 @@ void ORowSetCache::deleteIterator(const ORowSetBase* _pRowSet)
         {
             m_aCacheIterators.erase(aCacheIter);
             aCacheIter = m_aCacheIterators.begin();
-        } // if ( aCacheIter->second.pRowSet == _pRowSet )
+        }
         else
             ++aCacheIter;
     }
@@ -1466,7 +1459,7 @@ sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode 
*pNode
     {
         bOk = checkInnerJoin(pNode->getChild(1),_xConnection,_sUpdateTableName);
     }
-    else if ((SQL_ISRULE(pNode,search_condition) || SQL_ISRULE(pNode,boolean_term))    &&          
            // AND/OR-Verknuepfung:
+    else if ((SQL_ISRULE(pNode,search_condition) || SQL_ISRULE(pNode,boolean_term))    &&          
            // AND/OR link
                 pNode->count() == 3)
     {
         // only allow an AND link
@@ -1568,7 +1561,7 @@ void ORowSetCache::clearInsertRow()
             aIter->setBound(sal_False);
             aIter->setModified(sal_False);
             aIter->setNull();
-        } // for(;aIter != (*m_aInsertRow)->end();++aIter)
+        }
     }
 }
 
@@ -1579,7 +1572,6 @@ ORowSetMatrix::iterator   ORowSetCache::calcPosition() const
     return ( nValue < 0 || nValue >= static_cast<sal_Int32>(m_pMatrix->size()) ) ? 
m_pMatrix->end() : (m_pMatrix->begin() + nValue);
 }
 
-
 TORowSetOldRowHelperRef ORowSetCache::registerOldRow()
 {
     TORowSetOldRowHelperRef pRef = new ORowSetOldRowHelper(ORowSetRow());
@@ -1612,7 +1604,7 @@ sal_Bool ORowSetCache::reFillMatrix(sal_Int32 _nNewStartPos,sal_Int32 
_nNewEndPo
     sal_Int32 nNewSt = _nNewStartPos;
     sal_Bool bRet = fillMatrix(nNewSt,_nNewEndPos);
     m_nStartPos = nNewSt - 1;
-    rotateCacheIterator(static_cast<sal_Int16>(m_nFetchSize+1)); // forces that every iterator 
will be set to null
+    rotateCacheIterator(static_cast<sal_Int16>(m_nFetchSize+1)); // forces every iterator to null
     return bRet;
 }
 
@@ -1666,7 +1658,7 @@ void ORowSetCache::impl_updateRowFromCache_throw(ORowSetValueVector::Vector& 
io_
                 break;
             }
         }
-        
+
         if ( aIter == m_pMatrix->end() )
         {
             m_pCacheSet->fillMissingValues(io_aRow);
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx 
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 5e056d3..f8153ca 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -1314,7 +1314,7 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * 
pCon
         const ::rtl::OUString* pEnd            = pBegin + aNames.getLength();
 
         if(!aTable.getLength())
-        { // we don't found a table name, now we must search every table for this column
+        { // we haven't found a table name, now we must search every table for this column
             for(;pBegin != pEnd;++pBegin)
             {
                 Reference<XColumnsSupplier> xColumnsSupp;
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index ba0e7e1..2bb86e4 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -536,7 +536,7 @@ Sequence< sal_Int8 > ODBTableDecorator::getUnoTunnelImplementationId()
 void ODBTableDecorator::fillPrivileges() const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", 
"ODBTableDecorator::fillPrivileges" );
-    // somebody is asking for the privileges an we do not know them, yet
+    // somebody is asking for the privileges and we do not know them, yet
     m_nPrivileges = 0;
     try
     {
diff --git a/dbaccess/source/core/api/querycontainer.cxx 
b/dbaccess/source/core/api/querycontainer.cxx
index 229ffa1..82a49f1 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -316,7 +316,7 @@ Reference< XVeto > SAL_CALL OQueryContainer::approveRemoveElement( const Contain
 void SAL_CALL OQueryContainer::disposing( const ::com::sun::star::lang::EventObject& _rSource ) 
throw(::com::sun::star::uno::RuntimeException)
 {
     if (_rSource.Source.get() == Reference< XInterface >(m_xCommandDefinitions, UNO_QUERY).get())
-    {  // our "master container" (with the command definitions) is beeing disposed
+    {  // our "master container" (with the command definitions) is being disposed
         DBG_ERROR("OQueryContainer::disposing : nobody should dispose the CommandDefinition 
container before disposing my connection !");
         dispose();
     }
diff --git a/dbaccess/source/core/api/tablecontainer.cxx 
b/dbaccess/source/core/api/tablecontainer.cxx
index 4b86763..8b619fe 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -266,8 +266,8 @@ Reference< XPropertySet > OTableContainer::createDescriptor()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", 
"OTableContainer::createDescriptor" );
     Reference< XPropertySet > xRet;
 
-    // frist we have to look if the master tables does support this
-    // and if then create a table object as well with the master tables
+    // frist we have to look if the master tables support this
+    // and if so then create a table object as well with the master tables
     Reference<XColumnsSupplier > xMasterColumnsSup;
     Reference<XDataDescriptorFactory> xDataFactory(m_xMasterContainer,UNO_QUERY);
     if ( xDataFactory.is() && m_xMetaData.is() )
diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx
index 465e451..4589fb9 100644
--- a/dbaccess/source/core/api/viewcontainer.cxx
+++ b/dbaccess/source/core/api/viewcontainer.cxx
@@ -125,8 +125,8 @@ ObjectType OViewContainer::createObject(const ::rtl::OUString& _rName)
 Reference< XPropertySet > OViewContainer::createDescriptor()
 {
     Reference< XPropertySet > xRet;
-    // frist we have to look if the master tables does support this
-    // and if then create a table object as well with the master tables
+    // first we have to look if the master tables support this
+    // and if so then create a table object as well with the master tables
     Reference<XColumnsSupplier > xMasterColumnsSup;
     Reference<XDataDescriptorFactory> xDataFactory(m_xMasterContainer,UNO_QUERY);
     if(xDataFactory.is())
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx 
b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index da4e3c2..dc5bee8 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -89,7 +89,7 @@ void SAL_CALL OContentHelper::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
-    // say our listeners goobye
+    // say goodbye to our listeners
     EventObject aEvt(*this);
     m_aContentListeners.disposeAndClear(aEvt);
 
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx 
b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
index 9caf1a5..2d05ab8 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
@@ -70,7 +70,7 @@ void OBookmarkContainer::dispose()
 {
     MutexGuard aGuard(m_rMutex);
 
-    // say our listeners goobye
+    // say goodbye to our listeners
     EventObject aEvt(*this);
     m_aContainerListeners.disposeAndClear(aEvt);
 
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 46a8201..e04153c 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1711,7 +1711,7 @@ void ODatabaseDocument::disposing()
     // the security warning, again.
     m_pImpl->resetMacroExecutionMode();
 
-    // similar argueing for our ViewMonitor
+    // similar arguing for our ViewMonitor
     m_aViewMonitor.reset();
 
     // tell our Impl to forget us
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx 
b/dbaccess/source/core/dataaccess/datasource.cxx
index 4577ebb..6849f81 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -203,7 +203,7 @@ void SAL_CALL FlushNotificationAdapter::disposing( const EventObject& Source ) t
 }
 
 OAuthenticationContinuation::OAuthenticationContinuation()
-    :m_bRemberPassword(sal_True),   // TODO: a meaningfull default
+    :m_bRemberPassword(sal_True),   // TODO: a meaningful default
     m_bCanSetUserName(sal_True)
 {
 }
@@ -220,7 +220,7 @@ void SAL_CALL OAuthenticationContinuation::setRealm( const ::rtl::OUString& /*Re
 
 sal_Bool SAL_CALL OAuthenticationContinuation::canSetUserName(  ) throw(RuntimeException)
 {
-    // we alwas allow this, even if the database document is read-only. In this case,
+    // we always allow this, even if the database document is read-only. In this case,
     // it's simply that the user cannot store the new user name.
     return m_bCanSetUserName;
 }
@@ -316,7 +316,7 @@ class OSharedConnectionManager : public OConnectionHelper_BASE
     typedef ::std::map< Reference< XConnection >,TConnectionMap::iterator>     
TSharedConnectionMap;// holds the shared connections
 
     ::osl::Mutex                               m_aMutex;
-    TConnectionMap                             m_aConnections;                 // remeber the 
master connection in conjunction with the digest
+    TConnectionMap                             m_aConnections;                 // remember the 
master connection in conjunction with the digest
     TSharedConnectionMap               m_aSharedConnection;    // the shared connections with 
conjunction with an iterator into the connections map
     Reference< XProxyFactory > m_xProxyFactory;
 
@@ -876,9 +876,9 @@ namespace
         }
     };
 
-    /** sets a new set of property values at a given property bag instance
+    /** sets a new set of property values for a given property bag instance
 
-        The methods takes a property bag, and a sequence of property values to set at this bag.
+        The method takes a property bag, and a sequence of property values to set for this bag.
         Upon return, every property which is not part of the given sequence is
         <ul><li>removed from the bag, if it's a removeable property</li>
             <li><em>or</em>reset to its default value, if it's not a removeable property</li>
@@ -887,7 +887,7 @@ namespace
         @param  _rxPropertyBag
             the property bag to operate on
         @param  _rAllNewPropertyValues
-            the new property values to set at the bag
+            the new property values to set for the bag
     */
     void lcl_setPropertyValues_resetOrRemoveOther( const Reference< XPropertyAccess >& 
_rxPropertyBag, const Sequence< PropertyValue >& _rAllNewPropertyValues )
     {
@@ -920,7 +920,7 @@ namespace
                     continue;
 
                 // this property is not to be set, but currently exists in the bag.
-                // -> Remove, respectively default, it
+                // -> Remove it, or reset it to the default.
                 if ( ( pExistentProperty->Attributes & PropertyAttribute::REMOVEABLE ) != 0 )
                     xPropertyContainer->removeProperty( pExistentProperty->Name );
                 else
@@ -952,7 +952,7 @@ void ODatabaseSource::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const
                 break;
             case PROPERTY_ID_USER:
                 rValue >>= m_pImpl->m_sUser;
-                // if the user name changed, reset the password
+                // if the user name has changed, reset the password
                 m_pImpl->m_aPassword = ::rtl::OUString();
                 break;
             case PROPERTY_ID_PASSWORD:
@@ -1031,7 +1031,7 @@ void ODatabaseSource::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) 
con
                     Sequence< PropertyValue > aValues( m_pImpl->m_xSettings->getPropertyValues() );
 
                     // transform them so that only property values which fulfill certain
-                    // criterions survive
+                    // criteria survive
                     Sequence< PropertyValue > aNonDefaultOrUserDefined( aValues.getLength() );
                     const PropertyValue* pCopyEnd = ::std::remove_copy_if(
                         aValues.getConstArray(),
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx 
b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index 0efce9c..a918726 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -530,7 +530,7 @@ void ODefinitionContainer::implAppend(const ::rtl::OUString& _rName, const Refer
         ODefinitionContainer_Impl::const_iterator aFind = rDefinitions.find( _rName );
         if ( aFind == rDefinitions.end() )
         {
-            // ensure that the new object thas the proper name.
+            // ensure that the new object has the proper name.
             // Somebody could create an object with name "foo", and insert it as "bar"
             // into a container. In this case, we need to ensure that the object name
             // is also "bar"
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx 
b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 8c59233..6a8a1d5 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -186,7 +186,7 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
     {
         MutexGuard aGuard(m_aMutex);
 
-        // extrat known arguments
+        // extract known arguments
         ::rtl::OUString sName, sPersistentName, sURL, sMediaType, sDocServiceName;
         Reference< XCommandProcessor > xCopyFrom;
         Reference< XConnection > xConnection;
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx 
b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 4bd8c8e..924afe5 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -219,7 +219,6 @@ namespace dbaccess
         if ( !m_bInChangingState && nNewState == EmbedStates::RUNNING && nOldState == 
EmbedStates::ACTIVE && m_pDefinition )
         {
             m_bInChangingState = true;
-            //m_pDefinition->save(sal_False);
             m_bInChangingState = false;
         }
     }
@@ -1509,9 +1508,9 @@ sal_Bool ODocumentDefinition::objectSupportsEmbeddedScripts() const
     bool bAllowDocumentMacros = !m_pImpl->m_pDataSource
                             ||  ( m_pImpl->m_pDataSource->determineEmbeddedMacros() == 
ODatabaseModelImpl::eSubDocumentMacros );
 
-    // if *any* of the objects of the database document already has macros, we continue to allow it
-    // to have them, until the user did a migration.
-    // If there are no macros, yet, we don't allow to create them
+    // if *any* of the objects of the database document already have macros, we
+    // continue to allow them to have them, until the user does a migration.
+    // If there are no macros, we don't allow them to be created.
 
     return bAllowDocumentMacros;
 }
-- 
1.7.2.2


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.