diff options
Diffstat (limited to 'connectivity/source/drivers')
5 files changed, 14 insertions, 17 deletions
diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx index b4394c7fbbf4..94da5b8df579 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.cxx +++ b/connectivity/source/drivers/mork/MQueryHelper.cxx @@ -286,13 +286,13 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression // Set the 'name' property of the boolString. OString attrName = _aQuery->getColumnAlias().getProgrammaticNameOrFallbackToUTF8Alias( evStr->getName() ); SAL_INFO("connectivity.mork", "Name = " << attrName.getStr()); - bool requiresValue = true; + bool bRequiresValue = true; OUString currentValue = entry->getValue(attrName); if (evStr->getCond() == MQueryOp::Exists || evStr->getCond() == MQueryOp::DoesNotExist) { - requiresValue = false; + bRequiresValue = false; } - if (requiresValue) + if (bRequiresValue) { SAL_INFO("connectivity.mork", "Value = " << evStr->getValue() ); OUString searchedValue = evStr->getValue(); diff --git a/connectivity/source/drivers/mork/MorkParser.cxx b/connectivity/source/drivers/mork/MorkParser.cxx index bcdda99e104e..d976a8d5b15f 100644 --- a/connectivity/source/drivers/mork/MorkParser.cxx +++ b/connectivity/source/drivers/mork/MorkParser.cxx @@ -670,11 +670,11 @@ void MorkParser::getRecordKeysForListTable(std::string& listName, std::set<int>& std::cout << "\t\t\t\t Cells:\r\n"; #endif // Get cells - bool listFound = false; + bool isListFound = false; for ( MorkCells::iterator cellsIter = RowIter->second.begin(); cellsIter != RowIter->second.end(); ++cellsIter ) { - if (listFound) + if (isListFound) { if (cellsIter->first >= 0xC7) { @@ -686,7 +686,7 @@ void MorkParser::getRecordKeysForListTable(std::string& listName, std::set<int>& else if ((cellsIter->first == 0xC1) && listName == getValue( cellsIter->second )) { - listFound = true; + isListFound = true; } } diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index 8505d48cb8cf..f5b3c185888f 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -60,9 +60,6 @@ MozillaBootstrap::~MozillaBootstrap() void MozillaBootstrap::Init() { - bool aProfileExists=false; - - (void)aProfileExists; /* avoid warning about unused parameter */ m_ProfileAccess = new ProfileAccess(); bootupProfile(::com::sun::star::mozilla::MozillaProductType_Mozilla,OUString()); } diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx index 1935da6460a3..7a0a3ed5deb5 100644 --- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx @@ -59,7 +59,7 @@ namespace // for now, never use wchar, // but most of code is prepared to handle it // in case we make this configurable - const bool useWChar = false; + const bool bUseWChar = false; } OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OUString& sql) @@ -312,7 +312,7 @@ void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const sal_ sal_Int32 nCharLen; sal_Int32 nByteLen; void *pData; - if (useWChar) + if (bUseWChar) { /* * On Windows, wchar is 16 bits (UTF-16 encoding), the ODBC "W" variants functions take UTF-16 encoded strings @@ -384,7 +384,7 @@ void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const sal_ void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const sal_Int32 _nType, const SQLULEN _nColumnSize, const sal_Int32 _nScale, const void* const _pData, const SQLULEN _nDataLen, const SQLLEN _nDataAllocLen) { SQLSMALLINT fCType, fSqlType; - OTools::getBindTypes(useWChar, m_pConnection->useOldDateFormat(), OTools::jdbcTypeToOdbc(_nType), fCType, fSqlType); + OTools::getBindTypes(bUseWChar, m_pConnection->useOldDateFormat(), OTools::jdbcTypeToOdbc(_nType), fCType, fSqlType); SQLLEN& rDataLen = boundParams[parameterIndex-1].getBindLengthBuffer(); rDataLen = _nDataLen; @@ -525,7 +525,7 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, const sal_I SQLSMALLINT fCType; SQLSMALLINT fSqlType; - OTools::getBindTypes( useWChar, + OTools::getBindTypes( bUseWChar, m_pConnection->useOldDateFormat(), OTools::jdbcTypeToOdbc(_nType), fCType, @@ -853,7 +853,7 @@ void OPreparedStatement::setStream( *lenBuf = SQL_LEN_DATA_AT_EXEC (length); SQLSMALLINT fCType, fSqlType; - OTools::getBindTypes(useWChar, m_pConnection->useOldDateFormat(), OTools::jdbcTypeToOdbc(_nType), fCType, fSqlType); + OTools::getBindTypes(bUseWChar, m_pConnection->useOldDateFormat(), OTools::jdbcTypeToOdbc(_nType), fCType, fSqlType); OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx index 03c1c31d5576..1347e2a3761b 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.cxx +++ b/connectivity/source/drivers/postgresql/pq_statement.cxx @@ -757,7 +757,7 @@ Reference< XResultSet > getGeneratedValuesFromLastInsert( buf.append( "SELECT * FROM " ); bufferQuoteQualifiedIdentifier(buf, schemaName, tableName, pConnectionSettings ); buf.append( " WHERE " ); - bool additionalCondition = false; + bool bAdditionalCondition = false; String2StringMap autoValues; for( int i = 0 ; i < keyColumnNames.getLength() ; i ++ ) { @@ -813,12 +813,12 @@ Reference< XResultSet > getGeneratedValuesFromLastInsert( } } - if( additionalCondition ) + if( bAdditionalCondition ) buf.append( " AND " ); bufferQuoteIdentifier( buf, keyColumnNames[i], pConnectionSettings ); buf.append( " = " ); buf.append( value ); - additionalCondition = true; + bAdditionalCondition = true; } query = buf.makeStringAndClear(); } |