diff options
Diffstat (limited to 'connectivity/source/drivers')
15 files changed, 19 insertions, 131 deletions
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index 7c82b58553d5..d9b156e302f5 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -697,7 +697,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const { if (sizeof(double) != rIndex.getHeader().db_keylen) { - OSL_TRACE("this key length cannot possibly be right?"); + SAL_WARN("connectivity.dbase", "this key length cannot possibly be right?"); } if (aKey.getValue().isNull()) { @@ -935,8 +935,8 @@ SvStream& connectivity::dbase::WriteONDXPage(SvStream &rStream, const ONDXPage& void ONDXPage::PrintPage() { - OSL_TRACE("\nSDB: -----------Page: %d Parent: %d Count: %d Child: %d-----", - nPagePos, HasParent() ? aParent->GetPagePos() : 0 ,nCount, aChild.GetPagePos()); + SAL_WARN("connectivity.dbase", "SDB: -----------Page: " << nPagePos << " Parent: " << (HasParent() ? aParent->GetPagePos() : 0) + << " Count: " << nCount << " Child: " << aChild.GetPagePos() << "-----"); for (sal_uInt16 i = 0; i < nCount; i++) { @@ -947,18 +947,20 @@ void ONDXPage::PrintPage() if (rKey.getValue().isNull()) { - OSL_TRACE("SDB: [%d,NULL,%d]",rKey.GetRecord(), rNode.GetChild().GetPagePos()); + SAL_WARN("connectivity.dbase", "SDB: [" << rKey.GetRecord() << ",NULL," << rNode.GetChild().GetPagePos() << "]"); } else if (rIndex.getHeader().db_keytype) { - OSL_TRACE("SDB: [%d,%f,%d]",rKey.GetRecord(), rKey.getValue().getDouble(),rNode.GetChild().GetPagePos()); + SAL_WARN("connectivity.dbase", "SDB: [" << rKey.GetRecord() << "," << rKey.getValue().getDouble() + << "," << rNode.GetChild().GetPagePos() << "]"); } else { - OSL_TRACE("SDB: [%d,%s,%d]",rKey.GetRecord(), OUStringToOString(rKey.getValue().getString(), rIndex.m_pTable->getConnection()->getTextEncoding()).getStr(),rNode.GetChild().GetPagePos()); + SAL_WARN("connectivity.dbase", "SDB: [" << rKey.GetRecord() << "," << rKey.getValue().getString() + << "," << rNode.GetChild().GetPagePos() << "]" ); } } - OSL_TRACE("SDB: -----------------------------------------------"); + SAL_WARN("connectivity.dbase", "SDB: -----------------------------------------------"); if (!IsLeaf()) { #if OSL_DEBUG_LEVEL > 1 @@ -970,7 +972,7 @@ void ONDXPage::PrintPage() } #endif } - OSL_TRACE("SDB: ==============================================="); + SAL_WARN("connectivity.dbase", "SDB: ==============================================="); } #endif diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx index cf6c216cb04b..c77cf8e0fcef 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx @@ -306,7 +306,6 @@ ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const aRow[5] = new ORowSetValueDecorator( static_cast<sal_Int16>( getFieldType( i ) ) ); aRow[6] = new ORowSetValueDecorator( getFieldTypeName( i ) ); - OSL_TRACE( "ColumnName = '%s'", g_param_spec_get_name( pFields[i]->pField ) ); // COLUMN_NAME aRow[4] = new ORowSetValueDecorator( getFieldName( i ) ); // ORDINAL_POSITION diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index eaf526dee639..cbf82ff8c7b3 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -263,10 +263,8 @@ getValue( EContact* pContact, sal_Int32 nColumnNum, GType nType, GValue* pStackV if ( G_PARAM_SPEC_VALUE_TYPE (pSpec) != nType ) { - - OSL_TRACE( "Wrong type (0x%x) (0x%x) '%s'", - (int)G_PARAM_SPEC_VALUE_TYPE (pSpec), (int) nType, - pSpec->name ? pSpec->name : "<noname>"); + SAL_WARN("connectivity.evoab", "Wrong type (0x" << std::hex << (int)G_PARAM_SPEC_VALUE_TYPE(pSpec) << ") (0x" + << std::hex << (int) nType << ") " << (pSpec->name ? pSpec->name : "<noname>")); return false; } @@ -290,7 +288,7 @@ getValue( EContact* pContact, sal_Int32 nColumnNum, GType nType, GValue* pStackV pStackValue ); if ( G_VALUE_TYPE( pStackValue ) != nType ) { - OSL_TRACE( "Fetched type mismatch" ); + SAL_WARN("connectivity.evoab", "Fetched type mismatch" ); g_value_unset( pStackValue ); return false; } @@ -1079,8 +1077,6 @@ void SAL_CALL OEvoabResultSet::cancel( ) throw(RuntimeException, std::exception { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - OSL_TRACE("In/Out: OEvoabResultSet::cancel" ); - } //XCloseable @@ -1090,7 +1086,6 @@ void SAL_CALL OEvoabResultSet::close( ) throw(SQLException, RuntimeException, s ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); } - OSL_TRACE("In/Out: OEvoabResultSet::close" ); dispose(); } @@ -1098,13 +1093,11 @@ void SAL_CALL OEvoabResultSet::close( ) throw(SQLException, RuntimeException, s void SAL_CALL OEvoabResultSet::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("In/Out: OEvoabResultSet::clearWarnings" ); m_aWarnings.clearWarnings(); } Any SAL_CALL OEvoabResultSet::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("In/Out: OEvoabResultSet::getWarnings" ); return m_aWarnings.getWarnings(); } diff --git a/connectivity/source/drivers/file/quotedstring.cxx b/connectivity/source/drivers/file/quotedstring.cxx index 8a859c5b9a57..3652f2d6c59c 100644 --- a/connectivity/source/drivers/file/quotedstring.cxx +++ b/connectivity/source/drivers/file/quotedstring.cxx @@ -75,7 +75,6 @@ namespace connectivity } } } - //OSL_TRACE("QuotedTokenizedString::nTokCount = %d\n", ((OUtoCStr(OUString(nTokCount))) ? (OUtoCStr(OUString(nTokCount))):("NULL")) ); return nTokCount; } diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index e79718a18f65..6e43cd9cb183 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -358,8 +358,8 @@ namespace connectivity { if (env->ExceptionCheck()) env->ExceptionClear(); + SAL_WARN("connectivity.hsqldb", "forwarding Exception: " << _aException.Message ); OString cstr( OUStringToOString(_aException.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); - OSL_TRACE( __FILE__": forwarding Exception: %s", cstr.getStr() ); env->ThrowNew(env->FindClass("java/io/IOException"), cstr.getStr()); } diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx index 69b676e95b05..b452c7e5dcf3 100644 --- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx +++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx @@ -79,8 +79,7 @@ extern "C" SAL_JNI_EXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_S OSL_FAIL("Exception caught! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement"); if (env->ExceptionCheck()) env->ExceptionClear(); - OString cstr( OUStringToOString(e.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); - OSL_TRACE( __FILE__": forwarding Exception: %s", cstr.getStr() ); + SAL_WARN("connectivity.hsqldb", "forwarding Exception: " << e.Message); } } return JNI_FALSE; diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx index 2b0a3cd95c9e..f611f15bdd86 100644 --- a/connectivity/source/drivers/kab/KStatement.cxx +++ b/connectivity/source/drivers/kab/KStatement.cxx @@ -397,8 +397,6 @@ Reference< XResultSet > SAL_CALL KabCommonStatement::executeQuery( ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); -OSL_TRACE("KDE Address book - SQL Request: %s", OUtoCStr(sql)); - KabResultSet* pResult = new KabResultSet(this); Reference< XResultSet > xRS = pResult; OUString aErr; diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx index 7140c41dba33..d35c1e37449b 100644 --- a/connectivity/source/drivers/macab/MacabStatement.cxx +++ b/connectivity/source/drivers/macab/MacabStatement.cxx @@ -404,8 +404,6 @@ Reference< XResultSet > SAL_CALL MacabCommonStatement::executeQuery( ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); -OSL_TRACE("Mac OS Address book - SQL Request: %s", OUtoCStr(sql)); - MacabResultSet* pResult = new MacabResultSet(this); Reference< XResultSet > xRS = pResult; OUString aErr; diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx index 8fbcb755da51..4a58a4ed257e 100644 --- a/connectivity/source/drivers/mork/MConnection.cxx +++ b/connectivity/source/drivers/mork/MConnection.cxx @@ -358,7 +358,6 @@ void OConnection::disposing() Reference< XTablesSupplier > SAL_CALL OConnection::createCatalog() { - OSL_TRACE("IN OConnection::createCatalog()" ); ::osl::MutexGuard aGuard( m_aMutex ); Reference< XTablesSupplier > xTab = m_xCatalog; if(!m_xCatalog.is()) @@ -367,7 +366,6 @@ Reference< XTablesSupplier > SAL_CALL OConnection::createCatalog() xTab = pCat; m_xCatalog = xTab; } - OSL_TRACE( "\tOUT OConnection::createCatalog()" ); return xTab; } diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx index 196b623897ee..51f1dd2e8e5d 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx @@ -13,12 +13,6 @@ #include <connectivity/dbtools.hxx> #include <com/sun/star/sdbc/ColumnValue.hpp> -#if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) -#else /* OSL_DEBUG_LEVEL */ -# define OUtoCStr( x ) ("dummy") -#endif /* OSL_DEBUG_LEVEL */ - using namespace ::comphelper; using namespace connectivity; using namespace connectivity::mork; @@ -167,7 +161,6 @@ void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUS ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); - OSL_TRACE("prepStmt::setString( %s )", OUtoCStr( x ) ); setParameter( parameterIndex, x ); } @@ -184,7 +177,6 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); - OSL_TRACE("In: OPreparedStatement::executeQuery" ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); // our statement has already been parsed in lateInit, no need to do all this (potentially expensive) diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx index e6e27410ae97..5fd79bc9a449 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.cxx +++ b/connectivity/source/drivers/mork/MQueryHelper.cxx @@ -79,17 +79,13 @@ MQueryHelper::MQueryHelper(const OColumnAlias& _ca) MQueryHelper::~MQueryHelper() { clear_results(); - OSL_TRACE("OUT MQueryHelper::~MQueryHelper()"); } void MQueryHelper::setAddressbook(OUString &ab) { ::osl::MutexGuard aGuard(m_aMutex); - m_aAddressbook = ab; - - OSL_TRACE("\tOUT MQuery::setAddressbook()"); } void MQueryHelper::append(MQueryHelperResultEntry* resEnt) diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index c6206668301e..7ebeca716020 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -398,7 +398,6 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeExcep // here you have to implement your movements // return true means there is no data - OSL_TRACE("In/Out: OResultSet::isBeforeFirst" ); return( m_nRowPos < 1 ); } @@ -407,7 +406,6 @@ sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeExcepti SAL_WARN("connectivity.mork", "OResultSet::isAfterLast() NOT IMPLEMENTED!"); ResultSetEntryGuard aGuard( *this ); - OSL_TRACE("In/Out: OResultSet::isAfterLast" ); // return sal_True; return m_nRowPos > currentRowCount() && MQueryHelper::queryComplete(); } @@ -416,7 +414,6 @@ sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException, { ResultSetEntryGuard aGuard( *this ); - OSL_TRACE("In/Out: OResultSet::isFirst" ); return m_nRowPos == 1; } @@ -425,7 +422,6 @@ sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException, s SAL_WARN("connectivity.mork", "OResultSet::isLast() NOT IMPLEMENTED!"); ResultSetEntryGuard aGuard( *this ); - OSL_TRACE("In/Out: OResultSet::isLast" ); // return sal_True; return m_nRowPos == currentRowCount() && MQueryHelper::queryComplete(); } @@ -435,7 +431,6 @@ void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException, ResultSetEntryGuard aGuard( *this ); // move before the first row so that isBeforeFirst returns false - OSL_TRACE("In/Out: OResultSet::beforeFirst" ); if ( first() ) previous(); } @@ -443,7 +438,6 @@ void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException, void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); - OSL_TRACE("In/Out: OResultSet::afterLast" ); if(last()) next(); @@ -452,48 +446,40 @@ void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException, st void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("In/Out: OResultSet::close" ); dispose(); } sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("In/Out: OResultSet::first" ); return seekRow( FIRST_POS ); } sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("In/Out: OResultSet::last" ); return seekRow( LAST_POS ); } sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("In/Out: OResultSet::absolute" ); return seekRow( ABSOLUTE_POS, row ); } sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("In/Out: OResultSet::relative" ); return seekRow( RELATIVE_POS, row ); } sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); - OSL_TRACE("In/Out: OResultSet::previous" ); return seekRow( PRIOR_POS ); } Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); - - OSL_TRACE("In/Out: OResultSet::getStatement" ); return m_xStatement; } @@ -536,25 +522,19 @@ sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException, void SAL_CALL OResultSet::cancel( ) throw(RuntimeException, std::exception) { - ResultSetEntryGuard aGuard( *this ); - OSL_TRACE("In/Out: OResultSet::cancel" ); - } void SAL_CALL OResultSet::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("In/Out: OResultSet::clearWarnings" ); } Any SAL_CALL OResultSet::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("In/Out: OResultSet::getWarnings" ); return Any(); } void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("In/Out: OResultSet::refreshRow" ); if (fetchRow(getCurrentCardNumber(),true)) { //force fetch current row will cause we lose all change to the current row m_pStatement->getOwnConnection()->throwSQLException( STR_ERROR_REFRESH_ROW, *this ); @@ -746,7 +726,6 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT if ( SQL_ISRULE(parseTree,where_clause) ) { - OSL_TRACE("analyseSQL : Got WHERE clause"); // Reset Parameter Counter resetParameters(); analyseWhereClause( parseTree->getChild( 1 ), queryExpression ); @@ -755,8 +734,6 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT SQL_ISPUNCTUATION(parseTree->getChild(0),"(") && SQL_ISPUNCTUATION(parseTree->getChild(2),")")) { - - OSL_TRACE("analyseSQL : Got Punctuation ()"); MQueryExpression *subExpression = new MQueryExpression(); analyseWhereClause( parseTree->getChild( 1 ), *subExpression ); queryExpression.addExpression( subExpression ); @@ -764,9 +741,6 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT else if ((SQL_ISRULE(parseTree,search_condition) || (SQL_ISRULE(parseTree,boolean_term))) && parseTree->count() == 3) // Handle AND/OR { - - OSL_TRACE("analyseSQL : Got AND/OR clause"); - // TODO - Need to take care or AND, for now match is always OR analyseWhereClause( parseTree->getChild( 0 ), queryExpression ); analyseWhereClause( parseTree->getChild( 2 ), queryExpression ); @@ -817,7 +791,6 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT } if ( columnName == "0" && op == MQueryOp::Is && matchString == "1" ) { - OSL_TRACE("Query always evaluates to FALSE"); m_bIsAlwaysFalseQuery = true; } queryExpression.addExpression( new MQueryExpressionString( columnName, op, matchString )); @@ -826,8 +799,6 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT { OSL_ENSURE(parseTree->count() == 2, "Error parsing LIKE predicate"); - OSL_TRACE("analyseSQL : Got LIKE rule"); - if ( !(SQL_ISRULE(parseTree->getChild(0), column_ref)) ) { m_pStatement->getOwnConnection()->throwSQLException( STR_QUERY_INVALID_LIKE_COLUMN, *this ); @@ -851,8 +822,6 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT ( pAtom->getChild(0) && pAtom->getChild(0)->getNodeType() == SQLNodeType::String ) ) ) { - OSL_TRACE("analyseSQL : pAtom->count() = %zu", pAtom->count() ); - m_pStatement->getOwnConnection()->throwSQLException( STR_QUERY_INVALID_LIKE_STRING, *this ); } @@ -985,8 +954,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT } else { - OSL_TRACE( "Unexpected statement!!!" ); - + SAL_WARN("connectivity.mork", "Unexpected statement!!!" ); m_pStatement->getOwnConnection()->throwSQLException( STR_QUERY_TOO_COMPLEX, *this ); } } @@ -1024,8 +992,6 @@ void OResultSet::fillRowData() { // Extract required info - OSL_TRACE("\tHave a Where Clause"); - analyseWhereClause( pParseTree, queryExpression ); } // If the query is a 0=1 then set Row count to 0 and return @@ -1052,8 +1018,6 @@ void OResultSet::fillRowData() determineReadOnly(); SAL_INFO("connectivity.mork", "executeQuery returned " << rv); - - OSL_TRACE( "\tOUT OResultSet::fillRowData()" ); } @@ -1189,13 +1153,10 @@ void SAL_CALL OResultSet::executeQuery() throw(css::sdbc::SQLException, // query to the mozilla addressbooks has returned all // values. - OSL_TRACE("Query is to be sorted"); - OSL_ENSURE( MQueryHelper::queryComplete(), "Query not complete!!"); OSortIndex aSortIndex(eKeyType,m_aOrderbyAscending); - OSL_TRACE("OrderbyColumnNumber->size() = %zu",m_aOrderbyColumnNumber.size()); #if OSL_DEBUG_LEVEL > 0 for ( ::std::vector<sal_Int32>::size_type i = 0; i < m_aColMapping.size(); i++ ) SAL_INFO( @@ -1374,9 +1335,6 @@ bool OResultSet::validRow( sal_uInt32 nRow) sal_Int32 nNumberOfRecords = m_aQueryHelper.getResultCount(); while ( nRow > (sal_uInt32)nNumberOfRecords && !MQueryHelper::queryComplete() ) { -#if OSL_DEBUG_LEVEL > 0 - OSL_TRACE("validRow: waiting..."); -#endif if (!m_aQueryHelper.checkRowAvailable( nRow )) { SAL_INFO( @@ -1438,30 +1396,22 @@ bool OResultSet::seekRow( eRowPosition pos, sal_Int32 nOffset ) SAL_INFO("connectivity.mork", "nCurPos = " << nCurPos); switch( pos ) { case NEXT_POS: - OSL_TRACE("seekRow: NEXT"); nCurPos++; break; case PRIOR_POS: - OSL_TRACE("seekRow: PRIOR"); if ( nCurPos > 0 ) nCurPos--; break; - case FIRST_POS: - OSL_TRACE("seekRow: FIRST"); nCurPos = 1; break; - case LAST_POS: - OSL_TRACE("seekRow: LAST"); nCurPos = nRetrievedRows; break; case ABSOLUTE_POS: - SAL_INFO("connectivity.mork", "ABSOLUTE : " << nOffset); nCurPos = nOffset; break; case RELATIVE_POS: - SAL_INFO("connectivity.mork", "RELATIVE : " << nOffset); nCurPos += sal_uInt32( nOffset ); break; } @@ -1584,7 +1534,6 @@ void OResultSet::checkPendingUpdate() throw(SQLException, RuntimeException) { OSL_FAIL( "OResultSet::checkPendingUpdate() not implemented" ); /* - OSL_TRACE("checkPendingUpdate, m_nRowPos = %u", m_nRowPos ); const sal_Int32 nCurrentRow = getCurrentCardNumber(); if ((m_nNewRow && nCurrentRow != m_nNewRow) @@ -1803,13 +1752,11 @@ bool OResultSet::determineReadOnly() void OResultSet::setTable(OTable* _rTable) { - OSL_TRACE("In : setTable"); m_pTable = _rTable; m_pTable->acquire(); m_xTableColumns = m_pTable->getColumns(); if(m_xTableColumns.is()) m_aColumnNames = m_xTableColumns->getElementNames(); - OSL_TRACE("Out : setTable"); } void OResultSet::setOrderByColumns(const ::std::vector<sal_Int32>& _aColumnOrderBy) diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx index 505afda939c2..14be8ae4df35 100644 --- a/connectivity/source/drivers/mork/MStatement.cxx +++ b/connectivity/source/drivers/mork/MStatement.cxx @@ -33,12 +33,6 @@ #include "resource/mork_res.hrc" #include "resource/common_res.hrc" -#if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) -#else /* OSL_DEBUG_LEVEL */ -# define OUtoCStr( x ) ("dummy") -#endif /* OSL_DEBUG_LEVEL */ - static ::osl::Mutex m_ThreadMutex; using namespace ::comphelper; @@ -126,12 +120,6 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql m_pParseTree = m_aParser.parseTree(aErr,sql); -#if OSL_DEBUG_LEVEL > 0 - { - OSL_TRACE("ParseSQL: %s", OUtoCStr( sql ) ); - } -#endif // OSL_DEBUG_LEVEL - if(m_pParseTree) { m_pSQLIterator->setParseTree(m_pParseTree); @@ -143,13 +131,6 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql getOwnConnection()->throwSQLException( STR_QUERY_AT_LEAST_ONE_TABLES, *this ); } -#if OSL_DEBUG_LEVEL > 0 - OSQLTables::const_iterator citer; - for( citer = rTabs.begin(); citer != rTabs.end(); ++citer ) { - OSL_TRACE("SELECT Table : %s", OUtoCStr(citer->first) ); - } -#endif - Reference<XIndexAccess> xNames; switch(m_pSQLIterator->getStatementType()) { @@ -242,8 +223,6 @@ sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) throw(SQLExce ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); - OSL_TRACE("Statement::execute( %s )", OUtoCStr( sql ) ); - Reference< XResultSet > xRS = executeQuery( sql ); // returns true when a resultset is available return xRS.is(); @@ -255,8 +234,6 @@ Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString& ::osl::MutexGuard aGuard( m_ThreadMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); - OSL_TRACE("Statement::executeQuery( %s )", OUtoCStr( sql ) ); - // parse the statement StatementType eStatementType = parseSql( sql ); if ( eStatementType != eSelect ) diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx index b0aa61ab8af0..f859727eef3b 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx @@ -28,10 +28,6 @@ IniParser::IniParser(OUString const & rIniName) throw(css::io::IOException, std: return; -#if OSL_DEBUG_LEVEL > 0 - OString sFile = OUStringToOString(iniUrl, RTL_TEXTENCODING_ASCII_US); - OSL_TRACE(__FILE__" -- parser() - %s\n", sFile.getStr()); -#endif oslFileHandle handle=nullptr; oslFileError fileError = osl_File_E_INVAL; try{ @@ -40,10 +36,7 @@ IniParser::IniParser(OUString const & rIniName) throw(css::io::IOException, std: } catch(const css::io::IOException&) { -#if OSL_DEBUG_LEVEL > 0 - OString file_tmp = OUStringToOString(iniUrl, RTL_TEXTENCODING_ASCII_US); - OSL_TRACE( __FILE__" -- couldn't open file: %s", file_tmp.getStr() ); -#endif + SAL_WARN("connectivity.mozab", "couldn't open file: " << iniUrl ); } if (osl_File_E_None == fileError) @@ -92,13 +85,10 @@ IniParser::IniParser(OUString const & rIniName) throw(css::io::IOException, std: } osl_closeFile(handle); } -#if OSL_DEBUG_LEVEL > 0 else { - OString file_tmp = OUStringToOString(iniUrl, RTL_TEXTENCODING_ASCII_US); - OSL_TRACE( __FILE__" -- couldn't open file: %s", file_tmp.getStr() ); + SAL_WARN("connectivity.mozab", "couldn't open file: " << iniUrl ); } -#endif } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 9a7c03994d5e..2e3560022ac1 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -478,7 +478,7 @@ static void properties2arrays( const Sequence< PropertyValue > & args, else { // ignore for now - OSL_TRACE("sdbc-postgresql: unknown argument '%s'", OUStringToOString( args[i].Name, RTL_TEXTENCODING_UTF8 ).getStr() ); + SAL_WARN("connectivity.postgresql", "sdbc-postgresql: unknown argument " << args[i].Name ); } } } |