Kaydet (Commit) a005fbed authored tarafından Noel Grandin's avatar Noel Grandin

OSL_TRACE->SAL in framework..sal

Change-Id: I9a897af88aa9f6f7ca98ce521c69b5a4ee8462e9
Reviewed-on: https://gerrit.libreoffice.org/31903Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
Tested-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 81f2a9f4
......@@ -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);
......
......@@ -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();
}
......
......@@ -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 )
{
......
......@@ -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" );
}
}
......
/* -*- 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: */
......@@ -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
......
......@@ -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())
......
......@@ -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 );
......
......@@ -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() );
}
}
......
......@@ -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();
......
......@@ -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(
......
......@@ -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;
}
......
......@@ -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)