mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove remaining DBG_CTOR etc. remnants from connectivity

Browse Source 
Change-Id: I9d7ca8354cef6a1474914ce290c476460f982bdd
This commit is contained in:
Stephan Bergmann 2014-03-28 15:26:01 +01:00
parent 5b5e626503
commit 5a1732eaab
9 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
connectivity/source/drivers/dbase/DConnection.cxx
View File

@ -40,17 +40,13 @@ using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::lang; using namespace ::com::sun::star::lang;
DBG_NAME(ODbaseConnection)
ODbaseConnection::ODbaseConnection(ODriver* _pDriver) : OConnection(_pDriver) ODbaseConnection::ODbaseConnection(ODriver* _pDriver) : OConnection(_pDriver)
{ {
DBG_CTOR(ODbaseConnection,NULL);
m_aFilenameExtension = "dbf"; m_aFilenameExtension = "dbf";
} }
ODbaseConnection::~ODbaseConnection() ODbaseConnection::~ODbaseConnection()
{ {
DBG_DTOR(ODbaseConnection,NULL);
} }
// XServiceInfo // XServiceInfo

3
connectivity/source/drivers/file/FDatabaseMetaData.cxx
View File

@ -44,17 +44,14 @@ using namespace com::sun::star::sdbc;
using namespace com::sun::star::sdbcx; using namespace com::sun::star::sdbcx;
using namespace com::sun::star::container; using namespace com::sun::star::container;
DBG_NAME( file_ODatabaseMetaData )
ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon) : ::connectivity::ODatabaseMetaDataBase(_pCon,_pCon->getConnectionInfo()) ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon) : ::connectivity::ODatabaseMetaDataBase(_pCon,_pCon->getConnectionInfo())
,m_pConnection(_pCon) ,m_pConnection(_pCon)
{ {
SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::ODatabaseMetaData" ); SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::ODatabaseMetaData" );
DBG_CTOR( file_ODatabaseMetaData, NULL );
} }
ODatabaseMetaData::~ODatabaseMetaData() ODatabaseMetaData::~ODatabaseMetaData()
{ {
DBG_DTOR( file_ODatabaseMetaData, NULL );
} }
Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( )

4
connectivity/source/drivers/file/FPreparedStatement.cxx
View File

@ -51,20 +51,16 @@ using namespace com::sun::star;
IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbc.driver.file.PreparedStatement","com.sun.star.sdbc.PreparedStatement"); IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbc.driver.file.PreparedStatement","com.sun.star.sdbc.PreparedStatement");
DBG_NAME( file_OPreparedStatement )
OPreparedStatement::OPreparedStatement( OConnection* _pConnection) OPreparedStatement::OPreparedStatement( OConnection* _pConnection)
: OStatement_BASE2( _pConnection ) : OStatement_BASE2( _pConnection )
{ {
SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::OPreparedStatement" ); SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::OPreparedStatement" );
DBG_CTOR( file_OPreparedStatement, NULL );
} }
OPreparedStatement::~OPreparedStatement() OPreparedStatement::~OPreparedStatement()
{ {
SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::~OPreparedStatement" ); SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::~OPreparedStatement" );
DBG_DTOR( file_OPreparedStatement, NULL );
} }

3
connectivity/source/drivers/file/FResultSet.cxx
View File

@ -73,7 +73,6 @@ namespace
} }
IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.drivers.file.ResultSet","com.sun.star.sdbc.ResultSet"); IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.drivers.file.ResultSet","com.sun.star.sdbc.ResultSet");
DBG_NAME( file_OResultSet )
OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator& _aSQLIterator) : OResultSet_BASE(m_aMutex) OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator& _aSQLIterator) : OResultSet_BASE(m_aMutex)
,::comphelper::OPropertyContainer(OResultSet_BASE::rBHelper) ,::comphelper::OPropertyContainer(OResultSet_BASE::rBHelper)
@ -110,7 +109,6 @@ OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator& _aSQLIte
,m_bIsCount(sal_False) ,m_bIsCount(sal_False)
{ {
SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::OResultSet" ); SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::OResultSet" );
DBG_CTOR( file_OResultSet, NULL );
osl_atomic_increment( &m_refCount ); osl_atomic_increment( &m_refCount );
m_bIsCount = (m_pParseTree && m_bIsCount = (m_pParseTree &&
m_pParseTree->count() > 2 && m_pParseTree->count() > 2 &&
@ -132,7 +130,6 @@ OResultSet::~OResultSet()
SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::~OResultSet" ); SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::~OResultSet" );
osl_atomic_increment( &m_refCount ); osl_atomic_increment( &m_refCount );
disposing(); disposing();
DBG_DTOR( file_OResultSet, NULL );
} }
void OResultSet::construct() void OResultSet::construct()

5
connectivity/source/drivers/file/FStatement.cxx
View File

