Commits

Anonymous committed 867b0ab

dba33f: build problems ....

  • Participants
  • Parent commits 734054e

Comments (0)

Files changed (3)

File connectivity/source/parse/sqliterator.cxx

 	{
 		OSL_ENSURE(pSearchCondition->count() == 2,"OSQLParseTreeIterator: error in parse tree!");
         const OSQLParseNode* pPart2 = pSearchCondition->getChild(1);
+        (void)pPart2;
 		OSL_ENSURE(SQL_ISTOKEN(pPart2->getChild(0),IS),"OSQLParseTreeIterator: error in parse tree!");
 
 		::rtl::OUString aString;

File dbaccess/source/core/api/OptimisticSet.cxx

                     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();
                 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 )
                     {
                 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 )
                     {

File dbaccess/source/core/api/SingleSelectQueryComposer.cxx

         case CommandType::COMMAND:
             setElementaryQuery(Command);
             return;
-            break;
         case CommandType::TABLE:
             if ( m_xConnectionTables->hasByName(Command) )
             {