summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/calc
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/source/drivers/calc
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/source/drivers/calc')
-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
5 files changed, 0 insertions, 45 deletions
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;