[Libreoffice-commits] core.git: dbaccess/source
Arnaud Versini
arnaud.versini at gmail.com
Tue Jan 21 08:20:38 PST 2014
dbaccess/source/core/api/CRowSetDataColumn.cxx | 6 -
dbaccess/source/core/api/CacheSet.cxx | 3
dbaccess/source/core/api/KeySet.cxx | 3
dbaccess/source/core/api/OptimisticSet.cxx | 3
dbaccess/source/core/api/RowSet.cxx | 3
dbaccess/source/core/api/RowSetBase.cxx | 7 -
dbaccess/source/core/api/RowSetCache.cxx | 3
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 3
dbaccess/source/core/api/TableDeco.cxx | 3
dbaccess/source/core/api/column.cxx | 7 -
dbaccess/source/core/api/columnsettings.cxx | 3
dbaccess/source/core/api/datacolumn.cxx | 3
dbaccess/source/core/api/definitioncolumn.cxx | 9 --
dbaccess/source/core/api/preparedstatement.cxx | 3
dbaccess/source/core/api/query.cxx | 3
dbaccess/source/core/api/querycomposer.cxx | 3
dbaccess/source/core/api/querycontainer.cxx | 3
dbaccess/source/core/api/querydescriptor.cxx | 8 -
dbaccess/source/core/api/resultcolumn.cxx | 3
dbaccess/source/core/api/resultset.cxx | 3
dbaccess/source/core/api/statement.cxx | 3
dbaccess/source/core/api/table.cxx | 4
dbaccess/source/core/api/tablecontainer.cxx | 3
dbaccess/source/core/api/viewcontainer.cxx | 3
dbaccess/source/core/dataaccess/ComponentDefinition.cxx | 7 -
dbaccess/source/core/dataaccess/ContentHelper.cxx | 3
dbaccess/source/core/dataaccess/ModelImpl.cxx | 7 -
dbaccess/source/core/dataaccess/SharedConnection.cxx | 3
dbaccess/source/core/dataaccess/bookmarkcontainer.cxx | 3
dbaccess/source/core/dataaccess/commandcontainer.cxx | 3
dbaccess/source/core/dataaccess/commanddefinition.cxx | 4
dbaccess/source/core/dataaccess/connection.cxx | 3
dbaccess/source/core/dataaccess/databasedocument.cxx | 3
dbaccess/source/core/dataaccess/datasource.cxx | 9 --
dbaccess/source/core/dataaccess/definitioncontainer.cxx | 3
dbaccess/source/core/dataaccess/documentcontainer.cxx | 3
dbaccess/source/core/dataaccess/documentdefinition.cxx | 3
dbaccess/source/core/dataaccess/intercept.cxx | 3
dbaccess/source/core/dataaccess/myucp_datasupplier.cxx | 3
dbaccess/source/core/misc/ContainerMediator.cxx | 3
dbaccess/source/core/misc/PropertyForward.cxx | 3
dbaccess/source/core/misc/apitools.cxx | 3
dbaccess/source/core/misc/dsntypes.cxx | 3
dbaccess/source/filter/xml/dbloader2.cxx | 3
dbaccess/source/filter/xml/xmlAutoStyle.cxx | 3
dbaccess/source/filter/xml/xmlColumn.cxx | 3
dbaccess/source/filter/xml/xmlComponent.cxx | 3
dbaccess/source/filter/xml/xmlConnectionData.cxx | 3
dbaccess/source/filter/xml/xmlConnectionResource.cxx | 3
dbaccess/source/filter/xml/xmlDataSource.cxx | 3
dbaccess/source/filter/xml/xmlDataSourceInfo.cxx | 3
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx | 3
dbaccess/source/filter/xml/xmlDataSourceSettings.cxx | 3
dbaccess/source/filter/xml/xmlDatabase.cxx | 3
dbaccess/source/filter/xml/xmlDatabaseDescription.cxx | 3
dbaccess/source/filter/xml/xmlDocuments.cxx | 4
dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx | 3
dbaccess/source/filter/xml/xmlHelper.cxx | 3
dbaccess/source/filter/xml/xmlHierarchyCollection.cxx | 4
dbaccess/source/filter/xml/xmlLogin.cxx | 3
dbaccess/source/filter/xml/xmlQuery.cxx | 3
dbaccess/source/filter/xml/xmlServerDatabase.cxx | 3
dbaccess/source/filter/xml/xmlStyleImport.cxx | 6 -
dbaccess/source/filter/xml/xmlTable.cxx | 3
dbaccess/source/filter/xml/xmlTableFilterList.cxx | 3
dbaccess/source/filter/xml/xmlTableFilterPattern.cxx | 3
dbaccess/source/filter/xml/xmlfilter.cxx | 3
dbaccess/source/ui/app/AppController.cxx | 3
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 3
dbaccess/source/ui/app/AppDetailView.cxx | 55 -------------
dbaccess/source/ui/app/AppIconControl.cxx | 3
dbaccess/source/ui/app/AppSwapWindow.cxx | 3
dbaccess/source/ui/app/AppTitleWindow.cxx | 3
dbaccess/source/ui/app/AppView.cxx | 6 -
dbaccess/source/ui/browser/AsyncronousLink.cxx | 3
dbaccess/source/ui/browser/brwctrlr.cxx | 6 -
dbaccess/source/ui/browser/brwview.cxx | 6 -
dbaccess/source/ui/browser/dataview.cxx | 3
dbaccess/source/ui/browser/dbloader.cxx | 3
dbaccess/source/ui/browser/dbtreemodel.cxx | 3
dbaccess/source/ui/browser/dbtreeview.cxx | 3
dbaccess/source/ui/browser/exsrcbrw.cxx | 3
dbaccess/source/ui/browser/formadapter.cxx | 3
dbaccess/source/ui/browser/genericcontroller.cxx | 3
dbaccess/source/ui/browser/sbagrid.cxx | 9 --
dbaccess/source/ui/browser/unodatbr.cxx | 3
dbaccess/source/ui/control/ColumnControlWindow.cxx | 3
dbaccess/source/ui/control/FieldDescControl.cxx | 18 ----
dbaccess/source/ui/control/RelationControl.cxx | 17 ----
dbaccess/source/ui/control/ScrollHelper.cxx | 3
dbaccess/source/ui/control/TableGrantCtrl.cxx | 14 ---
dbaccess/source/ui/control/VertSplitView.cxx | 3
dbaccess/source/ui/control/curledit.cxx | 3
dbaccess/source/ui/control/dbtreelistbox.cxx | 4
dbaccess/source/ui/control/marktree.cxx | 4
dbaccess/source/ui/control/sqledit.cxx | 7 -
dbaccess/source/ui/dlg/CollectionView.cxx | 3
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 3
dbaccess/source/ui/dlg/ConnectionPage.cxx | 3
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 3
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 15 ---
dbaccess/source/ui/dlg/RelationDlg.cxx | 3
dbaccess/source/ui/dlg/TablesSingleDlg.cxx | 3
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 3
dbaccess/source/ui/dlg/UserAdmin.cxx | 3
dbaccess/source/ui/dlg/UserAdminDlg.cxx | 3
dbaccess/source/ui/dlg/adminpages.cxx | 4
dbaccess/source/ui/dlg/dbadmin.cxx | 3
dbaccess/source/ui/dlg/dbfindex.cxx | 3
dbaccess/source/ui/dlg/dbwiz.cxx | 3
dbaccess/source/ui/dlg/dbwizsetup.cxx | 3
dbaccess/source/ui/dlg/detailpages.cxx | 12 --
dbaccess/source/ui/dlg/directsql.cxx | 3
dbaccess/source/ui/dlg/dlgattr.cxx | 3
dbaccess/source/ui/dlg/dlgsize.cxx | 1
dbaccess/source/ui/dlg/finteraction.cxx | 3
dbaccess/source/ui/dlg/indexdialog.cxx | 3
dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 3
dbaccess/source/ui/dlg/odbcconfig.cxx | 6 -
dbaccess/source/ui/dlg/paramdialog.cxx | 3
dbaccess/source/ui/dlg/queryfilter.cxx | 7 -
dbaccess/source/ui/dlg/queryorder.cxx | 7 -
dbaccess/source/ui/dlg/sqlmessage.cxx | 3
dbaccess/source/ui/dlg/tablespage.cxx | 5 -
dbaccess/source/ui/inc/TableConnection.hxx | 1
dbaccess/source/ui/misc/DExport.cxx | 10 --
dbaccess/source/ui/misc/HtmlReader.cxx | 13 ---
dbaccess/source/ui/misc/RtfReader.cxx | 9 --
dbaccess/source/ui/misc/TokenWriter.cxx | 8 -
dbaccess/source/ui/misc/ToolBoxHelper.cxx | 3
dbaccess/source/ui/misc/WCPage.cxx | 11 --
dbaccess/source/ui/misc/WColumnSelect.cxx | 6 -
dbaccess/source/ui/misc/WCopyTable.cxx | 4
dbaccess/source/ui/misc/WNameMatch.cxx | 6 -
dbaccess/source/ui/misc/WTypeSelect.cxx | 15 ---
dbaccess/source/ui/misc/linkeddocuments.cxx | 3
dbaccess/source/ui/misc/moduledbu.cxx | 3
dbaccess/source/ui/querydesign/ConnectionLine.cxx | 4
dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx | 1
dbaccess/source/ui/querydesign/ConnectionLineData.cxx | 5 -
dbaccess/source/ui/querydesign/JoinController.cxx | 3
dbaccess/source/ui/querydesign/JoinExchange.cxx | 3
dbaccess/source/ui/querydesign/JoinTableView.cxx | 37 --------
dbaccess/source/ui/querydesign/QTableConnection.cxx | 4
dbaccess/source/ui/querydesign/QTableConnectionData.cxx | 11 --
dbaccess/source/ui/querydesign/QTableWindow.cxx | 3
dbaccess/source/ui/querydesign/QTableWindowData.cxx | 3
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 3
dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx | 3
dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx | 6 -
dbaccess/source/ui/querydesign/QueryTableView.cxx | 23 -----
dbaccess/source/ui/querydesign/QueryTextView.cxx | 3
dbaccess/source/ui/querydesign/QueryViewSwitch.cxx | 3
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 50 -----------
dbaccess/source/ui/querydesign/TableConnection.cxx | 3
dbaccess/source/ui/querydesign/TableConnectionData.cxx | 5 -
dbaccess/source/ui/querydesign/TableFieldDescription.cxx | 10 --
dbaccess/source/ui/querydesign/TableFieldInfo.cxx | 3
dbaccess/source/ui/querydesign/TableWindow.cxx | 3
dbaccess/source/ui/querydesign/TableWindowData.cxx | 3
dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 3
dbaccess/source/ui/querydesign/TableWindowTitle.cxx | 3
dbaccess/source/ui/querydesign/querycontainerwindow.cxx | 3
dbaccess/source/ui/querydesign/querycontroller.cxx | 3
dbaccess/source/ui/querydesign/querydlg.cxx | 6 -
dbaccess/source/ui/querydesign/queryview.cxx | 3
dbaccess/source/ui/relationdesign/RTableConnection.cxx | 6 -
dbaccess/source/ui/relationdesign/RTableConnectionData.cxx | 9 --
dbaccess/source/ui/relationdesign/RelationController.cxx | 3
dbaccess/source/ui/relationdesign/RelationDesignView.cxx | 3
dbaccess/source/ui/relationdesign/RelationTableView.cxx | 10 --
dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx | 11 --
dbaccess/source/ui/tabledesign/FieldDescriptions.cxx | 5 -
dbaccess/source/ui/tabledesign/TEditControl.cxx | 53 ------------
dbaccess/source/ui/tabledesign/TableController.cxx | 3
dbaccess/source/ui/tabledesign/TableDesignControl.cxx | 3
dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx | 5 -
dbaccess/source/ui/tabledesign/TableDesignView.cxx | 6 -
dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | 8 -
dbaccess/source/ui/tabledesign/TableRow.cxx | 8 -
dbaccess/source/ui/tabledesign/TableUndo.cxx | 24 -----
dbaccess/source/ui/uno/ColumnModel.cxx | 4
dbaccess/source/ui/uno/composerdialogs.cxx | 3
dbaccess/source/ui/uno/unoDirectSql.cxx | 3
dbaccess/source/ui/uno/unoadmin.cxx | 3
185 files changed, 3 insertions(+), 1033 deletions(-)
New commits:
commit 5b2ba8ed5d6406492205b08ef25fe640253f66a1
Author: Arnaud Versini <arnaud.versini at gmail.com>
Date: Sun Jan 19 15:51:52 2014 +0100
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 at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index 2588806..bc63b1b 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 c30cd72..3b1c298 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 e02e699..79628f9 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 931bd57..341cbf8 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 0b6d9a2..7cbb193 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 2b41f10..c3b2e7a 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 17c1522..f2a965f 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 9142e2f..a5b3d5e 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 d46fe96..9d94317 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 9d523b2..ba6b851 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 58eb794..cb7e65e 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 421d23d..49ce7b0 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 962011b..2884f7d 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 9e6b5e2..9e0e566 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 12d959a..79e9662 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 ca71328..244e1b1 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 fca43df76..f969d4f 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 e08e751..a3dca17 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 d47a632..28774f4 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 d0b5834..9e9cb59 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 b6b35e9..b19ae0b 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 55bcc68..c3085d8 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 1dcc68e..94845c1 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 at 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 23af3b0..aeb36cb 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 9765d8a..6f72319 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 88aaf2f..0246433 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 ae1f9b9..2e35c7a 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 4bbd822..5f5fbd6 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 3750da8..7a32031 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 4154675..dd24395 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 ece84a5..842686e 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 e275cbb..7f0bccc 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 007a3b3..37e4688 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 b1a994c..299d31b 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 f087587..9b942c6 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 11bba72..9d694b5 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 941443a..d17fd8c 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 5cfd72e..ac6faff 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 60d06b4..73389cc 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 fae5b20..e872d93 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 a58cfe4..69e8cfd 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 d0fbfb1..b717090 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 da1b59e..cb21950 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!");
}
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index c4e6a8b..1577435 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -254,20 +254,17 @@ private:
sal_Bool impl_executeNewDatabaseWizard( Reference< XModel >& _rxModel, sal_Bool& _bShouldStartTableWizard );
};
-DBG_NAME(DBContentLoader)
DBContentLoader::DBContentLoader(const Reference< XComponentContext >& _rxFactory)
:m_aContext( _rxFactory )
,m_nStartWizard(0)
{
- DBG_CTOR(DBContentLoader,NULL);
}
DBContentLoader::~DBContentLoader()
{
- DBG_DTOR(DBContentLoader,NULL);
}
Reference< XInterface > SAL_CALL DBContentLoader::Create( const Reference< XMultiServiceFactory > & rSMgr )
diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.cxx b/dbaccess/source/filter/xml/xmlAutoStyle.cxx
index c8faf14..976a077 100644
--- a/dbaccess/source/filter/xml/xmlAutoStyle.cxx
+++ b/dbaccess/source/filter/xml/xmlAutoStyle.cxx
@@ -68,19 +68,16 @@ void OXMLAutoStylePoolP::exportStyleAttributes(
}
}
-DBG_NAME(OXMLAutoStylePoolP)
OXMLAutoStylePoolP::OXMLAutoStylePoolP(ODBExport& rTempODBExport):
SvXMLAutoStylePoolP(rTempODBExport),
rODBExport(rTempODBExport)
{
- DBG_CTOR(OXMLAutoStylePoolP,NULL);
}
OXMLAutoStylePoolP::~OXMLAutoStylePoolP()
{
- DBG_DTOR(OXMLAutoStylePoolP,NULL);
}
} // namespace dbaxml
diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx
index b541b01..4627516 100644
--- a/dbaccess/source/filter/xml/xmlColumn.cxx
+++ b/dbaccess/source/filter/xml/xmlColumn.cxx
@@ -40,7 +40,6 @@ namespace dbaxml
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME(OXMLColumn)
OXMLColumn::OXMLColumn( ODBFilter& rImport
,sal_uInt16 nPrfx
@@ -54,7 +53,6 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport
,m_xTable(_xTable)
,m_bHidden(sal_False)
{
- DBG_CTOR(OXMLColumn,NULL);
OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!");
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
@@ -104,7 +102,6 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport
OXMLColumn::~OXMLColumn()
{
- DBG_DTOR(OXMLColumn,NULL);
}
void OXMLColumn::EndElement()
diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx
index 7bb13c5..74f5ae0 100644
--- a/dbaccess/source/filter/xml/xmlComponent.cxx
+++ b/dbaccess/source/filter/xml/xmlComponent.cxx
@@ -35,7 +35,6 @@ namespace dbaxml
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME(OXMLComponent)
OXMLComponent::OXMLComponent( ODBFilter& rImport
,sal_uInt16 nPrfx
@@ -47,7 +46,6 @@ OXMLComponent::OXMLComponent( ODBFilter& rImport
SvXMLImportContext( rImport, nPrfx, _sLocalName )
,m_bAsTemplate(sal_False)
{
- DBG_CTOR(OXMLComponent,NULL);
OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!");
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
@@ -114,7 +112,6 @@ OXMLComponent::OXMLComponent( ODBFilter& rImport
OXMLComponent::~OXMLComponent()
{
- DBG_DTOR(OXMLComponent,NULL);
}
} // namespace dbaxml
diff --git a/dbaccess/source/filter/xml/xmlConnectionData.cxx b/dbaccess/source/filter/xml/xmlConnectionData.cxx
index 8bd0096..759ba46 100644
--- a/dbaccess/source/filter/xml/xmlConnectionData.cxx
+++ b/dbaccess/source/filter/xml/xmlConnectionData.cxx
@@ -35,7 +35,6 @@ namespace dbaxml
{
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME(OXMLConnectionData)
OXMLConnectionData::OXMLConnectionData( ODBFilter& rImport,
sal_uInt16 nPrfx, const OUString& _sLocalName) :
@@ -43,13 +42,11 @@ OXMLConnectionData::OXMLConnectionData( ODBFilter& rImport,
,m_bFoundOne(false)
{
rImport.setNewFormat(true);
- DBG_CTOR(OXMLConnectionData,NULL);
}
OXMLConnectionData::~OXMLConnectionData()
{
- DBG_DTOR(OXMLConnectionData,NULL);
}
SvXMLImportContext* OXMLConnectionData::CreateChildContext(
diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.cxx b/dbaccess/source/filter/xml/xmlConnectionResource.cxx
index d5625e8..b315e58 100644
--- a/dbaccess/source/filter/xml/xmlConnectionResource.cxx
+++ b/dbaccess/source/filter/xml/xmlConnectionResource.cxx
@@ -31,14 +31,12 @@ namespace dbaxml
{
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME(OXMLConnectionResource)
OXMLConnectionResource::OXMLConnectionResource( ODBFilter& rImport,
sal_uInt16 nPrfx, const OUString& _sLocalName,
const Reference< XAttributeList > & _xAttrList) :
SvXMLImportContext( rImport, nPrfx, _sLocalName )
{
- DBG_CTOR(OXMLConnectionResource,NULL);
OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!");
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
@@ -93,7 +91,6 @@ OXMLConnectionResource::OXMLConnectionResource( ODBFilter& rImport,
OXMLConnectionResource::~OXMLConnectionResource()
{
- DBG_DTOR(OXMLConnectionResource,NULL);
}
} // namespace dbaxml
diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx
index e39966e..8fd6654 100644
--- a/dbaccess/source/filter/xml/xmlDataSource.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.cxx
@@ -37,14 +37,12 @@ namespace dbaxml
{
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME(OXMLDataSource)
OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
sal_uInt16 nPrfx, const OUString& _sLocalName,
const Reference< XAttributeList > & _xAttrList, const UsedFor _eUsedFor ) :
SvXMLImportContext( rImport, nPrfx, _sLocalName )
{
- DBG_CTOR(OXMLDataSource,NULL);
OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!");
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
@@ -203,7 +201,6 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
OXMLDataSource::~OXMLDataSource()
{
- DBG_DTOR(OXMLDataSource,NULL);
}
SvXMLImportContext* OXMLDataSource::CreateChildContext(
diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
index b2c8a7a..e187ee1 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
@@ -33,7 +33,6 @@ namespace dbaxml
{
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME(OXMLDataSourceInfo)
OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport
,sal_uInt16 nPrfx
@@ -42,7 +41,6 @@ OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport
,const sal_uInt16 _nToken) :
SvXMLImportContext( rImport, nPrfx, _sLocalName )
{
- DBG_CTOR(OXMLDataSourceInfo,NULL);
OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!");
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
@@ -134,7 +132,6 @@ OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport
OXMLDataSourceInfo::~OXMLDataSourceInfo()
{
- DBG_DTOR(OXMLDataSourceInfo,NULL);
}
} // namespace dbaxml
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
index 8d9460e..2e14cac 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
@@ -37,7 +37,6 @@ namespace dbaxml
{
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME(OXMLDataSourceSetting)
OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport
,sal_uInt16 nPrfx
@@ -48,7 +47,6 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport
,m_pContainer(_pContainer)
,m_bIsList(sal_False)
{
- DBG_CTOR(OXMLDataSourceSetting,NULL);
m_aPropType = ::getVoidCppuType();
@@ -100,7 +98,6 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport
OXMLDataSourceSetting::~OXMLDataSourceSetting()
{
- DBG_DTOR(OXMLDataSourceSetting,NULL);
}
SvXMLImportContext* OXMLDataSourceSetting::CreateChildContext(
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
index 573b30c..a043aa8 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
@@ -34,21 +34,18 @@ namespace dbaxml
{
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME(OXMLDataSourceSettings)
OXMLDataSourceSettings::OXMLDataSourceSettings( ODBFilter& rImport
,sal_uInt16 nPrfx
,const OUString& _sLocalName) :
SvXMLImportContext( rImport, nPrfx, _sLocalName )
{
- DBG_CTOR(OXMLDataSourceSettings,NULL);
}
OXMLDataSourceSettings::~OXMLDataSourceSettings()
{
- DBG_DTOR(OXMLDataSourceSettings,NULL);
}
SvXMLImportContext* OXMLDataSourceSettings::CreateChildContext(
diff --git a/dbaccess/source/filter/xml/xmlDatabase.cxx b/dbaccess/source/filter/xml/xmlDatabase.cxx
index 34ba885..967ee87 100644
--- a/dbaccess/source/filter/xml/xmlDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlDatabase.cxx
@@ -38,20 +38,17 @@ namespace dbaxml
using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME(OXMLDatabase)
OXMLDatabase::OXMLDatabase( ODBFilter& rImport,
sal_uInt16 nPrfx, const OUString& rLName ) :
SvXMLImportContext( rImport, nPrfx, rLName )
{
- DBG_CTOR(OXMLDatabase,NULL);
}
OXMLDatabase::~OXMLDatabase()
{
- DBG_DTOR(OXMLDatabase,NULL);
}
SvXMLImportContext* OXMLDatabase::CreateChildContext(
diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
index b310249..25cd46d 100644
--- a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
+++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
@@ -34,20 +34,17 @@ namespace dbaxml
{
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME(OXMLDatabaseDescription)
OXMLDatabaseDescription::OXMLDatabaseDescription( ODBFilter& rImport,
sal_uInt16 nPrfx, const OUString& _sLocalName) :
SvXMLImportContext( rImport, nPrfx, _sLocalName )
,m_bFoundOne(false)
{
- DBG_CTOR(OXMLDatabaseDescription,NULL);
}
OXMLDatabaseDescription::~OXMLDatabaseDescription()
{
- DBG_DTOR(OXMLDatabaseDescription,NULL);
}
SvXMLImportContext* OXMLDatabaseDescription::CreateChildContext(
diff --git a/dbaccess/source/filter/xml/xmlDocuments.cxx b/dbaccess/source/filter/xml/xmlDocuments.cxx
index 696740b..61d9370 100644
--- a/dbaccess/source/filter/xml/xmlDocuments.cxx
+++ b/dbaccess/source/filter/xml/xmlDocuments.cxx
@@ -34,7 +34,6 @@ namespace dbaxml
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME(OXMLDocuments)
OXMLDocuments::OXMLDocuments( ODBFilter& rImport
,sal_uInt16 nPrfx
@@ -47,7 +46,6 @@ OXMLDocuments::OXMLDocuments( ODBFilter& rImport
,m_sCollectionServiceName(_sCollectionServiceName)
,m_sComponentServiceName(_sComponentServiceName)
{
- DBG_CTOR(OXMLDocuments,NULL);
}
@@ -61,13 +59,11 @@ OXMLDocuments::OXMLDocuments( ODBFilter& rImport
,m_xContainer(_xContainer)
,m_sCollectionServiceName(_sCollectionServiceName)
{
- DBG_CTOR(OXMLDocuments,NULL);
}
OXMLDocuments::~OXMLDocuments()
{
- DBG_DTOR(OXMLDocuments,NULL);
}
SvXMLImportContext* OXMLDocuments::CreateChildContext(
diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
index 126dbe8..4b9d676 100644
--- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
@@ -35,14 +35,12 @@ namespace dbaxml
{
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME(OXMLFileBasedDatabase)
OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport,
sal_uInt16 nPrfx, const OUString& _sLocalName,
const Reference< XAttributeList > & _xAttrList) :
SvXMLImportContext( rImport, nPrfx, _sLocalName )
{
- DBG_CTOR(OXMLFileBasedDatabase,NULL);
OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!");
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
@@ -117,7 +115,6 @@ OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport,
OXMLFileBasedDatabase::~OXMLFileBasedDatabase()
{
- DBG_DTOR(OXMLFileBasedDatabase,NULL);
}
} // namespace dbaxml
diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx
index 94ca651..6157ec3 100644
--- a/dbaccess/source/filter/xml/xmlHelper.cxx
+++ b/dbaccess/source/filter/xml/xmlHelper.cxx
@@ -32,17 +32,14 @@ namespace dbaxml
{
using namespace ::xmloff::token;
using namespace ::com::sun::star::awt;
-DBG_NAME(OPropertyHandlerFactory)
OPropertyHandlerFactory::OPropertyHandlerFactory()
{
- DBG_CTOR(OPropertyHandlerFactory,NULL);
}
OPropertyHandlerFactory::~OPropertyHandlerFactory()
{
- DBG_DTOR(OPropertyHandlerFactory,NULL);
}
const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 _nType) const
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
index 8a1313d..5abc7bf 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
@@ -37,7 +37,6 @@ namespace dbaxml
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME(OXMLHierarchyCollection)
OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport
,sal_uInt16 nPrfx
@@ -51,7 +50,6 @@ OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport
,m_sCollectionServiceName(_sCollectionServiceName)
,m_sComponentServiceName(_sComponentServiceName)
{
- DBG_CTOR(OXMLHierarchyCollection,NULL);
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
const SvXMLTokenMap& rTokenMap = rImport.GetComponentElemTokenMap();
@@ -112,13 +110,11 @@ OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport
,m_xContainer(_xContainer)
,m_xTable(_xTable)
{
- DBG_CTOR(OXMLHierarchyCollection,NULL);
}
OXMLHierarchyCollection::~OXMLHierarchyCollection()
{
- DBG_DTOR(OXMLHierarchyCollection,NULL);
}
SvXMLImportContext* OXMLHierarchyCollection::CreateChildContext(
diff --git a/dbaccess/source/filter/xml/xmlLogin.cxx b/dbaccess/source/filter/xml/xmlLogin.cxx
index 8565ffe..b35e187 100644
--- a/dbaccess/source/filter/xml/xmlLogin.cxx
+++ b/dbaccess/source/filter/xml/xmlLogin.cxx
@@ -34,14 +34,12 @@ namespace dbaxml
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME(OXMLLogin)
OXMLLogin::OXMLLogin( ODBFilter& rImport,
sal_uInt16 nPrfx, const OUString& _sLocalName,
const Reference< XAttributeList > & _xAttrList ) :
SvXMLImportContext( rImport, nPrfx, _sLocalName )
{
- DBG_CTOR(OXMLLogin,NULL);
OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!");
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
@@ -119,7 +117,6 @@ OXMLLogin::OXMLLogin( ODBFilter& rImport,
OXMLLogin::~OXMLLogin()
{
- DBG_DTOR(OXMLLogin,NULL);
}
} // namespace dbaxml
diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx
index e77503b..82606fe 100644
--- a/dbaccess/source/filter/xml/xmlQuery.cxx
+++ b/dbaccess/source/filter/xml/xmlQuery.cxx
@@ -36,7 +36,6 @@ namespace dbaxml
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME(OXMLQuery)
OXMLQuery::OXMLQuery( ODBFilter& rImport
,sal_uInt16 nPrfx
@@ -47,7 +46,6 @@ OXMLQuery::OXMLQuery( ODBFilter& rImport
OXMLTable( rImport, nPrfx, _sLocalName,_xAttrList,_xParentContainer, "com.sun.star.sdb.CommandDefinition" )
,m_bEscapeProcessing(sal_True)
{
- DBG_CTOR(OXMLQuery,NULL);
OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!");
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
@@ -76,7 +74,6 @@ OXMLQuery::OXMLQuery( ODBFilter& rImport
OXMLQuery::~OXMLQuery()
{
- DBG_DTOR(OXMLQuery,NULL);
}
SvXMLImportContext* OXMLQuery::CreateChildContext(
diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
index e055d9c..0650255 100644
--- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
@@ -31,14 +31,12 @@ namespace dbaxml
{
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME(OXMLServerDatabase)
OXMLServerDatabase::OXMLServerDatabase( ODBFilter& rImport,
sal_uInt16 nPrfx, const OUString& _sLocalName,
const Reference< XAttributeList > & _xAttrList) :
SvXMLImportContext( rImport, nPrfx, _sLocalName )
{
- DBG_CTOR(OXMLServerDatabase,NULL);
OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!");
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
@@ -139,7 +137,6 @@ OXMLServerDatabase::OXMLServerDatabase( ODBFilter& rImport,
OXMLServerDatabase::~OXMLServerDatabase()
{
- DBG_DTOR(OXMLServerDatabase,NULL);
}
} // namespace dbaxml
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx
index 73b64e7..8d00021 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.cxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx
@@ -48,7 +48,6 @@ using namespace xmloff::token;
TYPEINIT1( OTableStyleContext, XMLPropStyleContext );
TYPEINIT1( OTableStylesContext, SvXMLStylesContext );
-DBG_NAME(OTableStyleContext)
OTableStyleContext::OTableStyleContext( ODBFilter& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
@@ -59,14 +58,12 @@ OTableStyleContext::OTableStyleContext( ODBFilter& rImport,
,pStyles(&rStyles)
,m_nNumberFormat(-1)
{
- DBG_CTOR(OTableStyleContext,NULL);
}
OTableStyleContext::~OTableStyleContext()
{
- DBG_DTOR(OTableStyleContext,NULL);
}
void OTableStyleContext::FillPropertySet(
@@ -142,7 +139,6 @@ ODBFilter& OTableStyleContext::GetOwnImport()
return static_cast<ODBFilter&>(GetImport());
}
-DBG_NAME(OTableStylesContext)
OTableStylesContext::OTableStylesContext( SvXMLImport& rImport,
sal_uInt16 nPrfx ,
@@ -156,14 +152,12 @@ OTableStylesContext::OTableStylesContext( SvXMLImport& rImport,
m_nNumberFormatIndex(-1),
bAutoStyles(bTempAutoStyles)
{
- DBG_CTOR(OTableStylesContext,NULL);
}
OTableStylesContext::~OTableStylesContext()
{
- DBG_DTOR(OTableStylesContext,NULL);
}
void OTableStylesContext::EndElement()
diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx
index 2d1b698..876d85d 100644
--- a/dbaccess/source/filter/xml/xmlTable.cxx
+++ b/dbaccess/source/filter/xml/xmlTable.cxx
@@ -38,7 +38,6 @@ namespace dbaxml
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME(OXMLTable)
OXMLTable::OXMLTable( ODBFilter& _rImport
,sal_uInt16 nPrfx
@@ -53,7 +52,6 @@ OXMLTable::OXMLTable( ODBFilter& _rImport
,m_bApplyFilter(sal_False)
,m_bApplyOrder(sal_False)
{
- DBG_CTOR(OXMLTable,NULL);
OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!");
const SvXMLNamespaceMap& rMap = GetOwnImport().GetNamespaceMap();
@@ -107,7 +105,6 @@ OXMLTable::OXMLTable( ODBFilter& _rImport
OXMLTable::~OXMLTable()
{
- DBG_DTOR(OXMLTable,NULL);
}
SvXMLImportContext* OXMLTable::CreateChildContext(
diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
index 70cca6b..2caf2fc 100644
--- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
@@ -35,18 +35,15 @@ namespace dbaxml
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME(OXMLTableFilterList)
OXMLTableFilterList::OXMLTableFilterList( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& _sLocalName )
:SvXMLImportContext( rImport, nPrfx, _sLocalName )
{
- DBG_CTOR(OXMLTableFilterList,NULL);
}
OXMLTableFilterList::~OXMLTableFilterList()
{
- DBG_DTOR(OXMLTableFilterList,NULL);
}
SvXMLImportContext* OXMLTableFilterList::CreateChildContext(
diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
index c6dff59..48c2cbd 100644
--- a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
@@ -25,7 +25,6 @@ namespace dbaxml
{
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME(OXMLTableFilterPattern)
OXMLTableFilterPattern::OXMLTableFilterPattern( SvXMLImport& rImport,
sal_uInt16 nPrfx
@@ -36,14 +35,12 @@ OXMLTableFilterPattern::OXMLTableFilterPattern( SvXMLImport& rImport,
,m_rParent(_rParent)
,m_bNameFilter(_bNameFilter)
{
- DBG_CTOR(OXMLTableFilterPattern,NULL);
}
OXMLTableFilterPattern::~OXMLTableFilterPattern()
{
- DBG_DTOR(OXMLTableFilterPattern,NULL);
}
void OXMLTableFilterPattern::Characters( const OUString& rChars )
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 3bda64e..a204280 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -344,13 +344,11 @@ sal_Int32 ReadThroughComponent(
}
// - ODBFilter -
-DBG_NAME(ODBFilter)
ODBFilter::ODBFilter( const uno::Reference< XComponentContext >& _rxContext )
:SvXMLImport(_rxContext, getImplementationName_Static())
,m_bNewFormat(false)
{
- DBG_CTOR(ODBFilter,NULL);
GetMM100UnitConverter().SetCoreMeasureUnit(util::MeasureUnit::MM_10TH);
GetMM100UnitConverter().SetXMLMeasureUnit(util::MeasureUnit::CM);
@@ -366,7 +364,6 @@ ODBFilter::ODBFilter( const uno::Reference< XComponentContext >& _rxContext )
ODBFilter::~ODBFilter() throw()
{
- DBG_DTOR(ODBFilter,NULL);
}
OUString ODBFilter::getImplementationName_Static()
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index cbd9b18..f5da591 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -284,7 +284,6 @@ private:
};
// OApplicationController
-DBG_NAME(OApplicationController)
OApplicationController::OApplicationController(const Reference< XComponentContext >& _rxORB)
:OApplicationController_CBASE( _rxORB )
,m_aContextMenuInterceptors( getMutex() )
@@ -300,7 +299,6 @@ OApplicationController::OApplicationController(const Reference< XComponentContex
,m_bSuspended( sal_False )
,m_pSelectionNotifier( new SelectionNotifier( getMutex(), *this ) )
{
- DBG_CTOR(OApplicationController,NULL);
}
OApplicationController::~OApplicationController()
@@ -317,7 +315,6 @@ OApplicationController::~OApplicationController()
SAL_WNODEPRECATED_DECLARATIONS_POP
clearView();
- DBG_DTOR(OApplicationController,NULL);
}
IMPLEMENT_FORWARD_XTYPEPROVIDER2(OApplicationController,OApplicationController_CBASE,OApplicationController_Base)
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index c8a7dda..919d25c 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -183,7 +183,6 @@ namespace
}
// class OAppDetailPageHelper
-DBG_NAME(OAppDetailPageHelper)
OAppDetailPageHelper::OAppDetailPageHelper(Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode) : Window(_pParent,WB_DIALOGCONTROL)
,m_rBorderWin(_rBorderWin)
,m_aFL(this,WB_VERT)
@@ -194,7 +193,6 @@ OAppDetailPageHelper::OAppDetailPageHelper(Window* _pParent,OAppBorderWindow& _r
,m_pTablePreview(NULL)
,m_ePreviewMode(_ePreviewMode)
{
- DBG_CTOR(OAppDetailPageHelper,NULL);
m_aBorder.SetBorderStyle(WINDOW_BORDER_MONO);
@@ -252,7 +250,6 @@ OAppDetailPageHelper::~OAppDetailPageHelper()
}
- DBG_DTOR(OAppDetailPageHelper,NULL);
}
int OAppDetailPageHelper::getVisibleControlIndex() const
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 08d657a..f08fcd0 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -338,8 +338,6 @@ void OCreationList::KeyInput( const KeyEvent& rKEvt )
}
}
-DBG_NAME(OTasksWindow)
-
OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView)
: Window(_pParent,WB_DIALOGCONTROL )
,m_aCreation(*this)
@@ -348,7 +346,6 @@ OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView
,m_aFL(this,WB_VERT)
,m_pDetailView(_pDetailView)
{
- DBG_CTOR(OTasksWindow,NULL);
SetUniqueId(UID_APP_TASKS_WINDOW);
m_aCreation.SetHelpId(HID_APP_CREATION_LIST);
m_aCreation.SetSelectHdl(LINK(this, OTasksWindow, OnEntrySelectHdl));
@@ -366,13 +363,11 @@ OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView
OTasksWindow::~OTasksWindow()
{
- DBG_DTOR(OTasksWindow,NULL);
Clear();
}
void OTasksWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
- DBG_CHKTHIS(OTasksWindow,NULL);
Window::DataChanged( rDCEvt );
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
@@ -385,7 +380,6 @@ void OTasksWindow::DataChanged( const DataChangedEvent& rDCEvt )
void OTasksWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground )
{
- DBG_CHKTHIS(OTasksWindow,NULL);
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if( bFont )
{
@@ -420,7 +414,6 @@ void OTasksWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_B
void OTasksWindow::setHelpText(sal_uInt16 _nId)
{
- DBG_CHKTHIS(OTasksWindow,NULL);
if ( _nId )
{
OUString sText = ModuleRes(_nId);
@@ -436,7 +429,6 @@ void OTasksWindow::setHelpText(sal_uInt16 _nId)
IMPL_LINK(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, /*_pTreeBox*/)
{
- DBG_CHKTHIS(OTasksWindow,NULL);
SvTreeListEntry* pEntry = m_aCreation.GetHdlEntry();
if ( pEntry )
m_aHelpText.SetText( ModuleRes( reinterpret_cast< TaskEntry* >( pEntry->GetUserData() )->nHelpID ) );
@@ -445,8 +437,6 @@ IMPL_LINK(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, /*_pTreeBox*/)
void OTasksWindow::Resize()
{
- DBG_CHKTHIS(OTasksWindow,NULL);
-
// parent window dimension
Size aOutputSize( GetOutputSize() );
long nOutputWidth = aOutputSize.Width();
@@ -468,7 +458,6 @@ void OTasksWindow::Resize()
void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList )
{
- DBG_CHKTHIS(OTasksWindow,NULL);
Clear();
try
@@ -519,7 +508,6 @@ void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList )
void OTasksWindow::Clear()
{
- DBG_CHKTHIS(OTasksWindow,NULL);
m_aCreation.resetLastActive();
SvTreeListEntry* pEntry = m_aCreation.First();
while ( pEntry )
@@ -532,15 +520,12 @@ void OTasksWindow::Clear()
// class OApplicationDetailView
-DBG_NAME(OApplicationDetailView)
-
OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,PreviewMode _ePreviewMode) : OSplitterView(&_rParent,sal_False )
,m_aHorzSplitter(this)
,m_aTasks(this,STR_TASKS,WB_BORDER | WB_DIALOGCONTROL )
,m_aContainer(this,0,WB_BORDER | WB_DIALOGCONTROL )
,m_rBorderWin(_rParent)
{
- DBG_CTOR(OApplicationDetailView,NULL);
SetUniqueId(UID_APP_DETAIL_VIEW);
ImplInitSettings( sal_True, sal_True, sal_True );
@@ -570,7 +555,6 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe
OApplicationDetailView::~OApplicationDetailView()
{
- DBG_DTOR(OApplicationDetailView,NULL);
set(NULL,NULL);
setSplitter(NULL);
m_pControlHelper = NULL;
@@ -578,7 +562,6 @@ OApplicationDetailView::~OApplicationDetailView()
void OApplicationDetailView::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground )
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if( bFont )
{
@@ -604,7 +587,6 @@ void OApplicationDetailView::ImplInitSettings( sal_Bool bFont, sal_Bool bForegro
void OApplicationDetailView::DataChanged( const DataChangedEvent& rDCEvt )
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
OSplitterView::DataChanged( rDCEvt );
if ( (rDCEvt.GetType() == DATACHANGED_FONTS) ||
@@ -620,7 +602,6 @@ void OApplicationDetailView::DataChanged( const DataChangedEvent& rDCEvt )
void OApplicationDetailView::GetFocus()
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
OSplitterView::GetFocus();
}
@@ -652,8 +633,6 @@ void OApplicationDetailView::createPage( ElementType _eType,const Reference< XNa
void OApplicationDetailView::impl_createPage( ElementType _eType, const Reference< XConnection >& _rxConnection,
const Reference< XNameAccess >& _rxNonTableElements )
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
-
// get the data for the pane
const TaskPaneData& rData = impl_getTaskPaneData( _eType );
getTasksWindow().fillTaskEntryList( rData.aTasks );
@@ -757,55 +736,46 @@ void OApplicationDetailView::impl_fillTaskPaneData( ElementType _eType, TaskPane
OUString OApplicationDetailView::getQualifiedName( SvTreeListEntry* _pEntry ) const
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->getQualifiedName( _pEntry );
}
sal_Bool OApplicationDetailView::isLeaf(SvTreeListEntry* _pEntry) const
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->isLeaf(_pEntry);
}
sal_Bool OApplicationDetailView::isALeafSelected() const
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->isALeafSelected();
}
void OApplicationDetailView::selectAll()
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->selectAll();
}
void OApplicationDetailView::sortDown()
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->sortDown();
}
void OApplicationDetailView::sortUp()
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->sortUp();
}
sal_Bool OApplicationDetailView::isFilled() const
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->isFilled();
}
ElementType OApplicationDetailView::getElementType() const
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->getElementType();
}
void OApplicationDetailView::clearPages(sal_Bool _bTaskAlso)
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
if ( _bTaskAlso )
getTasksWindow().Clear();
m_pControlHelper->clearPages();
@@ -813,79 +783,67 @@ void OApplicationDetailView::clearPages(sal_Bool _bTaskAlso)
sal_Int32 OApplicationDetailView::getSelectionCount()
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->getSelectionCount();
}
sal_Int32 OApplicationDetailView::getElementCount()
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->getElementCount();
}
void OApplicationDetailView::getSelectionElementNames( ::std::vector< OUString>& _rNames ) const
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->getSelectionElementNames( _rNames );
}
void OApplicationDetailView::describeCurrentSelectionForControl( const Control& _rControl, Sequence< NamedDatabaseObject >& _out_rSelectedObjects )
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->describeCurrentSelectionForControl( _rControl, _out_rSelectedObjects );
}
void OApplicationDetailView::describeCurrentSelectionForType( const ElementType _eType, Sequence< NamedDatabaseObject >& _out_rSelectedObjects )
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->describeCurrentSelectionForType( _eType, _out_rSelectedObjects );
}
void OApplicationDetailView::selectElements(const Sequence< OUString>& _aNames)
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->selectElements( _aNames );
}
SvTreeListEntry* OApplicationDetailView::getEntry( const Point& _aPoint ) const
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->getEntry(_aPoint);
}
sal_Bool OApplicationDetailView::isCutAllowed()
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->isCutAllowed();
}
sal_Bool OApplicationDetailView::isCopyAllowed()
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->isCopyAllowed();
}
-sal_Bool OApplicationDetailView::isPasteAllowed() { DBG_CHKTHIS(OApplicationDetailView,NULL);return m_pControlHelper->isPasteAllowed(); }
+sal_Bool OApplicationDetailView::isPasteAllowed() { return m_pControlHelper->isPasteAllowed(); }
-void OApplicationDetailView::copy() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->copy(); }
+void OApplicationDetailView::copy() { m_pControlHelper->copy(); }
-void OApplicationDetailView::cut() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->cut(); }
+void OApplicationDetailView::cut() { m_pControlHelper->cut(); }
void OApplicationDetailView::paste()
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->paste();
}
SvTreeListEntry* OApplicationDetailView::elementAdded(ElementType _eType,const OUString& _rName, const Any& _rObject )
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->elementAdded(_eType,_rName, _rObject );
}
void OApplicationDetailView::elementRemoved(ElementType _eType,const OUString& _rName )
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->elementRemoved(_eType,_rName );
}
@@ -893,31 +851,26 @@ void OApplicationDetailView::elementReplaced(ElementType _eType
,const OUString& _rOldName
,const OUString& _rNewName )
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->elementReplaced( _eType, _rOldName, _rNewName );
}
PreviewMode OApplicationDetailView::getPreviewMode()
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->getPreviewMode();
}
sal_Bool OApplicationDetailView::isPreviewEnabled()
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->isPreviewEnabled();
}
void OApplicationDetailView::switchPreview(PreviewMode _eMode)
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->switchPreview(_eMode);
}
void OApplicationDetailView::showPreview(const Reference< XContent >& _xContent)
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->showPreview(_xContent);
}
@@ -925,13 +878,11 @@ void OApplicationDetailView::showPreview( const OUString& _sDataSourceName,
const OUString& _sName,
sal_Bool _bTable)
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
m_pControlHelper->showPreview(_sDataSourceName,_sName,_bTable);
}
sal_Bool OApplicationDetailView::isSortUp() const
{
- DBG_CHKTHIS(OApplicationDetailView,NULL);
return m_pControlHelper->isSortUp();
}
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index 2cfccd1..752ac35 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -29,14 +29,12 @@
using namespace ::dbaui;
// class OApplicationIconControl
-DBG_NAME(OApplicationIconControl)
OApplicationIconControl::OApplicationIconControl(Window* _pParent)
: SvtIconChoiceCtrl(_pParent,WB_ICON | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | /*!WB_NOSELECTION |*/
WB_TABSTOP | WB_CLIPCHILDREN | WB_NOVSCROLL | WB_SMART_ARRANGE | WB_NOHSCROLL | WB_CENTER)
,DropTargetHelper(this)
,m_pActionListener(NULL)
{
- DBG_CTOR(OApplicationIconControl,NULL);
struct CategoryDescriptor
{
@@ -75,7 +73,6 @@ OApplicationIconControl::~OApplicationIconControl()
}
}
- DBG_DTOR(OApplicationIconControl,NULL);
}
sal_Int8 OApplicationIconControl::AcceptDrop( const AcceptDropEvent& _rEvt )
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 97f6cc0..49452b4 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -37,14 +37,12 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
// class OApplicationSwapWindow
-DBG_NAME(OApplicationSwapWindow)
OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWindow& _rBorderWindow )
:Window(_pParent,WB_DIALOGCONTROL )
,m_aIconControl(this)
,m_eLastType(E_NONE)
,m_rBorderWin( _rBorderWindow )
{
- DBG_CTOR(OApplicationSwapWindow,NULL);
ImplInitSettings( sal_True, sal_True, sal_True );
@@ -57,7 +55,6 @@ OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWind
OApplicationSwapWindow::~OApplicationSwapWindow()
{
- DBG_DTOR(OApplicationSwapWindow,NULL);
}
void OApplicationSwapWindow::Resize()
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index 384ed8e..381ed4a 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -26,7 +26,6 @@
namespace dbaui
{
-DBG_NAME(OTitleWindow)
OTitleWindow::OTitleWindow(Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,sal_Bool _bShift)
: Window(_pParent,_nBits | WB_DIALOGCONTROL)
, m_aSpace1(this)
@@ -35,7 +34,6 @@ OTitleWindow::OTitleWindow(Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,
, m_pChild(NULL)
, m_bShift(_bShift)
{
- DBG_CTOR(OTitleWindow,NULL);
setTitle(_nTitleId);
SetBorderStyle(WINDOW_BORDER_MONO);
@@ -55,7 +53,6 @@ OTitleWindow::~OTitleWindow()
m_pChild = NULL;
}
- DBG_DTOR(OTitleWindow,NULL);
}
void OTitleWindow::setChildWindow(Window* _pChild)
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 6083b2e..d35e8cd 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -58,13 +58,11 @@ using namespace ::com::sun::star::container;
using ::com::sun::star::sdb::application::NamedDatabaseObject;
// class OAppBorderWindow
-DBG_NAME(OAppBorderWindow)
OAppBorderWindow::OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePreviewMode) : Window(_pParent,WB_DIALOGCONTROL)
,m_pPanel(NULL)
,m_pDetailView(NULL)
,m_pView(_pParent)
{
- DBG_CTOR(OAppBorderWindow,NULL);
SetBorderStyle(WINDOW_BORDER_MONO);
@@ -104,7 +102,6 @@ OAppBorderWindow::~OAppBorderWindow()
m_pDetailView = NULL;
}
- DBG_DTOR(OAppBorderWindow,NULL);
}
void OAppBorderWindow::GetFocus()
@@ -190,7 +187,6 @@ OApplicationDetailView* OAppBorderWindow::getDetailView() const
}
// class OApplicationView
-DBG_NAME(OApplicationView);
OApplicationView::OApplicationView( Window* pParent
,const Reference< XComponentContext >& _rxOrb
,IApplicationController& _rAppController
@@ -200,7 +196,6 @@ OApplicationView::OApplicationView( Window* pParent
,m_rAppController( _rAppController )
,m_eChildFocus(NONE)
{
- DBG_CTOR(OApplicationView,NULL);
try
{
@@ -219,7 +214,6 @@ OApplicationView::OApplicationView( Window* pParent
OApplicationView::~OApplicationView()
{
- DBG_DTOR(OApplicationView,NULL);
{
stopComponentListening(m_xObject);
diff --git a/dbaccess/source/ui/browser/AsyncronousLink.cxx b/dbaccess/source/ui/browser/AsyncronousLink.cxx
index 68b554e..bf05ab0a 100644
--- a/dbaccess/source/ui/browser/AsyncronousLink.cxx
+++ b/dbaccess/source/ui/browser/AsyncronousLink.cxx
@@ -23,14 +23,12 @@
// OAsyncronousLink
using namespace dbaui;
-DBG_NAME(OAsyncronousLink)
OAsyncronousLink::OAsyncronousLink( const Link& _rHandler )
:m_aHandler(_rHandler)
,m_aEventSafety()
,m_aDestructionSafety()
,m_nEventId(0)
{
- DBG_CTOR(OAsyncronousLink,NULL);
}
OAsyncronousLink::~OAsyncronousLink()
@@ -49,7 +47,6 @@ OAsyncronousLink::~OAsyncronousLink()
// link handler blocked. With leaving the above block it continued, but now we are prevented
// to leave this destructor 'til the link handler recognizes that nEvent == 0 and leaves.
}
- DBG_DTOR(OAsyncronousLink,NULL);
}
void OAsyncronousLink::Call( void* _pArgument )
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 9a2c0ec..17107ca 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -240,12 +240,10 @@ protected:
~FormControllerImpl();
};
-DBG_NAME(FormControllerImpl)
SbaXDataBrowserController::FormControllerImpl::FormControllerImpl(SbaXDataBrowserController* _pOwner)
:m_aActivateListeners(_pOwner->getMutex())
,m_pOwner(_pOwner)
{
- DBG_CTOR(FormControllerImpl,NULL);
OSL_ENSURE(m_pOwner, "SbaXDataBrowserController::FormControllerImpl::FormControllerImpl : invalid Owner !");
}
@@ -253,7 +251,6 @@ SbaXDataBrowserController::FormControllerImpl::FormControllerImpl(SbaXDataBrowse
SbaXDataBrowserController::FormControllerImpl::~FormControllerImpl()
{
- DBG_DTOR(FormControllerImpl,NULL);
}
Reference< runtime::XFormOperations > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getFormOperations() throw (RuntimeException)
@@ -545,7 +542,6 @@ Any SAL_CALL SbaXDataBrowserController::queryInterface(const Type& _rType) throw
return aRet;
}
-DBG_NAME(SbaXDataBrowserController)
SbaXDataBrowserController::SbaXDataBrowserController(const Reference< ::com::sun::star::uno::XComponentContext >& _rM)
:SbaXDataBrowserController_Base(_rM)
,m_nRowSetPrivileges(0)
@@ -561,7 +557,6 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< ::com::sun
,m_bCannotSelectUnfiltered( true )
{
SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::SbaXDataBrowserController" );
- DBG_CTOR(SbaXDataBrowserController,NULL);
// create the form controller aggregate
::comphelper::increment(m_refCount);
@@ -587,7 +582,6 @@ SbaXDataBrowserController::~SbaXDataBrowserController()
m_xFormControllerImpl->setDelegator(xEmpty);
}
- DBG_DTOR(SbaXDataBrowserController,NULL);
}
void SbaXDataBrowserController::startFrameListening( const Reference< XFrame >& _rxFrame )
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index d7a2d0c..edecf45 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -64,7 +64,6 @@ namespace
// UnoDataBrowserView
-DBG_NAME(UnoDataBrowserView)
UnoDataBrowserView::UnoDataBrowserView( Window* pParent,
IController& _rController,
const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext)
@@ -74,7 +73,6 @@ UnoDataBrowserView::UnoDataBrowserView( Window* pParent,
,m_pVclControl(NULL)
,m_pStatus(NULL)
{
- DBG_CTOR(UnoDataBrowserView,NULL);
}
@@ -138,7 +136,6 @@ UnoDataBrowserView::~UnoDataBrowserView()
catch(const Exception&)
{}
- DBG_DTOR(UnoDataBrowserView,NULL);
}
IMPL_LINK( UnoDataBrowserView, SplitHdl, void*, /*NOINTERESTEDIN*/ )
@@ -330,11 +327,9 @@ bool UnoDataBrowserView::PreNotify( NotifyEvent& rNEvt )
return nDone || ODataView::PreNotify(rNEvt);
}
-DBG_NAME(BrowserViewStatusDisplay)
BrowserViewStatusDisplay::BrowserViewStatusDisplay( UnoDataBrowserView* _pView, const OUString& _rStatus )
:m_pView(_pView)
{
- DBG_CTOR(BrowserViewStatusDisplay,NULL);
if (m_pView)
m_pView->showStatus(_rStatus);
@@ -345,7 +340,6 @@ BrowserViewStatusDisplay::~BrowserViewStatusDisplay( )
if (m_pView)
m_pView->showStatus(OUString());
- DBG_DTOR(BrowserViewStatusDisplay,NULL);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index 7426382..eba8139 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -58,7 +58,6 @@ namespace dbaui
}
};
- DBG_NAME(ODataView)
ODataView::ODataView( Window* pParent,
IController& _rController,
const Reference< XComponentContext >& _rxContext,
@@ -68,7 +67,6 @@ namespace dbaui
,m_rController( _rController )
,m_aSeparator( this )
{
- DBG_CTOR(ODataView,NULL);
m_rController.acquire();
m_pAccel.reset(::svt::AcceleratorExecute::createAcceleratorHelper());
m_aSeparator.Show();
@@ -80,7 +78,6 @@ namespace dbaui
ODataView::~ODataView()
{
- DBG_DTOR(ODataView,NULL);
m_rController.release();
}
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index f53375a..6ddc0f9 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -93,19 +93,16 @@ public:
virtual void SAL_CALL cancel(void) throw();
};
-DBG_NAME(DBContentLoader)
DBContentLoader::DBContentLoader(const Reference< XComponentContext >& _rxContext)
:m_xContext(_rxContext)
{
- DBG_CTOR(DBContentLoader,NULL);
}
DBContentLoader::~DBContentLoader()
{
- DBG_DTOR(DBContentLoader,NULL);
}
extern "C" void SAL_CALL createRegistryInfo_DBContentLoader()
diff --git a/dbaccess/source/ui/browser/dbtreemodel.cxx b/dbaccess/source/ui/browser/dbtreemodel.cxx
index a321c06..196674a 100644
--- a/dbaccess/source/ui/browser/dbtreemodel.cxx
+++ b/dbaccess/source/ui/browser/dbtreemodel.cxx
@@ -23,15 +23,12 @@
namespace dbaui
{
- DBG_NAME(DBTreeListUserData)
DBTreeListUserData::DBTreeListUserData()
:eType(SbaTableQueryBrowser::etQuery)
{
- DBG_CTOR(DBTreeListUserData,NULL);
}
DBTreeListUserData::~DBTreeListUserData()
{
- DBG_DTOR(DBTreeListUserData,NULL);
}
}
diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx
index 0914360..c31e705 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -29,13 +29,11 @@ namespace dbaui
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-DBG_NAME(DBTreeView)
// class DBTreeView
DBTreeView::DBTreeView( Window* pParent, WinBits nBits)
: Window( pParent, nBits )
, m_pTreeListBox(NULL)
{
- DBG_CTOR(DBTreeView,NULL);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list