diff options
45 files changed, 64 insertions, 621 deletions
diff --git a/framework/source/uielement/genericstatusbarcontroller.cxx b/framework/source/uielement/genericstatusbarcontroller.cxx index 7432e8c4da65..2ab06947effc 100644 --- a/framework/source/uielement/genericstatusbarcontroller.cxx +++ b/framework/source/uielement/genericstatusbarcontroller.cxx @@ -126,7 +126,6 @@ void SAL_CALL GenericStatusbarController::paint( ::sal_Int32 /*nStyle*/ ) throw ( RuntimeException, std::exception ) { - OSL_TRACE("framework::GenericStatusbarController::paint"); SolarMutexGuard aGuard; const Reference< awt::XGraphics2 > xGraphics2(xGraphics, UNO_QUERY); diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index 03dfe6d1b8ef..bbfaf0ee8510 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -64,7 +64,6 @@ MacrosMenuController::MacrosMenuController( const css::uno::Reference< css::uno: MacrosMenuController::~MacrosMenuController() { - OSL_TRACE("calling dtor"); } // private function @@ -98,7 +97,6 @@ void SAL_CALL MacrosMenuController::disposing( const EventObject& ) throw ( Runt Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY ); osl::MutexGuard aLock( m_aMutex ); - OSL_TRACE("disposing"); m_xFrame.clear(); m_xDispatch.clear(); m_xContext.clear(); @@ -106,7 +104,6 @@ void SAL_CALL MacrosMenuController::disposing( const EventObject& ) throw ( Runt if ( m_xPopupMenu.is() ) { m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(static_cast<OWeakObject *>(this), UNO_QUERY )); - OSL_TRACE("removed listener"); } m_xPopupMenu.clear(); } diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index e609cf129237..c7380cae9891 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -293,8 +293,6 @@ void SAL_CALL RecentFilesMenuController::itemSelected( const css::awt::MenuEvent if ( xPopupMenu.is() ) { const OUString aCommand( xPopupMenu->getCommand( rEvent.MenuId ) ); - OSL_TRACE( "RecentFilesMenuController::itemSelected() - Command : %s", - OUStringToOString( aCommand, RTL_TEXTENCODING_UTF8 ).getStr() ); if ( aCommand == CMD_CLEAR_LIST ) { diff --git a/include/canvas/canvastools.hxx b/include/canvas/canvastools.hxx index 67119cf914b8..261a490230bb 100644 --- a/include/canvas/canvastools.hxx +++ b/include/canvas/canvastools.hxx @@ -377,7 +377,7 @@ namespace canvas ( arg>TargetLimits::max() ) ) // overflow will happen { # if OSL_DEBUG_LEVEL > 2 - OSL_TRACE("numeric_cast detected data loss"); + SAL_WARN("canvas", "numeric_cast detected data loss"); #endif throw css::uno::RuntimeException( "numeric_cast detected data loss", @@ -460,8 +460,7 @@ namespace canvas if( !mbCaseSensitive && aStr != aStr.toAsciiLowerCase() ) { - OSL_TRACE("ValueMap::ValueMap(): Key %s is not lowercase", - pMap->maKey); + SAL_WARN("canvas", "ValueMap::ValueMap(): Key is not lowercase " << pMap->maKey); OSL_FAIL( "ValueMap::ValueMap(): Key is not lowercase" ); } @@ -472,9 +471,8 @@ namespace canvas if( !mapComparator(pMap[0], pMap[1]) && mapComparator(pMap[1], pMap[0]) ) { - OSL_TRACE("ValueMap::ValueMap(): Map is not sorted, keys %s and %s are wrong", - pMap[0].maKey, - pMap[1].maKey); + SAL_WARN("canvas", "ValueMap::ValueMap(): Map is not sorted, keys are wrong, " + << pMap[0].maKey << " and " << pMap[1].maKey); OSL_FAIL( "ValueMap::ValueMap(): Map is not sorted" ); } @@ -482,8 +480,7 @@ namespace canvas if( !mbCaseSensitive && aStr2 != aStr2.toAsciiLowerCase() ) { - OSL_TRACE("ValueMap::ValueMap(): Key %s is not lowercase", - pMap[1].maKey); + SAL_WARN("canvas", "ValueMap::ValueMap(): Key is not lowercase" << pMap[1].maKey); OSL_FAIL( "ValueMap::ValueMap(): Key is not lowercase" ); } } diff --git a/include/canvas/debug.hxx b/include/canvas/debug.hxx deleted file mode 100644 index f016df163eb7..000000000000 --- a/include/canvas/debug.hxx +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_CANVAS_DEBUG_HXX -#define INCLUDED_CANVAS_DEBUG_HXX - -// shared_ptr debugging - - -#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - -# include <sal/config.h> -# include <osl/diagnose.h> -# include <memory> - -::std::size_t find_unreachable_objects( bool ); - -# if OSL_DEBUG_LEVEL > 2 -# define SHARED_PTR_LEFTOVERS(a) OSL_TRACE("%s\n%s: Unreachable objects still use %d bytes\n", \ - OSL_THIS_FUNC, a, \ - find_unreachable_objects(true) ) -# else -/** This macro shows how much memory is still used by shared_ptrs - - Use this macro at places in the code where normally all shared_ptr - objects should have been deleted. You'll get the number of bytes - still contained in those objects, which quite possibly are prevented - from deletion by circular references. - */ -# define SHARED_PTR_LEFTOVERS(a) OSL_TRACE("%s\n%s: Unreachable objects still use %d bytes\n", \ - OSL_THIS_FUNC, a, \ - find_unreachable_objects(false) ) -# endif - -#else - -# define SHARED_PTR_LEFTOVERS(a) ((void)0) - -#endif - -#endif // ! defined(INCLUDED_CANVAS_DEBUG_HXX) - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index adfa1c206dd4..50da8e1cb628 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -20,6 +20,7 @@ certain functionality. @section SAL +@li @c sal @li @c sal.bootstrap - SAL bootstrap @li @c sal.debug - SAL debugging functionality @li @c sal.file @@ -551,6 +552,7 @@ certain functionality. @li @c drawinglayer @li @c dtrans @li @c helpcompiler +@li @c javaunohelper @li @c jvmaccess @li @c lingucomponent @li @c linguistic diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index b6ef0a33556f..939eb436e402 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -124,10 +124,6 @@ namespace io_acceptor IllegalArgumentException, RuntimeException, std::exception) { - OSL_TRACE( - "acceptor %s\n", - OUStringToOString( - sConnectionDescription, RTL_TEXTENCODING_ASCII_US).getStr()); // if there is a thread alread accepting in this object, throw an exception. struct BeingInAccept guard( &m_bInAccept, sConnectionDescription ); @@ -205,11 +201,6 @@ namespace io_acceptor else { OUString delegatee = "com.sun.star.connection.Acceptor." + aDesc.getName(); - - OSL_TRACE( - "trying to get service %s\n", - OUStringToOString( - delegatee, RTL_TEXTENCODING_ASCII_US).getStr()); _xAcceptor.set(_xSMgr->createInstanceWithContext(delegatee, _xCtx), UNO_QUERY); if(!_xAcceptor.is()) diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx index 695326718c25..d12296295700 100644 --- a/io/source/connector/connector.cxx +++ b/io/source/connector/connector.cxx @@ -73,11 +73,6 @@ namespace stoc_connector Reference< XConnection > SAL_CALL OConnector::connect( const OUString& sConnectionDescription ) throw( NoConnectException, ConnectionSetupException, RuntimeException, std::exception) { - OSL_TRACE( - "connector %s\n", - OUStringToOString( - sConnectionDescription, RTL_TEXTENCODING_ASCII_US).getStr()); - // split string into tokens try { @@ -143,13 +138,8 @@ namespace stoc_connector } else { - OUString delegatee("com.sun.star.connection.Connector."); - delegatee += aDesc.getName(); + OUString delegatee= "com.sun.star.connection.Connector." + aDesc.getName(); - OSL_TRACE( - "connector: trying to get service %s\n", - OUStringToOString( - delegatee, RTL_TEXTENCODING_ASCII_US).getStr()); Reference<XConnector> xConnector( _xSMgr->createInstanceWithContext(delegatee, _xCtx), UNO_QUERY ); diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx index e245ecc174e6..6ec95eaa4484 100644 --- a/javaunohelper/source/bootstrap.cxx +++ b/javaunohelper/source/bootstrap.cxx @@ -150,9 +150,9 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap( jclass c = jni_env->FindClass( "com/sun/star/uno/RuntimeException" ); if (nullptr != c) { + SAL_WARN("javaunohelper", "forwarding RuntimeException: " << exc.Message ); OString cstr( OUStringToOString( exc.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); - OSL_TRACE( __FILE__": forwarding RuntimeException: %s", cstr.getStr() ); jni_env->ThrowNew( c, cstr.getStr() ); } } @@ -161,9 +161,9 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap( jclass c = jni_env->FindClass( "com/sun/star/uno/Exception" ); if (nullptr != c) { + SAL_WARN("javaunohelper", "forwarding Exception: " << exc.Message ); OString cstr( OUStringToOString( exc.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); - OSL_TRACE( __FILE__": forwarding Exception: %s", cstr.getStr() ); jni_env->ThrowNew( c, cstr.getStr() ); } } diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index a4a887c33d41..9d04e16f40e3 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -441,7 +441,6 @@ OString MergeDataFile::CreateKey(const OString& rTYP, const OString& rGID, sKey += rLID; sKey += sStroke; sKey += lcl_NormalizeFilename(rFilename); - OSL_TRACE("created key: %s", sKey.getStr()); if(bCaseSensitive) return sKey; // officecfg case sensitive identifier return sKey.toAsciiUpperCase(); diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index 04fff735c627..75ae62bb09f3 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -68,13 +68,11 @@ OConnection::OConnection(MysqlCDriver& _rDriver, sql::Driver * _cppDriver) ,cppDriver(_cppDriver) ,m_bClosed(false) { - OSL_TRACE("OConnection::OConnection"); m_rDriver.acquire(); } OConnection::~OConnection() { - OSL_TRACE("OConnection::~OConnection"); if (!isClosed()) { close(); } @@ -84,14 +82,12 @@ OConnection::~OConnection() void SAL_CALL OConnection::release() throw() { - OSL_TRACE("OConnection::release"); release_ChildImpl(); } void OConnection::construct(const rtl::OUString& url, const Sequence< PropertyValue >& info) throw(SQLException) { - OSL_TRACE("OConnection::construct"); MutexGuard aGuard(m_aMutex); sal_Int32 nIndex; @@ -178,12 +174,6 @@ void OConnection::construct(const rtl::OUString& url, const Sequence< PropertyVa connProps["socket"] = pipe_str; } - OSL_TRACE("hostName=%s", host_str.c_str()); - OSL_TRACE("port=%i", int(nPort)); - OSL_TRACE("userName=%s", user_str.c_str()); - OSL_TRACE("password=%s", pass_str.c_str()); - OSL_TRACE("schema=%s", schema_str.c_str()); - m_settings.cppConnection.reset(cppDriver->connect(connProps)); } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); @@ -193,7 +183,6 @@ void OConnection::construct(const rtl::OUString& url, const Sequence< PropertyVa } m_settings.schema = aDbName; - OSL_TRACE("%s", rtl::OUStringToOString(m_settings.schema, getConnectionEncoding()).getStr()); // Check if the server is 4.1 or above if (this->getMysqlVersion() < 40100) { @@ -231,7 +220,6 @@ sal_Bool OConnection::supportsService(rtl::OUString const & ServiceName) Reference< XStatement > SAL_CALL OConnection::createStatement() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OConnection::createStatement"); MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -251,7 +239,6 @@ Reference< XStatement > SAL_CALL OConnection::createStatement() Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement(const rtl::OUString& _sSql) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OConnection::prepareStatement"); MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); const rtl::OUString sSqlStatement = transFormPreparedStatement( _sSql ); @@ -272,7 +259,6 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement(const rtl Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall(const rtl::OUString& /*_sSql*/ ) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OConnection::prepareCall"); MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -283,7 +269,6 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall(const rtl::OUS rtl::OUString SAL_CALL OConnection::nativeSQL(const rtl::OUString& _sSql) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OConnection::nativeSQL"); MutexGuard aGuard(m_aMutex); const rtl::OUString sSqlStatement = transFormPreparedStatement( _sSql ); @@ -300,7 +285,6 @@ rtl::OUString SAL_CALL OConnection::nativeSQL(const rtl::OUString& _sSql) void SAL_CALL OConnection::setAutoCommit(sal_Bool autoCommit) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OConnection::setAutoCommit"); MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); try { @@ -313,7 +297,6 @@ void SAL_CALL OConnection::setAutoCommit(sal_Bool autoCommit) sal_Bool SAL_CALL OConnection::getAutoCommit() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OConnection::getAutoCommit"); // you have to distinguish which if you are in autocommit mode or not // at normal case true should be fine here @@ -332,7 +315,6 @@ sal_Bool SAL_CALL OConnection::getAutoCommit() void SAL_CALL OConnection::commit() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OConnection::commit"); MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); try { @@ -345,7 +327,6 @@ void SAL_CALL OConnection::commit() void SAL_CALL OConnection::rollback() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OConnection::rollback"); MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); try { @@ -358,7 +339,6 @@ void SAL_CALL OConnection::rollback() sal_Bool SAL_CALL OConnection::isClosed() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OConnection::isClosed"); MutexGuard aGuard(m_aMutex); // just simple -> we are close when we are disposed that means someone called dispose(); (XComponent) @@ -368,7 +348,6 @@ sal_Bool SAL_CALL OConnection::isClosed() Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OConnection::getMetaData"); MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -388,7 +367,6 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData() void SAL_CALL OConnection::setReadOnly(sal_Bool readOnly) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OConnection::setReadOnly"); MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -398,7 +376,6 @@ void SAL_CALL OConnection::setReadOnly(sal_Bool readOnly) sal_Bool SAL_CALL OConnection::isReadOnly() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OConnection::isReadOnly"); MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -409,7 +386,6 @@ sal_Bool SAL_CALL OConnection::isReadOnly() void SAL_CALL OConnection::setCatalog(const rtl::OUString& catalog) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OConnection::setCatalog"); MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -424,7 +400,6 @@ void SAL_CALL OConnection::setCatalog(const rtl::OUString& catalog) rtl::OUString SAL_CALL OConnection::getCatalog() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OConnection::getCatalog"); MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -440,7 +415,6 @@ rtl::OUString SAL_CALL OConnection::getCatalog() void SAL_CALL OConnection::setTransactionIsolation(sal_Int32 level) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OConnection::setTransactionIsolation"); MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -475,7 +449,6 @@ void SAL_CALL OConnection::setTransactionIsolation(sal_Int32 level) sal_Int32 SAL_CALL OConnection::getTransactionIsolation() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OConnection::getTransactionIsolation"); MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -497,7 +470,6 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation() Reference<XNameAccess> SAL_CALL OConnection::getTypeMap() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OConnection::getTypeMap"); MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -508,7 +480,6 @@ Reference<XNameAccess> SAL_CALL OConnection::getTypeMap() void SAL_CALL OConnection::setTypeMap(const Reference<XNameAccess >& typeMap) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OConnection::setTypeMap"); MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -519,7 +490,6 @@ void SAL_CALL OConnection::setTypeMap(const Reference<XNameAccess >& typeMap) void SAL_CALL OConnection::close() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OConnection::close"); /* we need block, because the mutex is a local variable, which will guard the block @@ -537,7 +507,6 @@ Any SAL_CALL OConnection::getWarnings() throw(SQLException, RuntimeException, std::exception) { Any x = Any(); - OSL_TRACE("OConnection::getWarnings"); // when you collected some warnings -> return it return x; } @@ -545,13 +514,11 @@ Any SAL_CALL OConnection::getWarnings() void SAL_CALL OConnection::clearWarnings() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OConnection::clearWarnings"); // you should clear your collected warnings here# } void OConnection::disposing() { - OSL_TRACE("OConnection::disposing"); // we noticed that we should be destroied in near future so we have to dispose our statements MutexGuard aGuard(m_aMutex); @@ -573,7 +540,6 @@ void OConnection::disposing() sal_Int32 OConnection::getMysqlVersion() throw(SQLException, RuntimeException) { - OSL_TRACE("OConnection::getMysqlVersion"); MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -591,7 +557,7 @@ sal_Int32 OConnection::getMysqlVersion() // TODO: Not used //sal_Int32 OConnection::sdbcColumnType(rtl::OUString typeName) //{ -// OSL_TRACE("OConnection::sdbcColumnType"); +// SAL_WARNx("mysqlc", "OConnection::sdbcColumnType"); // int i = 0; // while (mysqlc_types[i].typeName) { // if (rtl::OUString::createFromAscii(mysqlc_types[i].typeName).equals( diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx index f3b2029d656f..bc07e9abf692 100644 --- a/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/mysqlc/source/mysqlc_databasemetadata.cxx @@ -82,7 +82,6 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection& _rCon) ,meta(_rCon.getConnectionSettings().cppConnection->getMetaData()) ,identifier_quote_string_set(false) { - OSL_TRACE("ODatabaseMetaData::ODatabaseMetaData"); osl_atomic_increment(&m_refCount); m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable()); osl_atomic_decrement(&m_refCount); @@ -90,12 +89,10 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection& _rCon) ODatabaseMetaData::~ODatabaseMetaData() { - OSL_TRACE("ODatabaseMetaData::~ODatabaseMetaData"); } rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, const sql::SQLString& (sql::DatabaseMetaData::*Method)() ) { - OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName); rtl::OUString stringMetaData; try { stringMetaData = mysqlc_sdbc_driver::convert((meta->*Method)(), m_rConnection.getConnectionEncoding()); @@ -111,7 +108,6 @@ rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodN rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, sql::SQLString (sql::DatabaseMetaData::*Method)() ) { - OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName); rtl::OUString stringMetaData; try { stringMetaData = mysqlc_sdbc_driver::convert((meta->*Method)(), m_rConnection.getConnectionEncoding()); @@ -127,7 +123,6 @@ rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodN sal_Int32 ODatabaseMetaData::impl_getInt32MetaData(const sal_Char* _methodName, unsigned int (sql::DatabaseMetaData::*Method)() ) { - OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName); sal_Int32 int32MetaData(0); try { int32MetaData = (meta->*Method)(); @@ -143,7 +138,6 @@ sal_Int32 ODatabaseMetaData::impl_getInt32MetaData(const sal_Char* _methodName, bool ODatabaseMetaData::impl_getBoolMetaData(const sal_Char* _methodName, bool (sql::DatabaseMetaData::*Method)() ) { - OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName); bool boolMetaData(false); try { boolMetaData = (meta->*Method)(); @@ -159,7 +153,6 @@ bool ODatabaseMetaData::impl_getBoolMetaData(const sal_Char* _methodName, bool ( bool ODatabaseMetaData::impl_getBoolMetaData(const sal_Char* _methodName, bool (sql::DatabaseMetaData::*Method)(int), sal_Int32 _arg ) { - OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName); bool boolMetaData(false); try { boolMetaData = (meta->*Method)( _arg ); @@ -581,7 +574,6 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames() sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert(sal_Int32 /* fromType */, sal_Int32 /* toType */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::supportsConvert"); try { /* ToDo -> use supportsConvert( fromType, toType) */ return meta->supportsConvert(); @@ -754,7 +746,6 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL() rtl::OUString SAL_CALL ODatabaseMetaData::getURL() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getURL"); return m_rConnection.getConnectionSettings().connectionURL; } @@ -767,7 +758,6 @@ rtl::OUString SAL_CALL ODatabaseMetaData::getUserName() rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getDriverName"); rtl::OUString aValue( "MySQL Connector/OO.org" ); return aValue; } @@ -775,7 +765,6 @@ rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName() rtl::OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getDriverVersion"); return rtl::OUString( "0.9.2" ); } @@ -806,14 +795,12 @@ rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm() sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion() throw(RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getDriverMajorVersion"); return MARIADBC_VERSION_MAJOR; } sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getDefaultTransactionIsolation"); try { switch (meta->getDefaultTransactionIsolation()) { case sql::TRANSACTION_SERIALIZABLE: return TransactionIsolation::SERIALIZABLE; @@ -834,7 +821,6 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation() sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion() throw(RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getDriverMinorVersion"); return MARIADBC_VERSION_MINOR; } @@ -937,7 +923,6 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType(sal_Int32 setType) sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency(sal_Int32 setType, sal_Int32 concurrency) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::supportsResultSetConcurrency"); /* TODO: Check this out */ try { return meta->supportsResultSetConcurrency(setType, concurrency==css::sdbc::TransactionIsolation::READ_COMMITTED? @@ -1017,7 +1002,6 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates() Reference< XConnection > SAL_CALL ODatabaseMetaData::getConnection() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getConnection"); return &m_rConnection; } @@ -1031,7 +1015,6 @@ Reference< XConnection > SAL_CALL ODatabaseMetaData::getConnection() Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getTableTypes"); const char * table_types[] = {"TABLE", "VIEW"}; sal_Int32 requiredVersion[] = {0, 50000}; @@ -1053,7 +1036,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes() Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getTypeInfo"); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1093,8 +1075,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo() Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getCatalogs"); - Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1125,8 +1105,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs() Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getSchemas"); - Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1168,7 +1146,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( const rtl::OUString& columnNamePattern) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getColumnPrivileges"); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1208,7 +1185,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( const rtl::OUString& columnNamePattern) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getColumns"); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; std::string cat(catalog.hasValue()? rtl::OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), @@ -1254,7 +1230,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( const Sequence< rtl::OUString >& types ) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getTables"); sal_Int32 nLength = types.getLength(); Reference< XResultSet > xResultSet(getOwnConnection(). @@ -1313,7 +1288,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns( const rtl::OUString& /* columnNamePattern */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getProcedureColumns"); // Currently there is no information available return nullptr; } @@ -1324,7 +1298,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( const rtl::OUString& procedureNamePattern) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getProcedures"); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1366,7 +1339,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns( const rtl::OUString& /* table */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getVersionColumns"); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; lcl_setRows_throw(xResultSet, 16,rRows); @@ -1379,7 +1351,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( const rtl::OUString& table ) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getExportedKeys"); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; std::string cat(catalog.hasValue()? rtl::OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), @@ -1416,8 +1387,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( const rtl::OUString& table) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getImportedKeys"); - Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1455,7 +1424,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( const rtl::OUString& table) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getPrimaryKeys"); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1495,7 +1463,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( sal_Bool approximate) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getIndexInfo"); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1535,7 +1502,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( sal_Bool nullable) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getBestRowIdentifier"); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1573,7 +1539,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( const rtl::OUString& tableNamePattern) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getTablePrivileges"); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1635,7 +1600,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( const rtl::OUString& foreignTable) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getCrossReference"); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); std::vector< std::vector< Any > > rRows; @@ -1677,7 +1641,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Sequence< sal_Int32 >& /* types */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("ODatabaseMetaData::getUDTs"); mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getUDTs", *this); return nullptr; } diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx index 0c0f44ed0281..100a6c591855 100644 --- a/mysqlc/source/mysqlc_driver.cxx +++ b/mysqlc/source/mysqlc_driver.cxx @@ -49,13 +49,11 @@ MysqlCDriver::MysqlCDriver(const Reference< XMultiServiceFactory >& _rxFactory) ,m_bAttemptedLoadCppConn( false ) #endif { - OSL_TRACE("MysqlCDriver::MysqlCDriver"); cppDriver = nullptr; } void MysqlCDriver::disposing() { - OSL_TRACE("MysqlCDriver::disposing"); ::osl::MutexGuard aGuard(m_aMutex); // when driver will be destroied so all our connections have to be destroied as well @@ -75,14 +73,12 @@ void MysqlCDriver::disposing() rtl::OUString MysqlCDriver::getImplementationName_Static() throw(RuntimeException) { - OSL_TRACE("MysqlCDriver::getImplementationName_Static"); return rtl::OUString( "com.sun.star.comp.sdbc.mysqlc.MysqlCDriver" ); } Sequence< rtl::OUString > MysqlCDriver::getSupportedServiceNames_Static() throw(RuntimeException) { - OSL_TRACE("MysqlCDriver::getSupportedServiceNames_Static"); // which service is supported // for more information @see com.sun.star.sdbc.Driver Sequence< rtl::OUString > aSNS(1); @@ -93,7 +89,6 @@ Sequence< rtl::OUString > MysqlCDriver::getSupportedServiceNames_Static() rtl::OUString SAL_CALL MysqlCDriver::getImplementationName() throw(RuntimeException, std::exception) { - OSL_TRACE("MysqlCDriver::getImplementationName"); return getImplementationName_Static(); } @@ -106,7 +101,6 @@ sal_Bool SAL_CALL MysqlCDriver::supportsService(const rtl::OUString& _rServiceNa Sequence< rtl::OUString > SAL_CALL MysqlCDriver::getSupportedServiceNames() throw(RuntimeException, std::exception) { - OSL_TRACE("MysqlCDriver::getSupportedServiceNames"); return getSupportedServiceNames_Static(); } @@ -196,7 +190,6 @@ Reference< XConnection > SAL_CALL MysqlCDriver::connect(const rtl::OUString& url { ::osl::MutexGuard aGuard( m_aMutex ); - OSL_TRACE("MysqlCDriver::connect"); if (!acceptsURL(url)) { return nullptr; } @@ -227,14 +220,12 @@ Reference< XConnection > SAL_CALL MysqlCDriver::connect(const rtl::OUString& url sal_Bool SAL_CALL MysqlCDriver::acceptsURL(const rtl::OUString& url) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("MysqlCDriver::acceptsURL"); return url.startsWith("sdbc:mysqlc:"); } Sequence< DriverPropertyInfo > SAL_CALL MysqlCDriver::getPropertyInfo(const rtl::OUString& url, const Sequence< PropertyValue >& /* info */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("MysqlCDriver::getPropertyInfo"); if (acceptsURL(url)) { ::std::vector< DriverPropertyInfo > aDriverInfo; @@ -261,14 +252,12 @@ Sequence< DriverPropertyInfo > SAL_CALL MysqlCDriver::getPropertyInfo(const rtl: sal_Int32 SAL_CALL MysqlCDriver::getMajorVersion() throw(RuntimeException, std::exception) { - OSL_TRACE("MysqlCDriver::getMajorVersion"); return MARIADBC_VERSION_MAJOR; } sal_Int32 SAL_CALL MysqlCDriver::getMinorVersion() throw(RuntimeException, std::exception) { - OSL_TRACE("MysqlCDriver::getMinorVersion"); return MARIADBC_VERSION_MINOR; } diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx index df384d81a2f8..f3563ed16d66 100644 --- a/mysqlc/source/mysqlc_preparedstatement.cxx +++ b/mysqlc/source/mysqlc_preparedstatement.cxx @@ -79,7 +79,6 @@ sal_Bool OPreparedStatement::supportsService(rtl::OUString const & ServiceName) OPreparedStatement::OPreparedStatement(OConnection* _pConnection, sql::PreparedStatement * _cppPrepStmt) :OCommonStatement(_pConnection, _cppPrepStmt) { - OSL_TRACE("OPreparedStatement::OPreparedStatement"); m_pConnection = _pConnection; m_pConnection->acquire(); @@ -92,27 +91,23 @@ OPreparedStatement::OPreparedStatement(OConnection* _pConnection, sql::PreparedS OPreparedStatement::~OPreparedStatement() { - OSL_TRACE("OPreparedStatement::~OPreparedStatement"); } void SAL_CALL OPreparedStatement::acquire() throw() { - OSL_TRACE("OPreparedStatement::acquire"); OCommonStatement::acquire(); } void SAL_CALL OPreparedStatement::release() throw() { - OSL_TRACE("OPreparedStatement::release"); OCommonStatement::release(); } Any SAL_CALL OPreparedStatement::queryInterface(const Type & rType) throw(RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::queryInterface"); Any aRet = OCommonStatement::queryInterface(rType); if (!aRet.hasValue()) { aRet = OPreparedStatement_BASE::queryInterface(rType); @@ -123,14 +118,12 @@ Any SAL_CALL OPreparedStatement::queryInterface(const Type & rType) Sequence< Type > SAL_CALL OPreparedStatement::getTypes() throw(RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::getTypes"); return concatSequences(OPreparedStatement_BASE::getTypes(), OCommonStatement::getTypes()); } Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::getMetaData"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); @@ -152,8 +145,6 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData() void SAL_CALL OPreparedStatement::close() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::close"); - MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); @@ -172,7 +163,6 @@ void SAL_CALL OPreparedStatement::close() sal_Bool SAL_CALL OPreparedStatement::execute() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::execute"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); @@ -188,7 +178,6 @@ sal_Bool SAL_CALL OPreparedStatement::execute() sal_Int32 SAL_CALL OPreparedStatement::executeUpdate() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::executeUpdate"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); @@ -204,7 +193,6 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate() void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const rtl::OUString& x) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setString"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); @@ -222,7 +210,6 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const rtl::OUSt Reference< XConnection > SAL_CALL OPreparedStatement::getConnection() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::getConnection"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); @@ -232,7 +219,6 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection() Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::executeQuery"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); @@ -249,7 +235,6 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery() void SAL_CALL OPreparedStatement::setBoolean(sal_Int32 parameter, sal_Bool x) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setBoolean"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); @@ -266,7 +251,6 @@ void SAL_CALL OPreparedStatement::setBoolean(sal_Int32 parameter, sal_Bool x) void SAL_CALL OPreparedStatement::setByte(sal_Int32 parameter, sal_Int8 x) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setByte"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); @@ -283,7 +267,6 @@ void SAL_CALL OPreparedStatement::setByte(sal_Int32 parameter, sal_Int8 x) void SAL_CALL OPreparedStatement::setDate(sal_Int32 parameter, const Date& aData) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setDate"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); @@ -308,7 +291,6 @@ void SAL_CALL OPreparedStatement::setDate(sal_Int32 parameter, const Date& aData void SAL_CALL OPreparedStatement::setTime(sal_Int32 parameter, const Time& aVal) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setTime"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); @@ -333,7 +315,6 @@ void SAL_CALL OPreparedStatement::setTime(sal_Int32 parameter, const Time& aVal) void SAL_CALL OPreparedStatement::setTimestamp(sal_Int32 parameter, const DateTime& aVal) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setTimestamp"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); @@ -366,7 +347,6 @@ void SAL_CALL OPreparedStatement::setTimestamp(sal_Int32 parameter, const DateTi void SAL_CALL OPreparedStatement::setDouble(sal_Int32 parameter, double x) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setDouble"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); @@ -383,7 +363,6 @@ void SAL_CALL OPreparedStatement::setDouble(sal_Int32 parameter, double x) void SAL_CALL OPreparedStatement::setFloat(sal_Int32 parameter, float x) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setFloat"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); @@ -400,7 +379,6 @@ void SAL_CALL OPreparedStatement::setFloat(sal_Int32 parameter, float x) void SAL_CALL OPreparedStatement::setInt(sal_Int32 parameter, sal_Int32 x) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setInt"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); @@ -417,7 +395,6 @@ void SAL_CALL OPreparedStatement::setInt(sal_Int32 parameter, sal_Int32 x) void SAL_CALL OPreparedStatement::setLong(sal_Int32 parameter, sal_Int64 aVal) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setLong"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); @@ -434,7 +411,6 @@ void SAL_CALL OPreparedStatement::setLong(sal_Int32 parameter, sal_Int64 aVal) void SAL_CALL OPreparedStatement::setNull(sal_Int32 parameter, sal_Int32 sqlType) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setNull"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); @@ -451,7 +427,6 @@ void SAL_CALL OPreparedStatement::setNull(sal_Int32 parameter, sal_Int32 sqlType void SAL_CALL OPreparedStatement::setClob(sal_Int32 parameter, const Reference< XClob >& /* x */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setClob"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); @@ -462,7 +437,6 @@ void SAL_CALL OPreparedStatement::setClob(sal_Int32 parameter, const Reference< void SAL_CALL OPreparedStatement::setBlob(sal_Int32 parameter, const Reference< XBlob >& /* x */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setBlob"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); @@ -473,7 +447,6 @@ void SAL_CALL OPreparedStatement::setBlob(sal_Int32 parameter, const Reference< void SAL_CALL OPreparedStatement::setArray(sal_Int32 parameter, const Reference< XArray >& /* x */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setArray"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); @@ -484,7 +457,6 @@ void SAL_CALL OPreparedStatement::setArray(sal_Int32 parameter, const Reference< void SAL_CALL OPreparedStatement::setRef(sal_Int32 parameter, const Reference< XRef >& /* x */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setRef"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); @@ -524,7 +496,6 @@ namespace void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 _parameterIndex, const Any& _value, sal_Int32 _targetSqlType, sal_Int32 /* scale */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setObjectWithInfo"); checkDisposed(OPreparedStatement::rBHelper.bDisposed); MutexGuard aGuard(m_aMutex); checkParameterIndex( _parameterIndex ); @@ -658,7 +629,6 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 _parameterIndex, c void SAL_CALL OPreparedStatement::setObjectNull(sal_Int32 parameter, sal_Int32 /* sqlType */, const rtl::OUString& /* typeName */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setObjectNull"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); @@ -669,7 +639,6 @@ void SAL_CALL OPreparedStatement::setObjectNull(sal_Int32 parameter, sal_Int32 / void SAL_CALL OPreparedStatement::setObject(sal_Int32 parameter, const Any& /* x */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setObject"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); @@ -680,7 +649,6 @@ void SAL_CALL OPreparedStatement::setObject(sal_Int32 parameter, const Any& /* x void SAL_CALL OPreparedStatement::setShort(sal_Int32 parameter, sal_Int16 x) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setShort"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); @@ -697,7 +665,6 @@ void SAL_CALL OPreparedStatement::setShort(sal_Int32 parameter, sal_Int16 x) void SAL_CALL OPreparedStatement::setBytes(sal_Int32 parameter, const Sequence< sal_Int8 >& x) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setBytes"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); @@ -717,7 +684,6 @@ void SAL_CALL OPreparedStatement::setCharacterStream(sal_Int32 parameter, sal_Int32 /* length */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setCharacterStream"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); @@ -730,7 +696,6 @@ void SAL_CALL OPreparedStatement::setBinaryStream(sal_Int32 parameter, sal_Int32 /* length */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::setBinaryStream"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); @@ -741,7 +706,6 @@ void SAL_CALL OPreparedStatement::setBinaryStream(sal_Int32 parameter, void SAL_CALL OPreparedStatement::clearParameters() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::clearParameters"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); @@ -757,21 +721,18 @@ void SAL_CALL OPreparedStatement::clearParameters() void SAL_CALL OPreparedStatement::clearBatch() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::clearBatch"); mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearBatch", *this); } void SAL_CALL OPreparedStatement::addBatch() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::addBatch"); mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::addBatch", *this); } Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OPreparedStatement::executeBatch"); Sequence< sal_Int32 > aRet= Sequence< sal_Int32 > (); return aRet; } @@ -779,7 +740,6 @@ Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch() void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw(Exception, std::exception) { - OSL_TRACE("OPreparedStatement::setFastPropertyValue_NoBroadcast"); switch(nHandle) { case PROPERTY_ID_RESULTSETCONCURRENCY: @@ -798,7 +758,6 @@ void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,cons void OPreparedStatement::checkParameterIndex(sal_Int32 column) { - OSL_TRACE("OPreparedStatement::checkColumnIndex"); if (column < 1 || column > (sal_Int32) m_paramCount) { rtl::OUString buf( "Parameter index out of range" ); throw SQLException(buf, *this, rtl::OUString(), 1, Any ()); diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx index 1d8cfc8128fc..6c9f5209d6e9 100644 --- a/mysqlc/source/mysqlc_resultset.cxx +++ b/mysqlc/source/mysqlc_resultset.cxx @@ -52,14 +52,12 @@ using ::osl::MutexGuard; rtl::OUString SAL_CALL OResultSet::getImplementationName() throw (RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getImplementationName"); return rtl::OUString( "com.sun.star.sdbcx.mysqlc.ResultSet" ); } Sequence< rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames() throw(RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getSupportedServiceNames"); Sequence< rtl::OUString > aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; aSupported[1] = "com.sun.star.sdbcx.ResultSet"; @@ -81,7 +79,6 @@ OResultSet::OResultSet(OCommonStatement * pStmt, sql::ResultSet * result, rtl_Te ,fieldCount( 0 ) ,m_encoding( _encoding ) { - OSL_TRACE("OResultSet::OResultSet"); try { sql::ResultSetMetaData * rs_meta = m_result->getMetaData(); fieldCount = rs_meta->getColumnCount(); @@ -92,12 +89,10 @@ OResultSet::OResultSet(OCommonStatement * pStmt, sql::ResultSet * result, rtl_Te OResultSet::~OResultSet() { - OSL_TRACE("OResultSet::~OResultSet"); } void OResultSet::disposing() { - OSL_TRACE("OResultSet::disposing"); OPropertySetHelper::disposing(); MutexGuard aGuard(m_aMutex); @@ -109,7 +104,6 @@ void OResultSet::disposing() Any SAL_CALL OResultSet::queryInterface(const Type & rType) throw(RuntimeException, std::exception) { - OSL_TRACE("OResultSet::queryInterface"); Any aRet = OPropertySetHelper::queryInterface(rType); if (!aRet.hasValue()) { aRet = OResultSet_BASE::queryInterface(rType); @@ -120,7 +114,6 @@ Any SAL_CALL OResultSet::queryInterface(const Type & rType) Sequence< Type > SAL_CALL OResultSet::getTypes() throw(RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getTypes"); OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(), cppu::UnoType<XFastPropertySet>::get(), cppu::UnoType<XPropertySet>::get()); @@ -131,7 +124,6 @@ Sequence< Type > SAL_CALL OResultSet::getTypes() sal_Int32 SAL_CALL OResultSet::findColumn(const rtl::OUString& columnName) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::findColumn"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -159,7 +151,6 @@ sal_Int32 SAL_CALL OResultSet::findColumn(const rtl::OUString& columnName) Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getBinaryStream"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -171,7 +162,6 @@ Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream(sal_Int32 column) Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getCharacterStream"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -183,7 +173,6 @@ Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream(sal_Int32 colu sal_Bool SAL_CALL OResultSet::getBoolean(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getBoolean"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -199,7 +188,6 @@ sal_Bool SAL_CALL OResultSet::getBoolean(sal_Int32 column) sal_Int8 SAL_CALL OResultSet::getByte(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getByte"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -215,8 +203,6 @@ sal_Int8 SAL_CALL OResultSet::getByte(sal_Int32 column) Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getBytes"); - checkDisposed(OResultSet_BASE::rBHelper.bDisposed); MutexGuard aGuard(m_aMutex); @@ -231,7 +217,6 @@ Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes(sal_Int32 column) Date SAL_CALL OResultSet::getDate(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getDate"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -267,7 +252,6 @@ Date SAL_CALL OResultSet::getDate(sal_Int32 column) double SAL_CALL OResultSet::getDouble(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getDouble"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -283,7 +267,6 @@ double SAL_CALL OResultSet::getDouble(sal_Int32 column) float SAL_CALL OResultSet::getFloat(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getFloat"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -299,7 +282,6 @@ float SAL_CALL OResultSet::getFloat(sal_Int32 column) sal_Int32 SAL_CALL OResultSet::getInt(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getInt"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -315,7 +297,6 @@ sal_Int32 SAL_CALL OResultSet::getInt(sal_Int32 column) sal_Int32 SAL_CALL OResultSet::getRow() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getRow"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -330,7 +311,6 @@ sal_Int32 SAL_CALL OResultSet::getRow() sal_Int64 SAL_CALL OResultSet::getLong(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getLong"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -346,7 +326,6 @@ sal_Int64 SAL_CALL OResultSet::getLong(sal_Int32 column) Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getMetaData"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); try { @@ -364,7 +343,6 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData() Reference< XArray > SAL_CALL OResultSet::getArray(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getArray"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -376,7 +354,6 @@ Reference< XArray > SAL_CALL OResultSet::getArray(sal_Int32 column) Reference< XClob > SAL_CALL OResultSet::getClob(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getClob"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -388,7 +365,6 @@ Reference< XClob > SAL_CALL OResultSet::getClob(sal_Int32 column) Reference< XBlob > SAL_CALL OResultSet::getBlob(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getBlob"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -400,7 +376,6 @@ Reference< XBlob > SAL_CALL OResultSet::getBlob(sal_Int32 column) Reference< XRef > SAL_CALL OResultSet::getRef(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getRef"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -412,7 +387,6 @@ Reference< XRef > SAL_CALL OResultSet::getRef(sal_Int32 column) Any SAL_CALL OResultSet::getObject(sal_Int32 column, const Reference< XNameAccess >& /* typeMap */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getObject"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -426,7 +400,6 @@ Any SAL_CALL OResultSet::getObject(sal_Int32 column, const Reference< XNameAcces sal_Int16 SAL_CALL OResultSet::getShort(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getShort"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -441,7 +414,6 @@ sal_Int16 SAL_CALL OResultSet::getShort(sal_Int32 column) rtl::OUString SAL_CALL OResultSet::getString(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getString"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -463,7 +435,6 @@ rtl::OUString SAL_CALL OResultSet::getString(sal_Int32 column) Time SAL_CALL OResultSet::getTime(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getTime"); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); MutexGuard aGuard(m_aMutex); @@ -497,7 +468,6 @@ Time SAL_CALL OResultSet::getTime(sal_Int32 column) DateTime SAL_CALL OResultSet::getTimestamp(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getTimestamp"); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); MutexGuard aGuard(m_aMutex); @@ -518,7 +488,6 @@ DateTime SAL_CALL OResultSet::getTimestamp(sal_Int32 column) sal_Bool SAL_CALL OResultSet::isBeforeFirst() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::isBeforeFirst"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -533,7 +502,6 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst() sal_Bool SAL_CALL OResultSet::isAfterLast() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::isAfterLast"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -548,7 +516,6 @@ sal_Bool SAL_CALL OResultSet::isAfterLast() sal_Bool SAL_CALL OResultSet::isFirst() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::isFirst"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -563,7 +530,6 @@ sal_Bool SAL_CALL OResultSet::isFirst() sal_Bool SAL_CALL OResultSet::isLast() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::isLast"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -578,7 +544,6 @@ sal_Bool SAL_CALL OResultSet::isLast() void SAL_CALL OResultSet::beforeFirst() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::beforeFirst"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -592,7 +557,6 @@ void SAL_CALL OResultSet::beforeFirst() void SAL_CALL OResultSet::afterLast() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::afterLast"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -605,7 +569,6 @@ void SAL_CALL OResultSet::afterLast() void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::close"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -620,7 +583,6 @@ void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException, std::exc sal_Bool SAL_CALL OResultSet::first() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::first"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -635,7 +597,6 @@ sal_Bool SAL_CALL OResultSet::first() throw(SQLException, RuntimeException, std: sal_Bool SAL_CALL OResultSet::last() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::last"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -650,7 +611,6 @@ sal_Bool SAL_CALL OResultSet::last() sal_Bool SAL_CALL OResultSet::absolute(sal_Int32 row) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::absolute"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -665,7 +625,6 @@ sal_Bool SAL_CALL OResultSet::absolute(sal_Int32 row) sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::relative"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -680,7 +639,6 @@ sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row) sal_Bool SAL_CALL OResultSet::previous() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::previous"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -695,7 +653,6 @@ sal_Bool SAL_CALL OResultSet::previous() Reference< XInterface > SAL_CALL OResultSet::getStatement() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getStatement"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -705,7 +662,6 @@ Reference< XInterface > SAL_CALL OResultSet::getStatement() sal_Bool SAL_CALL OResultSet::rowDeleted() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::rowDeleted"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -715,7 +671,6 @@ sal_Bool SAL_CALL OResultSet::rowDeleted() sal_Bool SAL_CALL OResultSet::rowInserted() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::rowInserted"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -725,7 +680,6 @@ sal_Bool SAL_CALL OResultSet::rowInserted() sal_Bool SAL_CALL OResultSet::rowUpdated() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::rowUpdated"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -735,7 +689,6 @@ sal_Bool SAL_CALL OResultSet::rowUpdated() sal_Bool SAL_CALL OResultSet::next() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::next"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -750,7 +703,6 @@ sal_Bool SAL_CALL OResultSet::next() sal_Bool SAL_CALL OResultSet::wasNull() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::wasNull"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -765,7 +717,6 @@ sal_Bool SAL_CALL OResultSet::wasNull() void SAL_CALL OResultSet::cancel() throw(RuntimeException, std::exception) { - OSL_TRACE("OResultSet::cancel"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); } @@ -773,13 +724,11 @@ void SAL_CALL OResultSet::cancel() void SAL_CALL OResultSet::clearWarnings() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::clearWarnings"); } Any SAL_CALL OResultSet::getWarnings() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getWarnings"); Any aRet= Any(); return aRet; } @@ -787,7 +736,6 @@ Any SAL_CALL OResultSet::getWarnings() void SAL_CALL OResultSet::insertRow() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::insertRow"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); // you only have to implement this if you want to insert new rows @@ -797,7 +745,6 @@ void SAL_CALL OResultSet::insertRow() void SAL_CALL OResultSet::updateRow() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::updateRow"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -808,7 +755,6 @@ void SAL_CALL OResultSet::updateRow() void SAL_CALL OResultSet::deleteRow() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::deleteRow"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::deleteRow", *this); @@ -817,7 +763,6 @@ void SAL_CALL OResultSet::deleteRow() void SAL_CALL OResultSet::cancelRowUpdates() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::cancelRowUpdates"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::cancelRowUpdates", *this); @@ -826,7 +771,6 @@ void SAL_CALL OResultSet::cancelRowUpdates() void SAL_CALL OResultSet::moveToInsertRow() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::moveToInsertRow"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -837,7 +781,6 @@ void SAL_CALL OResultSet::moveToInsertRow() void SAL_CALL OResultSet::moveToCurrentRow() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::moveToCurrentRow"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); } @@ -845,7 +788,6 @@ void SAL_CALL OResultSet::moveToCurrentRow() void SAL_CALL OResultSet::updateNull(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::updateNull"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -855,7 +797,6 @@ void SAL_CALL OResultSet::updateNull(sal_Int32 column) void SAL_CALL OResultSet::updateBoolean(sal_Int32 column, sal_Bool /* x */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::updateBoolean"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -865,7 +806,6 @@ void SAL_CALL OResultSet::updateBoolean(sal_Int32 column, sal_Bool /* x */) void SAL_CALL OResultSet::updateByte(sal_Int32 column, sal_Int8 /* x */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::updateByte"); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); MutexGuard aGuard(m_aMutex); checkColumnIndex(column); @@ -875,7 +815,6 @@ void SAL_CALL OResultSet::updateByte(sal_Int32 column, sal_Int8 /* x */) void SAL_CALL OResultSet::updateShort(sal_Int32 column, sal_Int16 /* x */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::updateShort"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -885,7 +824,6 @@ void SAL_CALL OResultSet::updateShort(sal_Int32 column, sal_Int16 /* x */) void SAL_CALL OResultSet::updateInt(sal_Int32 column, sal_Int32 /* x */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::updateInt"); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); MutexGuard aGuard(m_aMutex); checkColumnIndex(column); @@ -895,7 +833,6 @@ void SAL_CALL OResultSet::updateInt(sal_Int32 column, sal_Int32 /* x */) void SAL_CALL OResultSet::updateLong(sal_Int32 column, sal_Int64 /* x */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::updateLong"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -905,7 +842,6 @@ void SAL_CALL OResultSet::updateLong(sal_Int32 column, sal_Int64 /* x */) void SAL_CALL OResultSet::updateFloat(sal_Int32 column, float /* x */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::updateFloat"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -915,7 +851,6 @@ void SAL_CALL OResultSet::updateFloat(sal_Int32 column, float /* x */) void SAL_CALL OResultSet::updateDouble(sal_Int32 column, double /* x */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::updateDouble"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -925,7 +860,6 @@ void SAL_CALL OResultSet::updateDouble(sal_Int32 column, double /* x */) void SAL_CALL OResultSet::updateString(sal_Int32 column, const rtl::OUString& /* x */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::updateString"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -935,7 +869,6 @@ void SAL_CALL OResultSet::updateString(sal_Int32 column, const rtl::OUString& /* void SAL_CALL OResultSet::updateBytes(sal_Int32 column, const Sequence< sal_Int8 >& /* x */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::updateBytes"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -945,7 +878,6 @@ void SAL_CALL OResultSet::updateBytes(sal_Int32 column, const Sequence< sal_Int8 void SAL_CALL OResultSet::updateDate(sal_Int32 column, const Date& /* x */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::updateDate"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -955,7 +887,6 @@ void SAL_CALL OResultSet::updateDate(sal_Int32 column, const Date& /* x */) void SAL_CALL OResultSet::updateTime(sal_Int32 column, const Time& /* x */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::updateTime"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -965,7 +896,6 @@ void SAL_CALL OResultSet::updateTime(sal_Int32 column, const Time& /* x */) void SAL_CALL OResultSet::updateTimestamp(sal_Int32 column, const DateTime& /* x */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::updateTimestamp"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -976,7 +906,6 @@ void SAL_CALL OResultSet::updateBinaryStream(sal_Int32 column, const Reference< sal_Int32 /* length */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::updateBinaryStream"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -987,7 +916,6 @@ void SAL_CALL OResultSet::updateCharacterStream(sal_Int32 column, const Referenc sal_Int32 /* length */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::updateCharacterStream"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -997,7 +925,6 @@ void SAL_CALL OResultSet::updateCharacterStream(sal_Int32 column, const Referenc void SAL_CALL OResultSet::refreshRow() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::refreshRow"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::refreshRow", *this); @@ -1006,7 +933,6 @@ void SAL_CALL OResultSet::refreshRow() void SAL_CALL OResultSet::updateObject(sal_Int32 column, const Any& /* x */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::updateObject"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -1016,7 +942,6 @@ void SAL_CALL OResultSet::updateObject(sal_Int32 column, const Any& /* x */) void SAL_CALL OResultSet::updateNumericObject(sal_Int32 column, const Any& /* x */, sal_Int32 /* scale */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::updateNumericObject"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkColumnIndex(column); @@ -1027,7 +952,6 @@ void SAL_CALL OResultSet::updateNumericObject(sal_Int32 column, const Any& /* x Any SAL_CALL OResultSet::getBookmark() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getBookmark"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); Any aRet = Any(); @@ -1041,7 +965,6 @@ Any SAL_CALL OResultSet::getBookmark() sal_Bool SAL_CALL OResultSet::moveToBookmark(const Any& /* bookmark */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::moveToBookmark"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1051,7 +974,6 @@ sal_Bool SAL_CALL OResultSet::moveToBookmark(const Any& /* bookmark */) sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark(const Any& /* bookmark */, sal_Int32 /* rows */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::moveRelativeToBookmark"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1062,7 +984,6 @@ sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark(const Any& /* bookmark */, sal_Int32 SAL_CALL OResultSet::compareBookmarks(const Any& /* n1 */, const Any& /* n2 */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::compareBookmarks"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1074,14 +995,12 @@ sal_Int32 SAL_CALL OResultSet::compareBookmarks(const Any& /* n1 */, const Any& sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::hasOrderedBookmarks"); return false; } sal_Int32 SAL_CALL OResultSet::hashBookmark(const Any& /* bookmark */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::hashBookmark"); mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::hashBookmark", *this); return 0; } @@ -1090,7 +1009,6 @@ sal_Int32 SAL_CALL OResultSet::hashBookmark(const Any& /* bookmark */) Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows(const Sequence< Any >& /* rows */) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSet::deleteRows"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); Sequence< sal_Int32 > aRet = Sequence< sal_Int32 >(); @@ -1101,7 +1019,6 @@ Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows(const Sequence< Any >& /* IPropertyArrayHelper * OResultSet::createArrayHelper() const { - OSL_TRACE("OResultSet::createArrayHelper"); Sequence< Property > aProps(5); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; @@ -1119,7 +1036,6 @@ IPropertyArrayHelper * OResultSet::createArrayHelper() const IPropertyArrayHelper & OResultSet::getInfoHelper() { - OSL_TRACE("OResultSet::getInfoHelper"); return *getArrayHelper(); } @@ -1129,7 +1045,6 @@ sal_Bool OResultSet::convertFastPropertyValue(Any & /* rConvertedValue */, const Any& /* rValue */) throw (css::lang::IllegalArgumentException) { - OSL_TRACE("OResultSet::convertFastPropertyValue"); switch (nHandle) { case PROPERTY_ID_ISBOOKMARKABLE: case PROPERTY_ID_CURSORNAME: @@ -1147,7 +1062,6 @@ sal_Bool OResultSet::convertFastPropertyValue(Any & /* rConvertedValue */, void OResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& /* rValue */) throw (Exception, std::exception) { - OSL_TRACE("OResultSet::setFastPropertyValue_NoBroadcast"); switch (nHandle) { case PROPERTY_ID_ISBOOKMARKABLE: case PROPERTY_ID_CURSORNAME: @@ -1165,7 +1079,6 @@ void OResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& void OResultSet::getFastPropertyValue(Any& _rValue, sal_Int32 nHandle) const { - OSL_TRACE("OResultSet::getFastPropertyValue"); switch (nHandle) { case PROPERTY_ID_ISBOOKMARKABLE: _rValue <<= false; @@ -1193,27 +1106,23 @@ void OResultSet::getFastPropertyValue(Any& _rValue, sal_Int32 nHandle) const void SAL_CALL OResultSet::acquire() throw() { - OSL_TRACE("OResultSet::acquire"); OResultSet_BASE::acquire(); } void SAL_CALL OResultSet::release() throw() { - OSL_TRACE("OResultSet::release"); OResultSet_BASE::release(); } css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) { - OSL_TRACE("OResultSet::getPropertySetInfo"); return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } void OResultSet::checkColumnIndex(sal_Int32 index) throw (SQLException, RuntimeException) { - OSL_TRACE("OResultSet::checkColumnIndex"); if ((index < 1 || index > (int) fieldCount)) { /* static object for efficiency or thread safety is a problem ? */ rtl::OUString buf( "index out of range" ); diff --git a/mysqlc/source/mysqlc_resultsetmetadata.cxx b/mysqlc/source/mysqlc_resultsetmetadata.cxx index dba7d33d164f..d5089da2075d 100644 --- a/mysqlc/source/mysqlc_resultsetmetadata.cxx +++ b/mysqlc/source/mysqlc_resultsetmetadata.cxx @@ -36,8 +36,6 @@ OResultSetMetaData::~OResultSetMetaData() sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSetMetaData::getColumnDisplaySize"); - try { meta->getColumnDisplaySize(column); } catch (const sql::MethodNotImplementedException &) { @@ -51,7 +49,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize(sal_Int32 column) sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSetMetaData::getColumnType"); checkColumnIndex(column); try { @@ -72,7 +69,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column) sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSetMetaData::getColumnCount"); try { return meta->getColumnCount(); } catch (const sql::MethodNotImplementedException &) { @@ -86,7 +82,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount() sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSetMetaData::isCaseSensitive"); checkColumnIndex(column); try { @@ -102,7 +97,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column) rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSetMetaData::getSchemaName"); checkColumnIndex(column); try { @@ -118,7 +112,6 @@ rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column) rtl::OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSetMetaData::getColumnName"); checkColumnIndex(column); try { @@ -134,7 +127,6 @@ rtl::OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column) rtl::OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSetMetaData::getTableName"); checkColumnIndex(column); try { @@ -150,7 +142,6 @@ rtl::OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column) rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSetMetaData::getCatalogName"); checkColumnIndex(column); try { @@ -166,7 +157,6 @@ rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column) rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSetMetaData::getColumnTypeName"); checkColumnIndex(column); try { @@ -182,7 +172,6 @@ rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column) rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSetMetaData::getColumnLabel"); checkColumnIndex(column); try { @@ -198,7 +187,6 @@ rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column) rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSetMetaData::getColumnServiceName"); checkColumnIndex(column); rtl::OUString aRet = rtl::OUString(); @@ -208,7 +196,6 @@ rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column sal_Bool SAL_CALL OResultSetMetaData::isCurrency(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSetMetaData::isCurrency"); checkColumnIndex(column); try { @@ -224,7 +211,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isCurrency(sal_Int32 column) sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSetMetaData::isAutoIncrement"); checkColumnIndex(column); try { @@ -240,7 +226,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column) sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSetMetaData::isSigned"); checkColumnIndex(column); try { @@ -256,7 +241,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32 column) sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSetMetaData::getPrecision"); checkColumnIndex(column); try { @@ -272,7 +256,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column) sal_Int32 SAL_CALL OResultSetMetaData::getScale(sal_Int32 column) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { - OSL_TRACE("OResultSetMetaData::getScale"); checkColumnIndex(column); try { return meta->getScale(column); @@ -287,7 +270,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getScale(sal_Int32 column) sal_Int32 SAL_CALL OResultSetMetaData::isNullable(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSetMetaData::isNullable"); checkColumnIndex(column); try { @@ -303,7 +285,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::isNullable(sal_Int32 column) sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSetMetaData::isSearchable"); checkColumnIndex(column); try { @@ -319,7 +300,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32 column) sal_Bool SAL_CALL OResultSetMetaData::isReadOnly(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSetMetaData::isReadOnly"); checkColumnIndex(column); try { @@ -335,7 +315,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly(sal_Int32 column) sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSetMetaData::isDefinitelyWritable"); checkColumnIndex(column); try { @@ -351,7 +330,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable(sal_Int32 column) sal_Bool SAL_CALL OResultSetMetaData::isWritable(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OResultSetMetaData::isWritable"); checkColumnIndex(column); try { @@ -367,7 +345,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isWritable(sal_Int32 column) void OResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex) throw (SQLException, RuntimeException) { - OSL_TRACE("OResultSetMetaData::checkColumnIndex"); if (columnIndex < 1 || columnIndex > (sal_Int32) meta->getColumnCount()) { rtl::OUStringBuffer buf; diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx index 371f011f07ec..061a192de68f 100644 --- a/mysqlc/source/mysqlc_statement.cxx +++ b/mysqlc/source/mysqlc_statement.cxx @@ -60,18 +60,15 @@ OCommonStatement::OCommonStatement(OConnection* _pConnection, sql::Statement *_c ,m_pConnection(_pConnection) ,cppStatement(_cppStatement) { - OSL_TRACE("OCommonStatement::OCommonStatement"); m_pConnection->acquire(); } OCommonStatement::~OCommonStatement() { - OSL_TRACE("OCommonStatement::~OCommonStatement"); } void OCommonStatement::disposeResultSet() { - OSL_TRACE("OCommonStatement::disposeResultSet"); // free the cursor if alive delete cppStatement; cppStatement = nullptr; @@ -79,7 +76,6 @@ void OCommonStatement::disposeResultSet() void OCommonStatement::disposing() { - OSL_TRACE("OCommonStatement::disposing"); MutexGuard aGuard(m_aMutex); disposeResultSet(); @@ -97,7 +93,6 @@ void OCommonStatement::disposing() Any SAL_CALL OCommonStatement::queryInterface(const Type & rType) throw(RuntimeException, std::exception) { - OSL_TRACE("OCommonStatement::queryInterface"); Any aRet = OCommonStatement_IBase::queryInterface(rType); if (!aRet.hasValue()) { aRet = OPropertySetHelper::queryInterface(rType); @@ -108,7 +103,6 @@ Any SAL_CALL OCommonStatement::queryInterface(const Type & rType) Sequence< Type > SAL_CALL OCommonStatement::getTypes() throw(RuntimeException, std::exception) { - OSL_TRACE("OCommonStatement::getTypes"); ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(), cppu::UnoType<XFastPropertySet>::get(), cppu::UnoType<XPropertySet>::get()); @@ -119,7 +113,6 @@ Sequence< Type > SAL_CALL OCommonStatement::getTypes() void SAL_CALL OCommonStatement::cancel() throw(RuntimeException, std::exception) { - OSL_TRACE("OCommonStatement::cancel"); MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); // cancel the current sql statement @@ -128,7 +121,6 @@ void SAL_CALL OCommonStatement::cancel() void SAL_CALL OCommonStatement::close() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OCommonStatement::close"); /* We need a block for the checkDisposed call. After the check we can call dispose() as we are not under lock ?? @@ -143,14 +135,12 @@ void SAL_CALL OCommonStatement::close() void SAL_CALL OStatement::clearBatch() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OStatement::clearBatch"); // if you support batches clear it here } sal_Bool SAL_CALL OCommonStatement::execute(const rtl::OUString& sql) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OCommonStatement::execute"); MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); const rtl::OUString sSqlStatement = m_pConnection->transFormPreparedStatement( sql ); @@ -167,8 +157,6 @@ sal_Bool SAL_CALL OCommonStatement::execute(const rtl::OUString& sql) Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery(const rtl::OUString& sql) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OCommonStatement::executeQuery"); - MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); const rtl::OUString sSqlStatement = m_pConnection->transFormPreparedStatement(sql); @@ -187,7 +175,6 @@ Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery(const rtl::OUStr Reference< XConnection > SAL_CALL OCommonStatement::getConnection() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OCommonStatement::getConnection"); MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); @@ -198,14 +185,12 @@ Reference< XConnection > SAL_CALL OCommonStatement::getConnection() sal_Int32 SAL_CALL OCommonStatement::getUpdateCount() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OCommonStatement::getUpdateCount"); return 0; } Any SAL_CALL OStatement::queryInterface(const Type & rType) throw(RuntimeException, std::exception) { - OSL_TRACE("OStatement::queryInterface"); Any aRet = ::cppu::queryInterface(rType,static_cast< XBatchExecution*> (this)); if (!aRet.hasValue()) { aRet = OCommonStatement::queryInterface(rType); @@ -216,7 +201,6 @@ Any SAL_CALL OStatement::queryInterface(const Type & rType) void SAL_CALL OStatement::addBatch(const rtl::OUString& sql) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OStatement::addBatch"); MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); @@ -226,7 +210,6 @@ void SAL_CALL OStatement::addBatch(const rtl::OUString& sql) Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OStatement::executeBatch"); MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); @@ -237,7 +220,6 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch() sal_Int32 SAL_CALL OCommonStatement::executeUpdate(const rtl::OUString& sql) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OCommonStatement::executeUpdate"); MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); const rtl::OUString sSqlStatement = m_pConnection->transFormPreparedStatement(sql); @@ -254,7 +236,6 @@ sal_Int32 SAL_CALL OCommonStatement::executeUpdate(const rtl::OUString& sql) Reference< XResultSet > SAL_CALL OCommonStatement::getResultSet() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OCommonStatement::getResultSet"); MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); @@ -272,7 +253,6 @@ Reference< XResultSet > SAL_CALL OCommonStatement::getResultSet() sal_Bool SAL_CALL OCommonStatement::getMoreResults() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OCommonStatement::getMoreResults"); MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); @@ -284,7 +264,6 @@ sal_Bool SAL_CALL OCommonStatement::getMoreResults() Any SAL_CALL OCommonStatement::getWarnings() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OCommonStatement::getWarnings"); MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); @@ -294,7 +273,6 @@ Any SAL_CALL OCommonStatement::getWarnings() void SAL_CALL OCommonStatement::clearWarnings() throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("OCommonStatement::clearWarnings"); MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); @@ -303,7 +281,6 @@ void SAL_CALL OCommonStatement::clearWarnings() ::cppu::IPropertyArrayHelper* OCommonStatement::createArrayHelper( ) const { - OSL_TRACE("OCommonStatement::createArrayHelper"); // this properties are define by the service statement // they must in alphabetic order Sequence< Property > aProps(10); @@ -325,7 +302,6 @@ void SAL_CALL OCommonStatement::clearWarnings() ::cppu::IPropertyArrayHelper & OCommonStatement::getInfoHelper() { - OSL_TRACE("OCommonStatement::getInfoHelper"); return *getArrayHelper(); } @@ -334,7 +310,6 @@ sal_Bool OCommonStatement::convertFastPropertyValue( sal_Int32 /* nHandle */, const Any& /* rValue */) throw (IllegalArgumentException) { - OSL_TRACE("OCommonStatement::convertFastPropertyValue"); bool bConverted = false; // here we have to try to convert return bConverted; @@ -343,7 +318,6 @@ sal_Bool OCommonStatement::convertFastPropertyValue( void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& /* rValue */) throw (Exception, std::exception) { - OSL_TRACE("OCommonStatement::setFastPropertyValue_NoBroadcast"); // set the value to what ever is necessary switch (nHandle) { case PROPERTY_ID_QUERYTIMEOUT: @@ -363,7 +337,6 @@ void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const void OCommonStatement::getFastPropertyValue(Any& _rValue, sal_Int32 nHandle) const { - OSL_TRACE("OCommonStatement::getFastPropertyValue"); switch (nHandle) { case PROPERTY_ID_QUERYTIMEOUT: case PROPERTY_ID_MAXFIELDSIZE: @@ -405,35 +378,30 @@ sal_Bool OStatement::supportsService(rtl::OUString const & ServiceName) void SAL_CALL OCommonStatement::acquire() throw() { - OSL_TRACE("OCommonStatement::acquire"); OCommonStatement_IBase::acquire(); } void SAL_CALL OCommonStatement::release() throw() { - OSL_TRACE("OCommonStatement::release"); release_ChildImpl(); } void SAL_CALL OStatement::acquire() throw() { - OSL_TRACE("OStatement::acquire"); OCommonStatement::acquire(); } void SAL_CALL OStatement::release() throw() { - OSL_TRACE("OStatement::release"); OCommonStatement::release(); } Reference< css::beans::XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo() throw(RuntimeException, std::exception) { - OSL_TRACE("OCommonStatement::getPropertySetInfo"); return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index 56d00f322c04..c40502967e4c 100644 --- a/oox/source/drawingml/customshapegeometry.cxx +++ b/oox/source/drawingml/customshapegeometry.cxx @@ -409,7 +409,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu } else { - OSL_TRACE("error: unhandled value '%s'", OUStringToOString( rValue, RTL_TEXTENCODING_ASCII_US ).getStr()); + SAL_WARN("oox", "error: unhandled value " << rValue); aRet.Value = Any( rValue ); } } diff --git a/oox/source/drawingml/diagram/datamodelcontext.cxx b/oox/source/drawingml/diagram/datamodelcontext.cxx index c438445ea93d..55627c4c0ec2 100644 --- a/oox/source/drawingml/diagram/datamodelcontext.cxx +++ b/oox/source/drawingml/diagram/datamodelcontext.cxx @@ -227,16 +227,13 @@ public: case DGM_TOKEN( extLst ): return nullptr; case DGM_TOKEN( prSet ): - OSL_TRACE( "diagram property set for point"); return new PropertiesContext( *this, mrPoint, rAttribs ); case DGM_TOKEN( spPr ): - OSL_TRACE( "shape props for point"); if( !mrPoint.mpShape ) mrPoint.mpShape.reset( new Shape() ); return new ShapePropertiesContext( *this, *(mrPoint.mpShape) ); case DGM_TOKEN( t ): { - OSL_TRACE( "shape text body for point"); TextBodyPtr xTextBody( new TextBody ); if( !mrPoint.mpShape ) mrPoint.mpShape.reset( new Shape() ); diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx index 7749d5ecdabe..c4dc45d54700 100644 --- a/oox/source/drawingml/diagram/diagram.cxx +++ b/oox/source/drawingml/diagram/diagram.cxx @@ -73,10 +73,10 @@ DiagramData::DiagramData() void DiagramData::dump() { - OSL_TRACE("Dgm: DiagramData # of cnx: %zu", maConnections.size() ); + SAL_INFO("oox", "Dgm: DiagramData # of cnx: " << maConnections.size() ); std::for_each( maConnections.begin(), maConnections.end(), [] (dgm::Connection & rConnection) { rConnection.dump(); } ); - OSL_TRACE("Dgm: DiagramData # of pt: %zu", maPoints.size() ); + SAL_INFO("oox", "Dgm: DiagramData # of pt: " << maPoints.size() ); std::for_each( maPoints.begin(), maPoints.end(), [] (dgm::Point & rPoint) { rPoint.dump(); } ); } diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx index d17708c10d4d..51cf114ea369 100644 --- a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx +++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx @@ -37,7 +37,6 @@ DiagramDefinitionContext::DiagramDefinitionContext( ContextHandler2Helper& rPare : ContextHandler2( rParent ) , mpLayout( pLayout ) { - OSL_TRACE( "OOX: DiagramDefinitionContext::DiagramDefinitionContext()" ); mpLayout->setDefStyle( rAttributes.getString( XML_defStyle ).get() ); OUString sValue = rAttributes.getString( XML_minVer ).get(); if( sValue.isEmpty() ) diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index 2df07c20d86d..d379bda4ada4 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -80,9 +80,7 @@ void ConditionAttr::loadFromXAttr( const Reference< XFastAttributeList >& xAttr void LayoutAtom::dump(int level) { - OSL_TRACE( "level = %d - %s of type %s", level, - OUSTRING_TO_CSTR( msName ), - typeid(*this).name() ); + SAL_INFO("oox", "level = " << level << " - " << msName << " of type " << typeid(*this).name() ); const std::vector<LayoutAtomPtr>& rChildren=getChildren(); std::for_each( rChildren.begin(), rChildren.end(), [level] (LayoutAtomPtr const& pAtom) { pAtom->dump(level + 1); } ); @@ -469,34 +467,14 @@ bool LayoutNode::setupShape( const ShapePtr& rShape, const Diagram& rDgm, sal_uI // now, but docs are a bit unclear on this if( !msStyleLabel.isEmpty() ) { - SAL_INFO( - "oox.drawingml", "setting style with label " << msStyleLabel); - const DiagramQStyleMap::const_iterator aStyle=rDgm.getStyles().find(msStyleLabel); if( aStyle != rDgm.getStyles().end() ) { rShape->getShapeStyleRefs()[XML_fillRef] = aStyle->second.maFillStyle; - SAL_INFO( - "oox.drawingml", - "added fill style with id " - << aStyle->second.maFillStyle.mnThemedIdx); rShape->getShapeStyleRefs()[XML_lnRef] = aStyle->second.maLineStyle; - SAL_INFO( - "oox.drawingml", - "added line style with id " - << aStyle->second.maLineStyle.mnThemedIdx); rShape->getShapeStyleRefs()[XML_effectRef] = aStyle->second.maEffectStyle; - SAL_INFO( - "oox.drawingml", - "added effect style with id " - << aStyle->second.maEffectStyle.mnThemedIdx); rShape->getShapeStyleRefs()[XML_fontRef] = aStyle->second.maTextStyle; - SAL_INFO( - "oox.drawingml", - "added fontref style with id " - << aStyle->second.maTextStyle.mnThemedIdx); Color aColor=aStyle->second.maTextStyle.maPhClr; - OSL_TRACE("added fontref color with alpha %d", aColor.getTransparency() ); } const DiagramColorMap::const_iterator aColor=rDgm.getColors().find(msStyleLabel); @@ -665,8 +643,7 @@ void ShapeCreationVisitor::visit(LayoutNode& rAtom) } else { - OSL_TRACE("ShapeCreationVisitor::visit: no shape set while processing layoutnode named %s", - OUSTRING_TO_CSTR( rAtom.getName() ) ); + SAL_WARN("oox", "ShapeCreationVisitor::visit: no shape set while processing layoutnode named " << rAtom.getName() ); } // set new parent for children diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx index a028d334416f..7aa33617e371 100644 --- a/oox/source/drawingml/diagram/layoutnodecontext.cxx +++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx @@ -120,7 +120,7 @@ public: } else { - OSL_TRACE( "ignoring second else clause" ); + SAL_WARN("oox", "ignoring second else clause" ); } break; default: @@ -269,7 +269,7 @@ LayoutNodeContext::onCreateContext( ::sal_Int32 aElement, } else { - OSL_TRACE( "OOX: encountered a shape in a non layoutNode context" ); + SAL_WARN("oox", "OOX: encountered a shape in a non layoutNode context" ); } break; } @@ -324,7 +324,7 @@ LayoutNodeContext::onCreateContext( ::sal_Int32 aElement, } else { - OSL_TRACE( "OOX: encountered a varLst in a non layoutNode context" ); + SAL_WARN("oox", "OOX: encountered a varLst in a non layoutNode context" ); } break; } diff --git a/oox/source/drawingml/hyperlinkcontext.cxx b/oox/source/drawingml/hyperlinkcontext.cxx index 1e88e68b5bd2..d0d807989066 100644 --- a/oox/source/drawingml/hyperlinkcontext.cxx +++ b/oox/source/drawingml/hyperlinkcontext.cxx @@ -46,11 +46,9 @@ HyperLinkContext::HyperLinkContext( ContextHandler2Helper& rParent, OUString aRelId = rAttribs.getString( R_TOKEN( id ) ).get(); if ( !aRelId.isEmpty() ) { - OSL_TRACE("OOX: URI rId %s", OUStringToOString (aRelId, RTL_TEXTENCODING_UTF8).pData->buffer); sHref = getRelations().getExternalTargetFromRelId( aRelId ); if( !sHref.isEmpty() ) { - OSL_TRACE("OOX: URI href %s", OUStringToOString (sHref, RTL_TEXTENCODING_UTF8).pData->buffer); sURL = getFilter().getAbsoluteUrl( sHref ); } else diff --git a/oox/source/drawingml/textfield.cxx b/oox/source/drawingml/textfield.cxx index 73fc3c23e206..8594f8ebe821 100644 --- a/oox/source/drawingml/textfield.cxx +++ b/oox/source/drawingml/textfield.cxx @@ -69,7 +69,7 @@ void lclCreateTextFields( std::list< Reference< XTextField > > & aFields, bool bIsDate = true; int idx = p.toInt32(); sal_uInt16 nNumFmt; -// OSL_TRACE( "OOX: p = %s, %d", p.pData->buffer, idx ); +// 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 ); @@ -132,7 +132,7 @@ void lclCreateTextFields( std::list< Reference< XTextField > > & aFields, } catch(Exception & e) { - OSL_TRACE( "Exception %s", OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); + SAL_WARN("oox", "Exception " << e.Message ); } } else if ( sType == "slidenum" ) @@ -236,7 +236,7 @@ sal_Int32 TextField::insertAt( } catch( const Exception& ) { - OSL_TRACE("OOX: TextField::insertAt() exception"); + SAL_WARN("oox", "OOX: TextField::insertAt() exception"); } return nCharHeight; @@ -244,4 +244,4 @@ sal_Int32 TextField::insertAt( } } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index aa6225359387..fb9e3e3064ab 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -120,7 +120,7 @@ void BulletList::setSuffixMinusRight() void BulletList::setType( sal_Int32 nType ) { OSL_ASSERT((nType & sal_Int32(0xFFFF0000))==0); -// OSL_TRACE( "OOX: set list numbering type %d", nType); +// SAL_WARNx("oox", "OOX: set list numbering type %d", nType); switch( nType ) { case XML_alphaLcParenBoth: diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx index 460bc2e2d4d6..f040a9846ce9 100644 --- a/oox/source/drawingml/textparagraphpropertiescontext.cxx +++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx @@ -220,7 +220,7 @@ ContextHandlerRef TextParagraphPropertiesContext::onCreateContext( sal_Int32 aEl } catch(SAXException& /* e */ ) { - OSL_TRACE("OOX: SAXException in XML_buAutoNum"); + SAL_WARN("oox", "OOX: SAXException in XML_buAutoNum"); } break; } @@ -232,7 +232,7 @@ ContextHandlerRef TextParagraphPropertiesContext::onCreateContext( sal_Int32 aEl } catch(SAXException& /* e */) { - OSL_TRACE("OOX: SAXException in XML_buChar"); + SAL_WARN("oox", "OOX: SAXException in XML_buChar"); } break; case A_TOKEN( buBlip ): // CT_TextBlipBullet diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx index 8d36dfc4bb02..92cfebe8811b 100644 --- a/oox/source/drawingml/textrun.cxx +++ b/oox/source/drawingml/textrun.cxx @@ -75,7 +75,7 @@ sal_Int32 TextRun::insertAt( { if( mbIsLineBreak ) { - OSL_TRACE( "OOX: TextRun::insertAt() insert line break" ); + SAL_WARN("oox", "OOX: TextRun::insertAt() insert line break" ); xText->insertControlCharacter( xStart, ControlCharacter::LINE_BREAK, false ); } else @@ -138,7 +138,7 @@ sal_Int32 TextRun::insertAt( } else { - OSL_TRACE( "OOX: URL field" ); + SAL_WARN("oox", "OOX: URL field" ); Reference< XMultiServiceFactory > xFactory( rFilterBase.getModel(), UNO_QUERY ); Reference< XTextField > xField( xFactory->createInstance( "com.sun.star.text.TextField.URL" ), UNO_QUERY ); if( xField.is() ) @@ -169,14 +169,14 @@ sal_Int32 TextRun::insertAt( } else { - OSL_TRACE( "OOX: URL field couldn't be created" ); + SAL_WARN("oox", "OOX: URL field couldn't be created" ); xText->insertString( xStart, getText(), false ); } } } catch( const Exception& ) { - OSL_TRACE("OOX: TextRun::insertAt() exception"); + SAL_WARN("oox", "OOX: TextRun::insertAt() exception"); } return nCharHeight; diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 6bd90d5c3550..136570ae0351 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -903,7 +903,7 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic , bool bRelPathToMedia ) } else { - OSL_TRACE( "unhandled graphic type" ); + SAL_WARN("oox", "unhandled graphic type" ); /*Earlier, even in case of unhandled graphic types we were proceeding to write the image, which would eventually write an empty image with a zero size, and return a valid diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 7bd85a8cd39f..11b482d2a7a2 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -1466,8 +1466,6 @@ ShapeExport& ShapeExport::WriteTextBox( const Reference< XInterface >& xIface, s void ShapeExport::WriteTable( const Reference< XShape >& rXShape ) { - OSL_TRACE("write table"); - Reference< XTable > xTable; Reference< XPropertySet > xPropSet( rXShape, UNO_QUERY ); @@ -1747,8 +1745,6 @@ ShapeExport& ShapeExport::WriteTableShape( const Reference< XShape >& xShape ) { FSHelperPtr pFS = GetFS(); - OSL_TRACE("write table shape"); - pFS->startElementNS( mnXmlNamespace, XML_graphicFrame, FSEND ); pFS->startElementNS( mnXmlNamespace, XML_nvGraphicFramePr, FSEND ); diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index b6ea8a2726e6..7e5dcb061f31 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -2598,8 +2598,8 @@ 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 ? - OSL_TRACE("HtmlTextBoxModel::importBinaryModel - string contents of stream :"); - OSL_TRACE("%s", OUStringToOString( sStringContents, RTL_TEXTENCODING_UTF8 ).getStr() ); + SAL_WARNx("oox", "HtmlTextBoxModel::importBinaryModel - string contents of stream :"); + SAL_WARNx("oox", "%s", OUStringToOString( sStringContents, RTL_TEXTENCODING_UTF8 ).getStr() ); #else (void) rInStrm; #endif diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx index d2764b865372..140d3b665534 100644 --- a/oox/source/ppt/pptimport.cxx +++ b/oox/source/ppt/pptimport.cxx @@ -132,7 +132,7 @@ sal_Int32 PowerPointImport::getSchemeColor( sal_Int32 nToken ) const } else { - OSL_TRACE("OOX: PowerPointImport::mpThemePtr is NULL"); + SAL_WARN("oox", "OOX: PowerPointImport::mpThemePtr is NULL"); } } } diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx index ec7932548824..3de25a809e2c 100644 --- a/oox/source/ppt/slidepersist.cxx +++ b/oox/source/ppt/slidepersist.cxx @@ -316,7 +316,6 @@ void SlidePersist::hideShapesAsMasterShapes() PPTShape* pPPTShape = dynamic_cast< PPTShape* >( (*aChildIter++).get() ); if (!pPPTShape) continue; - OSL_TRACE("hide shape with id: %s", OUStringToOString(pPPTShape->getId(), RTL_TEXTENCODING_UTF8 ).getStr()); pPPTShape->setHiddenMasterShape( true ); } } diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx index 9ae715fa49c0..b0b95c0ac43a 100644 --- a/oox/source/ppt/slidetransition.cxx +++ b/oox/source/ppt/slidetransition.cxx @@ -294,7 +294,7 @@ namespace oox { namespace ppt { mnTransitionType = TransitionType::BARWIPE; mnTransitionSubType = TransitionSubType::FADEOVERCOLOR; } - OSL_TRACE( "OOX: cut transition fallback." ); + SAL_WARN("oox", "OOX: cut transition fallback." ); break; case PPT_TOKEN( fade ): mnTransitionType = TransitionType::FADE; diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index 483442faac2e..6d169960c59f 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -188,10 +188,9 @@ namespace oox { namespace ppt { OUString aString; if( maTo >>= aString ) { - OSL_TRACE( "Magic conversion %s", OUSTRING_TO_CSTR( aString ) ); maTo = makeAny( aString == "visible" ); if( !maTo.has<sal_Bool>() ) - OSL_TRACE( "conversion failed" ); + SAL_WARN("oox", "conversion failed" ); } mpNode->setTo( maTo ); } @@ -295,7 +294,7 @@ namespace oox { namespace ppt { mpNode->getNodeProperties()[ NP_COMMAND ] = makeAny((sal_Int16)nCommand); if( nCommand == EffectCommands::CUSTOM ) { - OSL_TRACE("OOX: CmdTimeNodeContext::endFastElement(), unknown command!"); + SAL_WARN("oox", "OOX: CmdTimeNodeContext::endFastElement(), unknown command!"); aParamValue.Name = "UserDefined"; aParamValue.Value <<= msCommand; } @@ -307,7 +306,7 @@ namespace oox { namespace ppt { } catch( RuntimeException& ) { - OSL_TRACE( "OOX: Exception in CmdTimeNodeContext::endFastElement()" ); + SAL_WARN("oox", "OOX: Exception in CmdTimeNodeContext::endFastElement()" ); } } } @@ -982,7 +981,7 @@ namespace oox { namespace ppt { break; case PPT_TOKEN( video ): nNodeType = AnimationNodeType::AUDIO; - OSL_TRACE( "OOX: video requested, gave Audio instead" ); + SAL_WARN("oox", "OOX: video requested, gave Audio instead" ); break; default: diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index 0655a4642c43..6f684e12ef83 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -760,7 +760,6 @@ RegError ORegistry::closeKey(RegKeyHandle hKey) else { // closing modified RootKey, flush registry file. - OSL_TRACE("registry::ORegistry::closeKey(): flushing modified RootKey"); (void) m_file.flush(); } pKey->setModified(false); diff --git a/registry/tools/options.cxx b/registry/tools/options.cxx index 6584a0e2fe84..04f1f67e7e74 100644 --- a/registry/tools/options.cxx +++ b/registry/tools/options.cxx @@ -43,7 +43,6 @@ bool Options::checkArgument(std::vector< std::string> & rArgs, char const * arg, OSL_PRECOND(result, "registry::tools::Options::checkArgument(): invalid arguments"); if (result) { - OSL_TRACE("registry::tools:Options::checkArgument(): \"%s\"", arg); switch (arg[0]) { case '@': diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index cf7a0228d2c3..545707073ce0 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1507,7 +1507,6 @@ bool OReportDefinition::WriteThroughComponent( uno::Reference<io::XSeekable> xSeek(xStreamProp,uno::UNO_QUERY); if ( xSeek.is() ) { - OSL_TRACE("Length of stream %i",(int)xSeek->getPosition()); xSeek->seek(0); } diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index b93988ea6477..cda794958407 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -719,8 +719,6 @@ void OReportSection::fillControlModelSelection(::std::vector< uno::Reference< un sal_Int8 OReportSection::AcceptDrop( const AcceptDropEvent& _rEvt ) { - OSL_TRACE("AcceptDrop::DropEvent.Action %i", _rEvt.mnAction); - ::Point aDropPos(_rEvt.maPosPixel); const MouseEvent aMouseEvt(aDropPos); if ( m_pFunc->isOverlapping(aMouseEvt) ) @@ -769,7 +767,6 @@ sal_Int8 OReportSection::AcceptDrop( const AcceptDropEvent& _rEvt ) sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt ) { - OSL_TRACE("ExecuteDrop::DropEvent.Action %i", _rEvt.mnAction); ::Point aDropPos(PixelToLogic(_rEvt.maPosPixel)); const MouseEvent aMouseEvt(aDropPos); if ( m_pFunc->isOverlapping(aMouseEvt) ) diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 03f3574cc48a..f251a3f9cfb0 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -1060,7 +1060,6 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi // and create temporary objects on all other views at the same position // relative to its occurrence. - OSL_TRACE("BegDragObj createInvisible Objects" ); int nViewCount = 0; Point aNewObjPos(0,0); Point aLeftTop = Point(SAL_MAX_INT32, SAL_MAX_INT32); diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index 87183b56ab13..f856e2ac0474 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -537,7 +537,6 @@ namespace OUString sSys; if(FileBase::getSystemPathFromFileURL(i_sUrl, sSys) != FileBase::E_None) throw RscIoError(); - OSL_TRACE("temporary file: %s", OUStringToOString(sSys, RTL_TEXTENCODING_UTF8).getStr()); return OUStringToOString(sSys, RTL_TEXTENCODING_MS_1252); }; @@ -547,7 +546,6 @@ namespace OUString sTempUrl; if(FileBase::createTempFile(&sTempDirUrl, nullptr, &sTempUrl) != FileBase::E_None) throw RscIoError(); - OSL_TRACE("temporary url: %s", OUStringToOString(sTempUrl, RTL_TEXTENCODING_UTF8).getStr()); return lcl_getSystemPath(sTempUrl); }; } @@ -588,20 +586,16 @@ ERRTYPE RscCompiler::Link() OUString sRcUrl = lcl_getAbsoluteUrl(sPwdUrl, it->aOutputRc); // TempDir is either the directory where the rc file is located or pwd OUString sTempDirUrl = sRcUrl.copy(0,sRcUrl.lastIndexOf('/')); - OSL_TRACE("rc directory URL: %s", OUStringToOString(sTempDirUrl, RTL_TEXTENCODING_UTF8).getStr()); aRcTmp = lcl_getTempFile(sTempDirUrl); - OSL_TRACE("temporary rc file: %s", aRcTmp.getStr()); OUString sOilDirUrl; if(!pCL->aILDir.isEmpty()) sOilDirUrl = lcl_getAbsoluteUrl(sPwdUrl, pCL->aILDir); else sOilDirUrl = sTempDirUrl; - OSL_TRACE("ilst directory URL: %s", OUStringToOString(sOilDirUrl, RTL_TEXTENCODING_UTF8).getStr()); aSysListTmp = lcl_getTempFile(sOilDirUrl); - OSL_TRACE("temporary ilst file: %s", aSysListTmp.getStr()); OUString sIlstUrl; sIlstUrl = sRcUrl.copy(sRcUrl.lastIndexOf('/')+1); @@ -610,7 +604,6 @@ ERRTYPE RscCompiler::Link() sIlstUrl = lcl_getAbsoluteUrl(sOilDirUrl, OUStringToOString(sIlstUrl, RTL_TEXTENCODING_UTF8)); aSysList = lcl_getSystemPath(sIlstUrl); - OSL_TRACE("ilst file: %s", aSysList.getStr()); } catch (RscIoError&) { @@ -644,7 +637,6 @@ ERRTYPE RscCompiler::Link() aSysSearchPath.append(aToken); } while ( nIndex >= 0 ); - OSL_TRACE( "setting search path for language %s: %s", it->aLangName.getStr(), aSysSearchPath.getStr() ); pTC->SetSysSearchPath(aSysSearchPath.makeStringAndClear()); WriteRcContext aContext; diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx index 5f4182d096f2..b9887986b775 100644 --- a/sal/osl/unx/process.cxx +++ b/sal/osl/unx/process.cxx @@ -181,7 +181,7 @@ static void ChildStatusProc(void *pData) OSL_ASSERT(geteuid() == 0); /* must be root */ if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0)) - OSL_TRACE("Failed to change uid and guid, errno=%d (%s)", errno, strerror(errno)); + SAL_WARN("sal", "Failed to change uid and guid, errno=" << errno << " (" << strerror(errno) << ")" ); const rtl::OUString envVar("HOME"); osl_clearEnvironment(envVar.pData); @@ -205,7 +205,7 @@ static void ChildStatusProc(void *pData) } } - OSL_TRACE("ChildStatusProc : starting '%s'",data.m_pszArgs[0]); + SAL_INFO("sal", "ChildStatusProc : starting " << data.m_pszArgs[0]); /* Connect std IO to pipe ends */ @@ -243,14 +243,14 @@ static void ChildStatusProc(void *pData) execv(data.m_pszArgs[0], const_cast<char **>(data.m_pszArgs)); } - OSL_TRACE("Failed to exec, errno=%d (%s)", errno, strerror(errno)); + SAL_WARN("sal", "Failed to exec, errno=" << errno << " (" << strerror(errno) << ")"); - OSL_TRACE("ChildStatusProc : starting '%s' failed",data.m_pszArgs[0]); + SAL_WARN("sal", "ChildStatusProc : starting '" << data.m_pszArgs[0] << "' failed"); /* if we reach here, something went wrong */ errno_copy = errno; if ( !safeWrite(channel[1], &errno_copy, sizeof(errno_copy)) ) - OSL_TRACE("sendFdPipe : sending failed (%s)",strerror(errno)); + SAL_WARN("sal", "sendFdPipe : sending failed (" << strerror(errno) << ")"); if ( channel[1] != -1 ) close(channel[1]); @@ -309,7 +309,7 @@ static void ChildStatusProc(void *pData) if ( child_pid < 0) { - OSL_TRACE("Failed to wait for child process, errno=%d (%s)", errno, strerror(errno)); + SAL_WARN("sal", "Failed to wait for child process, errno=" << errno << " (" << strerror(errno) << ")"); /* We got an other error than EINTR. Anyway we have to wake up the @@ -349,8 +349,8 @@ static void ChildStatusProc(void *pData) } else { - OSL_TRACE("ChildStatusProc : starting '%s' failed",data.m_pszArgs[0]); - OSL_TRACE("Failed to launch child process, child reports errno=%d (%s)", status, strerror(status)); + SAL_WARN("sal", "ChildStatusProc : starting '" << data.m_pszArgs[0] << "' failed"); + SAL_WARN("sal", "Failed to launch child process, child reports errno=" << status << " (" << strerror(status) << ")"); /* Close pipe ends */ if ( pdata->m_pInputWrite ) diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx index ba54979c9b46..69242d2657d9 100644 --- a/sal/osl/unx/signal.cxx +++ b/sal/osl/unx/signal.cxx @@ -256,7 +256,7 @@ bool onInitSignal() if (sigemptyset(&unset) < 0 || pthread_sigmask(SIG_SETMASK, &unset, nullptr) < 0) { - OSL_TRACE("sigemptyset or pthread_sigmask failed"); + SAL_WARN("sal", "sigemptyset or pthread_sigmask failed"); } return true; diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx index d563a0eadb70..22ac01fe1882 100644 --- a/sal/osl/w32/profile.cxx +++ b/sal/osl/w32/profile.cxx @@ -68,7 +68,6 @@ static inline void copy_ustr_n( void *dest, const void *source, size_t length ) #define SVERSION_USER "user" /*#define DEBUG_OSL_PROFILE 1*/ -/*#define TRACE_OSL_PROFILE 1*/ /*****************************************************************************/ /* Data Type Definition */ @@ -174,9 +173,6 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag osl_TProfileImpl* pProfile; rtl_uString *FileName=nullptr; -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("In osl_openProfile"); -#endif OSL_VERIFY(strProfileName); if (rtl_uString_getLength(strProfileName) == 0 ) @@ -195,31 +191,28 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag if ( Flags == osl_Profile_DEFAULT ) { - OSL_TRACE("with osl_Profile_DEFAULT"); + SAL_INFO("sal", "with osl_Profile_DEFAULT"); } if ( Flags & osl_Profile_SYSTEM ) { - OSL_TRACE("with osl_Profile_SYSTEM"); + SAL_INFO("sal", "with osl_Profile_SYSTEM"); } if ( Flags & osl_Profile_READLOCK ) { - OSL_TRACE("with osl_Profile_READLOCK"); + SAL_INFO("sal", "with osl_Profile_READLOCK"); } if ( Flags & osl_Profile_WRITELOCK ) { - OSL_TRACE("with osl_Profile_WRITELOCK"); + SAL_INFO("sal", "with osl_Profile_WRITELOCK"); } if ( Flags & osl_Profile_FLUSHWRITE ) { - OSL_TRACE("with osl_Profile_FLUSHWRITE"); + SAL_INFO("sal", "with osl_Profile_FLUSHWRITE"); } #endif if ( (! (Flags & osl_Profile_SYSTEM)) && ( (pFile = openFileImpl(FileName, Flags) ) == nullptr ) ) { -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_openProfile [not opened]"); -#endif if( FileName) rtl_uString_release( FileName); @@ -241,9 +234,6 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag if (pProfile->m_pFile == nullptr) closeFileImpl(pFile); -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_openProfile [ok]"); -#endif if( FileName) rtl_uString_release( FileName); @@ -254,15 +244,9 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile) { osl_TProfileImpl* pProfile = static_cast<osl_TProfileImpl*>(Profile); -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("In osl_closeProfile"); -#endif if ( Profile == nullptr ) { -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_closeProfile [profile==0]"); -#endif return false; } @@ -284,9 +268,6 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile) if ( pProfile == nullptr ) { -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_closeProfile [pProfile==0]"); -#endif return false; } @@ -326,9 +307,6 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile) } free(pProfile); -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_closeProfile [ok]"); -#endif return true; } @@ -338,38 +316,26 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile) osl_TFile* pFile; bool bRet = false; -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("In osl_flushProfile()"); -#endif if ( pProfile == nullptr ) { -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_flushProfile() [pProfile == 0]"); -#endif return false; } pFile = pProfile->m_pFile; if ( pFile == nullptr || pFile->m_Handle == INVALID_HANDLE_VALUE ) { -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_flushProfile() [invalid file]"); -#endif return false; } if ( pProfile->m_Flags & FLG_MODIFIED ) { #ifdef DEBUG_OSL_PROFILE - OSL_TRACE("swapping to storeprofile"); + SAL_INFO("sal", "swapping to storeprofile"); #endif bRet = storeProfile(pProfile,false); } -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_flushProfile() [ok]"); -#endif return bRet; } @@ -378,15 +344,8 @@ static bool writeProfileImpl(osl_TFile* pFile) DWORD BytesWritten=0; BOOL bRet; -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("In osl_writeProfileImpl()"); -#endif - if ( !( pFile != nullptr && pFile->m_Handle != INVALID_HANDLE_VALUE ) || ( pFile->m_pWriteBuf == nullptr ) ) { -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_writeProfileImpl() [invalid args]"); -#endif return false; } @@ -395,7 +354,7 @@ static bool writeProfileImpl(osl_TFile* pFile) if ( bRet == 0 || BytesWritten == 0 ) { OSL_ENSURE(bRet,"WriteFile failed!!!"); - OSL_TRACE("write failed '%s'",strerror(errno)); + SAL_INFO("sal", "write failed '%s'",strerror(errno)); return false; } @@ -405,9 +364,6 @@ static bool writeProfileImpl(osl_TFile* pFile) pFile->m_nWriteBufLen=0; pFile->m_nWriteBufFree=0; -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_writeProfileImpl() [ok]"); -#endif return true; } @@ -420,18 +376,10 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, const sal_Char* pStr = nullptr; osl_TProfileImpl* pProfile = nullptr; -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("In osl_readProfileString"); -#endif - pProfile = acquireProfile(Profile, false); if (pProfile == nullptr) { -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_readProfileString [pProfile==0]"); -#endif - return false; } @@ -467,17 +415,9 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, if ( pStr == nullptr ) { -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_readProfileString [pStr==0]"); -#endif - return false; } -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_readProfileString [ok]"); -#endif - return true; } @@ -487,10 +427,6 @@ sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile, { sal_Char Line[32]; -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("In osl_readProfileBool"); -#endif - if (osl_readProfileString(Profile, pszSection, pszEntry, Line, sizeof(Line), "")) { if ((stricmp(Line, STR_INI_BOOLYES) == 0) || @@ -504,10 +440,6 @@ sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile, Default = false; } -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_readProfileBool [ok]"); -#endif - return Default; } @@ -519,10 +451,6 @@ sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile, sal_uInt32 i; sal_Char Line[256]; -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("In osl_readProfileIdent"); -#endif - if (osl_readProfileString(Profile, pszSection, pszEntry, Line, sizeof(Line), "")) { i = 0; @@ -537,9 +465,6 @@ sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile, } } -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_readProfileIdent [ok]"); -#endif return Default; } @@ -555,17 +480,10 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, osl_TProfileSection* pSec; osl_TProfileImpl* pProfile = nullptr; -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("In osl_writeProfileString"); -#endif - pProfile = acquireProfile(Profile, true); if (pProfile == nullptr) { -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_writeProfileString [pProfile==0]"); -#endif return false; } @@ -585,9 +503,6 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, (! addSection(pProfile, pProfile->m_NoLines - 1, &pStr[1], strlen(pszSection)))) { releaseProfile(pProfile); -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_writeProfileString [not added]"); -#endif return false; } @@ -611,9 +526,6 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, (! addEntry(pProfile, pSec, i, pStr, strlen(pszEntry)))) { releaseProfile(pProfile); -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_writeProfileString [not inserted]"); -#endif return false; } @@ -638,9 +550,6 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, } bRet = releaseProfile(pProfile); -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_writeProfileString [ok]"); -#endif return bRet; } @@ -650,19 +559,11 @@ sal_Bool SAL_CALL osl_writeProfileBool(oslProfile Profile, { bool bRet = false; -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("In osl_writeProfileBool"); -#endif - if (Value) bRet=osl_writeProfileString(Profile, pszSection, pszEntry, STR_INI_BOOLONE); else bRet=osl_writeProfileString(Profile, pszSection, pszEntry, STR_INI_BOOLZERO); -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_writeProfileBool [ok]"); -#endif - return bRet; } @@ -674,10 +575,6 @@ sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile, int i, n; bool bRet = false; -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("In osl_writeProfileIdent"); -#endif - for (n = 0; Strings[n] != nullptr; n++); if ((i = Value - FirstId) >= n) @@ -685,9 +582,6 @@ sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile, else bRet=osl_writeProfileString(Profile, pszSection, pszEntry, Strings[i]); -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_writeProfileIdent"); -#endif return bRet; } @@ -698,18 +592,10 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile, osl_TProfileImpl* pProfile = nullptr; bool bRet = false; -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("In osl_removeProfileEntry"); -#endif - pProfile = acquireProfile(Profile, true); if (pProfile == nullptr) { -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_removeProfileEntry [pProfile==0]"); -#endif - return false; } @@ -744,9 +630,6 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile, } bRet = releaseProfile(pProfile); -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_removeProfileEntry [ok]"); -#endif return bRet; } @@ -757,18 +640,10 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C sal_uInt32 NoEntry; osl_TProfileImpl* pProfile = nullptr; -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("In osl_getProfileSectionEntries"); -#endif - pProfile = acquireProfile(Profile, false); if (pProfile == nullptr) { -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_getProfileSectionEntries [pProfile=0]"); -#endif - return 0; } @@ -816,10 +691,6 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C releaseProfile(pProfile); -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out osl_getProfileSectionEntries [ok]"); -#endif - return n; } @@ -1143,7 +1014,7 @@ static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption Profi if ( ProfileFlags & ( osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE ) ) { #ifdef DEBUG_OSL_PROFILE - OSL_TRACE("setting bWriteable to TRUE"); + SAL_INFO("sal", "setting bWriteable to TRUE"); #endif bWriteable=true; } @@ -1160,7 +1031,7 @@ static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption Profi else { #ifdef DEBUG_OSL_PROFILE - OSL_TRACE("opening '%s' read/write",pszFilename); + SAL_INFO("sal", "opening '%s' read/write",pszFilename); #endif if ((pFile->m_Handle = CreateFileW( reinterpret_cast<LPCWSTR>(rtl_uString_getStr( strFileName )), GENERIC_READ | GENERIC_WRITE, @@ -1180,7 +1051,7 @@ static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption Profi if ( ProfileFlags & (osl_Profile_WRITELOCK | osl_Profile_READLOCK ) ) { #ifdef DEBUG_OSL_PROFILE - OSL_TRACE("locking '%s' file",pszFilename); + SAL_INFO("sal", "locking '%s' file",pszFilename); #endif lockFile(pFile, bWriteable ? write_lock : read_lock); @@ -1773,10 +1644,6 @@ static bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) static bool storeProfile(osl_TProfileImpl* pProfile, bool bCleanup) { -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("In storeProfile"); -#endif - if (pProfile->m_Lines != nullptr) { if (pProfile->m_Flags & FLG_MODIFIED) @@ -1808,9 +1675,6 @@ static bool storeProfile(osl_TProfileImpl* pProfile, bool bCleanup) pTmpFile->m_nWriteBufLen=0; pTmpFile->m_nWriteBufFree=0; -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out storeProfile [not flushed]"); -#endif closeFileImpl(pTmpFile); return false; @@ -1845,9 +1709,6 @@ static bool storeProfile(osl_TProfileImpl* pProfile, bool bCleanup) } } -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out storeProfile [ok]"); -#endif return true; } @@ -1959,7 +1820,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable) if (pProfile == nullptr) { #ifdef DEBUG_OSL_PROFILE - OSL_TRACE("AUTOOPEN MODE"); + SAL_INFO("sal", "AUTOOPEN MODE"); #endif if ( ( pProfile = static_cast<osl_TProfileImpl*>(osl_openProfile( nullptr, PFlags )) ) != nullptr ) @@ -1970,7 +1831,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable) else { #ifdef DEBUG_OSL_PROFILE - OSL_TRACE("try to acquire"); + SAL_INFO("sal", "try to acquire"); #endif if (! (pProfile->m_Flags & osl_Profile_SYSTEM)) @@ -1980,7 +1841,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable) { osl_TStamp Stamp; #ifdef DEBUG_OSL_PROFILE - OSL_TRACE("DEFAULT MODE"); + SAL_INFO("sal", "DEFAULT MODE"); #endif pProfile->m_pFile = openFileImpl( pProfile->m_strFileName, pProfile->m_Flags | PFlags); @@ -1999,7 +1860,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable) else { #ifdef DEBUG_OSL_PROFILE - OSL_TRACE("READ/WRITELOCK MODE"); + SAL_INFO("sal", "READ/WRITELOCK MODE"); #endif /* A readlock file could not be written */ @@ -2016,15 +1877,8 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable) static bool releaseProfile(osl_TProfileImpl* pProfile) { -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("In releaseProfile"); -#endif - if ( pProfile == nullptr ) { -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out releaseProfile [profile==0]"); -#endif return false; } @@ -2032,15 +1886,12 @@ static bool releaseProfile(osl_TProfileImpl* pProfile) { if (pProfile->m_Flags & FLG_AUTOOPEN) { -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out releaseProfile [AUTOOPEN]"); -#endif return osl_closeProfile(static_cast<oslProfile>(pProfile)); } else { #ifdef DEBUG_OSL_PROFILE - OSL_TRACE("DEFAULT MODE"); + SAL_INFO("sal", "DEFAULT MODE"); #endif if (! (pProfile->m_Flags & (osl_Profile_READLOCK | osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE))) @@ -2054,9 +1905,6 @@ static bool releaseProfile(osl_TProfileImpl* pProfile) } } -#ifdef TRACE_OSL_PROFILE - OSL_TRACE("Out releaseProfile [ok]"); -#endif return true; } diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx index b03e2b30b815..fd36705fd138 100644 --- a/sal/osl/w32/socket.cxx +++ b/sal/osl/w32/socket.cxx @@ -594,7 +594,7 @@ static oslHostAddr __osl_hostentToHostAddr (const struct hostent *he) /* unknown address family */ /* future extensions for new families might be implemented here */ - OSL_TRACE("_osl_hostentToHostAddr(): unknown address family."); + SAL_WARN("sal", "_osl_hostentToHostAddr(): unknown address family."); OSL_ASSERT(sal_False); osl_destroySocketAddr_( pSocketAddr ); |