[Libreoffice-commits] core.git: framework/source include/canvas include/sal io/source javaunohelper/source l10ntools/source mysqlc/source oox/source registry/source registry/tools reportdesign/source rsc/source sal/osl
Noel Grandin
noel.grandin at collabora.co.uk
Tue Dec 13 06:10:48 UTC 2016
framework/source/uielement/genericstatusbarcontroller.cxx | 1
framework/source/uielement/macrosmenucontroller.cxx | 3
framework/source/uielement/recentfilesmenucontroller.cxx | 2
include/canvas/canvastools.hxx | 13 -
include/canvas/debug.hxx | 59 ----
include/sal/log-areas.dox | 2
io/source/acceptor/acceptor.cxx | 9
io/source/connector/connector.cxx | 12
javaunohelper/source/bootstrap.cxx | 4
l10ntools/source/merge.cxx | 1
mysqlc/source/mysqlc_connection.cxx | 36 --
mysqlc/source/mysqlc_databasemetadata.cxx | 37 --
mysqlc/source/mysqlc_driver.cxx | 11
mysqlc/source/mysqlc_preparedstatement.cxx | 41 ---
mysqlc/source/mysqlc_resultset.cxx | 91 -------
mysqlc/source/mysqlc_resultsetmetadata.cxx | 23 -
mysqlc/source/mysqlc_statement.cxx | 32 --
oox/source/drawingml/customshapegeometry.cxx | 2
oox/source/drawingml/diagram/datamodelcontext.cxx | 3
oox/source/drawingml/diagram/diagram.cxx | 4
oox/source/drawingml/diagram/diagramdefinitioncontext.cxx | 1
oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 27 --
oox/source/drawingml/diagram/layoutnodecontext.cxx | 6
oox/source/drawingml/hyperlinkcontext.cxx | 2
oox/source/drawingml/textfield.cxx | 8
oox/source/drawingml/textparagraphproperties.cxx | 2
oox/source/drawingml/textparagraphpropertiescontext.cxx | 4
oox/source/drawingml/textrun.cxx | 8
oox/source/export/drawingml.cxx | 2
oox/source/export/shapes.cxx | 4
oox/source/ole/axcontrol.cxx | 4
oox/source/ppt/pptimport.cxx | 2
oox/source/ppt/slidepersist.cxx | 1
oox/source/ppt/slidetransition.cxx | 2
oox/source/ppt/timenodelistcontext.cxx | 9
registry/source/regimpl.cxx | 1
registry/tools/options.cxx | 1
reportdesign/source/core/api/ReportDefinition.cxx | 1
reportdesign/source/ui/report/ReportSection.cxx | 3
reportdesign/source/ui/report/ViewsWindow.cxx | 1
rsc/source/rsc/rsc.cxx | 8
sal/osl/unx/process.cxx | 16 -
sal/osl/unx/signal.cxx | 2
sal/osl/w32/profile.cxx | 182 +-------------
sal/osl/w32/socket.cxx | 2
45 files changed, 64 insertions(+), 621 deletions(-)
New commits:
commit a005fbeddc4e615cfff56a9bd84355f8d42c1c8c
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Dec 12 15:05:28 2016 +0200
OSL_TRACE->SAL in framework..sal
Change-Id: I9a897af88aa9f6f7ca98ce521c69b5a4ee8462e9
Reviewed-on: https://gerrit.libreoffice.org/31903
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/framework/source/uielement/genericstatusbarcontroller.cxx b/framework/source/uielement/genericstatusbarcontroller.cxx
index 7432e8c..2ab0694 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 03dfe6d..bbfaf0e 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 e609cf1..c7380cae 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 67119cf..261a490 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 f016df1..0000000
--- 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 adfa1c2..50da8e1 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -20,6 +20,7 @@ certain functionality.
@section SAL
+ at 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
+ at 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 b6ef0a3..939eb43 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 6953267..d122962 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 e245ecc..6ec95ea 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 a4a887c..9d04e16 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 04fff73..75ae62b 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 f3b2029..bc07e9a 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 0c0f44e..100a6c5 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 df384d8..f3563ed 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 1d8cfc8..6c9f520 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 dba7d33..d5089da 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 371f011..061a192 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()
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list