diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-12 16:31:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-13 06:12:00 +0000 |
| commit | c3586b684c58e06cd80dea87d7681354acfec80b (patch) | |
| tree | 09e1b3caab55f1c9ecd4c2559250b42892fd5ee7 | |
| parent | a005fbeddc4e615cfff56a9bd84355f8d42c1c8c (diff) | |
OSL_TRACE->SAL in chart2..oox
Change-Id: I133a6441824bfbefcfcda130119b5c5d706f86b2
Reviewed-on: https://gerrit.libreoffice.org/31907
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
60 files changed, 110 insertions, 462 deletions
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index 40f854d9ef75..14aed53385df 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -104,7 +104,6 @@ void DataEditor::dispose() SvtMiscOptions aMiscOptions; aMiscOptions.RemoveListenerLink( LINK( this, DataEditor, MiscHdl ) ); - OSL_TRACE( "DataEditor: DTOR" ); m_pTbxData.clear(); m_xBrwData.disposeAndClear(); ModalDialog::dispose(); diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index b9f59a9fbe70..9a4dfe2a115c 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -112,8 +112,6 @@ ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext) ,bSet(false) , mpOpenGLWindow(nullptr) { - OSL_TRACE( "ChartModel: CTOR called" ); - osl_atomic_increment(&m_refCount); { m_xOldModelAgg.set( @@ -158,8 +156,6 @@ ChartModel::ChartModel( const ChartModel & rOther ) , bSet(false) , mpOpenGLWindow(nullptr) { - OSL_TRACE( "ChartModel: Copy-CTOR called" ); - osl_atomic_increment(&m_refCount); { m_xOldModelAgg.set( @@ -195,7 +191,6 @@ ChartModel::ChartModel( const ChartModel & rOther ) ChartModel::~ChartModel() { - OSL_TRACE( "ChartModel: DTOR called" ); if( m_xOldModelAgg.is()) m_xOldModelAgg->setDelegator( nullptr ); } @@ -455,7 +450,7 @@ void SAL_CALL ChartModel::unlockControllers() throw(uno::RuntimeException, std:: return; //behave passive if already disposed or closed or throw exception @todo? if( m_nControllerLockCount == 0 ) { - OSL_TRACE( "ChartModel: unlockControllers called with m_nControllerLockCount == 0" ); + SAL_WARN("chart2", "ChartModel: unlockControllers called with m_nControllerLockCount == 0" ); return; } --m_nControllerLockCount; @@ -579,8 +574,6 @@ void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException, std::exception) if( m_xOldModelAgg.is()) m_xOldModelAgg->setDelegator( nullptr ); - - OSL_TRACE( "ChartModel: dispose() called" ); } void SAL_CALL ChartModel::addEventListener( const uno::Reference< lang::XEventListener > & xListener ) diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index 19e3e7636c53..b2eb99f87453 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -189,7 +189,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter( // fall-back: create XML-Filter if( ! xFilter.is()) { - OSL_TRACE( "No FilterName passed in MediaDescriptor" ); + SAL_WARN("chart2", "No FilterName passed in MediaDescriptor" ); xFilter.set( m_xContext->getServiceManager()->createInstanceWithContext( "com.sun.star.comp.chart2.XMLFilter", m_xContext ), diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx index 76810ce2cff1..2dbb9ba7ece2 100644 --- a/chart2/source/tools/LifeTime.cxx +++ b/chart2/source/tools/LifeTime.cxx @@ -118,7 +118,7 @@ bool LifeTimeManager::dispose() if( m_bDisposed || m_bInDispose ) { - OSL_TRACE( "This component is already disposed " ); + SAL_WARN("chart2", "This component is already disposed " ); return false; //behave passive if already disposed } diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx index 46935deb0b90..23cca54d9557 100644 --- a/cli_ure/source/climaker/climaker_app.cxx +++ b/cli_ure/source/climaker/climaker_app.cxx @@ -161,19 +161,12 @@ static bool is_option( if (len == 2 && arg[ 1 ] == option_info->m_short_option) { ++(*pIndex); -#if OSL_DEBUG_LEVEL > 1 - OSL_TRACE( - __FILE__": identified option \'%c\'", option_info->m_short_option ); -#endif return true; } if (arg[ 1 ] == '-' && rtl_ustr_ascii_compare( arg.pData->buffer + 2, option_info->m_name ) == 0) { ++(*pIndex); -#if OSL_DEBUG_LEVEL > 1 - OSL_TRACE( __FILE__": identified option \'%s\'", option_info->m_name ); -#endif return true; } return false; @@ -199,11 +192,6 @@ static bool read_argument( { osl_getCommandArg( *pIndex, &pValue->pData ); ++(*pIndex); -#if OSL_DEBUG_LEVEL > 1 - OString cstr_val( - OUStringToOString( *pValue, osl_getThreadTextEncoding() ) ); - OSL_TRACE( __FILE__": argument value: %s\n", cstr_val.getStr() ); -#endif return true; } --(*pIndex); diff --git a/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx index 9267444d6696..ba28772cd194 100644 --- a/comphelper/source/misc/asyncnotification.cxx +++ b/comphelper/source/misc/asyncnotification.cxx @@ -124,7 +124,6 @@ namespace comphelper { ::osl::MutexGuard aGuard( m_xImpl->aMutex ); - OSL_TRACE( "AsyncEventNotifier(%p): adding %p", this, _rEvent.get() ); // remember this event m_xImpl->aEvents.push_back( ProcessableEvent( _rEvent, _xProcessor ) ); @@ -149,9 +148,6 @@ namespace comphelper { aEvent = m_xImpl->aEvents.front(); m_xImpl->aEvents.pop_front(); - OSL_TRACE( - "AsyncEventNotifier(%p): popping %p", this, - aEvent.aEvent.get()); } if (m_xImpl->aEvents.empty()) { diff --git a/comphelper/source/misc/numbers.cxx b/comphelper/source/misc/numbers.cxx index 2dd29cd2f3b7..fb964292d463 100644 --- a/comphelper/source/misc/numbers.cxx +++ b/comphelper/source/misc/numbers.cxx @@ -41,7 +41,7 @@ sal_Int16 getNumberFormatType(const css::uno::Reference<css::util::XNumberFormat } catch(...) { - OSL_TRACE("getNumberFormatType : invalid key! (maybe created with another formatter ?)"); + SAL_WARN("comphelper", "getNumberFormatType : invalid key! (maybe created with another formatter ?)"); } } return nReturn; @@ -72,7 +72,7 @@ css::uno::Any getNumberFormatDecimals(const css::uno::Reference<css::util::XNumb } catch(...) { - OSL_TRACE("getNumberFormatDecimals : invalid key! (may be created with another formatter ?)"); + SAL_WARN("comphelper", "getNumberFormatDecimals : invalid key! (may be created with another formatter ?)"); } } return css::uno::makeAny((sal_Int16)0); 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 ); } } } diff --git a/connectivity/workben/iniParser/main.cxx b/connectivity/workben/iniParser/main.cxx index e9c338987c45..dacc8bae337e 100644 --- a/connectivity/workben/iniParser/main.cxx +++ b/connectivity/workben/iniParser/main.cxx @@ -73,10 +73,6 @@ public: throw css::io::IOException(); -#if OSL_DEBUG_LEVEL > 1 - OString sFile = OUStringToOString(iniUrl, RTL_TEXTENCODING_ASCII_US); - OSL_TRACE(__FILE__" -- parser() - %s\n", sFile.getStr()); -#endif oslFileHandle handle=NULL; if (iniUrl.getLength() && osl_File_E_None == osl_openFile(iniUrl.pData, &handle, osl_File_OpenFlag_Read)) @@ -128,8 +124,7 @@ public: #if OSL_DEBUG_LEVEL > 1 else { - OString file_tmp = OUStringToOString(iniUrl, RTL_TEXTENCODING_ASCII_US); - OSL_TRACE( __FILE__" -- couldn't open file: %s", file_tmp.getStr() ); + SAL_WARN("connectivity", "couldn't open file: " << iniUrl ); throw css::io::IOException(); } #endif @@ -142,19 +137,13 @@ public: for(;iBegin != iEnd;iBegin++) { ini_Section *aSection = &(*iBegin).second; - OString sec_name_tmp = OUStringToOString(aSection->sName, RTL_TEXTENCODING_ASCII_US); for(NameValueList::iterator itor=aSection->lList.begin(); itor != aSection->lList.end(); itor++) { struct ini_NameValue * aValue = &(*itor); - OString name_tmp = OUStringToOString(aValue->sName, RTL_TEXTENCODING_ASCII_US); - OString value_tmp = OUStringToOString(aValue->sValue, RTL_TEXTENCODING_UTF8); - OSL_TRACE( - " section=%s name=%s value=%s\n", - sec_name_tmp.getStr(), - name_tmp.getStr(), - value_tmp.getStr() ); + SAL_WARN("connectivity", + " section=" << aSection->sName << " name=" << aValue->sName << " value=" << aValue->sValue ); } } diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 963787aa2f54..4b644c4893a8 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -716,7 +716,7 @@ void newTypeDescription( && (pStructMembers == nullptr || eTypeClass == typelib_TypeClass_STRUCT)); if (typelib_TypeClass_TYPEDEF == eTypeClass) { - OSL_TRACE( "### unexpected typedef!" ); + SAL_WARN("cppu", "unexpected typedef!" ); typelib_typedescriptionreference_getDescription( ppRet, pType ); return; } diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index bc5d62825287..db32cec51d08 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -656,7 +656,7 @@ void writeLine( } else { - OSL_TRACE( "%s", pLine ); + SAL_WARN("cppu", pLine ); } } } diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx index eab7ec571b20..17f799fc3c8c 100644 --- a/cppuhelper/source/component.cxx +++ b/cppuhelper/source/component.cxx @@ -204,7 +204,7 @@ void OComponentHelper::dispose() // in a multithreaded environment, it can't be avoided // that dispose is called twice. // However this condition is traced, because it MAY indicate an error. - OSL_TRACE( "OComponentHelper::dispose() - dispose called twice" ); + SAL_WARN("cppuhelper", "OComponentHelper::dispose() - dispose called twice" ); } } diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx index 5b8ad45234df..d78260cb4a2c 100644 --- a/cppuhelper/source/tdmgr.cxx +++ b/cppuhelper/source/tdmgr.cxx @@ -592,18 +592,12 @@ static void SAL_CALL typelib_callback( catch (container::NoSuchElementException & exc) { (void) exc; // avoid warning about unused variable - OSL_TRACE( - "typelibrary type not available: %s", - OUStringToOString( - exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); + SAL_WARN("cppuhelper", "typelibrary type not available: " << exc.Message ); } catch (Exception & exc) { (void) exc; // avoid warning about unused variable - OSL_TRACE( - "%s", - OUStringToOString( - exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); + SAL_WARN("cppuhelper", exc.Message ); } } } diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index c5588c055726..8e8c8dd1d7a5 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -97,8 +97,6 @@ #include "dlgname.hxx" -#define PRTSTR(x) OUStringToOString(x, RTL_TEXTENCODING_ASCII_US).pData->buffer - #define ENTRY_HEIGHT 16 static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL"; @@ -136,7 +134,7 @@ void printPropertySet( uno::Sequence< beans::Property > aPropDetails = xPropSetInfo->getProperties(); - OSL_TRACE("printPropertySet: %d properties", aPropDetails.getLength()); + SAL_WARN("cui", "printPropertySet: " << aPropDetails.getLength() << " properties" ); for ( sal_Int32 i = 0; i < aPropDetails.getLength(); ++i ) { @@ -147,18 +145,15 @@ void printPropertySet( if ( a >>= tmp ) { - OSL_TRACE("%s: Got property: %s = %s", - PRTSTR(prefix), PRTSTR(aPropDetails[i].Name), PRTSTR(tmp)); + SAL_WARN("cui", prefix << ": Got property: " << aPropDetails[i].Name << tmp); } else if ( ( a >>= ival ) ) { - OSL_TRACE("%s: Got property: %s = %d", - PRTSTR(prefix), PRTSTR(aPropDetails[i].Name), ival); + SAL_WARN("cui", prefix << ": Got property: " << aPropDetails[i].Name << " = " << ival); } else { - OSL_TRACE("%s: Got property: %s of type %s", - PRTSTR(prefix), PRTSTR(aPropDetails[i].Name), PRTSTR(a.getValueTypeName())); + SAL_WARN("cui", prefix << ": Got property: " << aPropDetails[i].Name << " of type " << a.getValueTypeName()); } } } @@ -173,8 +168,7 @@ void printProperties( aProp[i].Value >>= tmp; - OSL_TRACE("%s: Got property: %s = %s", - PRTSTR(prefix), PRTSTR(aProp[i].Name), PRTSTR(tmp)); + SAL_WARN("cui", prefix << ": Got property: " << aProp[i].Name << " = " << tmp); } } @@ -186,7 +180,7 @@ void printEntries(SvxEntries* entries) { SvxConfigEntry* entry = *iter; - OSL_TRACE("printEntries: %s", PRTSTR(entry->GetName())); + SAL_WARN("cui", "printEntries: " << entry->GetName()); } } @@ -405,8 +399,6 @@ void RemoveEntry( SvxEntries* pEntries, SvxConfigEntry* pChildEntry ) bool SvxConfigPage::CanConfig( const OUString& aModuleId ) { - OSL_TRACE("SupportsDocumentConfig: %s", PRTSTR(aModuleId)); - if ( aModuleId == "com.sun.star.script.BasicIDE" || aModuleId == "com.sun.star.frame.Bibliography" ) { return false; @@ -1197,15 +1189,15 @@ bool MenuSaveInData::Apply() } catch ( container::NoSuchElementException& ) { - OSL_TRACE("caught container::NoSuchElementException saving settings"); + SAL_WARN("cui.customize", "caught container::NoSuchElementException saving settings"); } catch ( css::io::IOException& ) { - OSL_TRACE("caught IOException saving settings"); + SAL_WARN("cui.customize", "caught IOException saving settings"); } catch ( css::uno::Exception& ) { - OSL_TRACE("caught some other exception saving settings"); + SAL_WARN("cui.customize", "caught some other exception saving settings"); } SetModified( false ); @@ -3482,7 +3474,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton, void ) } catch ( uno::Exception& ) { - OSL_TRACE("Error restoring image"); + SAL_WARN("cui.customize", "Error restoring image"); } break; } @@ -3557,7 +3549,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton, void ) } catch ( uno::Exception& ) { - OSL_TRACE("Error replacing image"); + SAL_WARN("cui.customize", "Error replacing image"); } } } @@ -3617,7 +3609,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton, void ) } catch ( uno::Exception& ) { - OSL_TRACE("Error resetting image"); + SAL_WARN("cui.customize", "Error resetting image"); } break; } @@ -3784,7 +3776,7 @@ void ToolbarSaveInData::SetSystemStyle( catch ( uno::Exception& ) { // do nothing, a default value is returned - OSL_TRACE("Exception setting toolbar style"); + SAL_WARN("cui.customize", "Exception setting toolbar style"); } } } @@ -4140,7 +4132,7 @@ void ToolbarSaveInData::Reset() } catch ( uno::Exception& ) { - OSL_TRACE("Error resetting all icons when resetting toolbars"); + SAL_WARN("cui.customize", "Error resetting all icons when resetting toolbars"); } } @@ -4239,15 +4231,15 @@ void ToolbarSaveInData::ApplyToolbar( SvxConfigEntry* pToolbar ) } catch ( container::NoSuchElementException& ) { - OSL_TRACE("caught container::NoSuchElementException saving settings"); + SAL_WARN("cui.customize", "caught container::NoSuchElementException saving settings"); } catch ( css::io::IOException& ) { - OSL_TRACE("caught IOException saving settings"); + SAL_WARN("cui.customize", "caught IOException saving settings"); } catch ( css::uno::Exception& ) { - OSL_TRACE("caught some other exception saving settings"); + SAL_WARN("cui.customize", "caught some other exception saving settings"); } PersistChanges( GetConfigManager() ); @@ -4275,19 +4267,19 @@ void ToolbarSaveInData::CreateToolbar( SvxConfigEntry* pToolbar ) } catch ( container::ElementExistException& ) { - OSL_TRACE("caught ElementExistsException saving settings"); + SAL_WARN("cui.customize", "caught ElementExistsException saving settings"); } catch ( css::lang::IllegalArgumentException& ) { - OSL_TRACE("caught IOException saving settings"); + SAL_WARN("cui.customize", "caught IOException saving settings"); } catch ( css::lang::IllegalAccessException& ) { - OSL_TRACE("caught IOException saving settings"); + SAL_WARN("cui.customize", "caught IOException saving settings"); } catch ( css::uno::Exception& ) { - OSL_TRACE("caught some other exception saving settings"); + SAL_WARN("cui.customize", "caught some other exception saving settings"); } GetEntries()->push_back( pToolbar ); @@ -4369,10 +4361,10 @@ void ToolbarSaveInData::RestoreToolbar( SvxConfigEntry* pToolbar ) { GetImageManager()->removeImages( GetImageType(), aURLSeq ); } - catch ( uno::Exception& ) - { - OSL_TRACE("Error restoring icon when resetting toolbar"); - } + catch ( uno::Exception& ) + { + SAL_WARN("cui.customize", "Error restoring icon when resetting toolbar"); + } } PersistChanges( GetImageManager() ); } @@ -5574,17 +5566,17 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) } else { - OSL_TRACE("could not create Image from XGraphic"); + SAL_WARN("cui.customize", "could not create Image from XGraphic"); } } else { - OSL_TRACE("could not get query XGraphic"); + SAL_WARN("cui.customize", "could not get query XGraphic"); } } catch( uno::Exception& e ) { - OSL_TRACE("Caught exception importing XGraphic: %s", PRTSTR(e.Message)); + SAL_WARN("cui.customize", "Caught exception importing XGraphic: " << e.Message); } return result; } diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 855a5be1b615..84f3a3d68c2d 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -182,9 +182,7 @@ void SFTreeListBox::Init( const OUString& language ) } catch( Exception& e ) { - OSL_TRACE("Exception getting root browse node from factory: %s", - OUStringToOString( - e.Message , RTL_TEXTENCODING_ASCII_US ).pData->buffer ); + SAL_WARN("cui.dialogs", "Exception getting root browse node from factory: " << e.Message ); // TODO exception handling } @@ -762,8 +760,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton, void ) } catch( Exception& e ) { - OSL_TRACE("Caught exception trying to invoke %s", OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer ); - + SAL_WARN("cui.dialogs", "Caught exception trying to invoke " << e.Message ); } } } @@ -940,9 +937,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) } catch( Exception& e ) { - OSL_TRACE("Caught exception trying to Create %s", - OUStringToOString( - e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer ); + SAL_WARN("cui.dialogs", "Caught exception trying to Create " << e.Message ); } } if ( aChildNode.is() ) @@ -1044,9 +1039,7 @@ void SvxScriptOrgDialog::renameEntry( SvTreeListEntry* pEntry ) } catch( Exception& e ) { - OSL_TRACE("Caught exception trying to Rename %s", - OUStringToOString( - e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer ); + SAL_WARN("cui.dialogs", "Caught exception trying to Rename " << e.Message ); } } if ( aChildNode.is() ) @@ -1092,9 +1085,7 @@ void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry ) } catch( Exception& e ) { - OSL_TRACE("Caught exception trying to delete %s", - OUStringToOString( - e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer ); + SAL_WARN("cui.dialogs", "Caught exception trying to delete " << e.Message ); } } diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 064764916ac3..34a5be87667d 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -290,19 +290,15 @@ void SvxProxyTabPage::ReadConfigData_Impl() m_pNoProxyForED->SetText( aStringValue ); } } - catch (const container::NoSuchElementException&) { - OSL_TRACE( "SvxProxyTabPage::ReadConfigData_Impl: NoSuchElementException caught" ); + SAL_WARN("cui.options", "SvxProxyTabPage::ReadConfigData_Impl: NoSuchElementException caught" ); } - catch (const css::lang::WrappedTargetException &) { - OSL_TRACE( "SvxProxyTabPage::ReadConfigData_Impl: WrappedTargetException caught" ); + SAL_WARN("cui.options", "SvxProxyTabPage::ReadConfigData_Impl: WrappedTargetException caught" ); } - catch (const RuntimeException &) { - OSL_TRACE( "SvxProxyTabPage::ReadConfigData_Impl: RuntimeException caught" ); + SAL_WARN("cui.options", "SvxProxyTabPage::ReadConfigData_Impl: RuntimeException caught" ); } - } void SvxProxyTabPage::ReadConfigDefaults_Impl() @@ -351,16 +347,14 @@ void SvxProxyTabPage::ReadConfigDefaults_Impl() } catch (const beans::UnknownPropertyException &) { - OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: UnknownPropertyException caught" ); + SAL_WARN("cui.options", "SvxProxyTabPage::RestoreConfigDefaults_Impl: UnknownPropertyException caught" ); } - catch (const css::lang::WrappedTargetException &) { - OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: WrappedTargetException caught" ); + SAL_WARN("cui.options", "SvxProxyTabPage::RestoreConfigDefaults_Impl: WrappedTargetException caught" ); } - catch (const RuntimeException &) { - OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: RuntimeException caught" ); + SAL_WARN("cui.options", "SvxProxyTabPage::RestoreConfigDefaults_Impl: RuntimeException caught" ); } } @@ -382,19 +376,16 @@ void SvxProxyTabPage::RestoreConfigDefaults_Impl() Reference< util::XChangesBatch > xChangesBatch(m_xConfigurationUpdateAccess, UNO_QUERY_THROW); xChangesBatch->commitChanges(); } - catch (const beans::UnknownPropertyException &) { - OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: UnknownPropertyException caught" ); + SAL_WARN("cui.options", "SvxProxyTabPage::RestoreConfigDefaults_Impl: UnknownPropertyException caught" ); } - catch (const css::lang::WrappedTargetException &) { - OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: WrappedTargetException caught" ); + SAL_WARN("cui.options", "SvxProxyTabPage::RestoreConfigDefaults_Impl: WrappedTargetException caught" ); } - catch (const RuntimeException &) { - OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: RuntimeException caught" ); + SAL_WARN("cui.options", "SvxProxyTabPage::RestoreConfigDefaults_Impl: RuntimeException caught" ); } } @@ -480,25 +471,20 @@ bool SvxProxyTabPage::FillItemSet(SfxItemSet* ) Reference< util::XChangesBatch > xChangesBatch(m_xConfigurationUpdateAccess, UNO_QUERY_THROW); xChangesBatch->commitChanges(); } - catch (const css::lang::IllegalArgumentException &) { - OSL_TRACE( "SvxProxyTabPage::FillItemSet: IllegalArgumentException caught" ); + SAL_WARN("cui.options", "SvxProxyTabPage::FillItemSet: IllegalArgumentException caught" ); } - catch (const beans::UnknownPropertyException &) { - OSL_TRACE( "SvxProxyTabPage::FillItemSet: UnknownPropertyException caught" ); + SAL_WARN("cui.options", "SvxProxyTabPage::FillItemSet: UnknownPropertyException caught" ); } - catch (const beans::PropertyVetoException &) { - OSL_TRACE( "SvxProxyTabPage::FillItemSet: PropertyVetoException caught" ); + SAL_WARN("cui.options", "SvxProxyTabPage::FillItemSet: PropertyVetoException caught" ); } - catch (const css::lang::WrappedTargetException &) { - OSL_TRACE( "SvxProxyTabPage::FillItemSet: WrappedTargetException caught" ); + SAL_WARN("cui.options", "SvxProxyTabPage::FillItemSet: WrappedTargetException caught" ); } - catch (const RuntimeException &) { - OSL_TRACE( "SvxProxyTabPage::FillItemSet: RuntimeException caught" ); + SAL_WARN("cui.options", "SvxProxyTabPage::FillItemSet: RuntimeException caught" ); } return bModified; diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 36e2b998c879..121eed77e551 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -414,8 +414,7 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl, Button*, void) } catch( const uno::Exception& e ) { - OSL_TRACE( "Caught exception: %s\n thread terminated.\n", - OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); + SAL_WARN("cui.options", "Caught exception, thread terminated. " << e.Message); } } diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 6ced98863c4a..6191652350a7 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -154,8 +154,6 @@ ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference<ODatabaseModelImpl>& ,m_bHasBeenRecovered( false ) ,m_bEmbedded(false) { - OSL_TRACE( "DD: ctor: %p: %p", this, m_pImpl.get() ); - osl_atomic_increment( &m_refCount ); { impl_reparent_nothrow( m_xForms ); @@ -189,7 +187,6 @@ ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference<ODatabaseModelImpl>& ODatabaseDocument::~ODatabaseDocument() { - OSL_TRACE( "DD: dtor: %p: %p", this, m_pImpl.get() ); if ( !ODatabaseDocument_OfficeDocument::rBHelper.bInDispose && !ODatabaseDocument_OfficeDocument::rBHelper.bDisposed ) { acquire(); @@ -1790,7 +1787,6 @@ void ODatabaseDocument::impl_notifyStorageChange_nolck_nothrow( const Reference< void ODatabaseDocument::disposing() { - OSL_TRACE( "DD: disp: %p: %p", this, m_pImpl.get() ); if ( !m_pImpl.is() ) { // this means that we're already disposed diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 3572a4fe5a7d..d763bf18889b 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -746,7 +746,7 @@ bool OApplicationController::paste( ElementType _eType, const svx::ODataAccessDe } } else - OSL_TRACE("There should be a sequence in it!"); + SAL_WARN("dbaccess", "There should be a sequence in it!"); return true; } else if ( _rPasteData.has(DataAccessDescriptorProperty::Component) ) // forms or reports diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 01f1ab95dca1..55aa7bd0908b 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -560,7 +560,6 @@ void syncRepositories( Reference<task::XRestartManager> restarter(task::OfficeRestartManager::get(comphelper::getProcessComponentContext())); if (restarter.is()) { - OSL_TRACE( "Request restart for modified extensions manager" ); restarter->requestRestart(xCmdEnv.is() ? xCmdEnv->getInteractionHandler() : Reference<task::XInteractionHandler>()); } diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 243f48a72f02..7a02fb191b69 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -1202,9 +1202,7 @@ void BackendImpl::ComponentPackageImpl::componentLiveInsertion( try { set->insert(css::uno::Any(*factory++)); } catch (const container::ElementExistException &) { - OSL_TRACE( - "implementation %s already registered", - OUStringToOString(*i, RTL_TEXTENCODING_UTF8).getStr()); + SAL_WARN("desktop", "implementation already registered " << *i); } } if (!data.singletons.empty()) { @@ -1226,10 +1224,7 @@ void BackendImpl::ComponentPackageImpl::componentLiveInsertion( try { cont->insertByName(name, css::uno::Any()); } catch (const container::ElementExistException &) { - OSL_TRACE( - "singleton %s already registered", - OUStringToOString( - i->first, RTL_TEXTENCODING_UTF8).getStr()); + SAL_WARN("desktop", "singleton already registered " << i->first); cont->replaceByName(name, css::uno::Any()); } } diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 2b621f43fefc..2216ecef38b9 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -117,9 +117,6 @@ namespace accessibility // #i27138# mpParaManager( _pParaManager ) { -#ifdef DBG_UTIL - OSL_TRACE( "AccessibleEditableTextPara received ID: %d", mnNotifierClientId ); -#endif try { @@ -148,9 +145,6 @@ namespace accessibility try { ::comphelper::AccessibleEventNotifier::revokeClient( getNotifierClientId() ); -#ifdef DBG_UTIL - OSL_TRACE( "AccessibleEditableTextPara revoked ID: %d", mnNotifierClientId ); -#endif } catch (const uno::Exception&) { @@ -307,9 +301,6 @@ namespace accessibility // #106234# Delegate to EventNotifier ::comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( nClientId, xThis ); -#ifdef DBG_UTIL - OSL_TRACE( "Disposed ID: %d", nClientId ); -#endif } catch (const uno::Exception&) { @@ -710,11 +701,7 @@ namespace accessibility uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleParent() throw (uno::RuntimeException, std::exception) { - -#ifdef DBG_UTIL - if( !mxParent.is() ) - OSL_TRACE( "AccessibleEditableTextPara::getAccessibleParent: no frontend set, did somebody forgot to call AccessibleTextHelper::SetEventSource()?"); -#endif + SAL_WARN_IF(!mxParent.is(), "editeng", "AccessibleEditableTextPara::getAccessibleParent: no frontend set, did somebody forgot to call AccessibleTextHelper::SetEventSource()?"); return mxParent; } diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index 9075690e60f6..312a6b18ed06 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -63,10 +63,6 @@ namespace accessibility // fetched. Nevertheless, normally should employ RAII here... mnNotifierClientId(::comphelper::AccessibleEventNotifier::registerClient()) { -#ifdef DBG_UTIL - OSL_TRACE( "Received ID: %d", mnNotifierClientId ); -#endif - try { // Create the state set. @@ -91,9 +87,6 @@ namespace accessibility try { ::comphelper::AccessibleEventNotifier::revokeClient( getNotifierClientId() ); -#ifdef DBG_UTIL - OSL_TRACE( "AccessibleImageBullet revoked ID: %d", mnNotifierClientId ); -#endif } catch( const uno::Exception& ) {} } @@ -401,9 +394,6 @@ namespace accessibility // #106234# Delegate to EventNotifier ::comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( nClientId, xThis ); -#ifdef DBG_UTIL - OSL_TRACE( "AccessibleImageBullet disposed ID: %d", nClientId ); -#endif } catch( const uno::Exception& ) {} } diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 1e01793795cf..772a394b6bf1 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -3079,7 +3079,7 @@ bool SvxCharScaleWidthItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberI return true; } - OSL_TRACE( "SvxCharScaleWidthItem::PutValue - Wrong type!" ); + SAL_WARN("editeng", "SvxCharScaleWidthItem::PutValue - Wrong type!" ); return false; } diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index daabc23c09ed..ee154bc6005e 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx @@ -140,22 +140,18 @@ bool LdapUserProfileBe::readLdapConfiguration( } catch (const uno::Exception & e) { - OSL_TRACE("LdapUserProfileBackend: access to configuration data failed: %s", - OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); + SAL_WARN("extensions.config", "LdapUserProfileBackend: access to configuration data failed: " << e.Message); return false; } osl::Security aSecurityContext; if (!aSecurityContext.getUserName(*loggedOnUser)) - OSL_TRACE("LdapUserProfileBackend - could not get Logged on user from system"); + SAL_WARN("extensions.config", "LdapUserProfileBackend - could not get Logged on user from system"); sal_Int32 nIndex = loggedOnUser->indexOf('/'); if (nIndex > 0) *loggedOnUser = loggedOnUser->copy(nIndex+1); - //Remember to remove - OSL_TRACE("Logged on user is %s", OUStringToOString(*loggedOnUser,RTL_TEXTENCODING_ASCII_US).getStr()); - return true; } diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 2ea57a2d8713..fca52d28af57 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -248,21 +248,18 @@ namespace pcr void SAL_CALL PropertyControlContext_Impl::focusGained( const Reference< XPropertyControl >& Control ) throw (RuntimeException, std::exception) { - OSL_TRACE( "PropertyControlContext_Impl: FOCUS_GAINED" ); impl_notify_throw( Control, FOCUS_GAINED ); } void SAL_CALL PropertyControlContext_Impl::valueChanged( const Reference< XPropertyControl >& Control ) throw (RuntimeException, std::exception) { - OSL_TRACE( "PropertyControlContext_Impl: VALUE_CHANGED" ); impl_notify_throw( Control, VALUE_CHANGED ); } void SAL_CALL PropertyControlContext_Impl::activateNextControl( const Reference< XPropertyControl >& CurrentControl ) throw (RuntimeException, std::exception) { - OSL_TRACE( "PropertyControlContext_Impl: ACTIVATE_NEXT" ); impl_notify_throw( CurrentControl, ACTIVATE_NEXT ); } @@ -304,15 +301,12 @@ namespace pcr switch ( rControlEvent.eType ) { case FOCUS_GAINED: - OSL_TRACE( "PropertyControlContext_Impl::processEvent: FOCUS_GAINED" ); m_pContext->focusGained( rControlEvent.xControl ); break; case VALUE_CHANGED: - OSL_TRACE( "PropertyControlContext_Impl::processEvent: VALUE_CHANGED" ); m_pContext->valueChanged( rControlEvent.xControl ); break; case ACTIVATE_NEXT: - OSL_TRACE( "PropertyControlContext_Impl::processEvent: ACTIVATE_NEXT" ); m_pContext->activateNextControl( rControlEvent.xControl ); break; } diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 437af2a3d541..5c23f182ad02 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -537,8 +537,7 @@ UpdateCheckThread::run() catch(const uno::Exception& e) { // Silently catch all errors - OSL_TRACE( "Caught exception: %s\n thread terminated.\n", - OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() ); + SAL_WARN("extensions.update", "Caught exception, thread terminated. " << e.Message ); } } @@ -553,8 +552,7 @@ ManualUpdateCheckThread::run() } catch(const uno::Exception& e) { // Silently catch all errors - OSL_TRACE( "Caught exception: %s\n thread terminated.\n", - OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() ); + SAL_WARN("extensions.update", "Caught exception, thread terminated. " << e.Message ); } } diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index 4abdb50ddd3a..e891f3189664 100644 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.cxx @@ -141,8 +141,7 @@ void SAL_CALL InitUpdateCheckJobThread::run() aController->showDialog( true ); } catch (const uno::Exception &e) { // fdo#64962 - don't bring the app down on some unexpected exception. - OSL_TRACE( "Caught init update exception: %s\n thread terminated.\n", - OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() ); + SAL_WARN("extensions.update", "Caught init update exception, thread terminated. " << e.Message ); } } @@ -246,8 +245,7 @@ void UpdateCheckJob::handleExtensionUpdates( const uno::Sequence< beans::NamedVa } catch( const uno::Exception& e ) { - OSL_TRACE( "Caught exception: %s\n thread terminated.\n", - OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); + SAL_WARN("extensions.update", "Caught exception, thread terminated. " << e.Message); } } diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx index 4b656478991d..b1e9ecaac90e 100644 --- a/extensions/source/update/check/updateprotocol.cxx +++ b/extensions/source/update/check/updateprotocol.cxx @@ -80,8 +80,6 @@ checkForUpdates( uno::Reference< task::XInteractionHandler > const & rxInteractionHandler, const uno::Reference< deployment::XUpdateInformationProvider >& rUpdateInfoProvider) { - OSL_TRACE("checking for updates .."); - OUString myArch; OUString myOS; diff --git a/extensions/source/update/feed/test/updatefeedtest.cxx b/extensions/source/update/feed/test/updatefeedtest.cxx index 083c095d8b0c..a50cde2fa5a5 100644 --- a/extensions/source/update/feed/test/updatefeedtest.cxx +++ b/extensions/source/update/feed/test/updatefeedtest.cxx @@ -70,16 +70,14 @@ SAL_IMPLEMENT_MAIN() { uno::Sequence< uno::Reference< xml::dom::XElement > > theUpdateInfo = rUpdateInformationProvider->getUpdateInformation( theURLs, aExtension ); - - OSL_TRACE( "getUpdateInformation returns %d element(s)", theUpdateInfo.getLength() ); } catch( const uno::Exception & e ) { - OSL_TRACE( "exception caught: %s", OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr()); + SAL_WARN("extensions.update", "exception caught: " << e.Message); } catch( ... ) { - OSL_TRACE( "exception of undetermined type caught" ); + SAL_WARN("extensions.update", "exception of undetermined type caught" ); } diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 0ab0e1cec738..38c434608312 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -85,16 +85,12 @@ public: throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException) { sal_Int32 n = m_xStream->readBytes(aData, nBytesToRead); - if ( n ) - OSL_TRACE( "Read [%d] bytes: %s", n, aData.get()->elements ); return n; }; virtual sal_Int32 SAL_CALL readSomeBytes(uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException) { sal_Int32 n = m_xStream->readSomeBytes(aData, nMaxBytesToRead); - if ( n ) - OSL_TRACE( "Read [%d] bytes: %s", n, aData.get()->elements ); return n; }; virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx index e0698a36f370..dc700b933a27 100644 --- a/filter/source/msfilter/mstoolbar.cxx +++ b/filter/source/msfilter/mstoolbar.cxx @@ -60,13 +60,12 @@ void CustomToolBarImportHelper::applyIcons() uno::Sequence< uno::Reference< graphic::XGraphic > > images(1); images[ 0 ] = it->image; - OSL_TRACE("About to applyIcons for command %s, have image ? %s", OUStringToOString( commands[ 0 ], RTL_TEXTENCODING_UTF8 ).getStr(), images[ 0 ].is() ? "yes" : "no" ); uno::Reference< ui::XImageManager > xImageManager( getCfgManager()->getImageManager(), uno::UNO_QUERY_THROW ); sal_uInt16 nColor = ui::ImageType::COLOR_NORMAL; vcl::Window* topwin = Application::GetActiveTopWindow(); - if ( topwin != nullptr && topwin->GetDisplayBackground().GetColor().IsDark() ) - nColor = css::ui::ImageType::COLOR_HIGHCONTRAST; + if ( topwin != nullptr && topwin->GetDisplayBackground().GetColor().IsDark() ) + nColor = css::ui::ImageType::COLOR_HIGHCONTRAST; ScaleImage( images[ 0 ], 16 ); xImageManager->replaceImages( ui::ImageType::SIZE_DEFAULT | nColor, commands, images ); diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index 115855569ad0..addc6b06e454 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -92,7 +92,6 @@ SfxObjectShell* findShellForUrl( const OUString& sMacroURLOrPath ) osl::FileBase::getFileURLFromSystemPath( sMacroURLOrPath, aURL ); aObj.SetURL( aURL ); } - OSL_TRACE("Trying to find shell for url %s", OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr() ); while ( pShell ) { @@ -185,10 +184,6 @@ bool hasMacro( SfxObjectShell* pShell, const OUString& sLibrary, OUString& sMod, #else if ( !sLibrary.isEmpty() && !sMacro.isEmpty() ) { - OSL_TRACE("** Searching for %s.%s in library %s" - ,OUStringToOString( sMod, RTL_TEXTENCODING_UTF8 ).getStr() - ,OUStringToOString( sMacro, RTL_TEXTENCODING_UTF8 ).getStr() - ,OUStringToOString( sLibrary, RTL_TEXTENCODING_UTF8 ).getStr() ); BasicManager* pBasicMgr = pShell-> GetBasicManager(); if ( pBasicMgr ) { diff --git a/filter/source/svg/parserfragments.cxx b/filter/source/svg/parserfragments.cxx index 440226e155aa..7b1ce1addb4b 100644 --- a/filter/source/svg/parserfragments.cxx +++ b/filter/source/svg/parserfragments.cxx @@ -39,7 +39,6 @@ inline sal_uInt8 hex2int( char val ) void setFourBitColor( double& rChannel, char nChar ) { const sal_uInt8 nVal(hex2int(nChar)); - OSL_TRACE( "setFourBitCOlor %d color", nVal ); rChannel = (nVal*16+nVal)/255.0; } @@ -47,20 +46,17 @@ void setEightBitColor( double& rChannel, const char* pStart, const char* ) { const sal_uInt8 nVal0(hex2int(pStart[0])); const sal_uInt8 nVal1(hex2int(pStart[1])); - OSL_TRACE( "setEightbitCOlor %d, %d color", nVal0, nVal1 ); rChannel = (nVal0*16+nVal1)/255.0; } void setIntColor( double& rChannel, sal_uInt8 nVal ) { - OSL_TRACE( "setIntColor %d color", nVal ); rChannel = nVal/255.0; } void setPercentColor( double& rChannel, double nVal ) { rChannel = nVal/100.0; - SAL_INFO("svg", "setPercentColor " << nVal << " " << rChannel); } void calcRotation(std::vector<geometry::AffineMatrix2D>& rTransforms, @@ -72,7 +68,6 @@ void calcRotation(std::vector<geometry::AffineMatrix2D>& rTransforms, aCurr.rotate(fRotationAngle*M_PI/180); aCurr.translate(rCurrTransform.m02,rCurrTransform.m12); - OSL_TRACE("calcRotation - fRotationAngle - %f", fRotationAngle); rTransforms.push_back( basegfx::unotools::affineMatrixFromHomMatrix( rCurrTransform, diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index 5524379a012e..0426953ea5e9 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -473,14 +473,6 @@ struct AnnotatingVisitor maCurrState.maCTM = maCurrState.maCTM*maCurrState.maTransform*aLocalTransform; - OSL_TRACE("annotateStyle - CTM is: %f %f %f %f %f %f", - maCurrState.maCTM.get(0,0), - maCurrState.maCTM.get(0,1), - maCurrState.maCTM.get(0,2), - maCurrState.maCTM.get(1,0), - maCurrState.maCTM.get(1,1), - maCurrState.maCTM.get(1,2)); - // if necessary, serialize to automatic-style section writeStyle(xElem,nTagId); } @@ -1869,14 +1861,6 @@ struct ShapeWritingVisitor xAttrs->Clear(); - OSL_TRACE("writePath - the CTM is: %f %f %f %f %f %f", - maCurrState.maCTM.get(0,0), - maCurrState.maCTM.get(0,1), - maCurrState.maCTM.get(0,2), - maCurrState.maCTM.get(1,0), - maCurrState.maCTM.get(1,1), - maCurrState.maCTM.get(1,2)); - // TODO(F2): separate out shear, rotate etc. // apply transformation to polygon, to keep draw // import in 100th mm @@ -2087,29 +2071,17 @@ struct DumpingVisitor { void operator()( const uno::Reference<xml::dom::XElement>& xElem ) { - OSL_TRACE("name: %s", - OUStringToOString( - xElem->getTagName(), - RTL_TEXTENCODING_UTF8 ).getStr()); + SAL_WARN("filter", "name: " << xElem->getTagName()); } void operator()( const uno::Reference<xml::dom::XElement>& xElem, const uno::Reference<xml::dom::XNamedNodeMap>& xAttributes ) { - OSL_TRACE("name: %s", - OUStringToOString( - xElem->getTagName(), - RTL_TEXTENCODING_UTF8 ).getStr()); + SAL_WARN("filter", "name: " << xElem->getTagName()); const sal_Int32 nNumAttrs( xAttributes->getLength() ); for( sal_Int32 i=0; i<nNumAttrs; ++i ) { - OSL_TRACE(" %s=%s", - OUStringToOString( - xAttributes->item(i)->getNodeName(), - RTL_TEXTENCODING_UTF8 ).getStr(), - OUStringToOString( - xAttributes->item(i)->getNodeValue(), - RTL_TEXTENCODING_UTF8 ).getStr()); + SAL_WARN("filter", xAttributes->item(i)->getNodeName() << "=" << xAttributes->item(i)->getNodeValue()); } } diff --git a/filter/source/svg/test/parsertest.cxx b/filter/source/svg/test/parsertest.cxx index 0e9c7f557fa4..cbee13b0fca7 100644 --- a/filter/source/svg/test/parsertest.cxx +++ b/filter/source/svg/test/parsertest.cxx @@ -28,7 +28,6 @@ public: ARGBColor aOut(16, 32, 48); CPPUNIT_ASSERT_MESSAGE( "Consuming color #112233", parseColor( sIn, aTmp ) ); - OSL_TRACE("color is: a:%f r:%f g:%f b:%f", aTmp.a, aTmp.r, aTmp.g, aTmp.b); CPPUNIT_ASSERT_MESSAGE( "Parsing color #112233", aOut==aTmp ); @@ -36,7 +35,6 @@ public: aOut=ARGBColor(51, 34, 17); CPPUNIT_ASSERT_MESSAGE( "Consuming color #321", parseColor( sIn, aTmp ) ); - OSL_TRACE("color is: a:%f r:%f g:%f b:%f", aTmp.a, aTmp.r, aTmp.g, aTmp.b); CPPUNIT_ASSERT_MESSAGE( "Parsing color #321", aOut==aTmp ); @@ -44,7 +42,6 @@ public: aOut=ARGBColor(100, 200, 50); CPPUNIT_ASSERT_MESSAGE( "Consuming color rgb(100,200,50)", parseColor( sIn, aTmp ) ); - OSL_TRACE("color is: a:%f r:%f g:%f b:%f", aTmp.a, aTmp.r, aTmp.g, aTmp.b); CPPUNIT_ASSERT_MESSAGE( "Parsing color rgb(100,200,50)", aOut==aTmp ); @@ -52,7 +49,6 @@ public: aOut=ARGBColor(0.1, 0.2, 0.9); CPPUNIT_ASSERT_MESSAGE( "Consuming color rgb(0.1,0.2,0.9)", parseColor( sIn, aTmp ) ); - OSL_TRACE("color is: a:%f r:%f g:%f b:%f", aTmp.a, aTmp.r, aTmp.g, aTmp.b); CPPUNIT_ASSERT_MESSAGE( "Parsing color rgb(0.1,0.2,0.9)", aOut==aTmp ); @@ -60,7 +56,6 @@ public: aOut=ARGBColor(222,184,135); CPPUNIT_ASSERT_MESSAGE( "Consuming color burlywood", parseColor( sIn, aTmp ) ); - OSL_TRACE("color is: a:%f r:%f g:%f b:%f", aTmp.a, aTmp.r, aTmp.g, aTmp.b); CPPUNIT_ASSERT_MESSAGE( "Parsing color burlywood", aOut==aTmp ); } @@ -73,7 +68,6 @@ public: ARGBColor aOut(0.123, 0.0, 0.0, 0.0); CPPUNIT_ASSERT_MESSAGE( "Consuming opacity 0.123", parseOpacity( sIn, aTmp ) ); - OSL_TRACE("color is: a:%f r:%f g:%f b:%f", aTmp.a, aTmp.r, aTmp.g, aTmp.b); CPPUNIT_ASSERT_MESSAGE( "Parsing opacity 0.123", aOut==aTmp ); } @@ -86,8 +80,6 @@ public: basegfx::B2DHomMatrix aTmp; CPPUNIT_ASSERT_MESSAGE( "Consuming transformation none", parseTransform( sIn, aTmp ) ); - OSL_TRACE("transformation is: m00:%f m01:%f m02:%f m10:%f m11:%f m12:%f", - aTmp.get(0,0), aTmp.get(0,1), aTmp.get(0,2), aTmp.get(1,0), aTmp.get(1,1), aTmp.get(1,2) ); CPPUNIT_ASSERT_MESSAGE( "Parsing transformation none", aOut==aTmp ); @@ -96,8 +88,6 @@ public: aOut.scale(10.0,10.0); CPPUNIT_ASSERT_MESSAGE( "Consuming transformation scale(10)", parseTransform( sIn, aTmp ) ); - OSL_TRACE("transformation is: m00:%f m01:%f m02:%f m10:%f m11:%f m12:%f", - aTmp.get(0,0), aTmp.get(0,1), aTmp.get(0,2), aTmp.get(1,0), aTmp.get(1,1), aTmp.get(1,2) ); CPPUNIT_ASSERT_MESSAGE( "Parsing transformation scale(10)", aOut==aTmp ); @@ -106,8 +96,6 @@ public: aOut.scale(10.0,20.12); CPPUNIT_ASSERT_MESSAGE( "Consuming transformation scale(10 20.12)", parseTransform( sIn, aTmp ) ); - OSL_TRACE("transformation is: m00:%f m01:%f m02:%f m10:%f m11:%f m12:%f", - aTmp.get(0,0), aTmp.get(0,1), aTmp.get(0,2), aTmp.get(1,0), aTmp.get(1,1), aTmp.get(1,2) ); CPPUNIT_ASSERT_MESSAGE( "Parsing transformation scale(10 20.12)", aOut==aTmp ); @@ -116,8 +104,6 @@ public: aOut.set(0,0,1.0); aOut.set(1,0,2.0); aOut.set(0,1,3.0); aOut.set(1,1,4.0); aOut.set(0,2,5.0); aOut.set(1,2,6.0); CPPUNIT_ASSERT_MESSAGE( "Consuming transformation matrix(1,2,3,4,5,6)", parseTransform( sIn, aTmp ) ); - OSL_TRACE("transformation is: m00:%f m01:%f m02:%f m10:%f m11:%f m12:%f", - aTmp.get(0,0), aTmp.get(0,1), aTmp.get(0,2), aTmp.get(1,0), aTmp.get(1,1), aTmp.get(1,2) ); CPPUNIT_ASSERT_MESSAGE( "Parsing transformation matrix(1,2,3,4,5,6)", aOut==aTmp ); @@ -126,8 +112,6 @@ public: aOut.set(0,0,0.0); aOut.set(1,0,10.0); aOut.set(0,1,-10.0); aOut.set(1,1,0.0); aOut.set(0,2,0.0); aOut.set(1,2,0.0); CPPUNIT_ASSERT_MESSAGE( "Consuming transformation matrix(1,2,3,4,5,6)", parseTransform( sIn, aTmp ) ); - OSL_TRACE("transformation is: m00:%f m01:%f m02:%f m10:%f m11:%f m12:%f", - aTmp.get(0,0), aTmp.get(0,1), aTmp.get(0,2), aTmp.get(1,0), aTmp.get(1,1), aTmp.get(1,2) ); CPPUNIT_ASSERT_MESSAGE( "Parsing transformation matrix(1,2,3,4,5,6)", aOut==aTmp ); @@ -136,8 +120,6 @@ public: aOut.set(0,0,1.0); aOut.set(1,0,1.0); aOut.set(0,1,0.0); aOut.set(1,1,1.0); aOut.set(0,2,0.0); aOut.set(1,2,0.0); CPPUNIT_ASSERT_MESSAGE( "Consuming transformation skewX(45)", parseTransform( sIn, aTmp ) ); - OSL_TRACE("transformation is: m00:%f m01:%f m02:%f m10:%f m11:%f m12:%f", - aTmp.get(0,0), aTmp.get(0,1), aTmp.get(0,2), aTmp.get(1,0), aTmp.get(1,1), aTmp.get(1,2) ); CPPUNIT_ASSERT_MESSAGE( "Parsing transformation skewX(45)", aOut==aTmp ); @@ -146,8 +128,6 @@ public: aOut.set(0,0,1.0); aOut.set(1,0,0.0); aOut.set(0,1,1.0); aOut.set(1,1,1.0); aOut.set(0,2,0.0); aOut.set(1,2,0.0); CPPUNIT_ASSERT_MESSAGE( "Consuming transformation skewY(45)", parseTransform( sIn, aTmp ) ); - OSL_TRACE("transformation is: m00:%f m01:%f m02:%f m10:%f m11:%f m12:%f", - aTmp.get(0,0), aTmp.get(0,1), aTmp.get(0,2), aTmp.get(1,0), aTmp.get(1,1), aTmp.get(1,2) ); CPPUNIT_ASSERT_MESSAGE( "Parsing transformation skewY(45)", aOut==aTmp ); } @@ -160,7 +140,6 @@ public: basegfx::B2DRange aOut(10,20,40.5,25); CPPUNIT_ASSERT_MESSAGE( "Consuming 10,20,30.5,5", parseViewBox( sIn, aTmp ) ); - OSL_TRACE("viewbox is: x1:%f y1:%f x2:%f y2:%f", aTmp.getMinX(), aTmp.getMinY(), aTmp.getMaxX(), aTmp.getMaxY()); CPPUNIT_ASSERT_MESSAGE( "Parsing 10,20,30.5,5", aOut==aTmp ); } @@ -173,7 +152,6 @@ public: std::vector<double> aOut; aOut.push_back(10.0); aOut.push_back(20.0); aOut.push_back(-10.0); CPPUNIT_ASSERT_MESSAGE( "Consuming 10,20,-10.00", parseDashArray( sIn, aTmp ) ); - OSL_TRACE("dash array is: len %d, %f %f %f", aTmp.size(), aTmp[0], aTmp[1], aTmp[2] ); CPPUNIT_ASSERT_MESSAGE( "Parsing 10,20,-10.00", aOut==aTmp ); } diff --git a/filter/source/svg/test/svg2odf.cxx b/filter/source/svg/test/svg2odf.cxx index 5eab2b59e717..cbb3e6b05317 100644 --- a/filter/source/svg/test/svg2odf.cxx +++ b/filter/source/svg/test/svg2odf.cxx @@ -68,7 +68,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { if( argc != 4 ) { - OSL_TRACE( "Invocation: svg2odf <base_url> <dst_url> <ini_file>. Exiting" ); + SAL_WARN("filter.svg", "Invocation: svg2odf <base_url> <dst_url> <ini_file>. Exiting" ); return 1; } @@ -98,7 +98,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) xFactory.set(xCtx->getServiceManager(), uno::UNO_QUERY); if (!xFactory.is()) { - OSL_TRACE( "Could not bootstrap UNO, installation must be in disorder. Exiting." ); + SAL_WARN("filter.svg", "Could not bootstrap UNO, installation must be in disorder. Exiting." ); return 1; } @@ -107,7 +107,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) osl::File aInputFile(aSrcURL); if( osl::FileBase::E_None!=aInputFile.open(osl_File_OpenFlag_Read) ) { - OSL_TRACE( "Cannot open input file" ); + SAL_WARN("filter.svg", "Cannot open input file" ); return 1; } diff --git a/filter/source/svg/units.cxx b/filter/source/svg/units.cxx index dd1a31e36f65..60a094a38711 100644 --- a/filter/source/svg/units.cxx +++ b/filter/source/svg/units.cxx @@ -82,7 +82,7 @@ double convLength( const OUString& value, SvgUnit unit, const State& rState, cha fRet *= fBoxLen/100.0; } break; - default: OSL_TRACE( "Unknown length type" ); break; + default: SAL_WARN("filter.svg", "Unknown length type" ); break; } return fRet; diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 4d2916dee931..6d1aa2c708f5 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -541,31 +541,18 @@ namespace frm if ( bNeedParametrizedDispatcher ) { - #if OSL_DEBUG_LEVEL > 0 - OString sTrace( "ORichTextPeer::implCreateDispatcher: creating *parametrized* dispatcher for " ); - sTrace += OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US ); - OSL_TRACE( "%s", sTrace.getStr() ); - #endif pAttributeDispatcher = new OParametrizedAttributeDispatcher( pRichTextControl->getView(), _nSlotId, _rURL, pRichTextControl ); } else { - #if OSL_DEBUG_LEVEL > 0 - OString sTrace( "ORichTextPeer::implCreateDispatcher: creating *normal* dispatcher for " ); - sTrace += OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US ); - OSL_TRACE( "%s", sTrace.getStr() ); - #endif pAttributeDispatcher = new OAttributeDispatcher( pRichTextControl->getView(), _nSlotId, _rURL, pRichTextControl ); } } - #if OSL_DEBUG_LEVEL > 0 else { - OString sTrace( "ORichTextPeer::implCreateDispatcher: not creating dispatcher (unsupported slot) for " ); - sTrace += OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US ); - OSL_TRACE( "%s", sTrace.getStr() ); + SAL_WARN("forms.richtext", "ORichTextPeer::implCreateDispatcher: not creating dispatcher (unsupported slot) for " + << _rURL.Complete); } - #endif } break; } diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm index 3d04fd5c4ebe..2e06025bc6ce 100644 --- a/fpicker/source/aqua/FilterHelper.mm +++ b/fpicker/source/aqua/FilterHelper.mm @@ -237,7 +237,6 @@ void FilterHelper::ensureFilterList( const ::rtl::OUString& _rInitialCurrentFilt // set the first filter to the current filter m_aCurrentFilter = _rInitialCurrentFilter; - OSL_TRACE("ensureFilterList filter:%s", OUStringToOString(m_aCurrentFilter, RTL_TEXTENCODING_UTF8).getStr()); } } @@ -250,23 +249,6 @@ void FilterHelper::SetCurFilter( const rtl::OUString& rFilter ) m_aCurrentFilter = rFilter; } - //only for output purposes -#if OSL_DEBUG_LEVEL > 0 - FilterList::iterator aFilter = ::std::find_if(m_pFilterList->begin(), m_pFilterList->end(), FilterTitleMatch(m_aCurrentFilter)); - if (aFilter != m_pFilterList->end()) { - OUStringList suffixes = aFilter->getFilterSuffixList(); - if (!suffixes.empty()) { - SAL_INFO("fpicker.aqua", "Current active suffixes: "); - OUStringList::iterator suffIter = suffixes.begin(); - while(suffIter != suffixes.end()) { - SAL_INFO("fpicker.aqua", *suffIter); - suffIter++; - } - } - } else { - SAL_INFO("fpicker.aqua", "No filter entry was found for that name!"); - } -#endif } void FilterHelper::SetFilters() @@ -274,8 +256,6 @@ void FilterHelper::SetFilters() // set the default filter if( m_aCurrentFilter.getLength() > 0 ) { - OSL_TRACE( "Setting current filter to %s", OUStringToOString(m_aCurrentFilter, RTL_TEXTENCODING_UTF8).getStr()); - SetCurFilter( m_aCurrentFilter ); } } @@ -343,7 +323,7 @@ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) bool FilterHelper::filenameMatchesFilter(NSString* sFilename) { if (m_aCurrentFilter.isEmpty()) { - OSL_TRACE("filter name is empty"); + SAL_WARN("fpicker", "filter name is empty"); return true; } @@ -363,7 +343,7 @@ bool FilterHelper::filenameMatchesFilter(NSString* sFilename) FilterList::iterator filter = ::std::find_if(m_pFilterList->begin(), m_pFilterList->end(), FilterTitleMatch(m_aCurrentFilter)); if (filter == m_pFilterList->end()) { - OSL_TRACE("filter not found in list"); + SAL_WARN("fpicker", "filter not found in list"); return true; } diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx index c21317207003..e543ab8e5fb4 100644 --- a/fpicker/source/win32/filepicker/FPentry.cxx +++ b/fpicker/source/win32/filepicker/FPentry.cxx @@ -51,7 +51,6 @@ static Reference< XInterface > SAL_CALL createInstance( if (bVistaOrNewer) { - OSL_TRACE("use special (vista) system file picker ..."); xDlg.set( static_cast< XFilePicker2* >( new ::fpicker::win32::vista::VistaFilePicker( rServiceManager ) ) ); @@ -59,7 +58,6 @@ static Reference< XInterface > SAL_CALL createInstance( else #endif { - OSL_TRACE("use normal system file picker ..."); xDlg.set( static_cast< XFilePicker2* >( new CFilePicker( rServiceManager ) ) ); diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 50da8e1cb628..f812fc8cd285 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -83,6 +83,7 @@ certain functionality. @li @c connectivity.kab @li @c connectivity.macab @li @c connectivity.mork +@li @c connectivity.mozab @li @c connectivity.odbc @li @c connectivity.parse @li @c connectivity.postgresql @@ -190,7 +191,9 @@ certain functionality. @li @c extensions.abpilot @li @c extensions.biblio +@li @c extensions.config @li @c extensions.dbpilots +@li @c extensions.evoab @li @c extensions.olebridge - OLE automation bridge @li @c extensions.plugin @li @c extensions.propctrlr diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index 75ae62bb09f3..98b6d7b70dcc 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -554,22 +554,6 @@ sal_Int32 OConnection::getMysqlVersion() return version; } -// TODO: Not used -//sal_Int32 OConnection::sdbcColumnType(rtl::OUString typeName) -//{ -// SAL_WARNx("mysqlc", "OConnection::sdbcColumnType"); -// int i = 0; -// while (mysqlc_types[i].typeName) { -// if (rtl::OUString::createFromAscii(mysqlc_types[i].typeName).equals( -// typeName.toAsciiUpperCase())) -// { -// return mysqlc_types[i].dataType; -// } -// i++; -// } -// return 0; -//} - rtl::OUString OConnection::transFormPreparedStatement(const rtl::OUString& _sSQL) { rtl::OUString sSqlStatement = _sSQL; diff --git a/oox/source/drawingml/textfield.cxx b/oox/source/drawingml/textfield.cxx index 8594f8ebe821..3905a406c996 100644 --- a/oox/source/drawingml/textfield.cxx +++ b/oox/source/drawingml/textfield.cxx @@ -69,7 +69,6 @@ void lclCreateTextFields( std::list< Reference< XTextField > > & aFields, bool bIsDate = true; int idx = p.toInt32(); sal_uInt16 nNumFmt; -// SAL_WARNx("oox", "OOX: p = %s, %d", p.pData->buffer, idx ); xIface = xFactory->createInstance( "com.sun.star.text.TextField.DateTime" ); aFields.push_back( Reference< XTextField > ( xIface, UNO_QUERY ) ); Reference< XPropertySet > xProps( xIface, UNO_QUERY_THROW ); diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index fb9e3e3064ab..0a825cfc28c1 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -120,7 +120,6 @@ void BulletList::setSuffixMinusRight() void BulletList::setType( sal_Int32 nType ) { OSL_ASSERT((nType & sal_Int32(0xFFFF0000))==0); -// SAL_WARNx("oox", "OOX: set list numbering type %d", nType); switch( nType ) { case XML_alphaLcParenBoth: diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 7e5dcb061f31..2e4d7507f422 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -2598,8 +2598,7 @@ HtmlTextBoxModel::importBinaryModel( BinaryInputStream& rInStrm ) OUString sStringContents = rInStrm.readUnicodeArray( rInStrm.size() ); // in msocximex ( where this is ported from, it appears *nothing* is read // from the control stream ), surely there is some useful info there ? - SAL_WARNx("oox", "HtmlTextBoxModel::importBinaryModel - string contents of stream :"); - SAL_WARNx("oox", "%s", OUStringToOString( sStringContents, RTL_TEXTENCODING_UTF8 ).getStr() ); + SAL_WARN("oox", "HtmlTextBoxModel::importBinaryModel - string contents of stream: " << sStringContents ); #else (void) rInStrm; #endif |