@ -50,8 +50,6 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbc;
using namespace com::sun::star::sdbcx; using namespace com::sun::star::sdbcx;
using namespace com::sun::star::container; using namespace com::sun::star::container;
DBG_NAME( file_OStatement_Base )
OStatement_Base::OStatement_Base(OConnection* _pConnection ) OStatement_Base::OStatement_Base(OConnection* _pConnection )
:OStatement_BASE(m_aMutex) :OStatement_BASE(m_aMutex)
@ -75,7 +73,6 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection )
,rBHelper(OStatement_BASE::rBHelper) ,rBHelper(OStatement_BASE::rBHelper)
{ {
SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::OStatement_Base" ); SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::OStatement_Base" );
DBG_CTOR( file_OStatement_Base, NULL );
m_pConnection->acquire(); m_pConnection->acquire();
@ -98,8 +95,6 @@ OStatement_Base::~OStatement_Base()
osl_atomic_increment( &m_refCount ); osl_atomic_increment( &m_refCount );
disposing(); disposing();
delete m_pSQLAnalyzer; delete m_pSQLAnalyzer;
DBG_DTOR( file_OStatement_Base, NULL );
} }
void OStatement_BASE2::disposing() void OStatement_BASE2::disposing()

4
connectivity/source/drivers/file/FTable.cxx
View File

@ -37,7 +37,6 @@ using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container; using namespace ::com::sun::star::container;
DBG_NAME( file_OFileTable )
OFileTable::OFileTable(sdbcx::OCollection* _pTables,OConnection* _pConnection) OFileTable::OFileTable(sdbcx::OCollection* _pTables,OConnection* _pConnection)
: OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers()) : OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers())
,m_pConnection(_pConnection) ,m_pConnection(_pConnection)
@ -48,7 +47,6 @@ OFileTable::OFileTable(sdbcx::OCollection* _pTables,OConnection* _pConnection)
,m_bWriteable(sal_False) ,m_bWriteable(sal_False)
{ {
SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::OFileTable" ); SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::OFileTable" );
DBG_CTOR( file_OFileTable, NULL );
construct(); construct();
m_aColumns = new OSQLColumns(); m_aColumns = new OSQLColumns();
} }
@ -73,7 +71,6 @@ OFileTable::OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection,
, m_bWriteable(sal_False) , m_bWriteable(sal_False)
{ {
SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::OFileTable" ); SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::OFileTable" );
DBG_CTOR( file_OFileTable, NULL );
m_aColumns = new OSQLColumns(); m_aColumns = new OSQLColumns();
construct(); construct();
// refreshColumns(); // refreshColumns();
@ -81,7 +78,6 @@ OFileTable::OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection,
OFileTable::~OFileTable( ) OFileTable::~OFileTable( )
{ {
DBG_DTOR( file_OFileTable, NULL );
} }
void OFileTable::refreshColumns() void OFileTable::refreshColumns()

4
connectivity/source/drivers/file/fanalyzer.cxx
View File

@ -34,14 +34,11 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container; using namespace ::com::sun::star::container;
DBG_NAME( file_OSQLAnalyzer )
OSQLAnalyzer::OSQLAnalyzer(OConnection* _pConnection) OSQLAnalyzer::OSQLAnalyzer(OConnection* _pConnection)
:m_pConnection(_pConnection) :m_pConnection(_pConnection)
,m_bHasSelectionCode(sal_False) ,m_bHasSelectionCode(sal_False)
,m_bSelectionFirstTime(sal_True) ,m_bSelectionFirstTime(sal_True)
{ {
DBG_CTOR( file_OSQLAnalyzer, NULL );
m_aCompiler = new OPredicateCompiler(this); m_aCompiler = new OPredicateCompiler(this);
m_aInterpreter = new OPredicateInterpreter(m_aCompiler); m_aInterpreter = new OPredicateInterpreter(m_aCompiler);
} }
@ -49,7 +46,6 @@ OSQLAnalyzer::OSQLAnalyzer(OConnection* _pConnection)
OSQLAnalyzer::~OSQLAnalyzer() OSQLAnalyzer::~OSQLAnalyzer()
{ {
DBG_DTOR( file_OSQLAnalyzer, NULL );
} }

4
connectivity/source/drivers/file/fcode.cxx
View File

@ -57,16 +57,12 @@ TYPEINIT1(ONthOperator, OOperator);
TYPEINIT1(OBinaryOperator, OOperator); TYPEINIT1(OBinaryOperator, OOperator);
TYPEINIT1(OUnaryOperator, OOperator); TYPEINIT1(OUnaryOperator, OOperator);
DBG_NAME(OCode )
OCode::OCode() OCode::OCode()
{ {
DBG_CTOR(OCode ,NULL);
} }
OCode::~OCode() OCode::~OCode()
{ {
DBG_DTOR(OCode,NULL);
} }

4
connectivity/source/drivers/file/fcomp.cxx
View File

@ -43,21 +43,17 @@ using namespace com::sun::star::sdb;
using namespace ::com::sun::star::container; using namespace ::com::sun::star::container;
using namespace com::sun::star; using namespace com::sun::star;
DBG_NAME(OPredicateCompiler)
OPredicateCompiler::OPredicateCompiler(OSQLAnalyzer* pAnalyzer)//,OCursor& rCurs) OPredicateCompiler::OPredicateCompiler(OSQLAnalyzer* pAnalyzer)//,OCursor& rCurs)
: m_pAnalyzer(pAnalyzer) : m_pAnalyzer(pAnalyzer)
, m_nParamCounter(0) , m_nParamCounter(0)
, m_bORCondition(sal_False) , m_bORCondition(sal_False)
{ {
DBG_CTOR(OPredicateCompiler,NULL);
} }
OPredicateCompiler::~OPredicateCompiler() OPredicateCompiler::~OPredicateCompiler()
{ {
Clean(); Clean();
DBG_DTOR(OPredicateCompiler,NULL);
} }
void OPredicateCompiler::dispose() void OPredicateCompiler::dispose()