diff options
author | Arnaud Versini <arnaud.versini@gmail.com> | 2014-01-19 15:51:52 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-21 16:20:10 +0000 |
commit | 5b2ba8ed5d6406492205b08ef25fe640253f66a1 (patch) | |
tree | 166e6fd0c9e802a5cf8fb8d9895ef828a88daea1 /dbaccess/source/core | |
parent | de2d5d9abb7f625269cd4ee54c983c6dfde33767 (diff) |
DBACCESS : Remove usage of DBG_CTOR and DBG_DTOR.
Valgrind is capable of detecting such bugs. No need for extra macros.
Conflicts:
dbaccess/source/ui/dlg/tablespage.cxx
Change-Id: I25ea9174a042050efdb371246417ee7f2edae997
Reviewed-on: https://gerrit.libreoffice.org/7532
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess/source/core')
43 files changed, 0 insertions, 167 deletions
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx index 25888060175b..bc63b1bfd425 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.cxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star::util; using namespace cppu; using namespace osl; -DBG_NAME(ORowSetDataColumn) ORowSetDataColumn::ORowSetDataColumn( const Reference < XResultSetMetaData >& _xMetaData, const Reference < XRow >& _xRow, @@ -53,14 +52,12 @@ ORowSetDataColumn::ORowSetDataColumn( const Reference < XResultSetMetaData >& ,m_sLabel(i_sLabel) ,m_aDescription(_rDescription) { - DBG_CTOR(ORowSetDataColumn,NULL); OColumnSettings::registerProperties( *this ); registerProperty( PROPERTY_DESCRIPTION, PROPERTY_ID_DESCRIPTION, PropertyAttribute::READONLY, &m_aDescription, ::getCppuType( &m_aDescription ) ); } ORowSetDataColumn::~ORowSetDataColumn() { - DBG_DTOR(ORowSetDataColumn,NULL); } // comphelper::OPropertyArrayUsageHelper @@ -210,7 +207,6 @@ void ORowSetDataColumn::fireValueChange(const ORowSetValue& _rOldValue) } } -DBG_NAME(ORowSetDataColumns ) ORowSetDataColumns::ORowSetDataColumns( sal_Bool _bCase, const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns, @@ -220,12 +216,10 @@ ORowSetDataColumns::ORowSetDataColumns( ) : connectivity::sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector) ,m_aColumns(_rColumns) { - DBG_CTOR(ORowSetDataColumns ,NULL); } ORowSetDataColumns::~ORowSetDataColumns() { - DBG_DTOR(ORowSetDataColumns ,NULL); } sdbcx::ObjectType ORowSetDataColumns::createObject(const OUString& _rName) diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index c30cd723570e..3b1c298429ca 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -55,7 +55,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::io; using namespace ::osl; -DBG_NAME(OCacheSet) OCacheSet::OCacheSet(sal_Int32 i_nMaxRows) :m_nMaxRows(i_nMaxRows) @@ -64,7 +63,6 @@ OCacheSet::OCacheSet(sal_Int32 i_nMaxRows) ,m_bDeleted(sal_False) { SAL_INFO("dbaccess", "OCacheSet::OCacheSet" ); - DBG_CTOR(OCacheSet,NULL); } @@ -136,7 +134,6 @@ OCacheSet::~OCacheSet() SAL_WARN("dbaccess", "Unknown Exception occurred"); } - DBG_DTOR(OCacheSet,NULL); } void OCacheSet::fillTableName(const Reference<XPropertySet>& _xTable) throw(SQLException, RuntimeException) diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index e02e69931bf4..79628f984099 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -102,7 +102,6 @@ namespace } } -DBG_NAME(OKeySet) OKeySet::OKeySet(const connectivity::OSQLTable& _xTable, const Reference< XIndexAccess>& _xTableKeys, @@ -125,7 +124,6 @@ OKeySet::OKeySet(const connectivity::OSQLTable& _xTable, ,m_bRowCountFinal(sal_False) { SAL_INFO("dbaccess", "OKeySet::OKeySet" ); - DBG_CTOR(OKeySet,NULL); } @@ -143,7 +141,6 @@ OKeySet::~OKeySet() m_xComposer = NULL; - DBG_DTOR(OKeySet,NULL); } void OKeySet::initColumns() diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index 931bd57d88d6..341cbf84875f 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -82,7 +82,6 @@ namespace } } -DBG_NAME(OptimisticSet) OptimisticSet::OptimisticSet(const Reference<XComponentContext>& _rContext, const Reference< XConnection>& i_xConnection, @@ -96,12 +95,10 @@ OptimisticSet::OptimisticSet(const Reference<XComponentContext>& _rContext, ,m_bResultSetChanged(false) { SAL_INFO("dbaccess", "OptimisticSet::OptimisticSet" ); - DBG_CTOR(OptimisticSet,NULL); } OptimisticSet::~OptimisticSet() { - DBG_DTOR(OptimisticSet,NULL); } void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 0b6d9a218a91..7cbb193161c2 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -2743,7 +2743,6 @@ void ORowSet::impl_rebuild_throw(::osl::ResettableMutexGuard& _rGuard) // *********************************************************** // ORowSetClone // *********************************************************** -DBG_NAME(ORowSetClone); ORowSetClone::ORowSetClone( const Reference<XComponentContext>& _rContext, ORowSet& rParent, ::osl::Mutex* _pMutex ) :OSubComponent(m_aMutex, rParent) @@ -2753,7 +2752,6 @@ ORowSetClone::ORowSetClone( const Reference<XComponentContext>& _rContext, ORowS ,m_nFetchSize(rParent.m_nFetchSize) ,m_bIsBookmarkable(sal_True) { - DBG_CTOR(ORowSetClone, NULL); m_nResultSetType = rParent.m_nResultSetType; m_nResultSetConcurrency = ResultSetConcurrency::READ_ONLY; @@ -2833,7 +2831,6 @@ ORowSetClone::ORowSetClone( const Reference<XComponentContext>& _rContext, ORowS ORowSetClone::~ORowSetClone() { - DBG_DTOR(ORowSetClone, NULL); } // com::sun::star::XTypeProvider diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index 2b41f105d406..c3b2e7a88eaf 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -74,7 +74,6 @@ connectivity::sdbcx::ObjectType OEmptyCollection::createObject(const OUString& / } // ORowSetBase -DBG_NAME(ORowSetBase) ORowSetBase::ORowSetBase( const Reference<XComponentContext>& _rContext, ::cppu::OBroadcastHelper& _rBHelper, ::osl::Mutex* _pMutex ) :OPropertyStateContainer(_rBHelper) @@ -96,7 +95,6 @@ ORowSetBase::ORowSetBase( const Reference<XComponentContext>& _rContext, ::cppu: ,m_bIsInsertRow(sal_False) { SAL_INFO("dbaccess", "ORowSetBase::ORowSetBase" ); - DBG_CTOR(ORowSetBase,NULL); sal_Int32 nRBT = PropertyAttribute::READONLY | PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT; @@ -120,7 +118,6 @@ ORowSetBase::~ORowSetBase() if ( m_pEmptyCollection ) delete m_pEmptyCollection; - DBG_DTOR(ORowSetBase,NULL); } // com::sun::star::lang::XTypeProvider @@ -1455,7 +1452,6 @@ struct ORowSetNotifierImpl }; -DBG_NAME(ORowSetNotifier) ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet ) :m_pRowSet( _pRowSet ) @@ -1465,7 +1461,6 @@ ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet ) ,m_bNotifyCalled( sal_False ) #endif { - DBG_CTOR(ORowSetNotifier,NULL); OSL_ENSURE( m_pRowSet, "ORowSetNotifier::ORowSetNotifier: invalid row set. This wil crash." ); @@ -1487,7 +1482,6 @@ ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet,const ORowSetValueVector ,m_bNotifyCalled( sal_False ) #endif { - DBG_CTOR(ORowSetNotifier,NULL); OSL_ENSURE( m_pRowSet, "ORowSetNotifier::ORowSetNotifier: invalid row set. This wil crash." ); m_pImpl->aRow = i_aRow; // yes, create a copy to store the old values @@ -1496,7 +1490,6 @@ ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet,const ORowSetValueVector ORowSetNotifier::~ORowSetNotifier( ) { SAL_INFO("dbaccess", "ORowSetNotifier::~ORowSetNotifier" ); - DBG_DTOR(ORowSetNotifier,NULL); } void ORowSetNotifier::fire() diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 17c1522a966d..f2a965f6e685 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -77,7 +77,6 @@ using namespace ::osl; // until m_pCacheSet is moved (or refreshed) again. // So always make sure m_pCacheSet is moved or refreshed before accessing column values. -DBG_NAME(ORowSetCache) ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, const Reference< XSingleSelectQueryAnalyzer >& _xAnalyzer, @@ -108,7 +107,6 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, ,m_bModified(_bModified) ,m_bNew(_bNew) { - DBG_CTOR(ORowSetCache,NULL); // first try if the result can be used to do inserts and updates Reference< XPropertySet> xProp(_xRs,UNO_QUERY); @@ -376,7 +374,6 @@ ORowSetCache::~ORowSetCache() m_xMetaData = NULL; m_aUpdateTable = NULL; - DBG_DTOR(ORowSetCache,NULL); } void ORowSetCache::setFetchSize(sal_Int32 _nSize) diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index 9142e2f062d1..a5b3d5ec5dd0 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -215,7 +215,6 @@ namespace } -DBG_NAME(OSingleSelectQueryComposer) OSingleSelectQueryComposer::OSingleSelectQueryComposer(const Reference< XNameAccess>& _rxTables, const Reference< XConnection>& _xConnection, @@ -235,7 +234,6 @@ OSingleSelectQueryComposer::OSingleSelectQueryComposer(const Reference< XNameAcc ,m_nCommandType(CommandType::COMMAND) { SAL_INFO("dbaccess", "OSingleSelectQueryComposer::OSingleSelectQueryComposer" ); - DBG_CTOR(OSingleSelectQueryComposer,NULL); if ( !m_aContext.is() || !m_xConnection.is() || !m_xConnectionTables.is() ) throw IllegalArgumentException(); @@ -269,7 +267,6 @@ OSingleSelectQueryComposer::OSingleSelectQueryComposer(const Reference< XNameAcc OSingleSelectQueryComposer::~OSingleSelectQueryComposer() { - DBG_DTOR(OSingleSelectQueryComposer,NULL); ::std::vector<OPrivateColumns*>::iterator aColIter = m_aColumnsCollection.begin(); ::std::vector<OPrivateColumns*>::iterator aEnd = m_aColumnsCollection.end(); for(;aColIter != aEnd;++aColIter) diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index d46fe96ddf82..9d94317fb54c 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -57,7 +57,6 @@ using namespace ::dbtools; using namespace ::cppu; // ODBTableDecorator -DBG_NAME(ODBTableDecorator) ODBTableDecorator::ODBTableDecorator( const Reference< XConnection >& _rxConnection, const Reference< XColumnsSupplier >& _rxNewTable, const Reference< XNumberFormatsSupplier >& _rxNumberFormats, const Reference< XNameAccess >& _xColumnDefinitions ) throw(SQLException) @@ -72,13 +71,11 @@ ODBTableDecorator::ODBTableDecorator( const Reference< XConnection >& _rxConnect ,m_pColumns(NULL) { SAL_INFO("dbaccess", "ODBTableDecorator::ODBTableDecorator" ); - DBG_CTOR(ODBTableDecorator, NULL); ODataSettings::registerPropertiesFor(this); } ODBTableDecorator::~ODBTableDecorator() { - DBG_DTOR(ODBTableDecorator, NULL); if ( m_pColumns ) delete m_pColumns; } diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index 9d523b2b0c40..ba6b85136011 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -61,14 +61,12 @@ using namespace ::osl; using namespace ::comphelper; using namespace ::cppu; -DBG_NAME(OColumn) // OColumn OColumn::OColumn( const bool _bNameIsReadOnly ) :OColumnBase( m_aMutex ) ,::comphelper::OPropertyContainer( OColumnBase::rBHelper ) { - DBG_CTOR(OColumn, NULL); registerProperty( PROPERTY_NAME, PROPERTY_ID_NAME, _bNameIsReadOnly ? PropertyAttribute::READONLY : 0, &m_sName, ::getCppuType( &m_sName ) ); @@ -76,7 +74,6 @@ OColumn::OColumn( const bool _bNameIsReadOnly ) OColumn::~OColumn() { - DBG_DTOR(OColumn, NULL); } // com::sun::star::lang::XTypeProvider @@ -152,7 +149,6 @@ void OColumn::registerPropertyNoMember( const OUString& _rName, sal_Int32 _nHand } // OColumns -DBG_NAME(OColumns); OColumns::OColumns(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, @@ -171,7 +167,6 @@ OColumns::OColumns(::cppu::OWeakObject& _rParent, ,m_bAddColumn(_bAddColumn) ,m_bDropColumn(_bDropColumn) { - DBG_CTOR(OColumns, NULL); } OColumns::OColumns(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, @@ -191,12 +186,10 @@ OColumns::OColumns(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, ,m_bAddColumn(_bAddColumn) ,m_bDropColumn(_bDropColumn) { - DBG_CTOR(OColumns, NULL); } OColumns::~OColumns() { - DBG_DTOR(OColumns, NULL); } // XServiceInfo diff --git a/dbaccess/source/core/api/columnsettings.cxx b/dbaccess/source/core/api/columnsettings.cxx index 58eb794e5efb..cb7e65ea2aa8 100644 --- a/dbaccess/source/core/api/columnsettings.cxx +++ b/dbaccess/source/core/api/columnsettings.cxx @@ -48,17 +48,14 @@ namespace dbaccess namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute; // OColumnSettings - DBG_NAME( OColumnSettings ) OColumnSettings::OColumnSettings() :m_bHidden(sal_False) { - DBG_CTOR( OColumnSettings, NULL ); } OColumnSettings::~OColumnSettings() { - DBG_DTOR( OColumnSettings, NULL ); } void OColumnSettings::registerProperties( IPropertyContainer& _rPropertyContainer ) diff --git a/dbaccess/source/core/api/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx index 421d23df8be3..49ce7b083cf5 100644 --- a/dbaccess/source/core/api/datacolumn.cxx +++ b/dbaccess/source/core/api/datacolumn.cxx @@ -38,7 +38,6 @@ using namespace ::osl; using namespace ::comphelper; using namespace ::cppu; -DBG_NAME(ODataColumn) ODataColumn::ODataColumn( const Reference < XResultSetMetaData >& _xMetaData, @@ -50,12 +49,10 @@ ODataColumn::ODataColumn( ,m_xRow(_xRow) ,m_xRowUpdate(_xRowUpdate) { - DBG_CTOR(ODataColumn,NULL); } ODataColumn::~ODataColumn() { - DBG_DTOR(ODataColumn,NULL); } // com::sun::star::lang::XTypeProvider diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx index 962011bc862b..2884f7db65ea 100644 --- a/dbaccess/source/core/api/definitioncolumn.cxx +++ b/dbaccess/source/core/api/definitioncolumn.cxx @@ -130,18 +130,15 @@ void SAL_CALL OTableColumnDescriptor::setParent( const Reference< XInterface >& } // OTableColumn -DBG_NAME(OTableColumn); OTableColumn::OTableColumn( const OUString& _rName ) :OTableColumnDescriptor( false /* do not act as descriptor */ ) { - DBG_CTOR(OTableColumn,NULL); m_sName = _rName; } OTableColumn::~OTableColumn() { - DBG_DTOR(OTableColumn,NULL); } IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumn ) @@ -162,7 +159,6 @@ OUString OTableColumn::getImplementationName( ) throw (RuntimeException) } // OQueryColumn -DBG_NAME( OQueryColumn ); OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, const Reference< XConnection >& _rxConnection, const OUString &i_sLabel ) :OTableColumnDescriptor( false /* do not act as descriptor */ ) @@ -175,7 +171,6 @@ OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, co registerProperty( PROPERTY_REALNAME, PROPERTY_ID_REALNAME, nPropAttr, &m_sRealName, ::getCppuType( &m_sRealName ) ); registerProperty( PROPERTY_LABEL, PROPERTY_ID_LABEL, nPropAttr, &m_sLabel, ::getCppuType( &m_sLabel ) ); - DBG_CTOR( OQueryColumn, NULL ); OSL_VERIFY( _rxParserColumn->getPropertyValue( PROPERTY_TYPENAME ) >>= m_aTypeName ); OSL_VERIFY( _rxParserColumn->getPropertyValue( PROPERTY_ISNULLABLE ) >>= m_nIsNullable ); @@ -221,7 +216,6 @@ OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, co OQueryColumn::~OQueryColumn() { - DBG_DTOR( OQueryColumn, NULL ); } Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const Reference< XConnection >& _rxConnection ) @@ -318,14 +312,12 @@ void SAL_CALL OQueryColumn::getFastPropertyValue( Any& _rValue, sal_Int32 _nHand } // OColumnWrapper -DBG_NAME(OColumnWrapper); OColumnWrapper::OColumnWrapper( const Reference< XPropertySet > & rCol, const bool _bNameIsReadOnly ) :OColumn( _bNameIsReadOnly ) ,m_xAggregate(rCol) ,m_nColTypeID(-1) { - DBG_CTOR(OColumnWrapper,NULL); // which type of aggregate property do we have? // we distingish the properties by the containment of optional properties m_nColTypeID = 0; @@ -346,7 +338,6 @@ OColumnWrapper::OColumnWrapper( const Reference< XPropertySet > & rCol, const bo OColumnWrapper::~OColumnWrapper() { - DBG_DTOR(OColumnWrapper,NULL); } OUString OColumnWrapper::impl_getPropertyNameFromHandle( const sal_Int32 _nHandle ) const diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx index 9e6b5e25524c..9e0e56601471 100644 --- a/dbaccess/source/core/api/preparedstatement.cxx +++ b/dbaccess/source/core/api/preparedstatement.cxx @@ -43,13 +43,11 @@ using namespace ::cppu; using namespace ::osl; using namespace dbaccess; -DBG_NAME(OPreparedStatement) OPreparedStatement::OPreparedStatement(const Reference< XConnection > & _xConn, const Reference< XInterface > & _xStatement) :OStatementBase(_xConn, _xStatement) { - DBG_CTOR(OPreparedStatement, NULL); m_xAggregateAsParameters = Reference< XParameters >( m_xAggregateAsSet, UNO_QUERY_THROW ); Reference<XDatabaseMetaData> xMeta = _xConn->getMetaData(); @@ -62,7 +60,6 @@ OPreparedStatement::~OPreparedStatement() m_pColumns->disposing(); delete m_pColumns; - DBG_DTOR(OPreparedStatement, NULL); } // com::sun::star::lang::XTypeProvider diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx index 12d959a8aba0..79e9662cf6fc 100644 --- a/dbaccess/source/core/api/query.cxx +++ b/dbaccess/source/core/api/query.cxx @@ -66,7 +66,6 @@ namespace dbaccess { // OQuery -DBG_NAME(OQuery) OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition ,const Reference< XConnection >& _rxConn @@ -81,7 +80,6 @@ OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition ,m_bCaseSensitiv(sal_True) ,m_eDoingCurrently(NONE) { - DBG_CTOR(OQuery, NULL); registerProperties(); ODataSettings::registerPropertiesFor(this); @@ -108,7 +106,6 @@ OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition OQuery::~OQuery() { - DBG_DTOR(OQuery, NULL); } IMPLEMENT_IMPLEMENTATION_ID(OQuery); diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx index ca71328b95eb..244e1b17e550 100644 --- a/dbaccess/source/core/api/querycomposer.cxx +++ b/dbaccess/source/core/api/querycomposer.cxx @@ -62,13 +62,11 @@ using namespace ::osl; using namespace ::utl; -DBG_NAME(OQueryComposer) OQueryComposer::OQueryComposer(const Reference< XConnection>& _xConnection) : OSubComponent(m_aMutex,_xConnection) { SAL_INFO("dbaccess", "OQueryComposer::OQueryComposer" ); - DBG_CTOR(OQueryComposer,NULL); OSL_ENSURE(_xConnection.is()," Connection cant be null!"); Reference<XMultiServiceFactory> xFac( _xConnection, UNO_QUERY_THROW ); @@ -78,7 +76,6 @@ OQueryComposer::OQueryComposer(const Reference< XConnection>& _xConnection) OQueryComposer::~OQueryComposer() { - DBG_DTOR(OQueryComposer,NULL); } void SAL_CALL OQueryComposer::disposing() diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx index fca43df761d3..f969d4f7b6d8 100644 --- a/dbaccess/source/core/api/querycontainer.cxx +++ b/dbaccess/source/core/api/querycontainer.cxx @@ -58,7 +58,6 @@ namespace dbaccess { // OQueryContainer -DBG_NAME(OQueryContainer) OQueryContainer::OQueryContainer( const Reference< XNameContainer >& _rxCommandDefinitions @@ -70,7 +69,6 @@ OQueryContainer::OQueryContainer( ,m_xCommandDefinitions(_rxCommandDefinitions) ,m_xConnection(_rxConn) { - DBG_CTOR(OQueryContainer, NULL); } void OQueryContainer::init() @@ -110,7 +108,6 @@ rtl::Reference<OQueryContainer> OQueryContainer::create( OQueryContainer::~OQueryContainer() { - DBG_DTOR(OQueryContainer, NULL); // dispose(); // maybe we're already disposed, but this should be uncritical } diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index e08e751672d9..a3dca17bb91e 100644 --- a/dbaccess/source/core/api/querydescriptor.cxx +++ b/dbaccess/source/core/api/querydescriptor.cxx @@ -44,13 +44,11 @@ namespace dbaccess { // OQueryDescriptor -DBG_NAME(OQueryDescriptor) OQueryDescriptor::OQueryDescriptor() :OQueryDescriptor_Base(m_aMutex,*this) ,ODataSettings(m_aBHelper,sal_True) { - DBG_CTOR(OQueryDescriptor,NULL); registerProperties(); ODataSettings::registerPropertiesFor(this); } @@ -59,14 +57,12 @@ OQueryDescriptor::OQueryDescriptor(const OQueryDescriptor_Base& _rSource) :OQueryDescriptor_Base(_rSource,*this) ,ODataSettings(m_aBHelper,sal_True) { - DBG_CTOR(OQueryDescriptor,NULL); registerProperties(); ODataSettings::registerPropertiesFor(this); } OQueryDescriptor::~OQueryDescriptor() { - DBG_DTOR(OQueryDescriptor,NULL); } IMPLEMENT_TYPEPROVIDER2(OQueryDescriptor,OQueryDescriptor_Base,ODataSettings); @@ -115,13 +111,11 @@ Reference< XPropertySetInfo > SAL_CALL OQueryDescriptor::getPropertySetInfo( ) return new ::cppu::OPropertyArrayHelper(aProps); } -DBG_NAME(OQueryDescriptor_Base); OQueryDescriptor_Base::OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWeakObject& _rMySelf) :m_bColumnsOutOfDate(sal_True) ,m_rMutex(_rMutex) { - DBG_CTOR(OQueryDescriptor_Base,NULL); m_pColumns = new OColumns(_rMySelf, m_rMutex, sal_True,::std::vector< OUString>(), this,this); } @@ -129,7 +123,6 @@ OQueryDescriptor_Base::OQueryDescriptor_Base(const OQueryDescriptor_Base& _rSour :m_bColumnsOutOfDate(sal_True) ,m_rMutex(_rSource.m_rMutex) { - DBG_CTOR(OQueryDescriptor_Base,NULL); m_pColumns = new OColumns(_rMySelf, m_rMutex, sal_True,::std::vector< OUString>(), this,this); m_sCommand = _rSource.m_sCommand; @@ -146,7 +139,6 @@ OQueryDescriptor_Base::~OQueryDescriptor_Base() m_pColumns->disposing(); delete m_pColumns; - DBG_DTOR(OQueryDescriptor_Base,NULL); } sal_Int64 SAL_CALL OQueryDescriptor_Base::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) throw(RuntimeException) diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx index d47a6327c6a7..28774f4ecd44 100644 --- a/dbaccess/source/core/api/resultcolumn.cxx +++ b/dbaccess/source/core/api/resultcolumn.cxx @@ -41,7 +41,6 @@ using namespace ::comphelper; using namespace ::cppu; using namespace dbaccess; -DBG_NAME(OResultColumn) OResultColumn::OResultColumn( const Reference < XResultSetMetaData >& _xMetaData, sal_Int32 _nPos, const Reference< XDatabaseMetaData >& _rxDBMeta ) @@ -50,7 +49,6 @@ OResultColumn::OResultColumn( const Reference < XResultSetMetaData >& _xMetaData ,m_xDBMetaData( _rxDBMeta ) ,m_nPos( _nPos ) { - DBG_CTOR(OResultColumn,NULL); } void OResultColumn::impl_determineIsRowVersion_nothrow() @@ -100,7 +98,6 @@ void OResultColumn::impl_determineIsRowVersion_nothrow() OResultColumn::~OResultColumn() { - DBG_DTOR(OResultColumn,NULL); } // com::sun::star::lang::XTypeProvider diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index d0b5834a6510..9e9cb593b4b9 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -48,7 +48,6 @@ using namespace ::osl; using namespace dbaccess; using namespace dbtools; -DBG_NAME(OResultSet) OResultSet::OResultSet(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& _xResultSet, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xStatement, @@ -60,7 +59,6 @@ OResultSet::OResultSet(const ::com::sun::star::uno::Reference< ::com::sun::star: ,m_bIsBookmarkable(sal_False) { SAL_INFO("dbaccess", "OResultSet::OResultSet" ); - DBG_CTOR(OResultSet, NULL); m_pColumns = new OColumns(*this, m_aMutex, _bCaseSensitive, ::std::vector< OUString>(), NULL,NULL); @@ -99,7 +97,6 @@ OResultSet::~OResultSet() m_pColumns->disposing(); delete m_pColumns; - DBG_DTOR(OResultSet, NULL); } // com::sun::star::lang::XTypeProvider diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx index b6b35e9d9f5f..b19ae0b79dbd 100644 --- a/dbaccess/source/core/api/statement.cxx +++ b/dbaccess/source/core/api/statement.cxx @@ -41,7 +41,6 @@ using namespace ::osl; using namespace dbaccess; using namespace dbtools; -DBG_NAME(OStatementBase) OStatementBase::OStatementBase(const Reference< XConnection > & _xConn, const Reference< XInterface > & _xStatement) @@ -52,7 +51,6 @@ OStatementBase::OStatementBase(const Reference< XConnection > & _xConn, { SAL_INFO("dbaccess", "OStatementBase::OStatementBase" ); - DBG_CTOR(OStatementBase, NULL); OSL_ENSURE(_xStatement.is() ,"Statement is NULL!"); m_xAggregateAsSet.set(_xStatement,UNO_QUERY); m_xAggregateAsCancellable = Reference< ::com::sun::star::util::XCancellable > (m_xAggregateAsSet, UNO_QUERY); @@ -60,7 +58,6 @@ OStatementBase::OStatementBase(const Reference< XConnection > & _xConn, OStatementBase::~OStatementBase() { - DBG_DTOR(OStatementBase, NULL); } // com::sun::star::lang::XTypeProvider diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index 55bcc6870d4c..c3085d80b644 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -61,7 +61,6 @@ using namespace ::comphelper; using namespace ::cppu; // ODBTable -DBG_NAME(ODBTable) ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables ,const Reference< XConnection >& _rxConn @@ -76,7 +75,6 @@ ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables ,m_nPrivileges(0) { SAL_INFO("dbaccess", "ODBTable::ODBTable" ); - DBG_CTOR(ODBTable, NULL); OSL_ENSURE(getMetaData().is(), "ODBTable::ODBTable : invalid conn !"); OSL_ENSURE(!_rName.isEmpty(), "ODBTable::ODBTable : name !"); // TODO : think about collecting the privileges here, as we can't ensure that in getFastPropertyValue, where @@ -91,13 +89,11 @@ ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables :OTable_Base(_pTables,_rxConn, _rxConn->getMetaData().is() && _rxConn->getMetaData()->supportsMixedCaseQuotedIdentifiers()) ,m_nPrivileges(-1) { - DBG_CTOR(ODBTable, NULL); SAL_INFO("dbaccess", "ODBTable::ODBTable" ); } ODBTable::~ODBTable() { - DBG_DTOR(ODBTable, NULL); } IMPLEMENT_FORWARD_REFCOUNT(ODBTable,OTable_Base) diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx index 1dcc68efcf17..94845c15382d 100644 --- a/dbaccess/source/core/api/tablecontainer.cxx +++ b/dbaccess/source/core/api/tablecontainer.cxx @@ -94,7 +94,6 @@ namespace } // OTableContainer -DBG_NAME(OTableContainer) OTableContainer::OTableContainer(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, @@ -109,13 +108,11 @@ OTableContainer::OTableContainer(::cppu::OWeakObject& _rParent, ,m_pTableMediator( NULL ) ,m_bInDrop(sal_False) { - DBG_CTOR(OTableContainer, NULL); } OTableContainer::~OTableContainer() { SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::OTableContainer" ); - DBG_DTOR(OTableContainer, NULL); } void OTableContainer::removeMasterContainerListener() diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx index 23af3b0b31e9..aeb36cbdd5f1 100644 --- a/dbaccess/source/core/api/viewcontainer.cxx +++ b/dbaccess/source/core/api/viewcontainer.cxx @@ -57,7 +57,6 @@ using namespace ::cppu; using namespace ::connectivity::sdbcx; // OViewContainer -DBG_NAME(OViewContainer) OViewContainer::OViewContainer(::cppu::OWeakObject& _rParent ,::osl::Mutex& _rMutex @@ -69,12 +68,10 @@ OViewContainer::OViewContainer(::cppu::OWeakObject& _rParent :OFilteredContainer(_rParent,_rMutex,_xCon,_bCase,_pRefreshListener,_pWarningsContainer,_nInAppend) ,m_bInElementRemoved(false) { - DBG_CTOR(OViewContainer, NULL); } OViewContainer::~OViewContainer() { - DBG_DTOR(OViewContainer, NULL); } // XServiceInfo diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx index 9765d8a47123..6f7231954bed 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx @@ -74,20 +74,16 @@ public: void clear() { m_pComponent = NULL; } }; -DBG_NAME(OComponentDefinition_Impl) OComponentDefinition_Impl::OComponentDefinition_Impl() { - DBG_CTOR(OComponentDefinition_Impl,NULL); } OComponentDefinition_Impl::~OComponentDefinition_Impl() { - DBG_DTOR(OComponentDefinition_Impl,NULL); } // OComponentDefinition -DBG_NAME(OComponentDefinition) void OComponentDefinition::initialize( const Sequence< Any >& aArguments ) throw(Exception) { @@ -132,13 +128,11 @@ OComponentDefinition::OComponentDefinition(const Reference< XComponentContext >& ,ODataSettings(OContentHelper::rBHelper,!_bTable) ,m_bTable(_bTable) { - DBG_CTOR(OComponentDefinition, NULL); registerProperties(); } OComponentDefinition::~OComponentDefinition() { - DBG_DTOR(OComponentDefinition, NULL); } OComponentDefinition::OComponentDefinition( const Reference< XInterface >& _rxContainer @@ -150,7 +144,6 @@ OComponentDefinition::OComponentDefinition( const Reference< XInterface >& _rxCo ,ODataSettings(OContentHelper::rBHelper,!_bTable) ,m_bTable(_bTable) { - DBG_CTOR(OComponentDefinition, NULL); registerProperties(); m_pImpl->m_aProps.aTitle = _rElementName; diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index 88aaf2fd57ab..0246433688b6 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -50,15 +50,12 @@ using namespace ::com::sun::star::container; using namespace ::comphelper; using namespace ::cppu; -DBG_NAME(OContentHelper_Impl) OContentHelper_Impl::OContentHelper_Impl() { - DBG_CTOR(OContentHelper_Impl,NULL); } OContentHelper_Impl::~OContentHelper_Impl() { - DBG_DTOR(OContentHelper_Impl,NULL); } OContentHelper::OContentHelper(const Reference< XComponentContext >& _xORB diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index ae1f9b987b60..2e35c7a81a49 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -107,7 +107,6 @@ bool VosMutexFacade::tryToAcquire() } // DocumentStorageAccess -DBG_NAME( DocumentStorageAccess ) class DocumentStorageAccess : public ::cppu::WeakImplHelper2< XDocumentSubStorageSupplier , XTransactionListener > { @@ -126,13 +125,11 @@ public: ,m_bPropagateCommitToRoot( true ) ,m_bDisposingSubStorages( false ) { - DBG_CTOR( DocumentStorageAccess, NULL ); } protected: ~DocumentStorageAccess() { - DBG_DTOR( DocumentStorageAccess, NULL ); } public: @@ -392,7 +389,6 @@ void SAL_CALL DocumentStorageAccess::disposing( const css::lang::EventObject& So } // ODatabaseModelImpl -DBG_NAME(ODatabaseModelImpl) ODatabaseModelImpl::ODatabaseModelImpl( const Reference< XComponentContext >& _rxContext, ODatabaseContext& _rDBContext ) :m_xModel() @@ -419,7 +415,6 @@ ODatabaseModelImpl::ODatabaseModelImpl( const Reference< XComponentContext >& _r ,m_nControllerLockCount(0) { // some kind of default - DBG_CTOR(ODatabaseModelImpl,NULL); m_sConnectURL = "jdbc:"; m_aTableFilter.realloc(1); m_aTableFilter[0] = "%"; @@ -455,13 +450,11 @@ ODatabaseModelImpl::ODatabaseModelImpl( ,m_pSharedConnectionManager(NULL) ,m_nControllerLockCount(0) { - DBG_CTOR(ODatabaseModelImpl,NULL); impl_construct_nothrow(); } ODatabaseModelImpl::~ODatabaseModelImpl() { - DBG_DTOR(ODatabaseModelImpl,NULL); } void ODatabaseModelImpl::impl_construct_nothrow() diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx index 4bbd822294a5..5f5fbd601ce6 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.cxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx @@ -29,17 +29,14 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace connectivity; -DBG_NAME(OSharedConnection) OSharedConnection::OSharedConnection(Reference< XAggregation >& _rxProxyConnection) : OSharedConnection_BASE(m_aMutex) { - DBG_CTOR(OSharedConnection,NULL); setDelegation(_rxProxyConnection,m_refCount); } OSharedConnection::~OSharedConnection() { - DBG_DTOR(OSharedConnection,NULL); } void SAL_CALL OSharedConnection::disposing(void) diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index 3750da83474c..7a32031864b0 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -44,14 +44,12 @@ namespace dbaccess { // OBookmarkContainer -DBG_NAME(OBookmarkContainer) OBookmarkContainer::OBookmarkContainer(OWeakObject& _rParent, Mutex& _rMutex) :m_rParent(_rParent) ,m_aContainerListeners(_rMutex) ,m_rMutex(_rMutex) { - DBG_CTOR(OBookmarkContainer, NULL); } void OBookmarkContainer::dispose() @@ -79,7 +77,6 @@ void SAL_CALL OBookmarkContainer::release( ) throw() OBookmarkContainer::~OBookmarkContainer() { - DBG_DTOR(OBookmarkContainer, NULL); } // XServiceInfo diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx b/dbaccess/source/core/dataaccess/commandcontainer.cxx index 4154675da695..dd24395e7fb4 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.cxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx @@ -38,7 +38,6 @@ namespace dbaccess { // OCommandContainer -DBG_NAME(OCommandContainer) OCommandContainer::OCommandContainer( const Reference< ::com::sun::star::uno::XComponentContext >& _xORB ,const Reference< XInterface >& _xParentContainer @@ -48,12 +47,10 @@ OCommandContainer::OCommandContainer( const Reference< ::com::sun::star::uno::XC :ODefinitionContainer(_xORB,_xParentContainer,_pImpl,!_bTables) ,m_bTables(_bTables) { - DBG_CTOR(OCommandContainer, NULL); } OCommandContainer::~OCommandContainer() { - DBG_DTOR(OCommandContainer, NULL); } IMPLEMENT_FORWARD_XINTERFACE2( OCommandContainer,ODefinitionContainer,OCommandContainer_BASE) diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx index ece84a5a35ff..842686ec86fa 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.cxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx @@ -46,7 +46,6 @@ extern "C" void SAL_CALL createRegistryInfo_OCommandDefinition() static ::dba::OAutoRegistration< OCommandDefinition > aAutoRegistration; } -DBG_NAME(OCommandDefinition) void OCommandDefinition::registerProperties() { @@ -129,13 +128,11 @@ OCommandDefinition::OCommandDefinition(const Reference< XComponentContext >& _xO ,const TContentPtr& _pImpl) :OComponentDefinition(_xORB,_rxContainer,_pImpl,sal_False) { - DBG_CTOR(OCommandDefinition, NULL); registerProperties(); } OCommandDefinition::~OCommandDefinition() { - DBG_DTOR(OCommandDefinition, NULL); } OCommandDefinition::OCommandDefinition( const Reference< XInterface >& _rxContainer @@ -144,7 +141,6 @@ OCommandDefinition::OCommandDefinition( const Reference< XInterface >& _rxContai ,const TContentPtr& _pImpl) :OComponentDefinition(_rxContainer,_rElementName,_xORB,_pImpl,sal_False) { - DBG_CTOR(OCommandDefinition, NULL); registerProperties(); } diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index e275cbb0e73a..7f0bccc20e79 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -280,7 +280,6 @@ void OConnection::setTypeMap(const Reference< XNameAccess > & typeMap) throw( SQ } // OConnection -DBG_NAME(OConnection) OConnection::OConnection(ODatabaseSource& _rDB , Reference< XConnection >& _rxMaster @@ -302,7 +301,6 @@ OConnection::OConnection(ODatabaseSource& _rDB ,m_bSupportsGroups(sal_False) { SAL_INFO("dbaccess", "OConnection::OConnection" ); - DBG_CTOR(OConnection,NULL); osl_atomic_increment(&m_refCount); try @@ -385,7 +383,6 @@ OConnection::~OConnection() { delete m_pTables; delete m_pViews; - DBG_DTOR(OConnection,NULL); } // XWarningsSupplier diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 007a3b3ab804..37e4688d9f62 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -146,7 +146,6 @@ bool ViewMonitor::onSetCurrentController( const Reference< XController >& _rxCon } // ODatabaseDocument -DBG_NAME(ODatabaseDocument) extern "C" void SAL_CALL createRegistryInfo_ODatabaseDocument() { @@ -168,7 +167,6 @@ ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference<ODatabaseModelImpl>& ,m_bAllowDocumentScripting( false ) ,m_bHasBeenRecovered( false ) { - DBG_CTOR(ODatabaseDocument,NULL); OSL_TRACE( "DD: ctor: %p: %p", this, m_pImpl.get() ); osl_atomic_increment( &m_refCount ); @@ -205,7 +203,6 @@ ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference<ODatabaseModelImpl>& ODatabaseDocument::~ODatabaseDocument() { OSL_TRACE( "DD: dtor: %p: %p", this, m_pImpl.get() ); - DBG_DTOR(ODatabaseDocument,NULL); if ( !ODatabaseDocument_OfficeDocument::rBHelper.bInDispose && !ODatabaseDocument_OfficeDocument::rBHelper.bDisposed ) { acquire(); diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index b1a994cf73ca..299d31bbbe74 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -132,12 +132,10 @@ protected: virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); }; -DBG_NAME( FlushNotificationAdapter ) FlushNotificationAdapter::FlushNotificationAdapter( const Reference< XFlushable >& _rxBroadcaster, const Reference< XFlushListener >& _rxListener ) :m_aBroadcaster( _rxBroadcaster ) ,m_aListener( _rxListener ) { - DBG_CTOR( FlushNotificationAdapter, NULL ); OSL_ENSURE( _rxBroadcaster.is(), "FlushNotificationAdapter::FlushNotificationAdapter: invalid flushable!" ); osl_atomic_increment( &m_refCount ); @@ -151,7 +149,6 @@ FlushNotificationAdapter::FlushNotificationAdapter( const Reference< XFlushable FlushNotificationAdapter::~FlushNotificationAdapter() { - DBG_DTOR( FlushNotificationAdapter, NULL ); } void SAL_CALL FlushNotificationAdapter::impl_dispose( bool _bRevokeListener ) @@ -320,16 +317,13 @@ public: void addEventListener(const Reference<XConnection>& _rxConnection,TConnectionMap::iterator& _rIter); }; -DBG_NAME(OSharedConnectionManager) OSharedConnectionManager::OSharedConnectionManager(const Reference< XComponentContext >& _rxContext) { - DBG_CTOR(OSharedConnectionManager,NULL); m_xProxyFactory.set( ProxyFactory::create( _rxContext ) ); } OSharedConnectionManager::~OSharedConnectionManager() { - DBG_DTOR(OSharedConnectionManager,NULL); } void SAL_CALL OSharedConnectionManager::disposing( const ::com::sun::star::lang::EventObject& Source ) throw(RuntimeException) @@ -482,7 +476,6 @@ namespace } // ODatabaseContext -DBG_NAME(ODatabaseSource) extern "C" void SAL_CALL createRegistryInfo_ODatabaseSource() { @@ -497,14 +490,12 @@ ODatabaseSource::ODatabaseSource(const ::rtl::Reference<ODatabaseModelImpl>& _pI ,m_aFlushListeners( getMutex() ) { // some kind of default - DBG_CTOR(ODatabaseSource,NULL); SAL_INFO("dbaccess", "DS: ctor: " << std::hex << this << ": " << std::hex << m_pImpl.get() ); } ODatabaseSource::~ODatabaseSource() { SAL_INFO("dbaccess", "DS: dtor: " << std::hex << this << ": " << std::hex << m_pImpl.get() ); - DBG_DTOR(ODatabaseSource,NULL); if ( !ODatabaseSource_Base::rBHelper.bInDispose && !ODatabaseSource_Base::rBHelper.bDisposed ) { acquire(); diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index f08758736f98..9b942c6cfe95 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -85,7 +85,6 @@ ODefinitionContainer_Impl::iterator ODefinitionContainer_Impl::find( TContentPtr } // ODefinitionContainer -DBG_NAME(ODefinitionContainer) ODefinitionContainer::ODefinitionContainer( const Reference< XComponentContext >& _xORB , const Reference< XInterface >& _xParentContainer @@ -111,7 +110,6 @@ ODefinitionContainer::ODefinitionContainer( const Reference< XComponentContext m_aDocumentMap.insert( Documents::value_type( aDefinition->first, Documents::mapped_type() ) ).first ); - DBG_CTOR(ODefinitionContainer, NULL); } void SAL_CALL ODefinitionContainer::disposing() @@ -147,7 +145,6 @@ void SAL_CALL ODefinitionContainer::disposing() ODefinitionContainer::~ODefinitionContainer() { - DBG_DTOR(ODefinitionContainer, NULL); } IMPLEMENT_FORWARD_XINTERFACE2( ODefinitionContainer,OContentHelper,ODefinitionContainer_Base) diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index 11bba72a4d93..9d694b53c94f 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -87,7 +87,6 @@ void SAL_CALL LocalNameApproval::approveElement( const OUString& _rName, const R } // ODocumentContainer -DBG_NAME(ODocumentContainer) ODocumentContainer::ODocumentContainer(const Reference< XComponentContext >& _xORB ,const Reference< XInterface >& _xParentContainer @@ -98,7 +97,6 @@ ODocumentContainer::ODocumentContainer(const Reference< XComponentContext >& _xO ,OPropertyStateContainer(OContentHelper::rBHelper) ,m_bFormsContainer(_bFormsContainer) { - DBG_CTOR(ODocumentContainer, NULL); registerProperty(PROPERTY_NAME, PROPERTY_ID_NAME, PropertyAttribute::BOUND | PropertyAttribute::READONLY | PropertyAttribute::CONSTRAINED, &m_pImpl->m_aProps.aTitle, ::getCppuType(&m_pImpl->m_aProps.aTitle)); @@ -107,7 +105,6 @@ ODocumentContainer::ODocumentContainer(const Reference< XComponentContext >& _xO ODocumentContainer::~ODocumentContainer() { - DBG_DTOR(ODocumentContainer, NULL); if ( !OContentHelper::rBHelper.bInDispose && !OContentHelper::rBHelper.bDisposed ) { diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 941443a3f173..d17fd8cade12 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -411,7 +411,6 @@ OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const OUString& _ } // ODocumentDefinition -DBG_NAME(ODocumentDefinition) ODocumentDefinition::ODocumentDefinition( const Reference< XInterface >& _rxContainer, const Reference< XComponentContext >& _xORB, const TContentPtr& _pImpl, sal_Bool _bForm ) @@ -424,7 +423,6 @@ ODocumentDefinition::ODocumentDefinition( const Reference< XInterface >& _rxCont ,m_bRemoveListener(sal_False) ,m_pClientHelper(NULL) { - DBG_CTOR(ODocumentDefinition, NULL); registerProperties(); } @@ -440,7 +438,6 @@ void ODocumentDefinition::initialLoad( const Sequence< sal_Int8 >& i_rClassID, c ODocumentDefinition::~ODocumentDefinition() { - DBG_DTOR(ODocumentDefinition, NULL); if ( !OContentHelper::rBHelper.bInDispose && !OContentHelper::rBHelper.bDisposed ) { acquire(); diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index 5cfd72e4b360..ac6faff1a11b 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -74,7 +74,6 @@ void SAL_CALL OInterceptor::dispose() } -DBG_NAME(OInterceptor) OInterceptor::OInterceptor( ODocumentDefinition* _pContentHolder ) :m_pContentHolder( _pContentHolder ) @@ -82,7 +81,6 @@ OInterceptor::OInterceptor( ODocumentDefinition* _pContentHolder ) ,m_pDisposeEventListeners(0) ,m_pStatCL(0) { - DBG_CTOR(OInterceptor,NULL); OSL_ENSURE(DISPATCH_RELOAD < m_aInterceptedURL.getLength(),"Illegal size."); @@ -103,7 +101,6 @@ OInterceptor::~OInterceptor() if(m_pStatCL) delete m_pStatCL; - DBG_DTOR(OInterceptor,NULL); } struct DispatchHelper diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx index 60d06b4e172b..73389cc61535 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx @@ -89,20 +89,17 @@ DataSupplier_Impl::~DataSupplier_Impl() } // DataSupplier Implementation. -DBG_NAME(DataSupplier) DataSupplier::DataSupplier( const rtl::Reference< ODocumentContainer >& rContent, sal_Int32 nOpenMode ) : m_pImpl( new DataSupplier_Impl( rContent,nOpenMode ) ) { - DBG_CTOR(DataSupplier,NULL); } DataSupplier::~DataSupplier() { - DBG_DTOR(DataSupplier,NULL); } OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx index fae5b202d591..e872d9311465 100644 --- a/dbaccess/source/core/misc/ContainerMediator.cxx +++ b/dbaccess/source/core/misc/ContainerMediator.cxx @@ -39,14 +39,12 @@ namespace dbaccess using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; -DBG_NAME(OContainerMediator) OContainerMediator::OContainerMediator( const Reference< XContainer >& _xContainer, const Reference< XNameAccess >& _xSettings, const Reference< XConnection >& _rxConnection ) : m_xSettings( _xSettings ) , m_xContainer( _xContainer ) , m_aConnection( _rxConnection ) { - DBG_CTOR(OContainerMediator,NULL); if ( _xSettings.is() && _xContainer.is() ) { @@ -73,7 +71,6 @@ OContainerMediator::OContainerMediator( const Reference< XContainer >& _xContain OContainerMediator::~OContainerMediator() { - DBG_DTOR(OContainerMediator,NULL); acquire(); impl_cleanup_nothrow(); } diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx index a58cfe47f0b7..69e8cfdbbaad 100644 --- a/dbaccess/source/core/misc/PropertyForward.cxx +++ b/dbaccess/source/core/misc/PropertyForward.cxx @@ -37,7 +37,6 @@ namespace dbaccess using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::lang; - DBG_NAME(OPropertyForward) OPropertyForward::OPropertyForward( const Reference< XPropertySet>& _xSource, const Reference< XNameAccess>& _xDestContainer, const OUString& _sName, const ::std::vector< OUString>& _aPropertyList ) @@ -46,7 +45,6 @@ namespace dbaccess ,m_sName( _sName ) ,m_bInInsert( sal_False ) { - DBG_CTOR(OPropertyForward,NULL); osl_atomic_increment(&m_refCount); try @@ -70,7 +68,6 @@ namespace dbaccess OPropertyForward::~OPropertyForward() { - DBG_DTOR(OPropertyForward,NULL); } void SAL_CALL OPropertyForward::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException) diff --git a/dbaccess/source/core/misc/apitools.cxx b/dbaccess/source/core/misc/apitools.cxx index d0fbfb19e1f2..b717090c4ae3 100644 --- a/dbaccess/source/core/misc/apitools.cxx +++ b/dbaccess/source/core/misc/apitools.cxx @@ -31,12 +31,10 @@ using namespace osl; // various helper functions // OSubComponent -DBG_NAME(OSubComponent) OSubComponent::OSubComponent(Mutex& _rMutex, const Reference< XInterface > & xParent) :OComponentHelper(_rMutex) ,m_xParent(xParent) { - DBG_CTOR(OSubComponent,NULL); } @@ -44,7 +42,6 @@ OSubComponent::~OSubComponent() { m_xParent = NULL; - DBG_DTOR(OSubComponent,NULL); } // com::sun::star::lang::XTypeProvider diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index da1b59ef12b8..cb21950e70cb 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -50,7 +50,6 @@ namespace dbaccess } } // ODsnTypeCollection -DBG_NAME(ODsnTypeCollection) ODsnTypeCollection::ODsnTypeCollection(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext) :m_aDriverConfig(_xContext) ,m_xContext(_xContext) @@ -58,7 +57,6 @@ ODsnTypeCollection::ODsnTypeCollection(const ::com::sun::star::uno::Reference< : ,m_nLivingIterators(0) #endif { - DBG_CTOR(ODsnTypeCollection,NULL); const uno::Sequence< OUString > aURLs = m_aDriverConfig.getURLs(); const OUString* pIter = aURLs.getConstArray(); const OUString* pEnd = pIter + aURLs.getLength(); @@ -74,7 +72,6 @@ ODsnTypeCollection::ODsnTypeCollection(const ::com::sun::star::uno::Reference< : ODsnTypeCollection::~ODsnTypeCollection() { - DBG_DTOR(ODsnTypeCollection,NULL); OSL_ENSURE(0 == m_nLivingIterators, "ODsnTypeCollection::~ODsnTypeCollection : there are still living iterator objects!"); } |