summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-04-19 14:09:15 +0200
committerFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-04-19 14:09:15 +0200
commitceecd6235c6f1f73fa1fd41cbfa0b6029c563955 (patch)
treeb3bc65b4aedbd3d6180d856cc2032b4d50134ed7
parentb6693080a17418cf79b55f77add3bf7a84f00060 (diff)
dba33f: build problems ....
-rw-r--r--dbaccess/source/core/api/OptimisticSet.cxx14
-rw-r--r--dbaccess/source/core/api/SingleSelectQueryComposer.cxx1
2 files changed, 7 insertions, 8 deletions
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 71de01e4d3b6..a8037df05182 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -457,14 +457,14 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn
Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(sQuery.makeStringAndClear()));
Reference< XParameters > xParameter(xPrep,UNO_QUERY);
// and then the values of the where condition
- SelectColumnsMetaData::iterator aIter = m_pKeyColumnNames->begin();
- SelectColumnsMetaData::iterator aEnd = m_pKeyColumnNames->end();
+ SelectColumnsMetaData::iterator aKeyCol = m_pKeyColumnNames->begin();
+ SelectColumnsMetaData::iterator aKeysEnd = m_pKeyColumnNames->end();
sal_Int32 i = 1;
- for(;aIter != aEnd;++aIter)
+ for(;aKeyCol != aKeysEnd;++aKeyCol)
{
- if ( aIter->second.sTableName == aSqlIter->first )
+ if ( aKeyCol->second.sTableName == aSqlIter->first )
{
- setParameter(i++,xParameter,(_rInsertRow->get())[aIter->second.nPosition],aIter->second.nType,aIter->second.nScale);
+ setParameter(i++,xParameter,(_rInsertRow->get())[aKeyCol->second.nPosition],aKeyCol->second.nType,aKeyCol->second.nScale);
}
}
Reference<XResultSet> xRes = xPrep->executeQuery();
@@ -1549,7 +1549,7 @@ bool OptimisticSet::updateColumnValues(const ORowSetValueVector::Vector& io_aCac
bRet = true;
SelectColumnsMetaData::const_iterator aIter = m_pColumnNames->begin();
SelectColumnsMetaData::const_iterator aEnd = m_pColumnNames->end();
- for(sal_Int32 i = 1;aIter != aEnd;++aIter)
+ for ( ;aIter != aEnd;++aIter )
{
if ( aIter->second.sTableName == sTableName )
{
@@ -1587,7 +1587,7 @@ bool OptimisticSet::columnValuesUpdated(ORowSetValueVector::Vector& o_aCachedRow
bRet = true;
SelectColumnsMetaData::const_iterator aIter2 = m_pColumnNames->begin();
SelectColumnsMetaData::const_iterator aEnd2 = m_pColumnNames->end();
- for(sal_Int32 i = 1;aIter2 != aEnd2;++aIter2)
+ for ( ;aIter2 != aEnd2;++aIter2 )
{
if ( aIter2->second.sTableName == sTableName )
{
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 2ff33d126456..669ceb5ee814 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -379,7 +379,6 @@ void SAL_CALL OSingleSelectQueryComposer::setCommand( const ::rtl::OUString& Com
case CommandType::COMMAND:
setElementaryQuery(Command);
return;
- break;
case CommandType::TABLE:
if ( m_xConnectionTables->hasByName(Command) )
{