summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-05-13 09:35:18 +0200
committerThomas Arnhold <thomas@arnhold.org>2014-05-13 18:04:58 +0000
commit7339ab25eee98b9c90cf46e9073c1faa6b53e9bc (patch)
tree7f1445b874aed755a8367b08843f4d25aa7259d9 /connectivity
parent286760359bae7e21a772dd104ab17a1df69a57b0 (diff)
fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
this is a continuation of the above bug, removing SAL_INFO's that only mark function entry. Change-Id: Idb0f72481415594e3f8b7a11ad6e4b8835f6fca0 Reviewed-on: https://gerrit.libreoffice.org/9343 Tested-by: Thomas Arnhold <thomas@arnhold.org> Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/commontools/FValue.cxx27
-rw-r--r--connectivity/source/commontools/TSkipDeletedSet.cxx7
-rw-r--r--connectivity/source/drivers/calc/CCatalog.cxx2
-rw-r--r--connectivity/source/drivers/calc/CConnection.cxx10
-rw-r--r--connectivity/source/drivers/calc/CDatabaseMetaData.cxx10
-rw-r--r--connectivity/source/drivers/calc/CTable.cxx22
-rw-r--r--connectivity/source/drivers/calc/CTables.cxx1
-rw-r--r--connectivity/source/drivers/dbase/DDatabaseMetaData.cxx15
-rw-r--r--connectivity/source/drivers/dbase/DTable.cxx46
-rw-r--r--connectivity/source/drivers/file/FCatalog.cxx6
-rw-r--r--connectivity/source/drivers/file/FDatabaseMetaData.cxx137
-rw-r--r--connectivity/source/drivers/file/FDriver.cxx9
-rw-r--r--connectivity/source/drivers/file/FNoException.cxx2
-rw-r--r--connectivity/source/drivers/file/FPreparedStatement.cxx43
-rw-r--r--connectivity/source/drivers/file/FResultSet.cxx98
-rw-r--r--connectivity/source/drivers/file/FResultSetMetaData.cxx23
-rw-r--r--connectivity/source/drivers/file/FStatement.cxx23
-rw-r--r--connectivity/source/drivers/file/FStringFunctions.cxx16
-rw-r--r--connectivity/source/drivers/file/FTable.cxx17
-rw-r--r--connectivity/source/drivers/file/fcode.cxx29
-rw-r--r--connectivity/source/drivers/file/quotedstring.cxx2
-rw-r--r--connectivity/source/drivers/firebird/Connection.cxx15
-rw-r--r--connectivity/source/drivers/flat/EDatabaseMetaData.cxx5
-rw-r--r--connectivity/source/drivers/flat/ETable.cxx10
-rw-r--r--connectivity/source/drivers/jdbc/Clob.cxx5
-rw-r--r--connectivity/source/drivers/jdbc/ResultSet.cxx86
-rw-r--r--connectivity/source/drivers/jdbc/ResultSetMetaData.cxx23
-rw-r--r--connectivity/source/drivers/mork/MQueryHelper.cxx14
-rw-r--r--connectivity/source/drivers/mork/MStatement.cxx24
-rw-r--r--connectivity/source/drivers/odbc/OResultSet.cxx32
-rw-r--r--connectivity/source/drivers/odbc/OResultSetMetaData.cxx13
-rw-r--r--connectivity/source/drivers/odbc/OTools.cxx7
-rw-r--r--connectivity/source/parse/sqliterator.cxx58
-rw-r--r--connectivity/source/parse/sqlnode.cxx43
34 files changed, 1 insertions, 879 deletions
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 4958bf62d8a2..e7bb80306cd3 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -42,7 +42,6 @@ namespace connectivity
namespace {
static bool isStorageCompatible(sal_Int32 _eType1, sal_Int32 _eType2)
{
- SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::isStorageCompatible" );
bool bIsCompatible = true;
if (_eType1 != _eType2)
@@ -193,7 +192,6 @@ namespace tracing
void ORowSetValue::setTypeKind(sal_Int32 _eType)
{
- SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::setTypeKind" );
if ( !m_bNull && !isStorageCompatible(_eType, m_eTypeKind) )
{
switch(_eType)
@@ -275,7 +273,6 @@ void ORowSetValue::setTypeKind(sal_Int32 _eType)
void ORowSetValue::free()
{
- SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::free" );
if(!m_bNull)
{
switch(m_eTypeKind)
@@ -884,7 +881,6 @@ bool ORowSetValue::operator==(const ORowSetValue& _rRH) const
Any ORowSetValue::makeAny() const
{
- SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::makeAny" );
Any rValue;
if(isBound() && !isNull())
{
@@ -978,7 +974,6 @@ Any ORowSetValue::makeAny() const
OUString ORowSetValue::getString( ) const
{
- SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::getString" );
OUString aRet;
if(!m_bNull)
{
@@ -1066,7 +1061,6 @@ OUString ORowSetValue::getString( ) const
bool ORowSetValue::getBool() const
{
- SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::getBool" );
bool bRet = false;
if(!m_bNull)
{
@@ -1139,9 +1133,6 @@ bool ORowSetValue::getBool() const
sal_Int8 ORowSetValue::getInt8() const
{
- SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::getInt8" );
-
-
sal_Int8 nRet = 0;
if(!m_bNull)
{
@@ -1285,9 +1276,6 @@ sal_uInt8 ORowSetValue::getUInt8() const
sal_Int16 ORowSetValue::getInt16() const
{
- SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::getInt16" );
-
-
sal_Int16 nRet = 0;
if(!m_bNull)
{
@@ -1430,7 +1418,6 @@ sal_uInt16 ORowSetValue::getUInt16() const
sal_Int32 ORowSetValue::getInt32() const
{
- SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::getInt32" );
sal_Int32 nRet = 0;
if(!m_bNull)
{
@@ -1577,7 +1564,6 @@ sal_uInt32 ORowSetValue::getUInt32() const
sal_Int64 ORowSetValue::getLong() const
{
- SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::getLong" );
sal_Int64 nRet = 0;
if(!m_bNull)
{
@@ -1724,7 +1710,6 @@ sal_uInt64 ORowSetValue::getULong() const
float ORowSetValue::getFloat() const
{
- SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::getFloat" );
float nRet = 0;
if(!m_bNull)
{
@@ -1801,9 +1786,6 @@ float ORowSetValue::getFloat() const
double ORowSetValue::getDouble() const
{
- SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::getDouble" );
-
-
double nRet = 0;
if(!m_bNull)
{
@@ -1880,7 +1862,6 @@ double ORowSetValue::getDouble() const
Sequence<sal_Int8> ORowSetValue::getSequence() const
{
- SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::getSequence" );
Sequence<sal_Int8> aSeq;
if (!m_bNull)
{
@@ -1953,7 +1934,6 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
::com::sun::star::util::Date ORowSetValue::getDate() const
{
- SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::getDate" );
::com::sun::star::util::Date aValue;
if(!m_bNull)
{
@@ -2012,7 +1992,6 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
::com::sun::star::util::Time ORowSetValue::getTime() const
{
- SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::getTime" );
::com::sun::star::util::Time aValue;
if(!m_bNull)
{
@@ -2057,7 +2036,6 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
::com::sun::star::util::DateTime ORowSetValue::getDateTime() const
{
- SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::getDateTime" );
::com::sun::star::util::DateTime aValue;
if(!m_bNull)
{
@@ -2110,7 +2088,6 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
void ORowSetValue::setSigned(bool _bMod)
{
- SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::setSigned" );
if ( m_bSigned != _bMod )
{
m_bSigned = _bMod;
@@ -2269,15 +2246,12 @@ void ORowSetValue::fill(sal_Int32 _nPos,
sal_Int32 _nType,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow>& _xRow)
{
- SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::fill (1)" );
fill(_nPos,_nType,true,_xRow);
}
void ORowSetValue::impl_fill( const sal_Int32 _nType, bool _bNullable, const detail::IValueSource& _rValueSource )
-
{
- SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::fill (2)" );
bool bReadData = true;
switch(_nType)
{
@@ -2365,7 +2339,6 @@ void ORowSetValue::impl_fill( const sal_Int32 _nType, bool _bNullable, const det
void ORowSetValue::fill(const Any& _rValue)
{
- SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen@sun.com ORowSetValue::fill (3)" );
switch (_rValue.getValueType().getTypeClass())
{
case TypeClass_VOID:
diff --git a/connectivity/source/commontools/TSkipDeletedSet.cxx b/connectivity/source/commontools/TSkipDeletedSet.cxx
index 52268ea2f717..58e1a73dc057 100644
--- a/connectivity/source/commontools/TSkipDeletedSet.cxx
+++ b/connectivity/source/commontools/TSkipDeletedSet.cxx
@@ -27,7 +27,6 @@ OSkipDeletedSet::OSkipDeletedSet(IResultSetHelper* _pHelper)
: m_pHelper(_pHelper)
,m_bDeletedVisible(false)
{
- SAL_INFO( "connectivity.commontools", "commontools Ocke.Janssen@sun.com OSkipDeletedSet::OSkipDeletedSet" );
m_aBookmarksPositions.reserve(256);
}
@@ -39,7 +38,6 @@ OSkipDeletedSet::~OSkipDeletedSet()
bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, bool _bRetrieveData)
{
- SAL_INFO( "connectivity.commontools", "commontools Ocke.Janssen@sun.com OSkipDeletedSet::skipDeleted" );
OSL_ENSURE(_eCursorPosition != IResultSetHelper::BOOKMARK,"OSkipDeletedSet::SkipDeleted can't be called for BOOKMARK");
IResultSetHelper::Movement eDelPosition = _eCursorPosition;
@@ -164,7 +162,6 @@ bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPosition, s
bool OSkipDeletedSet::moveAbsolute(sal_Int32 _nPos,bool _bRetrieveData)
{
- SAL_INFO( "connectivity.commontools", "commontools Ocke.Janssen@sun.com OSkipDeletedSet::moveAbsolute" );
bool bDataFound = false;
sal_Int32 nNewPos = _nPos;
if(nNewPos > 0)
@@ -227,14 +224,12 @@ bool OSkipDeletedSet::moveAbsolute(sal_Int32 _nPos,bool _bRetrieveData)
void OSkipDeletedSet::clear()
{
- SAL_INFO( "connectivity.commontools", "commontools Ocke.Janssen@sun.com OSkipDeletedSet::clear" );
::std::vector<sal_Int32>().swap(m_aBookmarksPositions);
//TInt2IntMap().swap(m_aBookmarks);
}
sal_Int32 OSkipDeletedSet::getMappedPosition(sal_Int32 _nPos) const
{
- SAL_INFO( "connectivity.commontools", "commontools Ocke.Janssen@sun.com OSkipDeletedSet::getMappedPosition" );
::std::vector<sal_Int32>::const_iterator aFind = ::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nPos);
if ( aFind != m_aBookmarksPositions.end() )
return (aFind - m_aBookmarksPositions.begin()) + 1;
@@ -247,7 +242,6 @@ sal_Int32 OSkipDeletedSet::getMappedPosition(sal_Int32 _nPos) const
void OSkipDeletedSet::insertNewPosition(sal_Int32 _nPos)
{
- SAL_INFO( "connectivity.commontools", "commontools Ocke.Janssen@sun.com OSkipDeletedSet::insertNewPosition" );
//OSL_ENSURE(m_aBookmarks.find(_nPos) == m_aBookmarks.end(),"OSkipDeletedSet::insertNewPosition: Invalid position");
//m_aBookmarksPositions.push_back(m_aBookmarks.insert(TInt2IntMap::value_type(_nPos,m_aBookmarksPositions.size()+1)).first);
//OSL_ENSURE(::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nPos) == m_aBookmarksPositions.end(),"Invalid driver pos");
@@ -256,7 +250,6 @@ void OSkipDeletedSet::insertNewPosition(sal_Int32 _nPos)
void OSkipDeletedSet::deletePosition(sal_Int32 _nBookmark)
{
- SAL_INFO( "connectivity.commontools", "commontools Ocke.Janssen@sun.com OSkipDeletedSet::deletePosition" );
::std::vector<sal_Int32>::iterator aFind = ::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nBookmark);
if ( aFind != m_aBookmarksPositions.end() )
{
diff --git a/connectivity/source/drivers/calc/CCatalog.cxx b/connectivity/source/drivers/calc/CCatalog.cxx
index da63d9d443a8..8bc6fa6240d4 100644
--- a/connectivity/source/drivers/calc/CCatalog.cxx
+++ b/connectivity/source/drivers/calc/CCatalog.cxx
@@ -34,12 +34,10 @@ using namespace connectivity::calc;
OCalcCatalog::OCalcCatalog(OCalcConnection* _pCon) : file::OFileCatalog(_pCon)
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcCatalog::OCalcCatalog" );
}
void OCalcCatalog::refreshTables()
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcCatalog::refreshTables" );
TStringVector aVector;
Sequence< OUString > aTypes;
OCalcConnection::ODocHolder aDocHodler(((OCalcConnection*)m_pConnection));
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index 408c1a832b66..b81a58564f17 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -54,7 +54,6 @@ using namespace ::com::sun::star::sheet;
OCalcConnection::OCalcConnection(ODriver* _pDriver) : OConnection(_pDriver),m_nDocCount(0)
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcConnection::OCalcConnection" );
// m_aFilenameExtension is not used
}
@@ -65,7 +64,6 @@ OCalcConnection::~OCalcConnection()
void OCalcConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)
throw(SQLException, RuntimeException, DeploymentException)
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcConnection::construct" );
// open file
sal_Int32 nLen = url.indexOf(':');
@@ -106,7 +104,6 @@ void OCalcConnection::construct(const OUString& url,const Sequence< PropertyValu
Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc()
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcConnection::acquireDoc" );
if ( m_xDoc.is() )
{
osl_atomic_increment(&m_nDocCount);
@@ -173,14 +170,12 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc()
void OCalcConnection::releaseDoc()
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcConnection::releaseDoc" );
if ( osl_atomic_decrement(&m_nDocCount) == 0 )
::comphelper::disposeComponent( m_xDoc );
}
void OCalcConnection::disposing()
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcConnection::disposing" );
::osl::MutexGuard aGuard(m_aMutex);
m_nDocCount = 0;
@@ -198,7 +193,6 @@ IMPLEMENT_SERVICE_INFO(OCalcConnection, "com.sun.star.sdbc.drivers.calc.Connecti
Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcConnection::getMetaData" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -217,7 +211,6 @@ Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData( ) throw(S
::com::sun::star::uno::Reference< XTablesSupplier > OCalcConnection::createCatalog()
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcConnection::createCatalog" );
::osl::MutexGuard aGuard( m_aMutex );
Reference< XTablesSupplier > xTab = m_xCatalog;
if(!xTab.is())
@@ -233,7 +226,6 @@ Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData( ) throw(S
Reference< XStatement > SAL_CALL OCalcConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcConnection::createStatement" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -248,7 +240,6 @@ Reference< XStatement > SAL_CALL OCalcConnection::createStatement( ) throw(SQLE
Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( const OUString& sql )
throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcConnection::prepareStatement" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -265,7 +256,6 @@ Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( cons
Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareCall( const OUString& /*sql*/ )
throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcConnection::prepareCall" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OConnection_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index fad14523d368..ad343a747b9e 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -50,7 +50,6 @@ using namespace ::com::sun::star::sheet;
OCalcDatabaseMetaData::OCalcDatabaseMetaData(OConnection* _pCon) :ODatabaseMetaData(_pCon)
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::OCalcDatabaseMetaData" );
}
@@ -62,7 +61,6 @@ OCalcDatabaseMetaData::~OCalcDatabaseMetaData()
Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw( )
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::impl_getTypeInfo_throw" );
::osl::MutexGuard aGuard( m_aMutex );
ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo);
@@ -145,7 +143,6 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::getColumns" );
::osl::MutexGuard aGuard( m_aMutex );
@@ -241,7 +238,6 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
OUString SAL_CALL OCalcDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::getURL" );
::osl::MutexGuard aGuard( m_aMutex );
return OUString("sdbc:calc:") + m_pConnection->getURL();
@@ -251,7 +247,6 @@ OUString SAL_CALL OCalcDatabaseMetaData::getURL( ) throw(SQLException, RuntimeE
sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::getMaxBinaryLiteralLength" );
return SAL_MAX_INT32;
}
@@ -259,25 +254,21 @@ sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQ
sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::getMaxCharLiteralLength" );
return SAL_MAX_INT32;
}
sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::getMaxColumnNameLength" );
return SAL_MAX_INT32;
}
sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::getMaxColumnsInIndex" );
return 1;
}
sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::getMaxColumnsInTable" );
return 256;
}
@@ -360,7 +351,6 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
const OUString& tableNamePattern, const Sequence< OUString >& types )
throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::getTables" );
::osl::MutexGuard aGuard( m_aMutex );
ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTables);
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 3fd7505d7bf4..7910c1031ed4 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -67,7 +67,6 @@ using namespace ::com::sun::star::util;
static void lcl_UpdateArea( const Reference<XCellRange>& xUsedRange, sal_Int32& rEndCol, sal_Int32& rEndRow )
{
- //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::lcl_UpdateArea" );
// update rEndCol, rEndRow if any non-empty cell in xUsedRange is right/below
const Reference<XCellRangesQuery> xUsedQuery( xUsedRange, UNO_QUERY );
@@ -91,7 +90,6 @@ static void lcl_UpdateArea( const Reference<XCellRange>& xUsedRange, sal_Int32&
static void lcl_GetDataArea( const Reference<XSpreadsheet>& xSheet, sal_Int32& rColumnCount, sal_Int32& rRowCount )
{
- //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::lcl_GetDataArea" );
Reference<XSheetCellCursor> xCursor = xSheet->createCursor();
Reference<XCellRangeAddressable> xRange( xCursor, UNO_QUERY );
if ( !xRange.is() )
@@ -141,7 +139,6 @@ static void lcl_GetDataArea( const Reference<XSpreadsheet>& xSheet, sal_Int32& r
static CellContentType lcl_GetContentOrResultType( const Reference<XCell>& xCell )
{
- //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::lcl_GetContentOrResultType" );
CellContentType eCellType = xCell->getType();
if ( eCellType == CellContentType_FORMULA )
{
@@ -161,7 +158,6 @@ static CellContentType lcl_GetContentOrResultType( const Reference<XCell>& xCell
static Reference<XCell> lcl_GetUsedCell( const Reference<XSpreadsheet>& xSheet, sal_Int32 nDocColumn, sal_Int32 nDocRow )
{
- //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::lcl_GetUsedCell" );
Reference<XCell> xCell = xSheet->getCellByPosition( nDocColumn, nDocRow );
if ( xCell.is() && xCell->getType() == CellContentType_EMPTY )
{
@@ -199,7 +195,6 @@ static Reference<XCell> lcl_GetUsedCell( const Reference<XSpreadsheet>& xSheet,
static bool lcl_HasTextInColumn( const Reference<XSpreadsheet>& xSheet, sal_Int32 nDocColumn, sal_Int32 nDocRow )
{
- //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::lcl_HasTextInColumn" );
// look for any text cell or text result in the column
Reference<XCellRangeAddressable> xAddr( xSheet, UNO_QUERY );
@@ -229,7 +224,6 @@ static void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Refe
sal_Int32 nDocColumn, sal_Int32 nStartRow, bool bHasHeaders,
OUString& rName, sal_Int32& rDataType, bool& rCurrency )
{
- //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::lcl_GetColumnInfo" );
//! avoid duplicate field names
// get column name from first row, if range contains headers
@@ -318,7 +312,6 @@ static void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& x
const ::Date& rNullDate,
sal_Int32 nDBRow, sal_Int32 nDBColumn, sal_Int32 nType )
{
- //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::lcl_SetValue" );
sal_Int32 nDocColumn = nStartCol + nDBColumn - 1; // database counts from 1
sal_Int32 nDocRow = nStartRow + nDBRow - 1;
if (bHasHeaders)
@@ -432,7 +425,6 @@ static void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& x
static OUString lcl_GetColumnStr( sal_Int32 nColumn )
{
- //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::lcl_GetColumnStr" );
if ( nColumn < 26 )
return OUString( (sal_Unicode) ( 'A' + nColumn ) );
else
@@ -447,7 +439,6 @@ static OUString lcl_GetColumnStr( sal_Int32 nColumn )
void OCalcTable::fillColumns()
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::fillColumns" );
if ( !m_xSheet.is() )
throw SQLException();
@@ -541,12 +532,10 @@ OCalcTable::OCalcTable(sdbcx::OCollection* _pTables,OCalcConnection* _pConnectio
,m_bHasHeaders(false)
,m_aNullDate(::Date::EMPTY)
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::OCalcTable" );
}
void OCalcTable::construct()
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::construct" );
// get sheet object
Reference< XSpreadsheetDocument> xDoc = m_pConnection->acquireDoc();
if (xDoc.is())
@@ -629,7 +618,6 @@ void OCalcTable::construct()
void OCalcTable::refreshColumns()
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::refreshColumns" );
::osl::MutexGuard aGuard( m_aMutex );
TStringVector aVector;
@@ -646,14 +634,12 @@ void OCalcTable::refreshColumns()
void OCalcTable::refreshIndexes()
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::refreshIndexes" );
// Calc table has no index
}
void SAL_CALL OCalcTable::disposing(void)
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::disposing" );
OFileTable::disposing();
::osl::MutexGuard aGuard(m_aMutex);
m_aColumns = NULL;
@@ -665,7 +651,6 @@ void SAL_CALL OCalcTable::disposing(void)
Sequence< Type > SAL_CALL OCalcTable::getTypes( ) throw(RuntimeException, std::exception)
{
- //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::getTypes" );
Sequence< Type > aTypes = OTable_TYPEDEF::getTypes();
::std::vector<Type> aOwnTypes;
aOwnTypes.reserve(aTypes.getLength());
@@ -704,7 +689,6 @@ Any SAL_CALL OCalcTable::queryInterface( const Type & rType ) throw(RuntimeExcep
Sequence< sal_Int8 > OCalcTable::getUnoTunnelImplementationId()
{
- //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::getUnoTunnelImplementationId" );
static ::cppu::OImplementationId * pId = 0;
if (! pId)
{
@@ -722,7 +706,6 @@ Sequence< sal_Int8 > OCalcTable::getUnoTunnelImplementationId()
sal_Int64 OCalcTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception)
{
- //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::getSomething" );
return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) )
? reinterpret_cast< sal_Int64 >( this )
: OCalcTable_BASE::getSomething(rId);
@@ -730,14 +713,11 @@ sal_Int64 OCalcTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (Ru
sal_Int32 OCalcTable::getCurrentLastPos() const
{
- //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::getCurrentLastPos" );
return m_nDataRows;
}
bool OCalcTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos)
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::seekRow" );
-
// prepare positioning:
sal_uInt32 nNumberOfRecords = m_nDataRows;
@@ -810,7 +790,6 @@ End:
bool OCalcTable::fetchRow( OValueRefRow& _rRow, const OSQLColumns & _rCols,
bool _bUseTableDefs, bool bRetrieveData )
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::fetchRow" );
// read the bookmark
bool bIsCurRecordDeleted = false;
@@ -846,7 +825,6 @@ bool OCalcTable::fetchRow( OValueRefRow& _rRow, const OSQLColumns & _rCols,
void OCalcTable::FileClose()
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::FileClose" );
::osl::MutexGuard aGuard(m_aMutex);
OCalcTable_BASE::FileClose();
diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx
index 7b084a16b7d2..8a2fae9e7fd4 100644
--- a/connectivity/source/drivers/calc/CTables.cxx
+++ b/connectivity/source/drivers/calc/CTables.cxx
@@ -37,7 +37,6 @@ using namespace ::com::sun::star::container;
sdbcx::ObjectType OCalcTables::createObject(const OUString& _rName)
{
- SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTables::createObject" );
OCalcTable* pTable = new OCalcTable(this,(OCalcConnection*)static_cast<OFileCatalog&>(m_rParent).getConnection(),
_rName,OUString("TABLE"));
sdbcx::ObjectType xRet = pTable;
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index 06700541cb9e..b3020417d5bb 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -46,7 +46,6 @@ using namespace ::com::sun::star::lang;
ODbaseDatabaseMetaData::ODbaseDatabaseMetaData(::connectivity::file::OConnection* _pCon) :ODatabaseMetaData(_pCon)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::ODbaseDatabaseMetaData" );
}
ODbaseDatabaseMetaData::~ODbaseDatabaseMetaData()
@@ -55,7 +54,6 @@ ODbaseDatabaseMetaData::~ODbaseDatabaseMetaData()
Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw( )
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::impl_getTypeInfo_throw" );
::osl::MutexGuard aGuard( m_aMutex );
::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo);
@@ -157,7 +155,6 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns(
const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getColumns" );
::osl::MutexGuard aGuard( m_aMutex );
@@ -249,7 +246,6 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
const Any& /*catalog*/, const OUString& /*schema*/, const OUString& table,
sal_Bool unique, sal_Bool /*approximate*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getIndexInfo" );
::osl::MutexGuard aGuard( m_aMutex );
Reference< XTablesSupplier > xTables = m_pConnection->createCatalog();
@@ -324,56 +320,47 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
OUString SAL_CALL ODbaseDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getURL" );
::osl::MutexGuard aGuard( m_aMutex );
return OUString("sdbc:dbase:") + m_pConnection->getURL();
}
sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getMaxBinaryLiteralLength" );
return SAL_MAX_INT32;
}
sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getMaxCharLiteralLength" );
return 254;
}
sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getMaxColumnNameLength" );
return 10;
}
sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getMaxColumnsInIndex" );
return 1;
}
sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getMaxColumnsInTable" );
return 128;
}
sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithAddColumn( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::supportsAlterTableWithAddColumn" );
return sal_True;
}
sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithDropColumn( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::supportsAlterTableWithDropColumn" );
return sal_False;
}
sal_Bool SAL_CALL ODbaseDatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::isReadOnly" );
::osl::MutexGuard aGuard( m_aMutex );
bool bReadOnly = false;
@@ -386,13 +373,11 @@ sal_Bool SAL_CALL ODbaseDatabaseMetaData::isReadOnly( ) throw(SQLException, Run
bool ODbaseDatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( )
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw" );
return true;
}
bool ODbaseDatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( )
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw" );
return true;
}
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 47e548aed9aa..609161eb2035 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -191,7 +191,6 @@ void lcl_CalDate(sal_Int32 _nJulianDate,sal_Int32 _nJulianTime,com::sun::star::u
void ODbaseTable::readHeader()
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::readHeader" );
OSL_ENSURE(m_pFileStream,"No Stream available!");
if(!m_pFileStream)
return;
@@ -294,7 +293,6 @@ void ODbaseTable::readHeader()
void ODbaseTable::fillColumns()
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::fillColumns" );
m_pFileStream->Seek(STREAM_SEEK_TO_BEGIN);
m_pFileStream->Seek(32L);
@@ -444,7 +442,6 @@ ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables, ODbaseConnection* _pConne
, m_pMemoStream(NULL)
, m_bWriteableMemo(false)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::ODbaseTable" );
// initialize the header
memset(&m_aHeader, 0, sizeof(m_aHeader));
m_aHeader.db_typ = dBaseIII;
@@ -465,7 +462,6 @@ ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables, ODbaseConnection* _pConne
, m_pMemoStream(NULL)
, m_bWriteableMemo(false)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::ODbaseTable" );
memset(&m_aHeader, 0, sizeof(m_aHeader));
m_eEncoding = getConnection()->getTextEncoding();
}
@@ -473,7 +469,6 @@ ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables, ODbaseConnection* _pConne
void ODbaseTable::construct()
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::construct" );
// initialize the header
m_aHeader.db_typ = dBaseIII;
m_aHeader.db_anz = 0;
@@ -556,7 +551,6 @@ void ODbaseTable::construct()
bool ODbaseTable::ReadMemoHeader()
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::ReadMemoHeader" );
m_pMemoStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
m_pMemoStream->RefreshBuffer(); // make sure that the header information is actually read again
m_pMemoStream->Seek(0L);
@@ -606,7 +600,6 @@ bool ODbaseTable::ReadMemoHeader()
OUString ODbaseTable::getEntry(OConnection* _pConnection,const OUString& _sName )
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::getEntry" );
OUString sURL;
try
{
@@ -650,7 +643,6 @@ OUString ODbaseTable::getEntry(OConnection* _pConnection,const OUString& _sName
void ODbaseTable::refreshColumns()
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::refreshColumns" );
::osl::MutexGuard aGuard( m_aMutex );
TStringVector aVector;
@@ -667,7 +659,6 @@ void ODbaseTable::refreshColumns()
void ODbaseTable::refreshIndexes()
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::refreshIndexes" );
TStringVector aVector;
if(m_pFileStream && (!m_pIndexes || m_pIndexes->getCount() == 0))
{
@@ -712,7 +703,6 @@ void ODbaseTable::refreshIndexes()
void SAL_CALL ODbaseTable::disposing(void)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::disposing" );
OFileTable::disposing();
::osl::MutexGuard aGuard(m_aMutex);
m_aColumns = NULL;
@@ -720,7 +710,6 @@ void SAL_CALL ODbaseTable::disposing(void)
Sequence< Type > SAL_CALL ODbaseTable::getTypes( ) throw(RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::getTypes" );
Sequence< Type > aTypes = OTable_TYPEDEF::getTypes();
::std::vector<Type> aOwnTypes;
aOwnTypes.reserve(aTypes.getLength());
@@ -743,7 +732,6 @@ Sequence< Type > SAL_CALL ODbaseTable::getTypes( ) throw(RuntimeException, std:
Any SAL_CALL ODbaseTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::queryInterface" );
if( rType == ::getCppuType((const Reference<XKeysSupplier>*)0) ||
rType == ::getCppuType((const Reference<XDataDescriptorFactory>*)0))
return Any();
@@ -755,7 +743,6 @@ Any SAL_CALL ODbaseTable::queryInterface( const Type & rType ) throw(RuntimeExce
Sequence< sal_Int8 > ODbaseTable::getUnoTunnelImplementationId()
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::getUnoTunnelImplementationId" );
static ::cppu::OImplementationId * pId = 0;
if (! pId)
{
@@ -773,7 +760,6 @@ Sequence< sal_Int8 > ODbaseTable::getUnoTunnelImplementationId()
sal_Int64 ODbaseTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::getSomething" );
return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) )
? reinterpret_cast< sal_Int64 >( this )
: ODbaseTable_BASE::getSomething(rId);
@@ -781,7 +767,6 @@ sal_Int64 ODbaseTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (R
bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool _bUseTableDefs, bool bRetrieveData)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::fetchRow" );
// Read the data
bool bIsCurRecordDeleted = (char)m_pBuffer[0] == '*';
@@ -1004,7 +989,6 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool
void ODbaseTable::FileClose()
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::FileClose" );
::osl::MutexGuard aGuard(m_aMutex);
// if not everything has been written yet
if (m_pMemoStream && m_pMemoStream->IsWritable())
@@ -1018,7 +1002,6 @@ void ODbaseTable::FileClose()
bool ODbaseTable::CreateImpl()
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::CreateImpl" );
OSL_ENSURE(!m_pFileStream, "SequenceError");
if ( m_pConnection->isCheckEnabled() && ::dbtools::convertName2SQLName(m_Name,OUString()) != m_Name )
@@ -1133,7 +1116,6 @@ bool ODbaseTable::CreateImpl()
void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const OUString& _sColumnName)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::throwInvalidColumnType" );
try
{
// we have to drop the file because it is corrupted now
@@ -1153,7 +1135,6 @@ void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const OUStri
// creates in principle dBase IV file format
bool ODbaseTable::CreateFile(const INetURLObject& aFile, bool& bCreateMemo)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::CreateFile" );
bCreateMemo = false;
Date aDate( Date::SYSTEM ); // current date
@@ -1402,7 +1383,6 @@ bool ODbaseTable::CreateFile(const INetURLObject& aFile, bool& bCreateMemo)
// creates in principle dBase III file format
bool ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::CreateMemoFile" );
// filehandling macro for table creation
m_pMemoStream = createStream_simpleError( aFile.GetMainURL(INetURLObject::NO_DECODE),STREAM_READWRITE | STREAM_SHARE_DENYWRITE);
@@ -1422,7 +1402,6 @@ bool ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
bool ODbaseTable::Drop_Static(const OUString& _sUrl, bool _bHasMemoFields, OCollection* _pIndexes )
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::Drop_Static" );
INetURLObject aURL;
aURL.SetURL(_sUrl);
@@ -1471,7 +1450,6 @@ bool ODbaseTable::Drop_Static(const OUString& _sUrl, bool _bHasMemoFields, OColl
bool ODbaseTable::DropImpl()
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::DropImpl" );
FileClose();
if(!m_pIndexes)
@@ -1490,7 +1468,6 @@ bool ODbaseTable::DropImpl()
bool ODbaseTable::InsertRow(OValueRefVector& rRow, bool bFlush, const Reference<XIndexAccess>& _xCols)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::InsertRow" );
// fill buffer with blanks
AllocBuffer();
memset(m_pBuffer, 0, m_aHeader.db_slng);
@@ -1548,7 +1525,6 @@ bool ODbaseTable::InsertRow(OValueRefVector& rRow, bool bFlush, const Reference<
bool ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow, const Reference<XIndexAccess>& _xCols)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::UpdateRow" );
// fill buffer with blanks
AllocBuffer();
@@ -1578,7 +1554,6 @@ bool ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow, const
bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::DeleteRow" );
// Set the Delete-Flag (be it set or not):
// Position on desired record:
sal_Size nFilePos = m_aHeader.db_kopf + (long)(m_nFilePos-1) * m_aHeader.db_slng;
@@ -1631,7 +1606,6 @@ bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
Reference<XPropertySet> ODbaseTable::isUniqueByColumnName(sal_Int32 _nColumnPos)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::isUniqueByColumnName" );
if(!m_pIndexes)
refreshIndexes();
if(m_pIndexes->hasElements())
@@ -1666,7 +1640,6 @@ static double toDouble(const OString& rString)
bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow, const Reference<XIndexAccess>& _xCols, const bool bForceAllFields)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::UpdateBuffer" );
OSL_ENSURE(m_pBuffer,"Buffer is NULL!");
if ( !m_pBuffer )
return false;
@@ -2003,7 +1976,6 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow, cons
bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_Size& rBlockNr)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::WriteMemo" );
// if the BlockNo 0 is given, the block will be appended at the end
sal_Size nSize = 0;
OString aStr;
@@ -2139,7 +2111,6 @@ bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_Size& rBlockNr)
// XAlterTable
void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::alterColumnByName" );
::osl::MutexGuard aGuard(m_aMutex);
checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
@@ -2152,7 +2123,6 @@ void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Ref
void SAL_CALL ODbaseTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::alterColumnByIndex" );
::osl::MutexGuard aGuard(m_aMutex);
checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
@@ -2168,7 +2138,6 @@ void ODbaseTable::alterColumn(sal_Int32 index,
const Reference< XPropertySet >& descriptor ,
const Reference< XDataDescriptorFactory >& xOldColumn )
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::alterColumn" );
if(index < 0 || index >= m_pColumns->getCount())
throw IndexOutOfBoundsException(OUString::number(index),*this);
@@ -2274,13 +2243,11 @@ void ODbaseTable::alterColumn(sal_Int32 index,
Reference< XDatabaseMetaData> ODbaseTable::getMetaData() const
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::getMetaData" );
return getConnection()->getMetaData();
}
void SAL_CALL ODbaseTable::rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::rename" );
::osl::MutexGuard aGuard(m_aMutex);
checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
if(m_pTables && m_pTables->hasByName(newName))
@@ -2337,7 +2304,6 @@ namespace
void SAL_CALL ODbaseTable::renameImpl( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::getEntry" );
::osl::MutexGuard aGuard(m_aMutex);
FileClose();
@@ -2353,7 +2319,6 @@ void SAL_CALL ODbaseTable::renameImpl( const OUString& newName ) throw(::com::su
void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::addColumn" );
OUString sTempName = createTempFile();
ODbaseTable* pNewTable = new ODbaseTable(m_pTables,static_cast<ODbaseConnection*>(m_pConnection));
@@ -2426,7 +2391,6 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
void ODbaseTable::dropColumn(sal_Int32 _nPos)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::dropColumn" );
OUString sTempName = createTempFile();
ODbaseTable* pNewTable = new ODbaseTable(m_pTables,static_cast<ODbaseConnection*>(m_pConnection));
@@ -2482,7 +2446,6 @@ void ODbaseTable::dropColumn(sal_Int32 _nPos)
OUString ODbaseTable::createTempFile()
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::createTempFile" );
OUString aIdent = m_pConnection->getContent()->getIdentifier()->getContentIdentifier();
if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) )
aIdent += "/";
@@ -2505,7 +2468,6 @@ OUString ODbaseTable::createTempFile()
void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::copyData" );
sal_Int32 nPos = _nPos + 1; // +1 because we always have the bookmark clumn as well
OValueRefRow aRow = new OValueRefVector(m_pColumns->getCount());
OValueRefRow aInsertRow;
@@ -2563,7 +2525,6 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos)
void ODbaseTable::throwInvalidDbaseFormat()
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::throwInvalidDbaseFormat" );
FileClose();
// no dbase file
@@ -2576,15 +2537,12 @@ void ODbaseTable::throwInvalidDbaseFormat()
void ODbaseTable::refreshHeader()
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::refreshHeader" );
if ( m_aHeader.db_anz == 0 )
readHeader();
}
bool ODbaseTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::seekRow" );
-
// prepare positioning:
OSL_ENSURE(m_pFileStream,"ODbaseTable::seekRow: FileStream is NULL!");
@@ -2667,7 +2625,6 @@ End:
bool ODbaseTable::ReadMemo(sal_Size nBlockNo, ORowSetValue& aVariable)
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::ReadMemo" );
bool bIsText = true;
m_pMemoStream->Seek(nBlockNo * m_aMemoHeader.db_size);
@@ -2744,7 +2701,6 @@ bool ODbaseTable::ReadMemo(sal_Size nBlockNo, ORowSetValue& aVariable)
void ODbaseTable::AllocBuffer()
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::AllocBuffer" );
sal_uInt16 nSize = m_aHeader.db_slng;
OSL_ENSURE(nSize > 0, "Size too small");
@@ -2764,7 +2720,6 @@ void ODbaseTable::AllocBuffer()
bool ODbaseTable::WriteBuffer()
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::WriteBuffer" );
OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige Record-Position");
// position on desired record:
@@ -2775,7 +2730,6 @@ bool ODbaseTable::WriteBuffer()
sal_Int32 ODbaseTable::getCurrentLastPos() const
{
- SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::getCurrentLastPos" );
return m_aHeader.db_anz;
}
diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx
index 052145b4ccd3..2026f4244d78 100644
--- a/connectivity/source/drivers/file/FCatalog.cxx
+++ b/connectivity/source/drivers/file/FCatalog.cxx
@@ -35,12 +35,10 @@ using namespace connectivity::file;
OFileCatalog::OFileCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon)
,m_pConnection(_pCon)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileCatalog::OFileCatalog" );
}
void SAL_CALL OFileCatalog::disposing()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileCatalog::disposing" );
::osl::MutexGuard aGuard(m_aMutex);
typedef connectivity::sdbcx::OCatalog OFileCatalog_BASE;
@@ -50,13 +48,11 @@ m_xMetaData.clear();
OUString OFileCatalog::buildName(const Reference< XRow >& _xRow)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileCatalog::buildName" );
return _xRow->getString(3);
}
void OFileCatalog::refreshTables()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileCatalog::refreshTables" );
TStringVector aVector;
Sequence< OUString > aTypes;
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
@@ -72,7 +68,6 @@ void OFileCatalog::refreshTables()
Any SAL_CALL OFileCatalog::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileCatalog::queryInterface" );
if( rType == ::getCppuType((const Reference<XGroupsSupplier>*)0) ||
rType == ::getCppuType((const Reference<XUsersSupplier>*)0) ||
rType == ::getCppuType((const Reference<XViewsSupplier>*)0))
@@ -85,7 +80,6 @@ Any SAL_CALL OFileCatalog::queryInterface( const Type & rType ) throw(RuntimeExc
Sequence< Type > SAL_CALL OFileCatalog::getTypes( ) throw(RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileCatalog::getTypes" );
typedef sdbcx::OCatalog OFileCatalog_BASE;
Sequence< Type > aTypes = OFileCatalog_BASE::getTypes();
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index 06b17ca4f3e8..c36c3029d6ea 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -47,7 +47,6 @@ using namespace com::sun::star::container;
ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon) : ::connectivity::ODatabaseMetaDataBase(_pCon,_pCon->getConnectionInfo())
,m_pConnection(_pCon)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::ODatabaseMetaData" );
}
ODatabaseMetaData::~ODatabaseMetaData()
@@ -56,13 +55,11 @@ ODatabaseMetaData::~ODatabaseMetaData()
Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( )
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_getTypeInfo_throw" );
return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTypeInfo );
}
OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( )
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_getCatalogSeparator_throw" );
return OUString();
}
@@ -70,7 +67,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/,
const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getColumns" );
SAL_WARN( "connectivity.drivers","Should be overloaded!");
return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumns );
}
@@ -163,7 +159,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
const Any& /*catalog*/, const OUString& /*schemaPattern*/,
const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getTables" );
::osl::MutexGuard aGuard( m_aMutex );
@@ -316,80 +311,67 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxBinaryLiteralLength" );
return 0;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxRowSize" );
return 0;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxCatalogNameLength" );
return 0;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxCharLiteralLength" );
return SAL_MAX_INT32;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxColumnNameLength" );
return 0;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxColumnsInIndex" );
return 0;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxCursorNameLength" );
return 0;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxConnections" );
return 0;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxColumnsInTable" );
return 0;
}
sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw( )
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_getMaxStatements_throw" );
return 0;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxTableNameLength" );
return 0;
}
sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( )
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_getMaxTablesInSelect_throw" );
return 1;
}
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getTablePrivileges" );
::osl::MutexGuard aGuard( m_aMutex );
ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges );
@@ -458,230 +440,192 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::doesMaxRowSizeIncludeBlobs" );
return sal_True;
}
sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::storesLowerCaseQuotedIdentifiers" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::storesLowerCaseIdentifiers" );
return sal_False;
}
bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( )
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw" );
return false;
}
sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::storesMixedCaseIdentifiers" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::storesUpperCaseQuotedIdentifiers" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::storesUpperCaseIdentifiers" );
return sal_False;
}
bool ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw( )
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw" );
return false;
}
bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( )
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw" );
return false;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxIndexLength" );
return 0;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsNonNullableColumns" );
return sal_False;
}
OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getCatalogTerm" );
return OUString();
}
OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( )
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_getIdentifierQuoteString_throw" );
static const OUString sQuote("\"");
return sQuote;
}
OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getExtraNameCharacters" );
return OUString();
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsDifferentTableCorrelationNames" );
return sal_True;
}
bool ODatabaseMetaData::impl_isCatalogAtStart_throw( )
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_isCatalogAtStart_throw" );
return true;
}
sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::dataDefinitionIgnoredInTransactions" );
return sal_True;
}
sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::dataDefinitionCausesTransactionCommit" );
return sal_True;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsDataManipulationTransactionsOnly" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsPositionedDelete" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsPositionedUpdate" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsOpenStatementsAcrossRollback" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsOpenStatementsAcrossCommit" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsOpenCursorsAcrossCommit" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsOpenCursorsAcrossRollback" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsTransactionIsolationLevel" );
return sal_False;
}
bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( )
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw" );
return false;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsANSI92FullSQL" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsANSI92EntryLevelSQL" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsIntegrityEnhancementFacility" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSchemasInIndexDefinitions" );
return sal_False;
}
bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( )
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw" );
return false;
}
bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( )
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw" );
return false;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsCatalogsInIndexDefinitions" );
return sal_False;
}
bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( )
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw" );
return false;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsOuterJoins" );
return sal_False;
}
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getTableTypes" );
::osl::MutexGuard aGuard( m_aMutex );
ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTableTypes );
@@ -700,416 +644,347 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLE
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxStatementLength" );
return 0;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxProcedureNameLength" );
return 0;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxSchemaNameLength" );
return 0;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsTransactions" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::allProceduresAreCallable" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsStoredProcedures" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSelectForUpdate" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::allTablesAreSelectable" );
return sal_True;
}
sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::isReadOnly" );
return sal_True;
}
sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::usesLocalFiles" );
return sal_True;
}
sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::usesLocalFilePerTable" );
return sal_True;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsTypeConversion" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::nullPlusNonNullIsNull" );
return sal_True;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsColumnAliasing" );
return sal_True;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsTableCorrelationNames" );
return sal_True;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsConvert" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsExpressionsInOrderBy" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsGroupBy" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsGroupByBeyondSelect" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsGroupByUnrelated" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsMultipleTransactions" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsMultipleResultSets" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsLikeEscapeClause" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsOrderByUnrelated" );
return sal_True;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsUnion" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsUnionAll" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsMixedCaseIdentifiers" );
return sal_True;
}
bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( )
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw" );
return false;
}
sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::nullsAreSortedAtEnd" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::nullsAreSortedAtStart" );
return sal_True;
}
sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::nullsAreSortedHigh" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::nullsAreSortedLow" );
return sal_True;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSchemasInProcedureCalls" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsCatalogsInProcedureCalls" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsCorrelatedSubqueries" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSubqueriesInComparisons" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSubqueriesInExists" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSubqueriesInIns" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSubqueriesInQuantifieds" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsANSI92IntermediateSQL" );
return sal_False;
}
OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getURL" );
static const OUString aValue( "sdbc:file:" );
return aValue;
}
OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getUserName" );
return OUString();
}
OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDriverName" );
return OUString();
}
OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDriverVersion" );
return OUString::number(1);
}
OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDatabaseProductVersion" );
return OUString::number(0);
}
OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDatabaseProductName" );
return OUString();
}
OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getProcedureTerm" );
return OUString();
}
OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getSchemaTerm" );
return OUString();
}
sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDriverMajorVersion" );
return 0;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDefaultTransactionIsolation" );
return 0;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDriverMinorVersion" );
return 0;
}
OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getSQLKeywords" );
return OUString();
}
OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getSearchStringEscape" );
return OUString();
}
OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getStringFunctions" );
return OUString("UCASE,LCASE,ASCII,LENGTH,OCTET_LENGTH,CHAR_LENGTH,CHARACTER_LENGTH,CHAR,CONCAT,LOCATE,SUBSTRING,LTRIM,RTRIM,SPACE,REPLACE,REPEAT,INSERT,LEFT,RIGHT");
}
OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getTimeDateFunctions" );
return OUString("DAYOFWEEK,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME,MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,CURDATE,CURTIME,NOW");
}
OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getSystemFunctions" );
return OUString();
}
OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getNumericFunctions" );
return OUString("ABS,SIGN,MOD,FLOOR,CEILING,ROUND,EXP,LN,LOG,LOG10,POWER,SQRT,PI,COS,SIN,TAN,ACOS,ASIN,ATAN,ATAN2,DEGREES,RADIANS");
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsExtendedSQLGrammar" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsCoreSQLGrammar" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsMinimumSQLGrammar" );
return sal_True;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsFullOuterJoins" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsLimitedOuterJoins" );
return sal_False;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxColumnsInGroupBy" );
return 0;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxColumnsInOrderBy" );
return 0;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxColumnsInSelect" );
return 0;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxUserNameLength" );
return 0;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsResultSetType" );
switch(setType)
{
case ResultSetType::FORWARD_ONLY:
@@ -1123,7 +998,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)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsResultSetConcurrency" );
switch(setType)
{
case ResultSetType::FORWARD_ONLY:
@@ -1137,67 +1011,56 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 set
sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::ownUpdatesAreVisible" );
return sal_True;
}
sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::ownDeletesAreVisible" );
return sal_True;
}
sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::ownInsertsAreVisible" );
return sal_True;
}
sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::othersUpdatesAreVisible" );
return sal_True;
}
sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::othersDeletesAreVisible" );
return sal_True;
}
sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::othersInsertsAreVisible" );
return sal_True;
}
sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::updatesAreDetected" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::deletesAreDetected" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::insertsAreDetected" );
return sal_False;
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsBatchUpdates" );
return sal_False;
}
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getUDTs" );
return NULL;
}
diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index 4b18f9feeffa..b88dbfdcbb29 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -40,12 +40,10 @@ OFileDriver::OFileDriver(const ::com::sun::star::uno::Reference< ::com::sun::sta
: ODriver_BASE(m_aMutex)
,m_xContext(_rxContext)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::OFileDriver" );
}
void OFileDriver::disposing()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::disposing" );
::osl::MutexGuard aGuard(m_aMutex);
@@ -95,7 +93,6 @@ Sequence< OUString > SAL_CALL OFileDriver::getSupportedServiceNames( ) throw(Ru
Reference< XConnection > SAL_CALL OFileDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::connect" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(ODriver_BASE::rBHelper.bDisposed);
@@ -110,13 +107,11 @@ Reference< XConnection > SAL_CALL OFileDriver::connect( const OUString& url, con
sal_Bool SAL_CALL OFileDriver::acceptsURL( const OUString& url )
throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::acceptsURL" );
return url.startsWith("sdbc:file:");
}
Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::getPropertyInfo" );
if ( acceptsURL(url) )
{
::std::vector< DriverPropertyInfo > aDriverInfo;
@@ -179,13 +174,11 @@ Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUSt
sal_Int32 SAL_CALL OFileDriver::getMajorVersion( ) throw(RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::getMajorVersion" );
return 1;
}
sal_Int32 SAL_CALL OFileDriver::getMinorVersion( ) throw(RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::getMinorVersion" );
return 0;
}
@@ -193,7 +186,6 @@ sal_Int32 SAL_CALL OFileDriver::getMinorVersion( ) throw(RuntimeException, std:
// XDataDefinitionSupplier
Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection( const Reference< ::com::sun::star::sdbc::XConnection >& connection ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::getDataDefinitionByConnection" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(ODriver_BASE::rBHelper.bDisposed);
@@ -221,7 +213,6 @@ Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection
Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::getDataDefinitionByURL" );
if ( ! acceptsURL(url) )
{
::connectivity::SharedResources aResources;
diff --git a/connectivity/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx
index d456654d480c..70f5dfb0d8db 100644
--- a/connectivity/source/drivers/file/FNoException.cxx
+++ b/connectivity/source/drivers/file/FNoException.cxx
@@ -69,7 +69,6 @@ void OSQLAnalyzer::bindParameterRow(OValueRefRow& _pRow)
void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::scanParameter" );
DBG_ASSERT(pParseNode != NULL,"OResultSet: interner Fehler: ungueltiger ParseNode");
// found parameter Name-Rule?
@@ -90,7 +89,6 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector<
OKeyValue* OResultSet::GetOrderbyKeyValue(OValueRefRow& _rRow)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::GetOrderbyKeyValue" );
sal_uInt32 nBookmarkValue = std::abs((sal_Int32)(_rRow->get())[0]->getValue());
OKeyValue* pKeyValue = OKeyValue::createKeyValue((sal_uInt32)nBookmarkValue);
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index f4ed968dcdc5..6fb706bde90a 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -54,19 +54,16 @@ IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbc.driver.file.Prepare
OPreparedStatement::OPreparedStatement( OConnection* _pConnection)
: OStatement_BASE2( _pConnection )
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::OPreparedStatement" );
}
OPreparedStatement::~OPreparedStatement()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::~OPreparedStatement" );
}
void OPreparedStatement::disposing()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::disposing" );
::osl::MutexGuard aGuard(m_aMutex);
OStatement_BASE2::disposing();
@@ -82,7 +79,6 @@ void OPreparedStatement::disposing()
void OPreparedStatement::construct(const OUString& sql) throw(SQLException, RuntimeException)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::construct" );
OStatement_Base::construct(sql);
m_aParameterRow = new OValueRefVector();
@@ -135,7 +131,6 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt
Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::getMetaData" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -148,7 +143,6 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) thr
void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::close" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
}
@@ -156,7 +150,6 @@ void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException
sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::execute" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -173,7 +166,6 @@ sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeExc
sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::executeUpdate" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -196,14 +188,12 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, Run
void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setString" );
setParameter(parameterIndex,x);
}
Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::getConnection" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -213,7 +203,6 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQ
Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::executeQuery" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -223,40 +212,34 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLE
void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setBoolean" );
setParameter(parameterIndex,static_cast<bool>(x));
}
void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setByte" );
setParameter(parameterIndex,x);
}
void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const util::Date& aData ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setDate" );
setParameter(parameterIndex,DBTypeConversion::toDouble(aData));
}
void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const util::Time& aVal ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setTime" );
setParameter(parameterIndex,DBTypeConversion::toDouble(aVal));
}
void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const util::DateTime& aVal ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setTimestamp" );
setParameter(parameterIndex,DBTypeConversion::toDouble(aVal));
}
void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setDouble" );
setParameter(parameterIndex,x);
}
@@ -264,28 +247,24 @@ void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x
void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setFloat" );
setParameter(parameterIndex,x);
}
void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setInt" );
setParameter(parameterIndex,x);
}
void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setLong" );
throwFeatureNotImplementedException( "XParameters::setLong", *this );
}
void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setNull" );
::osl::MutexGuard aGuard( m_aMutex );
checkAndResizeParameters(parameterIndex);
@@ -298,35 +277,30 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /
void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setClob" );
throwFeatureNotImplementedException( "XParameters::setClob", *this );
}
void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setBlob" );
throwFeatureNotImplementedException( "XParameters::setBlob", *this );
}
void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setArray" );
throwFeatureNotImplementedException( "XParameters::setArray", *this );
}
void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setRef" );
throwFeatureNotImplementedException( "XParameters::setRef", *this );
}
void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setObjectWithInfo" );
switch(sqlType)
{
case DataType::DECIMAL:
@@ -342,14 +316,12 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c
void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setObjectNull" );
setNull(parameterIndex,sqlType);
}
void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setObject" );
if(!::dbtools::implSetObject(this,parameterIndex,x))
{
const OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution(
@@ -364,14 +336,12 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any
void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setShort" );
setParameter(parameterIndex,x);
}
void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setBytes" );
setParameter(parameterIndex,x);
}
@@ -379,14 +349,12 @@ void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequ
void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setCharacterStream" );
setBinaryStream(parameterIndex,x,length );
}
void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setBinaryStream" );
if(!x.is())
::dbtools::throwFunctionSequenceException(*this);
@@ -398,7 +366,6 @@ void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, con
void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::clearParameters" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -408,14 +375,11 @@ void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, Runtim
OResultSet* OPreparedStatement::createResultSet()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::createResultSet" );
return new OResultSet(this,m_aSQLIterator);
}
void OPreparedStatement::initResultSet(OResultSet *pResultSet)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::initResultSet" );
-
// check if we got enough parameters
if ( (m_aParameterRow.is() && ( m_aParameterRow->get().size() -1 ) < m_xParamColumns->get().size()) ||
(m_xParamColumns.is() && !m_aParameterRow.is() && !m_aParameterRow->get().empty()) )
@@ -437,7 +401,6 @@ void SAL_CALL OPreparedStatement::release() throw()
void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::checkAndResizeParameters" );
::connectivity::checkDisposed(OStatement_BASE::rBHelper.bDisposed);
if ( m_aAssignValues.is() && (parameterIndex < 1 || parameterIndex >= static_cast<sal_Int32>(m_aParameterIndexes.size())) )
throwInvalidIndexException(*this);
@@ -455,7 +418,6 @@ void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex)
void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const ORowSetValue& x)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setParameter" );
::osl::MutexGuard aGuard( m_aMutex );
checkAndResizeParameters(parameterIndex);
@@ -467,7 +429,6 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const ORowSetVal
sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::AddParameter" );
OSL_UNUSED( pParameter );
OSL_ENSURE(SQL_ISRULE(pParameter,parameter),"OResultSet::AddParameter: Argument ist kein Parameter");
OSL_ENSURE(pParameter->count() > 0,"OResultSet: Fehler im Parse Tree");
@@ -515,7 +476,6 @@ sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Re
void OPreparedStatement::describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::describeColumn" );
Reference<XPropertySet> xProp;
if(SQL_ISRULE(_pNode,column_ref))
{
@@ -535,7 +495,6 @@ void OPreparedStatement::describeColumn(OSQLParseNode* _pParameter,OSQLParseNode
void OPreparedStatement::describeParameter()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::describeParameter" );
::std::vector< OSQLParseNode*> aParseNodes;
scanParameter(m_pParseTree,aParseNodes);
if ( !aParseNodes.empty() )
@@ -556,7 +515,6 @@ void OPreparedStatement::describeParameter()
void OPreparedStatement::initializeResultSet(OResultSet* pRS)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::initializeResultSet" );
OStatement_Base::initializeResultSet(pRS);
pRS->setParameterColumns(m_xParamColumns);
@@ -597,7 +555,6 @@ void OPreparedStatement::initializeResultSet(OResultSet* pRS)
void OPreparedStatement::parseParamterElem(const OUString& _sColumnName, OSQLParseNode* pRow_Value_Constructor_Elem)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::parseParamterElem" );
Reference<XPropertySet> xCol;
m_xColNames->getByName(_sColumnName) >>= xCol;
sal_Int32 nParameter = -1;
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index fd90fb1fddb0..aece696e95b8 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -108,7 +108,6 @@ OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator& _aSQLIte
,m_bShowDeleted(pStmt->getOwnConnection()->showDeleted())
,m_bIsCount(false)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::OResultSet" );
osl_atomic_increment( &m_refCount );
m_bIsCount = (m_pParseTree &&
m_pParseTree->count() > 2 &&
@@ -127,14 +126,12 @@ OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator& _aSQLIte
OResultSet::~OResultSet()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::~OResultSet" );
osl_atomic_increment( &m_refCount );
disposing();
}
void OResultSet::construct()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::construct" );
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::cppu::UnoType<sal_Int32>::get());
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::cppu::UnoType<sal_Int32>::get());
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0,&m_nFetchDirection, ::cppu::UnoType<sal_Int32>::get());
@@ -143,7 +140,6 @@ void OResultSet::construct()
void OResultSet::disposing(void)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::disposing" );
OPropertySetHelper::disposing();
::osl::MutexGuard aGuard(m_aMutex);
@@ -175,14 +171,12 @@ void OResultSet::disposing(void)
Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
{
- //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::queryInterface" );
Any aRet = OPropertySetHelper::queryInterface(rType);
return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType);
}
Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw(RuntimeException, std::exception)
{
- //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getTypes" );
::osl::MutexGuard aGuard( m_aMutex );
OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
@@ -195,7 +189,6 @@ Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw(RuntimeException, std::
sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::findColumn" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -217,7 +210,6 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQ
const ORowSetValue& OResultSet::getValue(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getValue" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -230,7 +222,6 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 columnIndex ) throw(::com::su
void OResultSet::checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException)
{
- //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::checkIndex" );
if ( columnIndex <= 0
|| columnIndex >= m_nColumnCount )
::dbtools::throwInvalidIndexException(*this);
@@ -238,69 +229,59 @@ void OResultSet::checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc
Reference< ::com::sun::star::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getBinaryStream" );
return NULL;
}
Reference< ::com::sun::star::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getCharacterStream" );
return NULL;
}
sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getBoolean" );
return getValue(columnIndex);
}
sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getByte" );
return getValue(columnIndex);
}
Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getBytes" );
return getValue(columnIndex);
}
::com::sun::star::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getDate" );
return getValue(columnIndex);
}
double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getDouble" );
return getValue(columnIndex);
}
float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getFloat" );
return getValue(columnIndex);
}
sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getInt" );
return getValue(columnIndex);
}
sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getRow" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -312,14 +293,12 @@ sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException,
sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getLong" );
return getValue(columnIndex);
}
Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getMetaData" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -331,7 +310,6 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLEx
Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getArray" );
return NULL;
}
@@ -339,59 +317,50 @@ Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) t
Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getClob" );
return NULL;
}
Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getBlob" );
return NULL;
}
Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getRef" );
return NULL;
}
Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getObject" );
return getValue(columnIndex).makeAny();
}
sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getShort" );
return getValue(columnIndex);
}
OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getString" );
return getValue(columnIndex);
}
::com::sun::star::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getTime" );
return getValue(columnIndex);
}
::com::sun::star::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getTimestamp" );
return getValue(columnIndex);
}
sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::isAfterLast" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -401,7 +370,6 @@ sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeExcepti
sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::isFirst" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -411,7 +379,6 @@ sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException,
sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::isLast" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -421,7 +388,6 @@ sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException, s
void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::beforeFirst" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -432,7 +398,6 @@ void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException,
void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::afterLast" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -445,14 +410,12 @@ void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException, st
void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::close" );
dispose();
}
sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::first" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::FIRST,1,true) : sal_False;
@@ -461,7 +424,6 @@ sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException, st
sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::last" );
// here I know definitely that I stand on the last record
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -470,7 +432,6 @@ sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException, std
sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::absolute" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::ABSOLUTE,row,true) : sal_False;
@@ -478,7 +439,6 @@ sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, Runt
sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::relative" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::RELATIVE,row,true) : sal_False;
@@ -486,7 +446,6 @@ sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, Runt
sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::previous" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::PRIOR,0,true) : sal_False;
@@ -494,7 +453,6 @@ sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException,
Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getStatement" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -505,7 +463,6 @@ Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException
sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::rowDeleted" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -523,7 +480,6 @@ sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeExcepti
sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::rowInserted" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -534,7 +490,6 @@ sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeExceptio
sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::isBeforeFirst" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -544,7 +499,6 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeExcep
// sal_Bool OResultSet::evaluate()
// {
-// SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::evaluate" );
// OSL_ENSURE(m_pSQLAnalyzer,"OResultSet::evaluate: Analyzer isn't set!");
// sal_Bool bRet = sal_True;
// while(!m_pSQLAnalyzer->evaluateRestriction())
@@ -577,7 +531,6 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeExcep
sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::next" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -587,7 +540,6 @@ sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException, std
sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException, std::exception)
{
- //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::wasNull" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -597,23 +549,19 @@ sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException,
void SAL_CALL OResultSet::cancel( ) throw(RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::cancel" );
}
void SAL_CALL OResultSet::clearWarnings( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::clearWarnings" );
}
Any SAL_CALL OResultSet::getWarnings( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getWarnings" );
return Any();
}
void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::insertRow" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -638,7 +586,6 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException, st
void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateRow" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -653,7 +600,6 @@ void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException, st
void SAL_CALL OResultSet::deleteRow() throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::deleteRow" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -677,7 +623,6 @@ void SAL_CALL OResultSet::deleteRow() throw(SQLException, RuntimeException, std:
void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::cancelRowUpdates" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -701,7 +646,6 @@ void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeExcept
void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::moveToInsertRow" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -721,12 +665,10 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeExcepti
void SAL_CALL OResultSet::moveToCurrentRow( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::moveToCurrentRow" );
}
void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw(SQLException, RuntimeException)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateValue" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -740,7 +682,6 @@ void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw
void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateNull" );
ORowSetValue aEmpty;
updateValue(columnIndex,aEmpty);
}
@@ -748,84 +689,71 @@ void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException
void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateBoolean" );
updateValue(columnIndex, static_cast<bool>(x));
}
void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateByte" );
updateValue(columnIndex,x);
}
void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateShort" );
updateValue(columnIndex,x);
}
void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateInt" );
updateValue(columnIndex,x);
}
void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateLong" );
::dbtools::throwFeatureNotImplementedException( "XRowUpdate::updateLong", *this );
}
void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateFloat" );
updateValue(columnIndex,x);
}
void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateDouble" );
updateValue(columnIndex,x);
}
void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateString" );
updateValue(columnIndex,x);
}
void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateBytes" );
updateValue(columnIndex,x);
}
void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateDate" );
updateValue(columnIndex,x);
}
void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateTime" );
updateValue(columnIndex,x);
}
void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateTimestamp" );
updateValue(columnIndex,x);
}
void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateBinaryStream" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -839,20 +767,17 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer
void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateCharacterStream" );
updateBinaryStream(columnIndex,x,length);
}
void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::refreshRow" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
}
void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateObject" );
if (!::dbtools::implUpdateObject(this, columnIndex, x))
throw SQLException();
}
@@ -860,14 +785,12 @@ void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) th
void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateNumericObject" );
if (!::dbtools::implUpdateObject(this, columnIndex, x))
throw SQLException();
}
IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
{
- //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::createArrayHelper" );
Sequence< Property > aProps;
describeProperties(aProps);
return new ::cppu::OPropertyArrayHelper(aProps);
@@ -875,7 +798,6 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
IPropertyArrayHelper & OResultSet::getInfoHelper()
{
- //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getInfoHelper" );
return *const_cast<OResultSet*>(this)->getArrayHelper();
}
@@ -885,7 +807,6 @@ bool OResultSet::ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
bool bEvaluate,
bool bRetrieveData)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::ExecuteRow" );
OSL_ENSURE(m_pSQLAnalyzer,"OResultSet::ExecuteRow: Analyzer isn't set!");
// For further Fetch-Operations this information may possibly be changed ...
@@ -1023,10 +944,6 @@ again:
bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, bool bRetrieveData)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::Move" );
-
-//IgnoreDeletedRows:
-
sal_Int32 nTempPos = m_nRowPos;
if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT &&
@@ -1232,7 +1149,6 @@ Error:
void OResultSet::sortRows()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::sortRows" );
if (!m_pSQLAnalyzer->hasRestriction() && m_aOrderbyColumnNumber.size() == 1)
{
// is just one field given for sorting
@@ -1339,7 +1255,6 @@ void OResultSet::sortRows()
bool OResultSet::OpenImpl()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::OpenImpl" );
OSL_ENSURE(m_pSQLAnalyzer,"No analyzer set with setSqlAnalyzer!");
if(!m_pTable)
{
@@ -1601,7 +1516,6 @@ bool OResultSet::OpenImpl()
Sequence< sal_Int8 > OResultSet::getUnoTunnelImplementationId()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getUnoTunnelImplementationId" );
static ::cppu::OImplementationId * pId = 0;
if (! pId)
{
@@ -1619,7 +1533,6 @@ Sequence< sal_Int8 > OResultSet::getUnoTunnelImplementationId()
sal_Int64 OResultSet::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getSomething" );
return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) )
? reinterpret_cast< sal_Int64 >( this )
: 0;
@@ -1633,7 +1546,6 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
const Reference<XDatabaseMetaData>& _xMetaData,
::std::vector<sal_Int32>& _rColMapping)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::setBoundedColumns" );
::comphelper::UStringMixEqual aCase(_xMetaData->supportsMixedCaseQuotedIdentifiers());
Reference<XPropertySet> xTableColumn;
@@ -1756,13 +1668,11 @@ void SAL_CALL OResultSet::release() throw()
Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(RuntimeException, std::exception)
{
- //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getPropertySetInfo" );
return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
}
void OResultSet::doTableSpecials(const OSQLTable& _xTable)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::doTableSpecials" );
Reference< ::com::sun::star::lang::XUnoTunnel> xTunnel(_xTable,UNO_QUERY);
if(xTunnel.is())
{
@@ -1774,7 +1684,6 @@ void OResultSet::doTableSpecials(const OSQLTable& _xTable)
void OResultSet::clearInsertRow()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::clearInsertRow" );
m_aRow->setDeleted(false); // set to false here because this is the new row
OValueRefVector::Vector::iterator aIter = m_aInsertRow->get().begin();
const OValueRefVector::Vector::iterator aEnd = m_aInsertRow->get().end();
@@ -1793,7 +1702,6 @@ void OResultSet::clearInsertRow()
void OResultSet::initializeRow(OValueRefRow& _rRow,sal_Int32 _nColumnCount)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::initializeRow" );
if(!_rRow.is())
{
_rRow = new OValueRefVector(_nColumnCount);
@@ -1804,37 +1712,31 @@ void OResultSet::initializeRow(OValueRefRow& _rRow,sal_Int32 _nColumnCount)
bool OResultSet::fillIndexValues(const Reference< XColumnsSupplier> &/*_xIndex*/)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::fillIndexValues" );
return false;
}
bool OResultSet::move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, bool _bRetrieveData)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::move" );
return Move(_eCursorPosition,_nOffset,_bRetrieveData);
}
sal_Int32 OResultSet::getDriverPos() const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getDriverPos" );
return (m_aRow->get())[0]->getValue();
}
bool OResultSet::deletedVisible() const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::deletedVisible" );
return m_bShowDeleted;
}
bool OResultSet::isRowDeleted() const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::isRowDeleted" );
return m_aRow->isDeleted();
}
void SAL_CALL OResultSet::disposing( const EventObject& Source ) throw (RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::disposing" );
Reference<XPropertySet> xProp = m_pTable;
if(m_pTable && Source.Source == xProp)
{
diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx
index a90c9babac85..e397867fe04e 100644
--- a/connectivity/source/drivers/file/FResultSetMetaData.cxx
+++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx
@@ -41,7 +41,6 @@ OResultSetMetaData::OResultSetMetaData(const ::rtl::Reference<connectivity::OSQL
,m_xColumns(_rxColumns)
,m_pTable(_pTable)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::OResultSetMetaData" );
}
@@ -52,21 +51,18 @@ OResultSetMetaData::~OResultSetMetaData()
void OResultSetMetaData::checkColumnIndex(sal_Int32 column) throw(SQLException, RuntimeException)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::checkColumnIndex" );
if(column <= 0 || column > (sal_Int32)(sal_Int32)m_xColumns->get().size())
throwInvalidIndexException(*this);
}
sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getColumnDisplaySize" );
return getPrecision(column);
}
sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getColumnType" );
checkColumnIndex(column);
return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)));
}
@@ -74,28 +70,24 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(S
sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getColumnCount" );
return (m_xColumns->get()).size();
}
sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isCaseSensitive" );
return sal_False;
}
OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getSchemaName" );
return OUString();
}
OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getColumnName" );
checkColumnIndex(column);
Any aName((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)));
@@ -104,39 +96,33 @@ OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQ
OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getTableName" );
return m_aTableName;
}
OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getCatalogName" );
return OUString();
}
OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getColumnTypeName" );
checkColumnIndex(column);
return getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)));
}
OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getColumnLabel" );
return getColumnName(column);
}
OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getColumnServiceName" );
return OUString();
}
sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isCurrency" );
checkColumnIndex(column);
return getBOOL((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY)));
}
@@ -144,26 +130,22 @@ sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLEx
sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 /*setCatalogcolumn*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isAutoIncrement" );
return sal_False;
}
sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isSigned" );
return sal_True;
}
sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getPrecision" );
checkColumnIndex(column);
return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)));
}
sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getScale" );
checkColumnIndex(column);
return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)));
}
@@ -171,7 +153,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com:
sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isNullable" );
checkColumnIndex(column);
return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)));
}
@@ -179,14 +160,12 @@ sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLE
sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isSearchable" );
return sal_True;
}
sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isReadOnly" );
checkColumnIndex(column);
return m_pTable->isReadOnly() || (
(m_xColumns->get())[column-1]->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)) &&
@@ -196,13 +175,11 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLEx
sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isDefinitelyWritable" );
return !isReadOnly(column);
}
sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isWritable" );
return !isReadOnly(column);
}
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 5be7e09af7d3..a95af1c609f4 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -72,8 +72,6 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection )
,m_bEscapeProcessing(true)
,rBHelper(OStatement_BASE::rBHelper)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::OStatement_Base" );
-
m_pConnection->acquire();
sal_Int32 nAttrib = 0;
@@ -147,14 +145,12 @@ void SAL_CALL OStatement_BASE2::release() throw()
Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
{
- //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::queryInterface" );
const Any aRet = OStatement_BASE::queryInterface(rType);
return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType);
}
Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) throw(RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::getTypes" );
::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
@@ -165,13 +161,11 @@ Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) throw(RuntimeException,
void SAL_CALL OStatement_Base::cancel( ) throw(RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::cancel" );
}
void SAL_CALL OStatement_Base::close( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::close" );
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -182,7 +176,6 @@ void SAL_CALL OStatement_Base::close( ) throw(SQLException, RuntimeException, s
void OStatement_Base::reset() throw (SQLException)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::reset" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -193,7 +186,6 @@ void OStatement_Base::reset() throw (SQLException)
Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::getWarnings" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -202,7 +194,6 @@ Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeExcepti
void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::clearWarnings" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -211,7 +202,6 @@ void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeExce
::cppu::IPropertyArrayHelper* OStatement_Base::createArrayHelper( ) const
{
- //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::createArrayHelper" );
Sequence< Property > aProps;
describeProperties(aProps);
return new ::cppu::OPropertyArrayHelper(aProps);
@@ -220,7 +210,6 @@ void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeExce
::cppu::IPropertyArrayHelper & OStatement_Base::getInfoHelper()
{
- //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::getInfoHelper" );
return *const_cast<OStatement_Base*>(this)->getArrayHelper();
}
@@ -292,7 +281,6 @@ sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& sql ) throw(SQLExc
void SAL_CALL OStatement_Base::disposing(void)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::disposing" );
if(m_aEvaluateRow.is())
{
m_aEvaluateRow->get().clear();
@@ -304,7 +292,6 @@ void SAL_CALL OStatement_Base::disposing(void)
Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo( ) throw(RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::getPropertySetInfo" );
return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
}
@@ -316,13 +303,11 @@ Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeExcep
OSQLAnalyzer* OStatement_Base::createAnalyzer()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::createAnalyzer" );
return new OSQLAnalyzer(m_pConnection);
}
void OStatement_Base::anylizeSQL()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::anylizeSQL" );
OSL_ENSURE(m_pSQLAnalyzer,"OResultSet::anylizeSQL: Analyzer isn't set!");
// start analysing the statement
m_pSQLAnalyzer->setOrigColumns(m_xColNames);
@@ -354,7 +339,6 @@ void OStatement_Base::anylizeSQL()
void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef,
OSQLParseNode* pAscendingDescending)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::setOrderbyColumn" );
OUString aColumnName;
if (pColumnRef->count() == 1)
aColumnName = pColumnRef->getChild(0)->getTokenValue();
@@ -386,7 +370,6 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef,
void OStatement_Base::construct(const OUString& sql) throw(SQLException, RuntimeException)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::construct" );
OUString aErr;
m_pParseTree = m_aParser.parseTree(aErr,sql);
if(m_pParseTree)
@@ -465,7 +448,6 @@ void OStatement_Base::construct(const OUString& sql) throw(SQLException, Runtim
void OStatement_Base::createColumnMapping()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::createColumnMapping" );
// initialize the column index map (mapping select columns to table columns)
::rtl::Reference<connectivity::OSQLColumns> xColumns = m_aSQLIterator.getSelectColumns();
m_aColMapping.resize(xColumns->get().size() + 1);
@@ -479,7 +461,6 @@ void OStatement_Base::createColumnMapping()
void OStatement_Base::initializeResultSet(OResultSet* _pResult)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::initializeResultSet" );
GetAssignValues();
_pResult->setSqlAnalyzer(m_pSQLAnalyzer);
@@ -498,7 +479,6 @@ void OStatement_Base::initializeResultSet(OResultSet* _pResult)
void OStatement_Base::GetAssignValues()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::GetAssignValues" );
if (m_pParseTree == NULL)
{
::dbtools::throwFunctionSequenceException(*this);
@@ -646,7 +626,6 @@ void OStatement_Base::GetAssignValues()
void OStatement_Base::ParseAssignValues(const ::std::vector< OUString>& aColumnNameList,OSQLParseNode* pRow_Value_Constructor_Elem, sal_Int32 nIndex)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::ParseAssignValues" );
OSL_ENSURE(size_t(nIndex) <= aColumnNameList.size(),"SdbFileCursor::ParseAssignValues: nIndex > aColumnNameList.GetTokenCount()");
OUString aColumnName(aColumnNameList[nIndex]);
OSL_ENSURE(aColumnName.getLength() > 0,"OResultSet: Column-Name nicht gefunden");
@@ -677,7 +656,6 @@ void OStatement_Base::SetAssignValue(const OUString& aColumnName,
bool bSetNull,
sal_uInt32 nParameter)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::SetAssignValue" );
Reference<XPropertySet> xCol;
m_xColNames->getByName(aColumnName) >>= xCol;
sal_Int32 nId = Reference<XColumnLocate>(m_xColNames,UNO_QUERY)->findColumn(aColumnName);
@@ -740,7 +718,6 @@ void OStatement_Base::SetAssignValue(const OUString& aColumnName,
void OStatement_Base::parseParamterElem(const OUString& /*_sColumnName*/,OSQLParseNode* /*pRow_Value_Constructor_Elem*/)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::parseParamterElem" );
// do nothing here
}
diff --git a/connectivity/source/drivers/file/FStringFunctions.cxx b/connectivity/source/drivers/file/FStringFunctions.cxx
index 9459545669ab..f19dbc207db5 100644
--- a/connectivity/source/drivers/file/FStringFunctions.cxx
+++ b/connectivity/source/drivers/file/FStringFunctions.cxx
@@ -26,7 +26,6 @@ using namespace connectivity::file;
ORowSetValue OOp_Upper::operate(const ORowSetValue& lhs) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Upper::operate" );
if ( lhs.isNull() )
return lhs;
@@ -35,7 +34,6 @@ ORowSetValue OOp_Upper::operate(const ORowSetValue& lhs) const
ORowSetValue OOp_Lower::operate(const ORowSetValue& lhs) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Lower::operate" );
if ( lhs.isNull() )
return lhs;
@@ -44,7 +42,6 @@ ORowSetValue OOp_Lower::operate(const ORowSetValue& lhs) const
ORowSetValue OOp_Ascii::operate(const ORowSetValue& lhs) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Ascii::operate" );
if ( lhs.isNull() )
return lhs;
OString sStr(OUStringToOString(lhs,RTL_TEXTENCODING_ASCII_US));
@@ -54,7 +51,6 @@ ORowSetValue OOp_Ascii::operate(const ORowSetValue& lhs) const
ORowSetValue OOp_CharLength::operate(const ORowSetValue& lhs) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_CharLength::operate" );
if ( lhs.isNull() )
return lhs;
@@ -63,7 +59,6 @@ ORowSetValue OOp_CharLength::operate(const ORowSetValue& lhs) const
ORowSetValue OOp_Char::operate(const ::std::vector<ORowSetValue>& lhs) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Char::operate" );
if ( lhs.empty() )
return ORowSetValue();
@@ -85,7 +80,6 @@ ORowSetValue OOp_Char::operate(const ::std::vector<ORowSetValue>& lhs) const
ORowSetValue OOp_Concat::operate(const ::std::vector<ORowSetValue>& lhs) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Concat::operate" );
if ( lhs.empty() )
return ORowSetValue();
@@ -105,7 +99,6 @@ ORowSetValue OOp_Concat::operate(const ::std::vector<ORowSetValue>& lhs) const
ORowSetValue OOp_Locate::operate(const ::std::vector<ORowSetValue>& lhs) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Locate::operate" );
::std::vector<ORowSetValue>::const_iterator aIter = lhs.begin();
::std::vector<ORowSetValue>::const_iterator aEnd = lhs.end();
for (; aIter != aEnd; ++aIter)
@@ -124,7 +117,6 @@ ORowSetValue OOp_Locate::operate(const ::std::vector<ORowSetValue>& lhs) const
ORowSetValue OOp_SubString::operate(const ::std::vector<ORowSetValue>& lhs) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_SubString::operate" );
::std::vector<ORowSetValue>::const_iterator aIter = lhs.begin();
::std::vector<ORowSetValue>::const_iterator aEnd = lhs.end();
for (; aIter != aEnd; ++aIter)
@@ -143,7 +135,6 @@ ORowSetValue OOp_SubString::operate(const ::std::vector<ORowSetValue>& lhs) cons
ORowSetValue OOp_LTrim::operate(const ORowSetValue& lhs) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_LTrim::operate" );
if ( lhs.isNull() )
return lhs;
@@ -154,7 +145,6 @@ ORowSetValue OOp_LTrim::operate(const ORowSetValue& lhs) const
ORowSetValue OOp_RTrim::operate(const ORowSetValue& lhs) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_RTrim::operate" );
if ( lhs.isNull() )
return lhs;
@@ -165,7 +155,6 @@ ORowSetValue OOp_RTrim::operate(const ORowSetValue& lhs) const
ORowSetValue OOp_Space::operate(const ORowSetValue& lhs) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Space::operate" );
if ( lhs.isNull() )
return lhs;
@@ -181,7 +170,6 @@ ORowSetValue OOp_Space::operate(const ORowSetValue& lhs) const
ORowSetValue OOp_Replace::operate(const ::std::vector<ORowSetValue>& lhs) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Replace::operate" );
if ( lhs.size() != 3 )
return ORowSetValue();
@@ -200,7 +188,6 @@ ORowSetValue OOp_Replace::operate(const ::std::vector<ORowSetValue>& lhs) const
ORowSetValue OOp_Repeat::operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Repeat::operate" );
if ( lhs.isNull() || rhs.isNull() )
return lhs;
@@ -215,7 +202,6 @@ ORowSetValue OOp_Repeat::operate(const ORowSetValue& lhs,const ORowSetValue& rhs
ORowSetValue OOp_Insert::operate(const ::std::vector<ORowSetValue>& lhs) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Insert::operate" );
if ( lhs.size() != 4 )
return ORowSetValue();
@@ -229,7 +215,6 @@ ORowSetValue OOp_Insert::operate(const ::std::vector<ORowSetValue>& lhs) const
ORowSetValue OOp_Left::operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Left::operate" );
if ( lhs.isNull() || rhs.isNull() )
return lhs;
@@ -242,7 +227,6 @@ ORowSetValue OOp_Left::operate(const ORowSetValue& lhs,const ORowSetValue& rhs)
ORowSetValue OOp_Right::operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Right::operate" );
if ( lhs.isNull() || rhs.isNull() )
return lhs;
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index 65c388695b32..70e7c2d2dd64 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -46,7 +46,6 @@ OFileTable::OFileTable(sdbcx::OCollection* _pTables,OConnection* _pConnection)
,m_nBufferSize(0)
,m_bWriteable(false)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::OFileTable" );
construct();
m_aColumns = new OSQLColumns();
}
@@ -70,7 +69,6 @@ OFileTable::OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection,
, m_nBufferSize(0)
, m_bWriteable(false)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::OFileTable" );
m_aColumns = new OSQLColumns();
construct();
// refreshColumns();
@@ -82,7 +80,6 @@ OFileTable::~OFileTable( )
void OFileTable::refreshColumns()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::refreshColumns" );
TStringVector aVector;
Reference< XResultSet > xResult = m_pConnection->getMetaData()->getColumns(Any(),
m_SchemaName,m_Name, OUString("%"));
@@ -102,17 +99,14 @@ void OFileTable::refreshColumns()
void OFileTable::refreshKeys()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::refreshKeys" );
}
void OFileTable::refreshIndexes()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::refreshIndexes" );
}
Any SAL_CALL OFileTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::queryInterface" );
if( rType == ::getCppuType((const Reference<XKeysSupplier>*)0) ||
rType == ::getCppuType((const Reference<XRename>*)0) ||
rType == ::getCppuType((const Reference<XAlterTable>*)0) ||
@@ -125,7 +119,6 @@ Any SAL_CALL OFileTable::queryInterface( const Type & rType ) throw(RuntimeExcep
void SAL_CALL OFileTable::disposing(void)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::disposing" );
OTable::disposing();
::osl::MutexGuard aGuard(m_aMutex);
@@ -135,7 +128,6 @@ void SAL_CALL OFileTable::disposing(void)
Sequence< sal_Int8 > OFileTable::getUnoTunnelImplementationId()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::getUnoTunnelImplementationId" );
static ::cppu::OImplementationId * pId = 0;
if (! pId)
{
@@ -153,7 +145,6 @@ Sequence< sal_Int8 > OFileTable::getUnoTunnelImplementationId()
sal_Int64 OFileTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::getSomething" );
return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) )
? reinterpret_cast< sal_Int64 >( this )
: OTable_TYPEDEF::getSomething(rId);
@@ -161,7 +152,6 @@ sal_Int64 OFileTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (Ru
void OFileTable::FileClose()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::FileClose" );
::osl::MutexGuard aGuard(m_aMutex);
if (m_pFileStream && m_pFileStream->IsWritable())
@@ -189,38 +179,32 @@ void SAL_CALL OFileTable::release() throw()
bool OFileTable::InsertRow(OValueRefVector& /*rRow*/, bool /*bFlush*/, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::InsertRow" );
return false;
}
bool OFileTable::DeleteRow(const OSQLColumns& /*_rCols*/)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::DeleteRow" );
return false;
}
bool OFileTable::UpdateRow(OValueRefVector& /*rRow*/, OValueRefRow& /*pOrgRow*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::UpdateRow" );
return false;
}
void OFileTable::addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& /*descriptor*/)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::addColumn" );
OSL_FAIL( "OFileTable::addColumn: not implemented!" );
}
void OFileTable::dropColumn(sal_Int32 /*_nPos*/)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::dropColumn" );
OSL_FAIL( "OFileTable::addColumn: not implemented!" );
}
SvStream* OFileTable::createStream_simpleError( const OUString& _rFileName, StreamMode _eOpenMode)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::createStream_simpleError" );
utl::UcbLockBytesHandler* p_null_dummy = NULL;
SvStream* pReturn = ::utl::UcbStreamHelper::CreateStream( _rFileName, _eOpenMode, (_eOpenMode & STREAM_NOCREATE) == STREAM_NOCREATE, p_null_dummy);
if (pReturn && (ERRCODE_NONE != pReturn->GetErrorCode()))
@@ -234,7 +218,6 @@ SvStream* OFileTable::createStream_simpleError( const OUString& _rFileName, Stre
void OFileTable::refreshHeader()
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::refreshHeader" );
}
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index a3e827e5275e..9c18fb23579c 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -78,7 +78,6 @@ OOperandRow::OOperandRow(sal_uInt16 _nPos, sal_Int32 _rType)
void OOperandRow::bindValue(const OValueRefRow& _pRow)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOperandRow::OOperandRow" );
OSL_ENSURE(_pRow.is(),"NO EMPTY row allowed!");
m_pRow = _pRow;
OSL_ENSURE(m_pRow.is() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()");
@@ -87,14 +86,12 @@ void OOperandRow::bindValue(const OValueRefRow& _pRow)
void OOperandRow::setValue(const ORowSetValue& _rVal)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOperandRow::setValue" );
OSL_ENSURE(m_pRow.is() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()");
(*(m_pRow->get())[m_nRowPos]) = _rVal;
}
const ORowSetValue& OOperandRow::getValue() const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOperandRow::getValue" );
OSL_ENSURE(m_pRow.is() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()");
return (m_pRow->get())[m_nRowPos]->getValue();
}
@@ -102,7 +99,6 @@ const ORowSetValue& OOperandRow::getValue() const
void OOperandValue::setValue(const ORowSetValue& _rVal)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOperandValue::setValue" );
m_aValue = _rVal;
}
@@ -143,14 +139,12 @@ OOperandParam::OOperandParam(OSQLParseNode* pNode, sal_Int32 _nPos)
const ORowSetValue& OOperandValue::getValue() const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOperandValue::getValue" );
return m_aValue;
}
OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const OUString& aStrValue)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOperandConst::OOperandConst" );
switch (rColumnRef.getNodeType())
{
case SQL_NODE_STRING:
@@ -194,7 +188,6 @@ sal_uInt16 OOperator::getRequestedOperands() const {return 2;}
bool OBoolOperator::operate(const OOperand*, const OOperand*) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OBoolOperator::operate" );
return false;
}
@@ -202,7 +195,6 @@ bool OBoolOperator::operate(const OOperand*, const OOperand*) const
void OBoolOperator::Exec(OCodeStack& rCodeStack)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OBoolOperator::Exec" );
OOperand *pRight = rCodeStack.top();
rCodeStack.pop();
OOperand *pLeft = rCodeStack.top();
@@ -217,13 +209,11 @@ void OBoolOperator::Exec(OCodeStack& rCodeStack)
bool OOp_NOT::operate(const OOperand* pLeft, const OOperand* ) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_AND::operate" );
return !pLeft->isValid();
}
void OOp_NOT::Exec(OCodeStack& rCodeStack)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_ISNULL::Exec" );
OOperand* pOperand = rCodeStack.top();
rCodeStack.pop();
@@ -234,35 +224,30 @@ void OOp_NOT::Exec(OCodeStack& rCodeStack)
sal_uInt16 OOp_NOT::getRequestedOperands() const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_NOT::getRequestedOperands" );
return 1;
}
bool OOp_AND::operate(const OOperand* pLeft, const OOperand* pRight) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_AND::operate" );
return pLeft->isValid() && pRight->isValid();
}
bool OOp_OR::operate(const OOperand* pLeft, const OOperand* pRight) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_OR::operate" );
return pLeft->isValid() || pRight->isValid();
}
sal_uInt16 OOp_ISNULL::getRequestedOperands() const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_ISNULL::getRequestedOperands" );
return 1;
}
void OOp_ISNULL::Exec(OCodeStack& rCodeStack)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_ISNULL::Exec" );
OOperand* pOperand = rCodeStack.top();
rCodeStack.pop();
@@ -274,7 +259,6 @@ void OOp_ISNULL::Exec(OCodeStack& rCodeStack)
bool OOp_ISNULL::operate(const OOperand* pOperand, const OOperand*) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_ISNULL::operate" );
return pOperand->getValue().isNull();
}
@@ -287,7 +271,6 @@ bool OOp_ISNOTNULL::operate(const OOperand* pOperand, const OOperand*) const
bool OOp_LIKE::operate(const OOperand* pLeft, const OOperand* pRight) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_ISNULL::operate" );
bool bMatch;
ORowSetValue aLH(pLeft->getValue());
ORowSetValue aRH(pRight->getValue());
@@ -304,14 +287,12 @@ bool OOp_LIKE::operate(const OOperand* pLeft, const OOperand* pRight) const
bool OOp_NOTLIKE::operate(const OOperand* pLeft, const OOperand* pRight) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_NOTLIKE::operate" );
return !OOp_LIKE::operate(pLeft, pRight);
}
bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_COMPARE::operate" );
ORowSetValue aLH(pLeft->getValue());
ORowSetValue aRH(pRight->getValue());
@@ -382,8 +363,6 @@ bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) const
void ONumOperator::Exec(OCodeStack& rCodeStack)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ONumOperator::Exec" );
-
OOperand *pRight = rCodeStack.top();
rCodeStack.pop();
OOperand *pLeft = rCodeStack.top();
@@ -398,40 +377,34 @@ void ONumOperator::Exec(OCodeStack& rCodeStack)
double OOp_ADD::operate(const double& fLeft,const double& fRight) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_ADD::operate" );
return fLeft + fRight;
}
double OOp_SUB::operate(const double& fLeft,const double& fRight) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_SUB::operate" );
return fLeft - fRight;
}
double OOp_MUL::operate(const double& fLeft,const double& fRight) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_MUL::operate" );
return fLeft * fRight;
}
double OOp_DIV::operate(const double& fLeft,const double& fRight) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_DIV::operate" );
return fLeft / fRight;
}
OEvaluateSet* OOperandAttr::preProcess(OBoolOperator* /*pOp*/, OOperand* /*pRight*/)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOperandAttr::preProcess" );
return NULL;
}
void ONthOperator::Exec(OCodeStack& rCodeStack)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ONthOperator::Exec" );
::std::vector<ORowSetValue> aValues;
::std::vector<OOperand*> aOperands;
OOperand* pOperand;
@@ -459,7 +432,6 @@ void ONthOperator::Exec(OCodeStack& rCodeStack)
void OBinaryOperator::Exec(OCodeStack& rCodeStack)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OBinaryOperator::Exec" );
OOperand *pRight = rCodeStack.top();
rCodeStack.pop();
OOperand *pLeft = rCodeStack.top();
@@ -477,7 +449,6 @@ void OBinaryOperator::Exec(OCodeStack& rCodeStack)
void OUnaryOperator::Exec(OCodeStack& rCodeStack)
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OUnaryOperator::Exec" );
OSL_ENSURE(!rCodeStack.empty(),"Stack is empty!");
OOperand* pOperand = rCodeStack.top();
rCodeStack.pop();
diff --git a/connectivity/source/drivers/file/quotedstring.cxx b/connectivity/source/drivers/file/quotedstring.cxx
index 6a955b3dcaab..0ff6335f880e 100644
--- a/connectivity/source/drivers/file/quotedstring.cxx
+++ b/connectivity/source/drivers/file/quotedstring.cxx
@@ -28,7 +28,6 @@ namespace connectivity
sal_Int32 QuotedTokenizedString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel ) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com QuotedTokenizedString::GetTokenCount" );
const sal_Int32 nLen = m_sString.getLength();
if ( !nLen )
return 0;
@@ -87,7 +86,6 @@ namespace connectivity
OUString QuotedTokenizedString::GetTokenSpecial(sal_Int32& nStartPos, sal_Unicode cTok, sal_Unicode cStrDel) const
{
- SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com QuotedTokenizedString::GetTokenCount" );
const sal_Int32 nLen = m_sString.getLength();
if ( nLen )
{
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index fc6a9479e8cf..53349ee53cb7 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -113,8 +113,6 @@ void SAL_CALL Connection::release() throw()
void Connection::construct(const ::rtl::OUString& url, const Sequence< PropertyValue >& info)
throw(SQLException, RuntimeException)
{
- SAL_INFO("connectivity.firebird", "construct().");
-
osl_atomic_increment( &m_refCount );
m_sConnectionURL = url;
@@ -315,7 +313,6 @@ IMPLEMENT_SERVICE_INFO(Connection, "com.sun.star.sdbc.drivers.firebird.Connectio
Reference< XBlob> Connection::createBlob(ISC_QUAD* pBlobId)
throw(SQLException, RuntimeException)
{
- SAL_INFO("connectivity.firebird", "createBlob()");
MutexGuard aGuard(m_aMutex);
checkDisposed(Connection_BASE::rBHelper.bDisposed);
@@ -332,8 +329,6 @@ Reference< XBlob> Connection::createBlob(ISC_QUAD* pBlobId)
Reference< XStatement > SAL_CALL Connection::createStatement( )
throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO("connectivity.firebird", "createStatement().");
-
MutexGuard aGuard( m_aMutex );
checkDisposed(Connection_BASE::rBHelper.bDisposed);
@@ -341,9 +336,6 @@ Reference< XStatement > SAL_CALL Connection::createStatement( )
if(m_aTypeInfo.empty())
buildTypeInfo();
- SAL_INFO("connectivity.firebird", "createStatement(). "
- "Creating statement.");
-
// create a statement
// the statement can only be executed once
Reference< XStatement > xReturn = new OStatement(this);
@@ -630,8 +622,6 @@ void SAL_CALL Connection::setTypeMap(const Reference< XNameAccess >& typeMap)
//----- XCloseable -----------------------------------------------------------
void SAL_CALL Connection::close( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO("connectivity.firebird", "close().");
-
// we just dispose us
{
MutexGuard aGuard( m_aMutex );
@@ -693,8 +683,6 @@ void SAL_CALL Connection::disposing(const EventObject& /*rSource*/)
void Connection::buildTypeInfo() throw( SQLException)
{
- SAL_INFO("connectivity.firebird", "buildTypeInfo().");
-
MutexGuard aGuard( m_aMutex );
Reference< XResultSet> xRs = getMetaData ()->getTypeInfo ();
@@ -746,8 +734,6 @@ void Connection::buildTypeInfo() throw( SQLException)
void Connection::disposing()
{
- SAL_INFO("connectivity.firebird", "disposing().");
-
MutexGuard aGuard(m_aMutex);
disposeStatements();
@@ -804,7 +790,6 @@ uno::Reference< XTablesSupplier > Connection::createCatalog()
void Connection::rebuildIndexes() throw(SQLException)
{
- SAL_INFO("connectivity.firebird", "rebuildIndexes()");
MutexGuard aGuard(m_aMutex);
// We only need to do this for character based columns on user-created tables.
diff --git a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
index b910fb4997da..7383ca64a3a0 100644
--- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
@@ -43,17 +43,14 @@ using namespace ::com::sun::star::container;
OFlatDatabaseMetaData::OFlatDatabaseMetaData(::connectivity::file::OConnection* _pCon) :ODatabaseMetaData(_pCon)
{
- SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatDatabaseMetaData::OFlatDatabaseMetaData" );
}
OFlatDatabaseMetaData::~OFlatDatabaseMetaData()
{
- SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatDatabaseMetaData::~OFlatDatabaseMetaData" );
}
Reference< XResultSet > OFlatDatabaseMetaData::impl_getTypeInfo_throw( )
{
- SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatDatabaseMetaData::impl_getTypeInfo_throw" );
::osl::MutexGuard aGuard( m_aMutex );
::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo);
@@ -154,7 +151,6 @@ Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns(
const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatDatabaseMetaData::getColumns" );
::osl::MutexGuard aGuard( m_aMutex );
Reference< XTablesSupplier > xTables = m_pConnection->createCatalog();
@@ -243,7 +239,6 @@ Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns(
OUString SAL_CALL OFlatDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatDatabaseMetaData::getURL" );
::osl::MutexGuard aGuard( m_aMutex );
return OUString("sdbc:flat:") + m_pConnection->getURL();
}
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 1ba4323abbc4..2b4a75f47365 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -65,7 +65,6 @@ using std::lower_bound;
void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
{
- SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatTable::fillColumns" );
m_bNeedToReadLine = true; // we overwrite m_aCurrentLine, seek the stream, ...
m_pFileStream->Seek(0);
m_aCurrentLine = QuotedTokenizedString();
@@ -424,13 +423,11 @@ OFlatTable::OFlatTable(sdbcx::OCollection* _pTables,OFlatConnection* _pConnectio
,m_cFieldDelimiter(_pConnection->getFieldDelimiter())
,m_bNeedToReadLine(false)
{
- SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatTable::OFlatTable" );
}
void OFlatTable::construct()
{
- SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatTable::construct" );
SvtSysLocale aLocale;
::com::sun::star::lang::Locale aAppLocale(aLocale.GetLanguageTag().getLocale());
@@ -470,7 +467,6 @@ void OFlatTable::construct()
OUString OFlatTable::getEntry()
{
- SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatTable::getEntry" );
OUString sURL;
try
{
@@ -516,7 +512,6 @@ OUString OFlatTable::getEntry()
void OFlatTable::refreshColumns()
{
- SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatTable::refreshColumns" );
::osl::MutexGuard aGuard( m_aMutex );
TStringVector aVector;
@@ -534,7 +529,6 @@ void OFlatTable::refreshColumns()
void SAL_CALL OFlatTable::disposing(void)
{
- SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatTable::disposing" );
OFileTable::disposing();
::osl::MutexGuard aGuard(m_aMutex);
m_aColumns = NULL;
@@ -596,7 +590,6 @@ Sequence< sal_Int8 > OFlatTable::getUnoTunnelImplementationId()
sal_Int64 OFlatTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatTable::getSomething" );
return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) )
? reinterpret_cast< sal_Int64 >( this )
: OFlatTable_BASE::getSomething(rId);
@@ -604,7 +597,6 @@ sal_Int64 OFlatTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (Ru
bool OFlatTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool bIsTable, bool bRetrieveData)
{
- SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatTable::fetchRow" );
*(_rRow->get())[0] = m_nFilePos;
if (!bRetrieveData)
@@ -766,7 +758,6 @@ namespace
bool OFlatTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos)
{
- SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatTable::seekRow" );
OSL_ENSURE(m_pFileStream,"OFlatTable::seekRow: FileStream is NULL!");
@@ -919,7 +910,6 @@ bool OFlatTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 n
bool OFlatTable::readLine(sal_Int32 * const pEndPos, sal_Int32 * const pStartPos, const bool nonEmpty)
{
- SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatTable::readLine" );
const rtl_TextEncoding nEncoding = m_pConnection->getTextEncoding();
m_aCurrentLine = QuotedTokenizedString();
do
diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx
index 279dac3b1c33..dc722a10285e 100644
--- a/connectivity/source/drivers/jdbc/Clob.cxx
+++ b/connectivity/source/drivers/jdbc/Clob.cxx
@@ -49,7 +49,6 @@ jclass java_sql_Clob::getMyClass() const
sal_Int64 SAL_CALL java_sql_Clob::length( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_Clob::length" );
jlong out(0);
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
@@ -68,7 +67,6 @@ sal_Int64 SAL_CALL java_sql_Clob::length( ) throw(::com::sun::star::sdbc::SQLEx
OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStringLength ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_Clob::getSubString" );
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
OUString aStr;
{
@@ -88,7 +86,6 @@ OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStrin
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_Clob::getCharacterStream( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_Clob::getCharacterStream" );
SDBThreadAttach t;
static jmethodID mID(NULL);
jobject out = callObjectMethod(t.pEnv,"getCharacterStream","()Ljava/io/Reader;", mID);
@@ -99,7 +96,6 @@ OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStrin
sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32 start ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_Clob::position" );
jlong out(0);
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
@@ -122,7 +118,6 @@ sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32
sal_Int64 SAL_CALL java_sql_Clob::positionOfClob( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& /*pattern*/, sal_Int64 /*start*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_Clob::positionOfClob" );
::dbtools::throwFeatureNotImplementedException( "XClob::positionOfClob", *this );
// this was put here in CWS warnings01. The previous implementation was defective, as it did ignore
// the pattern parameter. Since the effort for proper implementation is rather high - we would need
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 97827683951a..18f9a85cdd69 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -70,7 +70,6 @@ java_sql_ResultSet::java_sql_ResultSet( JNIEnv * pEnv, jobject myObj, const java
,m_aLogger( _rParentLogger, java::sql::ConnectionLog::RESULTSET )
,m_pConnection(&_rConnection)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::java_sql_ResultSet" );
SDBThreadAttach::addRef();
osl_atomic_increment(&m_refCount);
if ( pStmt )
@@ -91,7 +90,6 @@ java_sql_ResultSet::~java_sql_ResultSet()
jclass java_sql_ResultSet::getMyClass() const
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getMyClass" );
// the class must be fetched only once, therefore static
if( !theClass )
theClass = findMyClass("java/sql/ResultSet");
@@ -101,7 +99,6 @@ jclass java_sql_ResultSet::getMyClass() const
void java_sql_ResultSet::disposing(void)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::disposing" );
OPropertySetHelper::disposing();
::osl::MutexGuard aGuard(m_aMutex);
@@ -119,14 +116,12 @@ m_xMetaData.clear();
::com::sun::star::uno::Any SAL_CALL java_sql_ResultSet::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::queryInterface" );
::com::sun::star::uno::Any aRet = OPropertySetHelper::queryInterface(rType);
return aRet.hasValue() ? aRet : java_sql_ResultSet_BASE::queryInterface(rType);
}
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_ResultSet::getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getTypes" );
::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
@@ -137,14 +132,12 @@ m_xMetaData.clear();
sal_Int32 SAL_CALL java_sql_ResultSet::findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::findColumn" );
static jmethodID mID(NULL);
return callIntMethodWithStringArg("findColumn",mID,columnName);
}
Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getBinaryStream" );
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
static jmethodID mID(NULL);
jobject out = callObjectMethodWithIntArg(t.pEnv,"getBinaryStream","(I)Ljava/io/InputStream;", mID, columnIndex);
@@ -155,7 +148,6 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::get
Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getCharacterStream" );
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
static jmethodID mID(NULL);
jobject out = callObjectMethodWithIntArg(t.pEnv,"getCharacterStream","(I)Ljava/io/Reader;", mID, columnIndex);
@@ -167,7 +159,6 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::get
sal_Bool SAL_CALL java_sql_ResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getBoolean" );
static jmethodID mID(NULL);
return callBooleanMethodWithIntArg( "getBoolean", mID,columnIndex );
}
@@ -175,7 +166,6 @@ sal_Bool SAL_CALL java_sql_ResultSet::getBoolean( sal_Int32 columnIndex ) throw(
sal_Int8 SAL_CALL java_sql_ResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getByte" );
static jmethodID mID(NULL);
jbyte (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallByteMethod;
return callMethodWithIntArg<jbyte>(pCallMethod,"getByte","(I)B",mID,columnIndex);
@@ -184,7 +174,6 @@ sal_Int8 SAL_CALL java_sql_ResultSet::getByte( sal_Int32 columnIndex ) throw(SQL
Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getBytes" );
Sequence< sal_Int8 > aSeq;
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
static jmethodID mID(NULL);
@@ -202,7 +191,6 @@ Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnInde
::com::sun::star::util::Date SAL_CALL java_sql_ResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getDate" );
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
static jmethodID mID(NULL);
jobject out = callObjectMethodWithIntArg(t.pEnv,"getDate","(I)Ljava/sql/Date;", mID, columnIndex);
@@ -213,7 +201,6 @@ Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnInde
double SAL_CALL java_sql_ResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getDouble" );
static jmethodID mID(NULL);
jdouble (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallDoubleMethod;
return callMethodWithIntArg<double>(pCallMethod,"getDouble","(I)D",mID,columnIndex);
@@ -222,7 +209,6 @@ double SAL_CALL java_sql_ResultSet::getDouble( sal_Int32 columnIndex ) throw(SQL
float SAL_CALL java_sql_ResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getFloat" );
static jmethodID mID(NULL);
jfloat (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallFloatMethod;
return callMethodWithIntArg<jfloat>(pCallMethod,"getFloat","(I)F",mID,columnIndex);
@@ -231,7 +217,6 @@ float SAL_CALL java_sql_ResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLEx
sal_Int32 SAL_CALL java_sql_ResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getInt" );
static jmethodID mID(NULL);
return callIntMethodWithIntArg("getInt",mID,columnIndex);
}
@@ -239,7 +224,6 @@ sal_Int32 SAL_CALL java_sql_ResultSet::getInt( sal_Int32 columnIndex ) throw(SQL
sal_Int32 SAL_CALL java_sql_ResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getRow" );
static jmethodID mID(NULL);
return callIntMethod("getRow",mID);
}
@@ -247,7 +231,6 @@ sal_Int32 SAL_CALL java_sql_ResultSet::getRow( ) throw(SQLException, RuntimeExc
sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getLong" );
static jmethodID mID(NULL);
jlong (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallLongMethod;
return callMethodWithIntArg<jlong>(pCallMethod,"getLong","(I)J",mID,columnIndex);
@@ -256,7 +239,6 @@ sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) throw(SQ
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL java_sql_ResultSet::getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getMetaData" );
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
static jmethodID mID(NULL);
jobject out = callObjectMethod(t.pEnv,"getMetaData","()Ljava/sql/ResultSetMetaData;", mID);
@@ -266,7 +248,6 @@ sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) throw(SQ
Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getArray" );
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
static jmethodID mID(NULL);
jobject out = callObjectMethodWithIntArg(t.pEnv,"getArray","(I)Ljava/sql/Array;", mID, columnIndex);
@@ -278,7 +259,6 @@ Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex
Reference< XClob > SAL_CALL java_sql_ResultSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getClob" );
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
static jmethodID mID(NULL);
jobject out = callObjectMethodWithIntArg(t.pEnv,"getClob","(I)Ljava/sql/Clob;", mID, columnIndex);
@@ -288,7 +268,6 @@ Reference< XClob > SAL_CALL java_sql_ResultSet::getClob( sal_Int32 columnIndex )
Reference< XBlob > SAL_CALL java_sql_ResultSet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getBlob" );
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
static jmethodID mID(NULL);
jobject out = callObjectMethodWithIntArg(t.pEnv,"getBlob","(I)Ljava/sql/Blob;", mID, columnIndex);
@@ -299,7 +278,6 @@ Reference< XBlob > SAL_CALL java_sql_ResultSet::getBlob( sal_Int32 columnIndex )
Reference< XRef > SAL_CALL java_sql_ResultSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getRef" );
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
static jmethodID mID(NULL);
jobject out = callObjectMethodWithIntArg(t.pEnv,"getRef","(I)Ljava/sql/Ref;", mID, columnIndex);
@@ -311,7 +289,6 @@ Reference< XRef > SAL_CALL java_sql_ResultSet::getRef( sal_Int32 columnIndex ) t
Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getObject" );
jobject out(0);
Any aRet;
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
@@ -373,7 +350,6 @@ Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Referen
sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getShort" );
static jmethodID mID(NULL);
jshort (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallShortMethod;
return callMethodWithIntArg<jshort>(pCallMethod,"getShort","(I)S",mID,columnIndex);
@@ -383,7 +359,6 @@ sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) throw(S
OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getString" );
static jmethodID mID(NULL);
return callStringMethodWithIntArg("getString",mID,columnIndex);
}
@@ -392,7 +367,6 @@ OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(S
::com::sun::star::util::Time SAL_CALL java_sql_ResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getTime" );
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
static jmethodID mID(NULL);
jobject out = callObjectMethodWithIntArg(t.pEnv,"getTime","(I)Ljava/sql/Time;", mID, columnIndex);
@@ -404,7 +378,6 @@ OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(S
::com::sun::star::util::DateTime SAL_CALL java_sql_ResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getTimestamp" );
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
static jmethodID mID(NULL);
jobject out = callObjectMethodWithIntArg(t.pEnv,"getTimestamp","(I)Ljava/sql/Timestamp;", mID, columnIndex);
@@ -415,35 +388,30 @@ OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(S
sal_Bool SAL_CALL java_sql_ResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::isAfterLast" );
static jmethodID mID(NULL);
return callBooleanMethod( "isAfterLast", mID );
}
sal_Bool SAL_CALL java_sql_ResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::isFirst" );
static jmethodID mID(NULL);
return callBooleanMethod( "isFirst", mID );
}
sal_Bool SAL_CALL java_sql_ResultSet::isLast( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::isLast" );
static jmethodID mID(NULL);
return callBooleanMethod( "isLast", mID );
}
void SAL_CALL java_sql_ResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::beforeFirst" );
static jmethodID mID(NULL);
callVoidMethod("beforeFirst",mID);
}
void SAL_CALL java_sql_ResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::afterLast" );
static jmethodID mID(NULL);
callVoidMethod("afterLast",mID);
}
@@ -451,14 +419,12 @@ void SAL_CALL java_sql_ResultSet::afterLast( ) throw(SQLException, RuntimeExcep
void SAL_CALL java_sql_ResultSet::close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::close" );
dispose();
}
sal_Bool SAL_CALL java_sql_ResultSet::first( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::first" );
static jmethodID mID(NULL);
return callBooleanMethod( "first", mID );
}
@@ -466,56 +432,48 @@ sal_Bool SAL_CALL java_sql_ResultSet::first( ) throw(SQLException, RuntimeExcep
sal_Bool SAL_CALL java_sql_ResultSet::last( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::last" );
static jmethodID mID(NULL);
return callBooleanMethod( "last", mID );
}
sal_Bool SAL_CALL java_sql_ResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::absolute" );
static jmethodID mID(NULL);
return callBooleanMethodWithIntArg( "absolute", mID,row );
}
sal_Bool SAL_CALL java_sql_ResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::relative" );
static jmethodID mID(NULL);
return callBooleanMethodWithIntArg( "relative", mID,row );
}
sal_Bool SAL_CALL java_sql_ResultSet::previous( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::previous" );
static jmethodID mID(NULL);
return callBooleanMethod( "previous", mID );
}
Reference< XInterface > SAL_CALL java_sql_ResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getStatement" );
return m_xStatement;
}
sal_Bool SAL_CALL java_sql_ResultSet::rowDeleted( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::rowDeleted" );
static jmethodID mID(NULL);
return callBooleanMethod( "rowDeleted", mID );
}
sal_Bool SAL_CALL java_sql_ResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::rowInserted" );
static jmethodID mID(NULL);
return callBooleanMethod( "rowInserted", mID );
}
sal_Bool SAL_CALL java_sql_ResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::rowUpdated" );
static jmethodID mID(NULL);
return callBooleanMethod( "rowUpdated", mID );
}
@@ -523,7 +481,6 @@ sal_Bool SAL_CALL java_sql_ResultSet::rowUpdated( ) throw(SQLException, Runtime
sal_Bool SAL_CALL java_sql_ResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::isBeforeFirst" );
static jmethodID mID(NULL);
return callBooleanMethod( "isBeforeFirst", mID );
}
@@ -531,7 +488,6 @@ sal_Bool SAL_CALL java_sql_ResultSet::isBeforeFirst( ) throw(SQLException, Runt
sal_Bool SAL_CALL java_sql_ResultSet::next( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::next" );
static jmethodID mID(NULL);
return callBooleanMethod( "next", mID );
}
@@ -539,7 +495,6 @@ sal_Bool SAL_CALL java_sql_ResultSet::next( ) throw(SQLException, RuntimeExcept
sal_Bool SAL_CALL java_sql_ResultSet::wasNull( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::wasNull" );
static jmethodID mID(NULL);
return callBooleanMethod( "wasNull", mID );
}
@@ -547,7 +502,6 @@ sal_Bool SAL_CALL java_sql_ResultSet::wasNull( ) throw(SQLException, RuntimeExc
void SAL_CALL java_sql_ResultSet::cancel( ) throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::cancel" );
static jmethodID mID(NULL);
callVoidMethod("cancel",mID);
}
@@ -555,14 +509,12 @@ void SAL_CALL java_sql_ResultSet::cancel( ) throw(::com::sun::star::uno::Runtim
void SAL_CALL java_sql_ResultSet::clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::clearWarnings" );
static jmethodID mID(NULL);
callVoidMethod("clearWarnings",mID);
}
::com::sun::star::uno::Any SAL_CALL java_sql_ResultSet::getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getWarnings" );
SDBThreadAttach t;
static jmethodID mID(NULL);
jobject out = callObjectMethod(t.pEnv,"getWarnings","()Ljava/sql/SQLWarning;", mID);
@@ -581,21 +533,18 @@ void SAL_CALL java_sql_ResultSet::clearWarnings( ) throw(::com::sun::star::sdbc
void SAL_CALL java_sql_ResultSet::insertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::insertRow" );
static jmethodID mID(NULL);
callVoidMethod("insertRow",mID);
}
void SAL_CALL java_sql_ResultSet::updateRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateRow" );
static jmethodID mID(NULL);
callVoidMethod("updateRow",mID);
}
void SAL_CALL java_sql_ResultSet::deleteRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::deleteRow" );
static jmethodID mID(NULL);
callVoidMethod("deleteRow",mID);
}
@@ -603,7 +552,6 @@ void SAL_CALL java_sql_ResultSet::deleteRow( ) throw(::com::sun::star::sdbc::SQ
void SAL_CALL java_sql_ResultSet::cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::cancelRowUpdates" );
static jmethodID mID(NULL);
callVoidMethod("cancelRowUpdates",mID);
}
@@ -611,7 +559,6 @@ void SAL_CALL java_sql_ResultSet::cancelRowUpdates( ) throw(::com::sun::star::s
void SAL_CALL java_sql_ResultSet::moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::moveToInsertRow" );
static jmethodID mID(NULL);
callVoidMethod("moveToInsertRow",mID);
}
@@ -619,7 +566,6 @@ void SAL_CALL java_sql_ResultSet::moveToInsertRow( ) throw(::com::sun::star::sd
void SAL_CALL java_sql_ResultSet::moveToCurrentRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::moveToCurrentRow" );
static jmethodID mID(NULL);
callVoidMethod("moveToCurrentRow",mID);
}
@@ -627,7 +573,6 @@ void SAL_CALL java_sql_ResultSet::moveToCurrentRow( ) throw(::com::sun::star::s
void SAL_CALL java_sql_ResultSet::updateNull( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateNull" );
static jmethodID mID(NULL);
callVoidMethodWithIntArg("updateNull",mID,columnIndex);
}
@@ -635,14 +580,12 @@ void SAL_CALL java_sql_ResultSet::updateNull( sal_Int32 columnIndex ) throw(::co
void SAL_CALL java_sql_ResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateBoolean" );
static jmethodID mID(NULL);
callVoidMethod("updateBoolean", "(IZ)V", mID, columnIndex, x);
}
void SAL_CALL java_sql_ResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateByte" );
static jmethodID mID(NULL);
callVoidMethod("updateByte", "(IB)V", mID, columnIndex, x);
}
@@ -650,21 +593,18 @@ void SAL_CALL java_sql_ResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x
void SAL_CALL java_sql_ResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateShort" );
static jmethodID mID(NULL);
callVoidMethod("updateShort", "(IS)V", mID, columnIndex, x);
}
void SAL_CALL java_sql_ResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateInt" );
static jmethodID mID(NULL);
callVoidMethod("updateInt", "(II)V", mID, columnIndex, x);
}
void SAL_CALL java_sql_ResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateLong" );
static jmethodID mID(NULL);
callVoidMethod("updateLong", "(IJ)V", mID, columnIndex, x);
}
@@ -673,7 +613,6 @@ void SAL_CALL java_sql_ResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x
void SAL_CALL java_sql_ResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateFloat" );
static jmethodID mID(NULL);
callVoidMethod("updateFloat", "(IF)V", mID, columnIndex, x);
}
@@ -681,7 +620,6 @@ void SAL_CALL java_sql_ResultSet::updateFloat( sal_Int32 columnIndex, float x )
void SAL_CALL java_sql_ResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateDouble" );
static jmethodID mID(NULL);
callVoidMethod("updateDouble", "(ID)V", mID, columnIndex, x);
}
@@ -689,11 +627,9 @@ void SAL_CALL java_sql_ResultSet::updateDouble( sal_Int32 columnIndex, double x
void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateString" );
SDBThreadAttach t;
{
-
// initialize temporary variable
// Java-Call
static jmethodID mID(NULL);
@@ -717,7 +653,6 @@ void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUS
void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateBytes" );
SDBThreadAttach t;
{
@@ -746,7 +681,6 @@ void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const ::co
void SAL_CALL java_sql_ResultSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateDate" );
java_sql_Date aD(x);
static jmethodID mID(NULL);
callVoidMethod("updateDate", "(ILjava/sql/Date;)V", mID, columnIndex, aD.getJavaObject());
@@ -755,7 +689,6 @@ void SAL_CALL java_sql_ResultSet::updateDate( sal_Int32 columnIndex, const ::com
void SAL_CALL java_sql_ResultSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateTime" );
java_sql_Time aD(x);
static jmethodID mID(NULL);
callVoidMethod("updateTime", "(ILjava/sql/Time;)V", mID, columnIndex, aD.getJavaObject());
@@ -764,7 +697,6 @@ void SAL_CALL java_sql_ResultSet::updateTime( sal_Int32 columnIndex, const ::com
void SAL_CALL java_sql_ResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateTimestamp" );
java_sql_Timestamp aD(x);
static jmethodID mID(NULL);
callVoidMethod("updateTimestamp", "(ILjava/sql/Timestamp;)V", mID, columnIndex, aD.getJavaObject());
@@ -773,7 +705,6 @@ void SAL_CALL java_sql_ResultSet::updateTimestamp( sal_Int32 columnIndex, const
void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateBinaryStream" );
try
{
SDBThreadAttach t;
@@ -805,7 +736,6 @@ void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, con
void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateCharacterStream" );
try
{
SDBThreadAttach t;
@@ -837,7 +767,6 @@ void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex,
void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateObject" );
if(!::dbtools::implUpdateObject(this,columnIndex,x))
{
::connectivity::SharedResources aResources;
@@ -852,7 +781,6 @@ void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const ::c
void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateNumericObject" );
// OSL_FAIL("java_sql_ResultSet::updateNumericObject: NYI");
try
{
@@ -895,35 +823,30 @@ void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, co
sal_Int32 java_sql_ResultSet::getResultSetConcurrency() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getResultSetConcurrency" );
static jmethodID mID(NULL);
return callIntMethod("getConcurrency",mID,true);
}
sal_Int32 java_sql_ResultSet::getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getResultSetType" );
static jmethodID mID(NULL);
return callIntMethod("getType",mID,true);
}
sal_Int32 java_sql_ResultSet::getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getFetchDirection" );
static jmethodID mID(NULL);
return callIntMethod("getFetchDirection",mID,true);
}
sal_Int32 java_sql_ResultSet::getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getFetchSize" );
static jmethodID mID(NULL);
return callIntMethod("getFetchSize",mID,true);
}
OUString java_sql_ResultSet::getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getCursorName" );
static jmethodID mID(NULL);
return callStringMethod("getCursorName",mID);
}
@@ -931,28 +854,24 @@ OUString java_sql_ResultSet::getCursorName() const throw(::com::sun::star::sdbc:
void java_sql_ResultSet::setFetchDirection(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::setFetchDirection" );
static jmethodID mID(NULL);
callVoidMethodWithIntArg("setFetchDirection",mID,_par0,true);
}
void SAL_CALL java_sql_ResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::refreshRow" );
static jmethodID mID(NULL);
callVoidMethod("refreshRow",mID);
}
void java_sql_ResultSet::setFetchSize(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::setFetchSize" );
static jmethodID mID(NULL);
callVoidMethodWithIntArg("setFetchSize",mID,_par0,true);
}
::cppu::IPropertyArrayHelper* java_sql_ResultSet::createArrayHelper( ) const
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::createArrayHelper" );
Sequence< Property > aProps(5);
Property* pProperties = aProps.getArray();
sal_Int32 nPos = 0;
@@ -979,7 +898,6 @@ void java_sql_ResultSet::setFetchSize(sal_Int32 _par0) throw(::com::sun::star::s
::cppu::IPropertyArrayHelper & java_sql_ResultSet::getInfoHelper()
{
- //SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getInfoHelper" );
return *const_cast<java_sql_ResultSet*>(this)->getArrayHelper();
}
@@ -990,7 +908,6 @@ sal_Bool java_sql_ResultSet::convertFastPropertyValue(
const ::com::sun::star::uno::Any& rValue )
throw (::com::sun::star::lang::IllegalArgumentException)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::convertFastPropertyValue" );
bool bRet = false;
switch(nHandle)
{
@@ -1016,7 +933,6 @@ void java_sql_ResultSet::setFastPropertyValue_NoBroadcast(
)
throw (::com::sun::star::uno::Exception, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::setFastPropertyValue_NoBroadcast" );
switch(nHandle)
{
case PROPERTY_ID_CURSORNAME:
@@ -1039,7 +955,6 @@ void java_sql_ResultSet::getFastPropertyValue(
sal_Int32 nHandle
) const
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getFastPropertyValue" );
try
{
switch(nHandle)
@@ -1078,7 +993,6 @@ void SAL_CALL java_sql_ResultSet::release() throw()
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL java_sql_ResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getPropertySetInfo" );
return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
}
diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
index 24155d7dccce..74dc2f8dbcb6 100644
--- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
@@ -39,7 +39,6 @@ java_sql_ResultSetMetaData::java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject m
,m_pConnection( &_rCon )
,m_nColumnCount(-1)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::java_sql_ResultSetMetaData" );
SDBThreadAttach::addRef();
}
java_sql_ResultSetMetaData::~java_sql_ResultSetMetaData()
@@ -49,7 +48,6 @@ java_sql_ResultSetMetaData::~java_sql_ResultSetMetaData()
jclass java_sql_ResultSetMetaData::getMyClass() const
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getMyClass" );
// The class needs to be fetched just once, that is why it is static
if( !theClass )
theClass = findMyClass("java/sql/ResultSetMetaData");
@@ -59,7 +57,6 @@ jclass java_sql_ResultSetMetaData::getMyClass() const
sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getColumnDisplaySize" );
static jmethodID mID(NULL);
return callIntMethodWithIntArg("getColumnDisplaySize",mID,column);
}
@@ -67,7 +64,6 @@ sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnDisplaySize( sal_Int32 c
sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getColumnType" );
static jmethodID mID(NULL);
return callIntMethodWithIntArg("getColumnType",mID,column);
}
@@ -75,7 +71,6 @@ sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnType( sal_Int32 column )
sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getColumnCount" );
if ( m_nColumnCount == -1 )
{
static jmethodID mID(NULL);
@@ -88,14 +83,12 @@ sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnCount( ) throw(SQLExcep
sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::isCaseSensitive" );
static jmethodID mID(NULL);
return callBooleanMethodWithIntArg( "isCaseSensitive", mID,column );
}
OUString SAL_CALL java_sql_ResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getSchemaName" );
static jmethodID mID(NULL);
return callStringMethodWithIntArg("getSchemaName",mID,column);
}
@@ -103,42 +96,36 @@ OUString SAL_CALL java_sql_ResultSetMetaData::getSchemaName( sal_Int32 column )
OUString SAL_CALL java_sql_ResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getColumnName" );
static jmethodID mID(NULL);
return callStringMethodWithIntArg("getColumnName",mID,column);
}
OUString SAL_CALL java_sql_ResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getTableName" );
static jmethodID mID(NULL);
return callStringMethodWithIntArg("getTableName",mID,column);
}
OUString SAL_CALL java_sql_ResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getCatalogName" );
static jmethodID mID(NULL);
return callStringMethodWithIntArg("getCatalogName",mID,column);
}
OUString SAL_CALL java_sql_ResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getColumnTypeName" );
static jmethodID mID(NULL);
return callStringMethodWithIntArg("getColumnTypeName",mID,column);
}
OUString SAL_CALL java_sql_ResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getColumnLabel" );
static jmethodID mID(NULL);
return callStringMethodWithIntArg("getColumnLabel",mID,column);
}
OUString SAL_CALL java_sql_ResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getColumnServiceName" );
static jmethodID mID(NULL);
return callStringMethodWithIntArg("getColumnClassName",mID,column);
}
@@ -146,7 +133,6 @@ OUString SAL_CALL java_sql_ResultSetMetaData::getColumnServiceName( sal_Int32 co
sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::isCurrency" );
if ( m_pConnection->isIgnoreCurrencyEnabled() )
return sal_False;
static jmethodID mID(NULL);
@@ -156,7 +142,6 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCurrency( sal_Int32 column ) thr
sal_Bool SAL_CALL java_sql_ResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::isAutoIncrement" );
static jmethodID mID(NULL);
return callBooleanMethodWithIntArg( "isAutoIncrement", mID,column );
}
@@ -165,28 +150,24 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isAutoIncrement( sal_Int32 column
sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::isSigned" );
static jmethodID mID(NULL);
return callBooleanMethodWithIntArg( "isSigned", mID,column );
}
sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getPrecision" );
static jmethodID mID(NULL);
return callIntMethodWithIntArg("getPrecision",mID,column);
}
sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getScale" );
static jmethodID mID(NULL);
return callIntMethodWithIntArg("getScale",mID,column);
}
sal_Int32 SAL_CALL java_sql_ResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::isNullable" );
static jmethodID mID(NULL);
return callIntMethodWithIntArg("isNullable",mID,column);
}
@@ -194,7 +175,6 @@ sal_Int32 SAL_CALL java_sql_ResultSetMetaData::isNullable( sal_Int32 column ) th
sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::isSearchable" );
static jmethodID mID(NULL);
return callBooleanMethodWithIntArg( "isSearchable", mID,column );
}
@@ -202,7 +182,6 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSearchable( sal_Int32 column ) t
sal_Bool SAL_CALL java_sql_ResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::isReadOnly" );
static jmethodID mID(NULL);
return callBooleanMethodWithIntArg( "isReadOnly", mID,column );
}
@@ -210,14 +189,12 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isReadOnly( sal_Int32 column ) thr
sal_Bool SAL_CALL java_sql_ResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::isDefinitelyWritable" );
static jmethodID mID(NULL);
return callBooleanMethodWithIntArg( "isDefinitelyWritable", mID,column );
}
sal_Bool SAL_CALL java_sql_ResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::isWritable" );
static jmethodID mID(NULL);
return callBooleanMethodWithIntArg( "isWritable", mID,column );
}
diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx
index c7ab09c63df3..c06cb9b37349 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.cxx
@@ -68,9 +68,6 @@ OUString MQueryHelperResultEntry::getValue( const OString &key ) const
void MQueryHelperResultEntry::setValue( const OString &key, const OUString & rValue)
{
-// SAL_INFO("connectivity.mork", "MQueryHelper::setValue()" );
-// SAL_INFO("connectivity.mork", "key: " << &key << " value: " << &rValue);
-
m_Fields[ key ] = rValue;
}
@@ -86,8 +83,6 @@ MQueryHelper::MQueryHelper(const OColumnAlias& _ca)
MQueryHelper::~MQueryHelper()
{
- SAL_INFO("connectivity.mork", "MQueryHelper::~MQueryHelper()");
-
clear_results();
OSL_TRACE("OUT MQueryHelper::~MQueryHelper()");
}
@@ -95,8 +90,6 @@ MQueryHelper::~MQueryHelper()
void MQueryHelper::setAddressbook(OUString &ab)
{
- SAL_INFO("connectivity.mork", "MQueryHelper::setAddressbook()");
-
::osl::MutexGuard aGuard(m_aMutex);
m_aAddressbook = ab;
@@ -106,7 +99,6 @@ void MQueryHelper::setAddressbook(OUString &ab)
void MQueryHelper::setExpression( MQueryExpression &_expr )
{
- SAL_INFO("connectivity.mork", "MQueryHelper::setExpression()");
OSL_TRACE("IN MQueryHelper::setExpression()");
::osl::MutexGuard aGuard(m_aMutex);
@@ -117,8 +109,6 @@ void MQueryHelper::setExpression( MQueryExpression &_expr )
void MQueryHelper::append(MQueryHelperResultEntry* resEnt)
{
-// SAL_INFO("connectivity.mork", "MQueryHelper::append()");
-
if ( resEnt != NULL ) {
m_aResults.push_back( resEnt );
m_bAtEnd = false;
@@ -157,9 +147,7 @@ MQueryHelper::getByIndex(sal_uInt32 nRow)
sal_Int32 MQueryHelper::getResultCount() const
{
-// SAL_INFO("connectivity.mork", "MQueryHelper::getResultCount()" );
sal_Int32 result = static_cast<sal_Int32>(m_aResults.size());
-// SAL_INFO("connectivity.mork", "result: " << result);
return result;
}
@@ -188,7 +176,6 @@ bool MQueryHelper::checkRowAvailable( sal_Int32 nDBRow )
bool MQueryHelper::getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBColumnName, sal_Int32 nType )
{
- SAL_INFO("connectivity.mork", "MQueryHelper::getRowValue()" );
MQueryHelperResultEntry* xResEntry = getByIndex( nDBRow );
OSL_ENSURE( xResEntry != NULL, "xResEntry == NULL");
@@ -213,7 +200,6 @@ bool MQueryHelper::getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUS
sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection)
{
- SAL_INFO("connectivity.mork", "MQueryHelper::executeQuery()");
reset();
OString oStringTable = OUStringToOString( m_aAddressbook, RTL_TEXTENCODING_UTF8 );
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index ac87c488e9bf..c9a06ffe70ac 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -71,7 +71,6 @@ using namespace com::sun::star::util;
OStatement::OStatement( OConnection* _pConnection) : OCommonStatement( _pConnection)
{
- SAL_INFO("connectivity.mork", "=> OStatement::OStatement()" );
}
OCommonStatement::OCommonStatement(OConnection* _pConnection )
@@ -84,7 +83,6 @@ OCommonStatement::OCommonStatement(OConnection* _pConnection )
,m_pSQLIterator( new OSQLParseTreeIterator( _pConnection, _pConnection->createCatalog()->getTables(), m_aParser, NULL ) )
,rBHelper(OCommonStatement_IBASE::rBHelper)
{
- SAL_INFO("connectivity.mork", "=> OCommonStatement::OCommonStatement()" );
m_xDBMetaData = _pConnection->getMetaData();
m_pParseTree = NULL;
m_pConnection->acquire();
@@ -143,8 +141,6 @@ void SAL_CALL OCommonStatement::close( ) throw(SQLException, RuntimeException,
void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException )
{
- SAL_INFO("connectivity.mork", "=> OCommonStatement::createTable()" );
-
/*
if(m_pParseTree)
{
@@ -193,8 +189,6 @@ void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException )
OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql , sal_Bool bAdjusted)
throw ( SQLException, RuntimeException )
{
- SAL_INFO("connectivity.mork", "=> OCommonStatement::parseSql()" );
-
OUString aErr;
m_pParseTree = m_aParser.parseTree(aErr,sql);
@@ -269,8 +263,6 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql
Reference< XResultSet > OCommonStatement::impl_executeCurrentQuery()
{
- SAL_INFO("connectivity.mork", "=> OCommonStatement::impl_executeCurrentQuery()" );
-
clearCachedResultSet();
::rtl::Reference< OResultSet > pResult( new OResultSet( this, m_pSQLIterator ) );
@@ -286,8 +278,6 @@ Reference< XResultSet > OCommonStatement::impl_executeCurrentQuery()
void OCommonStatement::initializeResultSet( OResultSet* _pResult )
{
- SAL_INFO("connectivity.mork", "=> OCommonStatement::initializeResultSet()" );
-
ENSURE_OR_THROW( _pResult, "invalid result set" );
_pResult->setColumnMapping(m_aColMapping);
@@ -300,8 +290,6 @@ void OCommonStatement::initializeResultSet( OResultSet* _pResult )
void OCommonStatement::clearCachedResultSet()
{
- SAL_INFO("connectivity.mork", "=> OCommonStatement::clearCachedResultSet()" );
-
Reference< XResultSet > xResultSet( m_xResultSet.get(), UNO_QUERY );
if ( !xResultSet.is() )
return;
@@ -321,8 +309,6 @@ void OCommonStatement::cacheResultSet( const ::rtl::Reference< OResultSet >& _pR
sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO("connectivity.mork", "=> OCommonStatement::execute()" );
-
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed);
@@ -336,8 +322,6 @@ sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) throw(SQLExce
Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO("connectivity.mork", "=> OCommonStatement::executeQuery()" );
-
::osl::MutexGuard aGuard( m_ThreadMutex );
checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed);
@@ -354,8 +338,6 @@ Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString&
Reference< XConnection > SAL_CALL OCommonStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO("connectivity.mork", "=> OCommonStatement::getConnection()" );
-
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed);
@@ -365,8 +347,6 @@ Reference< XConnection > SAL_CALL OCommonStatement::getConnection( ) throw(SQLE
Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
{
- SAL_INFO("connectivity.mork", "=> OCommonStatement::queryInterface()" );
-
Any aRet = ::cppu::queryInterface(rType,static_cast< XServiceInfo*> (this));
if(!aRet.hasValue())
aRet = OCommonStatement::queryInterface(rType);
@@ -512,8 +492,6 @@ Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OCommonStatement
void OCommonStatement::createColumnMapping()
{
- SAL_INFO("connectivity.mork", "=> OCommonStatement::createColumnMapping()" );
-
size_t i;
// initialize the column index map (mapping select columns to table columns)
@@ -564,8 +542,6 @@ void OCommonStatement::analyseSQL()
void OCommonStatement::setOrderbyColumn( OSQLParseNode* pColumnRef,
OSQLParseNode* pAscendingDescending)
{
- SAL_INFO("connectivity.mork", "=> OCommonStatement::setOrderbyColumn()" );
-
OUString aColumnName;
if (pColumnRef->count() == 1)
aColumnName = pColumnRef->getChild(0)->getTokenValue();
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 481da32eb9ae..76e53b9d8f26 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -199,7 +199,6 @@ void OResultSet::disposing(void)
SQLRETURN OResultSet::unbind(bool _bUnbindHandle)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::unbind" );
SQLRETURN nRet = 0;
if ( _bUnbindHandle )
nRet = N3SQLFreeStmt(m_aStatementHandle,SQL_UNBIND);
@@ -270,7 +269,6 @@ SQLRETURN OResultSet::unbind(bool _bUnbindHandle)
TVoidPtr OResultSet::allocBindColumn(sal_Int32 _nType,sal_Int32 _nColumnIndex)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::allocBindColumn" );
TVoidPtr aPair;
switch (_nType)
{
@@ -332,7 +330,6 @@ TVoidPtr OResultSet::allocBindColumn(sal_Int32 _nType,sal_Int32 _nColumnIndex)
void OResultSet::allocBuffer()
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::allocBuffer" );
Reference< XResultSetMetaData > xMeta = getMetaData();
sal_Int32 nLen = xMeta->getColumnCount();
@@ -353,7 +350,6 @@ void OResultSet::allocBuffer()
void OResultSet::releaseBuffer()
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::releaseBuffer" );
unbind(false);
m_aLengthVector.clear();
}
@@ -376,7 +372,6 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::findColumn" );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -587,7 +582,6 @@ sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException,
Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::getMetaData" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -706,7 +700,6 @@ sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException, s
void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::beforeFirst" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -718,7 +711,6 @@ void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException,
void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::afterLast" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -741,32 +733,27 @@ void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException, std::e
sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::first" );
return moveImpl(IResultSetHelper::FIRST,0,true);
}
sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::last" );
return moveImpl(IResultSetHelper::LAST,0,true);
}
sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::absolute" );
return moveImpl(IResultSetHelper::ABSOLUTE,row,true);
}
sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::relative" );
return moveImpl(IResultSetHelper::RELATIVE,row,true);
}
sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::previous" );
return moveImpl(IResultSetHelper::PRIOR,0,true);
}
@@ -780,7 +767,6 @@ Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException
sal_Bool SAL_CALL OResultSet::rowDeleted() throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::rowDeleted" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -792,7 +778,6 @@ sal_Bool SAL_CALL OResultSet::rowDeleted() throw(SQLException, RuntimeException,
sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::rowInserted" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -804,7 +789,6 @@ sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeExcepti
sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::rowUpdated" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -815,14 +799,12 @@ sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeExceptio
sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::next" );
return moveImpl(IResultSetHelper::NEXT,1,true);
}
sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::wasNull" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -850,7 +832,6 @@ Any SAL_CALL OResultSet::getWarnings( ) throw(SQLException, RuntimeException, s
void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::insertRow" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -927,7 +908,6 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException, st
void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::updateRow" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -978,7 +958,6 @@ void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException, st
void SAL_CALL OResultSet::deleteRow( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::deleteRow" );
SQLRETURN nRet = SQL_SUCCESS;
sal_Int32 nPos = getDriverPos();
nRet = N3SQLSetPos(m_aStatementHandle,1,SQL_DELETE,SQL_LOCK_NO_CHANGE);
@@ -1010,7 +989,6 @@ void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeExcept
void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::moveToInsertRow" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1030,7 +1008,6 @@ void SAL_CALL OResultSet::moveToCurrentRow( ) throw(SQLException, RuntimeExcept
void OResultSet::updateValue(sal_Int32 columnIndex,SQLSMALLINT _nType,void* _pValue) throw(SQLException, RuntimeException)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::updateValue" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1156,7 +1133,6 @@ void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Re
void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::refreshRow" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1189,7 +1165,6 @@ Any SAL_CALL OResultSet::getBookmark( ) throw( SQLException, RuntimeException,
}
Sequence<sal_Int8> OResultSet::impl_getBookmark( ) throw( SQLException, RuntimeException)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::getBookmark" );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
TBookmarkPosMap::iterator aFind = ::std::find_if(m_aPosToBookmarks.begin(),m_aPosToBookmarks.end(),
@@ -1217,7 +1192,6 @@ Sequence<sal_Int8> OResultSet::impl_getBookmark( ) throw( SQLException, Runtim
sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw( SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::moveToBookmark" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1246,7 +1220,6 @@ sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw( SQLE
sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw( SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::moveRelativeToBookmark" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1264,7 +1237,6 @@ sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_
sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) throw( SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::compareBookmarks" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1549,8 +1521,6 @@ void OResultSet::getFastPropertyValue(
void OResultSet::fillColumn(const sal_Int32 _nColumn)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::fillColumn" );
-
ensureCacheForColumn(_nColumn);
if (m_aRow[_nColumn].isBound())
@@ -1684,7 +1654,6 @@ void SAL_CALL OResultSet::release() throw()
bool OResultSet::move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, bool /*_bRetrieveData*/)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::move" );
SQLSMALLINT nFetchOrientation = SQL_FETCH_NEXT;
switch(_eCursorPosition)
{
@@ -1816,7 +1785,6 @@ bool OResultSet::moveImpl(IResultSetHelper::Movement _eCursorPosition, sal_Int32
void OResultSet::fillNeededData(SQLRETURN _nRet)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::fillNeededData" );
SQLRETURN nRet = _nRet;
if( nRet == SQL_NEED_DATA)
{
diff --git a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx b/connectivity/source/drivers/odbc/OResultSetMetaData.cxx
index 44c99e6c3f5d..5eb1bb1cae2b 100644
--- a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx
+++ b/connectivity/source/drivers/odbc/OResultSetMetaData.cxx
@@ -163,7 +163,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, Ru
{
if(m_nColCount != -1)
return m_nColCount;
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::getColumnCount" );
sal_Int16 nNumResultCols=0;
OTools::ThrowException(m_pConnection,N3SQLNumResultCols(m_aStatementHandle,&nNumResultCols),m_aStatementHandle,SQL_HANDLE_STMT,*this);
return m_nColCount = nNumResultCols;
@@ -199,19 +198,16 @@ OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 column ) throw(S
OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::getColumnTypeName" );
return getCharColAttrib(column,SQL_DESC_TYPE_NAME);
}
OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::getColumnLabel" );
return getCharColAttrib(column,SQL_DESC_LABEL);
}
OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::getColumnServiceName" );
return OUString();
}
@@ -231,13 +227,11 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(
sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::isSigned" );
return getNumColAttrib(column,SQL_DESC_UNSIGNED) == SQL_FALSE;
}
sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::getPrecision" );
sal_Int32 nType = 0;
try
{
@@ -253,7 +247,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQ
sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::getScale" );
sal_Int32 nType = 0;
try
{
@@ -270,35 +263,29 @@ sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com:
sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::isNullable" );
return getNumColAttrib(column,SQL_DESC_NULLABLE);
}
sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::isSearchable" );
return getNumColAttrib(column,SQL_DESC_SEARCHABLE) != SQL_PRED_NONE;
}
sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::isReadOnly" );
return getNumColAttrib(column,SQL_DESC_UPDATABLE) == SQL_ATTR_READONLY;
}
sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::isDefinitelyWritable" );
return getNumColAttrib(column,SQL_DESC_UPDATABLE) == SQL_ATTR_WRITE;
-;
}
sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::isWritable" );
return getNumColAttrib(column,SQL_DESC_UPDATABLE) == SQL_ATTR_WRITE;
}
diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx
index b3691ea3d8ec..70452dd7c469 100644
--- a/connectivity/source/drivers/odbc/OTools.cxx
+++ b/connectivity/source/drivers/odbc/OTools.cxx
@@ -120,7 +120,6 @@ void OTools::getValue( OConnection* _pConnection,
void* _pValue,
SQLLEN _nSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OTools::getValue" );
const size_t properSize = sqlTypeLen(_nType);
if ( properSize == static_cast<size_t>(-1) )
SAL_WARN( "connectivity.drivers", "connectivity::odbc::OTools::getValue: unknown SQL type - cannot check buffer size");
@@ -162,7 +161,6 @@ void OTools::bindValue( OConnection* _pConnection,
rtl_TextEncoding _nTextEncoding,
bool _bUseOldTimeDate) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OTools::bindValue" );
SQLRETURN nRetcode;
SQLSMALLINT fSqlType;
SQLSMALLINT fCType;
@@ -318,7 +316,6 @@ void OTools::ThrowException(const OConnection* _pConnection,
// Additional Information on the latest ODBC-functioncall available
// SQLError provides this Information.
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OTools::ThrowException" );
SDB_ODBC_CHAR szSqlState[5];
SQLINTEGER pfNativeError;
@@ -357,7 +354,6 @@ Sequence<sal_Int8> OTools::getBytesValue(const OConnection* _pConnection,
bool &_bWasNull,
const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OTools::getBytesValue" );
sal_Int8 aCharArray[2048];
// First try to fetch the data with the little Buffer:
const SQLLEN nMaxLen = sizeof aCharArray;
@@ -411,7 +407,6 @@ OUString OTools::getStringValue(OConnection* _pConnection,
const Reference< XInterface >& _xInterface,
rtl_TextEncoding _nTextEncoding) throw(SQLException, RuntimeException)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OTools::getStringValue" );
OUStringBuffer aData;
switch(_fSqlType)
{
@@ -664,7 +659,6 @@ sal_Int32 OTools::MapOdbcType2Jdbc(SQLSMALLINT _nType)
SQLSMALLINT OTools::jdbcTypeToOdbc(sal_Int32 jdbcType)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OTools::jdbcTypeToOdbc" );
// For the most part, JDBC types match ODBC types. We'll
// just convert the ones that we know are different
@@ -700,7 +694,6 @@ void OTools::getBindTypes(bool _bUseWChar,
SQLSMALLINT& fSqlType
)
{
- SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OTools::getBindTypes" );
switch(_nOdbcType)
{
case SQL_CHAR: if(_bUseWChar)
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 3e3d74dbb8df..e4a153ae0887 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -142,7 +142,6 @@ OSQLParseTreeIterator::OSQLParseTreeIterator(const Reference< XConnection >& _rx
:m_rParser( _rParser )
,m_pImpl( new OSQLParseTreeIteratorImpl( _rxConnection, _rxTables ) )
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::OSQLParseTreeIterator" );
setParseTree(pRoot);
}
@@ -151,7 +150,6 @@ OSQLParseTreeIterator::OSQLParseTreeIterator( const OSQLParseTreeIterator& _rPar
:m_rParser( _rParser )
,m_pImpl( new OSQLParseTreeIteratorImpl( _rParentIterator.m_pImpl->m_xConnection, _rParentIterator.m_pImpl->m_xTableContainer ) )
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::OSQLParseTreeIterator" );
m_pImpl->m_pForbiddenQueryNames = _rParentIterator.m_pImpl->m_pForbiddenQueryNames;
setParseTree( pRoot );
}
@@ -165,21 +163,18 @@ OSQLParseTreeIterator::~OSQLParseTreeIterator()
const OSQLTables& OSQLParseTreeIterator::getTables() const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getTables" );
return *m_pImpl->m_pTables;
}
bool OSQLParseTreeIterator::isCaseSensitive() const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::isCaseSensitive" );
return m_pImpl->m_bIsCaseSensitive;
}
void OSQLParseTreeIterator::dispose()
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::dispose" );
m_aSelectColumns = NULL;
m_aGroupColumns = NULL;
m_aOrderColumns = NULL;
@@ -193,7 +188,6 @@ void OSQLParseTreeIterator::dispose()
void OSQLParseTreeIterator::setParseTree(const OSQLParseNode * pNewParseTree)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::setParseTree" );
m_pImpl->m_pTables->clear();
m_pImpl->m_pSubTables->clear();
@@ -312,7 +306,6 @@ namespace
void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQuery )
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::impl_getQueryParameterColumns" );
if ( ( m_pImpl->m_nIncludeMask & Parameters ) != Parameters )
// parameters not to be included in the traversal
return;
@@ -361,7 +354,6 @@ void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQu
OSQLTable OSQLParseTreeIterator::impl_locateRecordSource( const OUString& _rComposedName )
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::impl_locateRecordSource" );
if ( _rComposedName.isEmpty() )
{
SAL_WARN( "connectivity.parse", "OSQLParseTreeIterator::impl_locateRecordSource: no object name at all?" );
@@ -439,7 +431,6 @@ OSQLTable OSQLParseTreeIterator::impl_locateRecordSource( const OUString& _rComp
void OSQLParseTreeIterator::traverseOneTableName( OSQLTables& _rTables,const OSQLParseNode * pTableName, const OUString & rTableRange )
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseOneTableName" );
if ( ( m_pImpl->m_nIncludeMask & TableNames ) != TableNames )
// tables should not be included in the traversal
return;
@@ -509,7 +500,6 @@ void OSQLParseTreeIterator::impl_fillJoinConditions(const OSQLParseNode* i_pJoin
void OSQLParseTreeIterator::getQualified_join( OSQLTables& _rTables, const OSQLParseNode *pTableRef, OUString& aTableRange )
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getQualified_join" );
OSL_PRECOND( SQL_ISRULE( pTableRef, cross_union ) || SQL_ISRULE( pTableRef, qualified_join ) ,
"OSQLParseTreeIterator::getQualified_join: illegal node!" );
@@ -552,7 +542,6 @@ void OSQLParseTreeIterator::getQualified_join( OSQLTables& _rTables, const OSQLP
const OSQLParseNode* OSQLParseTreeIterator::getTableNode( OSQLTables& _rTables, const OSQLParseNode *pTableRef,OUString& rTableRange )
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getTableNode" );
OSL_PRECOND( SQL_ISRULE( pTableRef, table_ref ) || SQL_ISRULE( pTableRef, joined_table )
|| SQL_ISRULE( pTableRef, qualified_join ) || SQL_ISRULE( pTableRef, cross_union ),
"OSQLParseTreeIterator::getTableNode: only to be called for table_ref nodes!" );
@@ -617,7 +606,6 @@ const OSQLParseNode* OSQLParseTreeIterator::getTableNode( OSQLTables& _rTables,
void OSQLParseTreeIterator::getSelect_statement(OSQLTables& _rTables,const OSQLParseNode* pSelect)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getSelect_statement" );
if(SQL_ISRULE(pSelect,union_statement))
{
getSelect_statement(_rTables,pSelect->getChild(0));
@@ -673,7 +661,6 @@ void OSQLParseTreeIterator::getSelect_statement(OSQLTables& _rTables,const OSQLP
bool OSQLParseTreeIterator::traverseTableNames(OSQLTables& _rTables)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseTableNames" );
if ( m_pParseTree == NULL )
return false;
@@ -709,7 +696,6 @@ bool OSQLParseTreeIterator::traverseTableNames(OSQLTables& _rTables)
OUString OSQLParseTreeIterator::getColumnAlias(const OSQLParseNode* _pDerivedColumn)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getColumnAlias" );
OSL_ENSURE(SQL_ISRULE(_pDerivedColumn,derived_column),"No derived column!");
OUString sColumnAlias;
if(_pDerivedColumn->getChild(1)->count() == 2)
@@ -779,7 +765,6 @@ void OSQLParseTreeIterator::getColumnRange( const OSQLParseNode* _pColumnRef,
OUString& _rColumnName,
OUString& _rTableRange) const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getColumnRange" );
OUString sDummy;
lcl_getColumnRange( _pColumnRef, m_pImpl->m_xConnection, _rColumnName, _rTableRange, NULL, sDummy );
}
@@ -790,7 +775,6 @@ void OSQLParseTreeIterator::getColumnRange( const OSQLParseNode* _pColumnRef,
OUString& _rTableRange,
OUString& _out_rColumnAliasIfPresent ) const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getColumnRange" );
lcl_getColumnRange( _pColumnRef, m_pImpl->m_xConnection, _rColumnName, _rTableRange, &*m_aSelectColumns, _out_rColumnAliasIfPresent );
}
@@ -798,7 +782,6 @@ void OSQLParseTreeIterator::getColumnRange( const OSQLParseNode* _pColumnRef,
void OSQLParseTreeIterator::getColumnRange( const OSQLParseNode* _pColumnRef,
const Reference< XConnection >& _rxConnection, OUString& _out_rColumnName, OUString& _out_rTableRange )
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getColumnRange" );
OUString sDummy;
lcl_getColumnRange( _pColumnRef, _rxConnection, _out_rColumnName, _out_rTableRange, NULL, sDummy );
}
@@ -815,9 +798,9 @@ bool OSQLParseTreeIterator::getColumnTableRange(const OSQLParseNode* pNode, OUSt
else
return false;
}
+
bool OSQLParseTreeIterator::impl_getColumnTableRange(const OSQLParseNode* pNode, OUString &rTableRange) const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getColumnTableRange" );
// See if all columns belong to one table
if (SQL_ISRULE(pNode,column_ref))
{
@@ -873,7 +856,6 @@ bool OSQLParseTreeIterator::impl_getColumnTableRange(const OSQLParseNode* pNode,
void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNode)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseCreateColumns" );
// aIteratorStatus.Clear();
if (!pSelectNode || m_eStatementType != SQL_STATEMENT_CREATE_TABLE || m_pImpl->m_pTables->empty())
@@ -934,7 +916,6 @@ void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNo
bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSelectNode)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseSelectColumnNames" );
if ( ( m_pImpl->m_nIncludeMask & SelectColumns ) != SelectColumns )
return true;
@@ -1039,14 +1020,12 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele
bool OSQLParseTreeIterator::traverseOrderByColumnNames(const OSQLParseNode* pSelectNode)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseOrderByColumnNames" );
traverseByColumnNames( pSelectNode, true );
return !hasErrors();
}
void OSQLParseTreeIterator::traverseByColumnNames(const OSQLParseNode* pSelectNode, bool _bOrder)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseByColumnNames" );
// aIteratorStatus.Clear();
if (pSelectNode == NULL)
@@ -1131,7 +1110,6 @@ void OSQLParseTreeIterator::traverseByColumnNames(const OSQLParseNode* pSelectNo
bool OSQLParseTreeIterator::traverseGroupByColumnNames(const OSQLParseNode* pSelectNode)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseGroupByColumnNames" );
traverseByColumnNames( pSelectNode, false );
return !hasErrors();
}
@@ -1158,7 +1136,6 @@ namespace
void OSQLParseTreeIterator::traverseParameters(const OSQLParseNode* _pNode)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseParameters" );
if ( _pNode == NULL )
return;
@@ -1212,7 +1189,6 @@ void OSQLParseTreeIterator::traverseParameters(const OSQLParseNode* _pNode)
bool OSQLParseTreeIterator::traverseSelectionCriteria(const OSQLParseNode* pSelectNode)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseSelectionCriteria" );
if ( pSelectNode == NULL )
return false;
@@ -1275,9 +1251,6 @@ bool OSQLParseTreeIterator::traverseSelectionCriteria(const OSQLParseNode* pSele
void OSQLParseTreeIterator::traverseSearchCondition(OSQLParseNode * pSearchCondition)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseSearchCondition" );
-
-
if (
SQL_ISRULE(pSearchCondition,boolean_primary) &&
pSearchCondition->count() == 3 &&
@@ -1408,7 +1381,6 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode
,OUString& _aTableRange
,const OUString& _rColumnAlias)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseParameter" );
if ( !SQL_ISRULE( _pParseNode, parameter ) )
return;
@@ -1548,7 +1520,6 @@ void OSQLParseTreeIterator::traverseOnePredicate(
OUString& rValue,
OSQLParseNode * pParseNode)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseOnePredicate" );
if ( !pParseNode )
return;
@@ -1572,21 +1543,18 @@ void OSQLParseTreeIterator::traverseOnePredicate(
void OSQLParseTreeIterator::traverseSome( sal_uInt32 _nIncludeMask )
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseSome" );
impl_traverse( _nIncludeMask );
}
void OSQLParseTreeIterator::traverseAll()
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseAll" );
impl_traverse( All );
}
void OSQLParseTreeIterator::impl_traverse( sal_uInt32 _nIncludeMask )
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::impl_traverse" );
impl_resetErrors();
m_pImpl->m_nIncludeMask = _nIncludeMask;
@@ -1628,7 +1596,6 @@ void OSQLParseTreeIterator::impl_traverse( sal_uInt32 _nIncludeMask )
OSQLTable OSQLParseTreeIterator::impl_createTableObject( const OUString& rTableName,
const OUString& rCatalogName, const OUString& rSchemaName )
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::impl_createTableObject" );
OSL_PRECOND( m_eStatementType == SQL_STATEMENT_CREATE_TABLE,
"OSQLParseTreeIterator::impl_createTableObject: only to be called for CREATE TABLE statements!" );
// (in all other cases, m_pTables is to contain the table objects as obtained from the tables
@@ -1648,8 +1615,6 @@ OSQLTable OSQLParseTreeIterator::impl_createTableObject( const OUString& rTableN
void OSQLParseTreeIterator::appendColumns(::rtl::Reference<OSQLColumns>& _rColumns,const OUString& _rTableAlias,const OSQLTable& _rTable)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::appendColumns" );
-
if (!_rTable.is())
return;
@@ -1695,7 +1660,6 @@ void OSQLParseTreeIterator::appendColumns(::rtl::Reference<OSQLColumns>& _rColum
void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _rColumns,const OUString & rColumnName,const OUString & rColumnAlias, const OUString & rTableRange, bool bFkt, sal_Int32 _nType, bool bAggFkt)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::setSelectColumnName" );
if(rColumnName.toChar() == '*' && rTableRange.isEmpty())
{ // SELECT * ...
OSL_ENSURE(_rColumns == m_aSelectColumns,"Invalid columns used here!");
@@ -1851,7 +1815,6 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _
OUString OSQLParseTreeIterator::getUniqueColumnName(const OUString & rColumnName) const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getUniqueColumnName" );
OUString aAlias(rColumnName);
OSQLColumns::Vector::const_iterator aIter = find(
@@ -1876,7 +1839,6 @@ OUString OSQLParseTreeIterator::getUniqueColumnName(const OUString & rColumnName
void OSQLParseTreeIterator::setOrderByColumnName(const OUString & rColumnName, OUString & rTableRange, bool bAscending)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::setOrderByColumnName" );
Reference<XPropertySet> xColumn = findSelectColumn( rColumnName );
if ( !xColumn.is() )
xColumn = findColumn ( rColumnName, rTableRange, false );
@@ -1900,7 +1862,6 @@ void OSQLParseTreeIterator::setOrderByColumnName(const OUString & rColumnName, O
void OSQLParseTreeIterator::setGroupByColumnName(const OUString & rColumnName, OUString & rTableRange)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::setGroupByColumnName" );
Reference<XPropertySet> xColumn = findColumn( rColumnName, rTableRange, false );
if ( xColumn.is() )
m_aGroupColumns->get().push_back(new OParseColumn(xColumn,isCaseSensitive()));
@@ -1923,9 +1884,6 @@ void OSQLParseTreeIterator::setGroupByColumnName(const OUString & rColumnName, O
const OSQLParseNode* OSQLParseTreeIterator::getWhereTree() const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getWhereTree" );
-
-
if (!m_pParseTree)
return NULL;
@@ -1955,9 +1913,6 @@ const OSQLParseNode* OSQLParseTreeIterator::getWhereTree() const
const OSQLParseNode* OSQLParseTreeIterator::getOrderTree() const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getOrderTree" );
-
-
if (!m_pParseTree || getStatementType() != SQL_STATEMENT_SELECT)
return NULL;
@@ -1979,7 +1934,6 @@ const OSQLParseNode* OSQLParseTreeIterator::getOrderTree() const
const OSQLParseNode* OSQLParseTreeIterator::getGroupByTree() const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getGroupByTree" );
if (!m_pParseTree || getStatementType() != SQL_STATEMENT_SELECT)
return NULL;
@@ -2022,7 +1976,6 @@ const OSQLParseNode* OSQLParseTreeIterator::getHavingTree() const
bool OSQLParseTreeIterator::isTableNode(const OSQLParseNode* _pTableNode) const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::isTableNode" );
return _pTableNode && (SQL_ISRULE(_pTableNode,catalog_name) ||
SQL_ISRULE(_pTableNode,schema_name) ||
SQL_ISRULE(_pTableNode,table_name));
@@ -2030,28 +1983,24 @@ bool OSQLParseTreeIterator::isTableNode(const OSQLParseNode* _pTableNode) const
const OSQLParseNode* OSQLParseTreeIterator::getSimpleWhereTree() const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getSimpleWhereTree" );
const OSQLParseNode* pNode = getWhereTree();
return pNode ? pNode->getChild(1) : NULL;
}
const OSQLParseNode* OSQLParseTreeIterator::getSimpleOrderTree() const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getSimpleOrderTree" );
const OSQLParseNode* pNode = getOrderTree();
return pNode ? pNode->getChild(2) : NULL;
}
const OSQLParseNode* OSQLParseTreeIterator::getSimpleGroupByTree() const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getSimpleGroupByTree" );
const OSQLParseNode* pNode = getGroupByTree();
return pNode ? pNode->getChild(2) : NULL;
}
const OSQLParseNode* OSQLParseTreeIterator::getSimpleHavingTree() const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getSimpleHavingTree" );
const OSQLParseNode* pNode = getHavingTree();
return pNode ? pNode->getChild(1) : NULL;
}
@@ -2059,7 +2008,6 @@ const OSQLParseNode* OSQLParseTreeIterator::getSimpleHavingTree() const
Reference< XPropertySet > OSQLParseTreeIterator::findSelectColumn( const OUString & rColumnName )
{
- SAL_INFO( "connectivity.parse", "parse lionel@mamane.lu OSQLParseTreeIterator::findSelectColumn" );
for ( OSQLColumns::Vector::const_iterator lookupColumn = m_aSelectColumns->get().begin();
lookupColumn != m_aSelectColumns->get().end();
++lookupColumn )
@@ -2083,7 +2031,6 @@ Reference< XPropertySet > OSQLParseTreeIterator::findSelectColumn( const OUStrin
Reference< XPropertySet > OSQLParseTreeIterator::findColumn( const OUString & rColumnName, OUString & rTableRange, bool _bLookInSubTables )
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::findColumn" );
Reference< XPropertySet > xColumn = findColumn( *m_pImpl->m_pTables, rColumnName, rTableRange );
if ( !xColumn.is() && _bLookInSubTables )
xColumn = findColumn( *m_pImpl->m_pSubTables, rColumnName, rTableRange );
@@ -2093,7 +2040,6 @@ Reference< XPropertySet > OSQLParseTreeIterator::findColumn( const OUString & rC
Reference< XPropertySet > OSQLParseTreeIterator::findColumn(const OSQLTables& _rTables, const OUString & rColumnName, OUString & rTableRange)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::findColumn" );
Reference< XPropertySet > xColumn;
if ( !rTableRange.isEmpty() )
{
@@ -2130,7 +2076,6 @@ Reference< XPropertySet > OSQLParseTreeIterator::findColumn(const OSQLTables& _r
void OSQLParseTreeIterator::impl_appendError( IParseContext::ErrorCode _eError, const OUString* _pReplaceToken1, const OUString* _pReplaceToken2 )
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::impl_appendError" );
OUString sErrorMessage = m_rParser.getContext().getErrorMessage( _eError );
if ( _pReplaceToken1 )
{
@@ -2150,7 +2095,6 @@ void OSQLParseTreeIterator::impl_appendError( IParseContext::ErrorCode _eError,
void OSQLParseTreeIterator::impl_appendError( const SQLException& _rError )
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::impl_appendError" );
if ( !m_aErrors.Message.isEmpty() )
{
SQLException* pErrorChain = &m_aErrors;
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index dbf154914317..1e003cb68d46 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -228,7 +228,6 @@ SQLParseNodeParameter::~SQLParseNodeParameter()
OUString OSQLParseNode::convertDateString(const SQLParseNodeParameter& rParam, const OUString& rString) const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::convertDateString" );
Date aDate = DBTypeConversion::toDate(rString);
Reference< XNumberFormatsSupplier > xSupplier(rParam.xFormatter->getNumberFormatsSupplier());
Reference< XNumberFormatTypes > xTypes(xSupplier->getNumberFormats(), UNO_QUERY);
@@ -241,7 +240,6 @@ OUString OSQLParseNode::convertDateString(const SQLParseNodeParameter& rParam, c
OUString OSQLParseNode::convertDateTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::convertDateTimeString" );
DateTime aDate = DBTypeConversion::toDateTime(rString);
Reference< XNumberFormatsSupplier > xSupplier(rParam.xFormatter->getNumberFormatsSupplier());
Reference< XNumberFormatTypes > xTypes(xSupplier->getNumberFormats(), UNO_QUERY);
@@ -254,7 +252,6 @@ OUString OSQLParseNode::convertDateTimeString(const SQLParseNodeParameter& rPara
OUString OSQLParseNode::convertTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::convertTimeString" );
Time aTime = DBTypeConversion::toTime(rString);
Reference< XNumberFormatsSupplier > xSupplier(rParam.xFormatter->getNumberFormatsSupplier());
@@ -272,8 +269,6 @@ void OSQLParseNode::parseNodeToStr(OUString& rString,
bool _bIntl,
bool _bQuote) const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::parseNodeToStr" );
-
parseNodeToStr(
rString, _rxConnection, NULL, NULL, OUString(),
pContext ? pContext->getPreferredLocale() : OParseContext::getDefaultLocale(),
@@ -288,8 +283,6 @@ void OSQLParseNode::parseNodeToPredicateStr(OUString& rString,
sal_Char _cDec,
const IParseContext* pContext ) const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::parseNodeToPredicateStr" );
-
OSL_ENSURE(xFormatter.is(), "OSQLParseNode::parseNodeToPredicateStr:: no formatter!");
if (xFormatter.is())
@@ -306,8 +299,6 @@ void OSQLParseNode::parseNodeToPredicateStr(OUString& rString,
sal_Char _cDec,
const IParseContext* pContext ) const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::parseNodeToPredicateStr" );
-
OSL_ENSURE(xFormatter.is(), "OSQLParseNode::parseNodeToPredicateStr:: no formatter!");
if (xFormatter.is())
@@ -328,8 +319,6 @@ void OSQLParseNode::parseNodeToStr(OUString& rString,
bool _bPredicate,
bool _bSubstitute) const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::parseNodeToStr" );
-
OSL_ENSURE( _rxConnection.is(), "OSQLParseNode::parseNodeToStr: invalid connection!" );
if ( _rxConnection.is() )
@@ -358,7 +347,6 @@ void OSQLParseNode::parseNodeToStr(OUString& rString,
bool OSQLParseNode::parseNodeToExecutableStatement( OUString& _out_rString, const Reference< XConnection >& _rxConnection,
OSQLParser& _rParser, ::com::sun::star::sdbc::SQLException* _pErrorHolder ) const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::parseNodeToExecutableStatement" );
OSL_PRECOND( _rxConnection.is(), "OSQLParseNode::parseNodeToExecutableStatement: invalid connection!" );
SQLParseNodeParameter aParseParam( _rxConnection,
NULL, NULL, OUString(), OParseContext::getDefaultLocale(), NULL, false, true, '.', false, true );
@@ -402,7 +390,6 @@ namespace
void OSQLParseNode::impl_parseNodeToString_throw(OUStringBuffer& rString, const SQLParseNodeParameter& rParam, bool bSimple) const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::impl_parseNodeToString_throw" );
if ( isToken() )
{
parseLeaf(rString,rParam);
@@ -636,7 +623,6 @@ void OSQLParseNode::impl_parseNodeToString_throw(OUStringBuffer& rString, const
bool OSQLParseNode::impl_parseTableNameNodeToString_throw( OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::impl_parseTableNameNodeToString_throw" );
// is the table_name part of a table_ref?
OSL_ENSURE( getParent(), "OSQLParseNode::impl_parseTableNameNodeToString_throw: table_name without parent?" );
if ( !getParent() || ( getParent()->getKnownRuleID() != table_ref ) )
@@ -734,7 +720,6 @@ bool OSQLParseNode::impl_parseTableNameNodeToString_throw( OUStringBuffer& rStri
void OSQLParseNode::impl_parseTableRangeNodeToString_throw(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::impl_parseTableRangeNodeToString_throw" );
OSL_PRECOND( ( count() == 2 ) || ( count() == 3 ) || ( count() == 5 ) ,"Illegal count");
// rString += " ";
@@ -745,7 +730,6 @@ void OSQLParseNode::impl_parseTableRangeNodeToString_throw(OUStringBuffer& rStri
void OSQLParseNode::impl_parseLikeNodeToString_throw( OUStringBuffer& rString, const SQLParseNodeParameter& rParam, bool bSimple ) const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::impl_parseLikeNodeToString_throw" );
assert(SQL_ISRULE(this,like_predicate));
OSL_ENSURE(count() == 2,"count != 2: Prepare for GPF");
@@ -784,7 +768,6 @@ bool OSQLParseNode::getTableComponents(const OSQLParseNode* _pTableNode,
OUString &_rTable,
const Reference< XDatabaseMetaData >& _xMetaData)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::getTableComponents" );
OSL_ENSURE(_pTableNode,"Wrong use of getTableComponents! _pTableNode is not allowed to be null!");
if(_pTableNode)
{
@@ -1517,7 +1500,6 @@ OSQLParser::~OSQLParser()
void OSQLParseNode::substituteParameterNames(OSQLParseNode* _pNode)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::substituteParameterNames" );
sal_Int32 nCount = _pNode->count();
for(sal_Int32 i=0;i < nCount;++i)
{
@@ -1612,8 +1594,6 @@ OSQLParseNode::OSQLParseNode(const sal_Char * pNewValue,
,m_eNodeType(eNewNodeType)
,m_nNodeID(nNewNodeID)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::OSQLParseNode" );
-
OSL_ENSURE(m_eNodeType >= SQL_NODE_RULE && m_eNodeType <= SQL_NODE_CONCAT,"OSQLParseNode: created with invalid NodeType");
}
@@ -1625,8 +1605,6 @@ OSQLParseNode::OSQLParseNode(const OString &_rNewValue,
,m_eNodeType(eNewNodeType)
,m_nNodeID(nNewNodeID)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::OSQLParseNode" );
-
OSL_ENSURE(m_eNodeType >= SQL_NODE_RULE && m_eNodeType <= SQL_NODE_CONCAT,"OSQLParseNode: created with invalid NodeType");
}
@@ -1638,15 +1616,11 @@ OSQLParseNode::OSQLParseNode(const OUString &_rNewValue,
,m_eNodeType(eNewNodeType)
,m_nNodeID(nNewNodeID)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::OSQLParseNode" );
-
OSL_ENSURE(m_eNodeType >= SQL_NODE_RULE && m_eNodeType <= SQL_NODE_CONCAT,"OSQLParseNode: created with invalid NodeType");
}
OSQLParseNode::OSQLParseNode(const OSQLParseNode& rParseNode)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::OSQLParseNode" );
-
// Set the getParent to NULL
m_pParent = NULL;
@@ -1721,8 +1695,6 @@ OSQLParseNode::~OSQLParseNode()
void OSQLParseNode::append(OSQLParseNode* pNewNode)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::append" );
-
OSL_ENSURE(pNewNode != NULL, "OSQLParseNode: invalid NewSubTree");
OSL_ENSURE(pNewNode->getParent() == NULL, "OSQLParseNode: Node is not an orphan");
OSL_ENSURE(::std::find(m_aChildren.begin(), m_aChildren.end(), pNewNode) == m_aChildren.end(),
@@ -1736,7 +1708,6 @@ void OSQLParseNode::append(OSQLParseNode* pNewNode)
bool OSQLParseNode::addDateValue(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::addDateValue" );
// special display for date/time values
if (SQL_ISRULE(this,set_fct_spec) && SQL_ISPUNCTUATION(m_aChildren[0],"{"))
{
@@ -1790,7 +1761,6 @@ bool OSQLParseNode::addDateValue(OUStringBuffer& rString, const SQLParseNodePara
void OSQLParseNode::replaceNodeValue(const OUString& rTableAlias, const OUString& rColumnName)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::replaceNodeValue" );
for (sal_uInt32 i=0;i<count();++i)
{
if (SQL_ISRULE(this,column_ref) && count() == 1 && getChild(0)->getTokenValue() == rColumnName)
@@ -1807,7 +1777,6 @@ void OSQLParseNode::replaceNodeValue(const OUString& rTableAlias, const OUString
OSQLParseNode* OSQLParseNode::getByRule(OSQLParseNode::Rule eRule) const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::getByRule" );
OSQLParseNode* pRetNode = 0;
if (isRule() && OSQLParser::RuleID(eRule) == getRuleID())
pRetNode = (OSQLParseNode*)this;
@@ -1840,7 +1809,6 @@ OSQLParseNode* MakeORNode(OSQLParseNode *pLeftLeaf,OSQLParseNode *pRightLeaf)
void OSQLParseNode::disjunctiveNormalForm(OSQLParseNode*& pSearchCondition)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::disjunctiveNormalForm" );
if(!pSearchCondition) // no where condition at entry point
return;
@@ -1917,7 +1885,6 @@ void OSQLParseNode::disjunctiveNormalForm(OSQLParseNode*& pSearchCondition)
void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool bNegate)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::negateSearchCondition" );
if(!pSearchCondition) // no where condition at entry point
return;
// '(' search_condition ')'
@@ -2070,7 +2037,6 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool
void OSQLParseNode::eraseBraces(OSQLParseNode*& pSearchCondition)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::eraseBraces" );
if (pSearchCondition && (SQL_ISRULE(pSearchCondition,boolean_primary) || (pSearchCondition->count() == 3 && SQL_ISPUNCTUATION(pSearchCondition->getChild(0),"(") &&
SQL_ISPUNCTUATION(pSearchCondition->getChild(2),")"))))
{
@@ -2089,7 +2055,6 @@ void OSQLParseNode::eraseBraces(OSQLParseNode*& pSearchCondition)
void OSQLParseNode::absorptions(OSQLParseNode*& pSearchCondition)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::absorptions" );
if(!pSearchCondition) // no where condition at entry point
return;
@@ -2193,7 +2158,6 @@ void OSQLParseNode::absorptions(OSQLParseNode*& pSearchCondition)
void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::compress" );
if(!pSearchCondition) // no WHERE condition at entry point
return;
@@ -2307,8 +2271,6 @@ void OSQLParseNode::showParseTree( OUString& rString ) const
void OSQLParseNode::showParseTree( OUStringBuffer& _inout_rBuffer, sal_uInt32 nLevel ) const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::showParseTree" );
-
for ( sal_uInt32 j=0; j<nLevel; ++j)
_inout_rBuffer.appendAscii( " " );
@@ -2426,7 +2388,6 @@ void OSQLParseNode::showParseTree( OUStringBuffer& _inout_rBuffer, sal_uInt32 nL
void OSQLParseNode::insert(sal_uInt32 nPos, OSQLParseNode* pNewSubTree)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::insert" );
OSL_ENSURE(pNewSubTree != NULL, "OSQLParseNode: invalid NewSubTree");
OSL_ENSURE(pNewSubTree->getParent() == NULL, "OSQLParseNode: Node is not an orphan");
@@ -2439,7 +2400,6 @@ void OSQLParseNode::insert(sal_uInt32 nPos, OSQLParseNode* pNewSubTree)
OSQLParseNode* OSQLParseNode::removeAt(sal_uInt32 nPos)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::removeAt" );
OSL_ENSURE(nPos < m_aChildren.size(),"Illegal position for removeAt");
OSQLParseNodes::iterator aPos(m_aChildren.begin() + nPos);
OSQLParseNode* pNode = *aPos;
@@ -2455,7 +2415,6 @@ OSQLParseNode* OSQLParseNode::removeAt(sal_uInt32 nPos)
OSQLParseNode* OSQLParseNode::replace (OSQLParseNode* pOldSubNode, OSQLParseNode* pNewSubNode )
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::replace " );
OSL_ENSURE(pOldSubNode != NULL && pNewSubNode != NULL, "OSQLParseNode: invalid nodes");
OSL_ENSURE(pNewSubNode->getParent() == NULL, "OSQLParseNode: node already has getParent");
OSL_ENSURE(::std::find(m_aChildren.begin(), m_aChildren.end(), pOldSubNode) != m_aChildren.end(),
@@ -2471,7 +2430,6 @@ OSQLParseNode* OSQLParseNode::replace (OSQLParseNode* pOldSubNode, OSQLParseNode
void OSQLParseNode::parseLeaf(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::parseLeaf" );
// Found a leaf
// Append content to the output string
switch (m_eNodeType)
@@ -2777,7 +2735,6 @@ OSQLParseNode::Rule OSQLParseNode::getKnownRuleID() const
OUString OSQLParseNode::getTableRange(const OSQLParseNode* _pTableRef)
{
- SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::getTableRange" );
OSL_ENSURE(_pTableRef && _pTableRef->count() > 1 && _pTableRef->getKnownRuleID() == OSQLParseNode::table_ref,"Invalid node give, only table ref is allowed!");
const sal_uInt32 nCount = _pTableRef->count();
OUString sTableRange;