summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorArnaud Versini <arnaud.versini@gmail.com>2014-01-19 15:51:52 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-01-21 16:20:10 +0000
commit5b2ba8ed5d6406492205b08ef25fe640253f66a1 (patch)
tree166e6fd0c9e802a5cf8fb8d9895ef828a88daea1 /dbaccess
parentde2d5d9abb7f625269cd4ee54c983c6dfde33767 (diff)
DBACCESS : Remove usage of DBG_CTOR and DBG_DTOR.
Valgrind is capable of detecting such bugs. No need for extra macros. Conflicts: dbaccess/source/ui/dlg/tablespage.cxx Change-Id: I25ea9174a042050efdb371246417ee7f2edae997 Reviewed-on: https://gerrit.libreoffice.org/7532 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/core/api/CRowSetDataColumn.cxx6
-rw-r--r--dbaccess/source/core/api/CacheSet.cxx3
-rw-r--r--dbaccess/source/core/api/KeySet.cxx3
-rw-r--r--dbaccess/source/core/api/OptimisticSet.cxx3
-rw-r--r--dbaccess/source/core/api/RowSet.cxx3
-rw-r--r--dbaccess/source/core/api/RowSetBase.cxx7
-rw-r--r--dbaccess/source/core/api/RowSetCache.cxx3
-rw-r--r--dbaccess/source/core/api/SingleSelectQueryComposer.cxx3
-rw-r--r--dbaccess/source/core/api/TableDeco.cxx3
-rw-r--r--dbaccess/source/core/api/column.cxx7
-rw-r--r--dbaccess/source/core/api/columnsettings.cxx3
-rw-r--r--dbaccess/source/core/api/datacolumn.cxx3
-rw-r--r--dbaccess/source/core/api/definitioncolumn.cxx9
-rw-r--r--dbaccess/source/core/api/preparedstatement.cxx3
-rw-r--r--dbaccess/source/core/api/query.cxx3
-rw-r--r--dbaccess/source/core/api/querycomposer.cxx3
-rw-r--r--dbaccess/source/core/api/querycontainer.cxx3
-rw-r--r--dbaccess/source/core/api/querydescriptor.cxx8
-rw-r--r--dbaccess/source/core/api/resultcolumn.cxx3
-rw-r--r--dbaccess/source/core/api/resultset.cxx3
-rw-r--r--dbaccess/source/core/api/statement.cxx3
-rw-r--r--dbaccess/source/core/api/table.cxx4
-rw-r--r--dbaccess/source/core/api/tablecontainer.cxx3
-rw-r--r--dbaccess/source/core/api/viewcontainer.cxx3
-rw-r--r--dbaccess/source/core/dataaccess/ComponentDefinition.cxx7
-rw-r--r--dbaccess/source/core/dataaccess/ContentHelper.cxx3
-rw-r--r--dbaccess/source/core/dataaccess/ModelImpl.cxx7
-rw-r--r--dbaccess/source/core/dataaccess/SharedConnection.cxx3
-rw-r--r--dbaccess/source/core/dataaccess/bookmarkcontainer.cxx3
-rw-r--r--dbaccess/source/core/dataaccess/commandcontainer.cxx3
-rw-r--r--dbaccess/source/core/dataaccess/commanddefinition.cxx4
-rw-r--r--dbaccess/source/core/dataaccess/connection.cxx3
-rw-r--r--dbaccess/source/core/dataaccess/databasedocument.cxx3
-rw-r--r--dbaccess/source/core/dataaccess/datasource.cxx9
-rw-r--r--dbaccess/source/core/dataaccess/definitioncontainer.cxx3
-rw-r--r--dbaccess/source/core/dataaccess/documentcontainer.cxx3
-rw-r--r--dbaccess/source/core/dataaccess/documentdefinition.cxx3
-rw-r--r--dbaccess/source/core/dataaccess/intercept.cxx3
-rw-r--r--dbaccess/source/core/dataaccess/myucp_datasupplier.cxx3
-rw-r--r--dbaccess/source/core/misc/ContainerMediator.cxx3
-rw-r--r--dbaccess/source/core/misc/PropertyForward.cxx3
-rw-r--r--dbaccess/source/core/misc/apitools.cxx3
-rw-r--r--dbaccess/source/core/misc/dsntypes.cxx3
-rw-r--r--dbaccess/source/filter/xml/dbloader2.cxx3
-rw-r--r--dbaccess/source/filter/xml/xmlAutoStyle.cxx3
-rw-r--r--dbaccess/source/filter/xml/xmlColumn.cxx3
-rw-r--r--dbaccess/source/filter/xml/xmlComponent.cxx3
-rw-r--r--dbaccess/source/filter/xml/xmlConnectionData.cxx3
-rw-r--r--dbaccess/source/filter/xml/xmlConnectionResource.cxx3
-rw-r--r--dbaccess/source/filter/xml/xmlDataSource.cxx3
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceInfo.cxx3
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceSetting.cxx3
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceSettings.cxx3
-rw-r--r--dbaccess/source/filter/xml/xmlDatabase.cxx3
-rw-r--r--dbaccess/source/filter/xml/xmlDatabaseDescription.cxx3
-rw-r--r--dbaccess/source/filter/xml/xmlDocuments.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx3
-rw-r--r--dbaccess/source/filter/xml/xmlHelper.cxx3
-rw-r--r--dbaccess/source/filter/xml/xmlHierarchyCollection.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlLogin.cxx3
-rw-r--r--dbaccess/source/filter/xml/xmlQuery.cxx3
-rw-r--r--dbaccess/source/filter/xml/xmlServerDatabase.cxx3
-rw-r--r--dbaccess/source/filter/xml/xmlStyleImport.cxx6
-rw-r--r--dbaccess/source/filter/xml/xmlTable.cxx3
-rw-r--r--dbaccess/source/filter/xml/xmlTableFilterList.cxx3
-rw-r--r--dbaccess/source/filter/xml/xmlTableFilterPattern.cxx3
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.cxx3
-rw-r--r--dbaccess/source/ui/app/AppController.cxx3
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx3
-rw-r--r--dbaccess/source/ui/app/AppDetailView.cxx55
-rw-r--r--dbaccess/source/ui/app/AppIconControl.cxx3
-rw-r--r--dbaccess/source/ui/app/AppSwapWindow.cxx3
-rw-r--r--dbaccess/source/ui/app/AppTitleWindow.cxx3
-rw-r--r--dbaccess/source/ui/app/AppView.cxx6
-rw-r--r--dbaccess/source/ui/browser/AsyncronousLink.cxx3
-rw-r--r--dbaccess/source/ui/browser/brwctrlr.cxx6
-rw-r--r--dbaccess/source/ui/browser/brwview.cxx6
-rw-r--r--dbaccess/source/ui/browser/dataview.cxx3
-rw-r--r--dbaccess/source/ui/browser/dbloader.cxx3
-rw-r--r--dbaccess/source/ui/browser/dbtreemodel.cxx3
-rw-r--r--dbaccess/source/ui/browser/dbtreeview.cxx3
-rw-r--r--dbaccess/source/ui/browser/exsrcbrw.cxx3
-rw-r--r--dbaccess/source/ui/browser/formadapter.cxx3
-rw-r--r--dbaccess/source/ui/browser/genericcontroller.cxx3
-rw-r--r--dbaccess/source/ui/browser/sbagrid.cxx9
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx3
-rw-r--r--dbaccess/source/ui/control/ColumnControlWindow.cxx3
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx18
-rw-r--r--dbaccess/source/ui/control/RelationControl.cxx17
-rw-r--r--dbaccess/source/ui/control/ScrollHelper.cxx3
-rw-r--r--dbaccess/source/ui/control/TableGrantCtrl.cxx14
-rw-r--r--dbaccess/source/ui/control/VertSplitView.cxx3
-rw-r--r--dbaccess/source/ui/control/curledit.cxx3
-rw-r--r--dbaccess/source/ui/control/dbtreelistbox.cxx4
-rw-r--r--dbaccess/source/ui/control/marktree.cxx4
-rw-r--r--dbaccess/source/ui/control/sqledit.cxx7
-rw-r--r--dbaccess/source/ui/dlg/CollectionView.cxx3
-rw-r--r--dbaccess/source/ui/dlg/ConnectionHelper.cxx3
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.cxx3
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPageSetup.cxx3
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx15
-rw-r--r--dbaccess/source/ui/dlg/RelationDlg.cxx3
-rw-r--r--dbaccess/source/ui/dlg/TablesSingleDlg.cxx3
-rw-r--r--dbaccess/source/ui/dlg/TextConnectionHelper.cxx3
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.cxx3
-rw-r--r--dbaccess/source/ui/dlg/UserAdminDlg.cxx3
-rw-r--r--dbaccess/source/ui/dlg/adminpages.cxx4
-rw-r--r--dbaccess/source/ui/dlg/dbadmin.cxx3
-rw-r--r--dbaccess/source/ui/dlg/dbfindex.cxx3
-rw-r--r--dbaccess/source/ui/dlg/dbwiz.cxx3
-rw-r--r--dbaccess/source/ui/dlg/dbwizsetup.cxx3
-rw-r--r--dbaccess/source/ui/dlg/detailpages.cxx12
-rw-r--r--dbaccess/source/ui/dlg/directsql.cxx3
-rw-r--r--dbaccess/source/ui/dlg/dlgattr.cxx3
-rw-r--r--dbaccess/source/ui/dlg/dlgsize.cxx1
-rw-r--r--dbaccess/source/ui/dlg/finteraction.cxx3
-rw-r--r--dbaccess/source/ui/dlg/indexdialog.cxx3
-rw-r--r--dbaccess/source/ui/dlg/indexfieldscontrol.cxx3
-rw-r--r--dbaccess/source/ui/dlg/odbcconfig.cxx6
-rw-r--r--dbaccess/source/ui/dlg/paramdialog.cxx3
-rw-r--r--dbaccess/source/ui/dlg/queryfilter.cxx7
-rw-r--r--dbaccess/source/ui/dlg/queryorder.cxx7
-rw-r--r--dbaccess/source/ui/dlg/sqlmessage.cxx3
-rw-r--r--dbaccess/source/ui/dlg/tablespage.cxx5
-rw-r--r--dbaccess/source/ui/inc/TableConnection.hxx1
-rw-r--r--dbaccess/source/ui/misc/DExport.cxx10
-rw-r--r--dbaccess/source/ui/misc/HtmlReader.cxx13
-rw-r--r--dbaccess/source/ui/misc/RtfReader.cxx9
-rw-r--r--dbaccess/source/ui/misc/TokenWriter.cxx8
-rw-r--r--dbaccess/source/ui/misc/ToolBoxHelper.cxx3
-rw-r--r--dbaccess/source/ui/misc/WCPage.cxx11
-rw-r--r--dbaccess/source/ui/misc/WColumnSelect.cxx6
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx4
-rw-r--r--dbaccess/source/ui/misc/WNameMatch.cxx6
-rw-r--r--dbaccess/source/ui/misc/WTypeSelect.cxx15
-rw-r--r--dbaccess/source/ui/misc/linkeddocuments.cxx3
-rw-r--r--dbaccess/source/ui/misc/moduledbu.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/ConnectionLine.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx1
-rw-r--r--dbaccess/source/ui/querydesign/ConnectionLineData.cxx5
-rw-r--r--dbaccess/source/ui/querydesign/JoinController.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/JoinExchange.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/JoinTableView.cxx37
-rw-r--r--dbaccess/source/ui/querydesign/QTableConnection.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/QTableConnectionData.cxx11
-rw-r--r--dbaccess/source/ui/querydesign/QTableWindow.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/QTableWindowData.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/QueryTableView.cxx23
-rw-r--r--dbaccess/source/ui/querydesign/QueryTextView.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/QueryViewSwitch.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx50
-rw-r--r--dbaccess/source/ui/querydesign/TableConnection.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/TableConnectionData.cxx5
-rw-r--r--dbaccess/source/ui/querydesign/TableFieldDescription.cxx10
-rw-r--r--dbaccess/source/ui/querydesign/TableFieldInfo.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/TableWindow.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/TableWindowData.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/TableWindowListBox.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/TableWindowTitle.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/querycontainerwindow.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/querydlg.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/queryview.cxx3
-rw-r--r--dbaccess/source/ui/relationdesign/RTableConnection.cxx6
-rw-r--r--dbaccess/source/ui/relationdesign/RTableConnectionData.cxx9
-rw-r--r--dbaccess/source/ui/relationdesign/RelationController.cxx3
-rw-r--r--dbaccess/source/ui/relationdesign/RelationDesignView.cxx3
-rw-r--r--dbaccess/source/ui/relationdesign/RelationTableView.cxx10
-rw-r--r--dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx11
-rw-r--r--dbaccess/source/ui/tabledesign/FieldDescriptions.cxx5
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.cxx53
-rw-r--r--dbaccess/source/ui/tabledesign/TableController.cxx3
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignControl.cxx3
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx5
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignView.cxx6
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx8
-rw-r--r--dbaccess/source/ui/tabledesign/TableRow.cxx8
-rw-r--r--dbaccess/source/ui/tabledesign/TableUndo.cxx24
-rw-r--r--dbaccess/source/ui/uno/ColumnModel.cxx4
-rw-r--r--dbaccess/source/ui/uno/composerdialogs.cxx3
-rw-r--r--dbaccess/source/ui/uno/unoDirectSql.cxx3
-rw-r--r--dbaccess/source/ui/uno/unoadmin.cxx3
185 files changed, 3 insertions, 1033 deletions
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index 25888060175b..bc63b1bfd425 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -38,7 +38,6 @@ using namespace ::com::sun::star::util;
using namespace cppu;
using namespace osl;
-DBG_NAME(ORowSetDataColumn)
ORowSetDataColumn::ORowSetDataColumn( const Reference < XResultSetMetaData >& _xMetaData,
const Reference < XRow >& _xRow,
@@ -53,14 +52,12 @@ ORowSetDataColumn::ORowSetDataColumn( const Reference < XResultSetMetaData >&
,m_sLabel(i_sLabel)
,m_aDescription(_rDescription)
{
- DBG_CTOR(ORowSetDataColumn,NULL);
OColumnSettings::registerProperties( *this );
registerProperty( PROPERTY_DESCRIPTION, PROPERTY_ID_DESCRIPTION, PropertyAttribute::READONLY, &m_aDescription, ::getCppuType( &m_aDescription ) );
}
ORowSetDataColumn::~ORowSetDataColumn()
{
- DBG_DTOR(ORowSetDataColumn,NULL);
}
// comphelper::OPropertyArrayUsageHelper
@@ -210,7 +207,6 @@ void ORowSetDataColumn::fireValueChange(const ORowSetValue& _rOldValue)
}
}
-DBG_NAME(ORowSetDataColumns )
ORowSetDataColumns::ORowSetDataColumns(
sal_Bool _bCase,
const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,
@@ -220,12 +216,10 @@ ORowSetDataColumns::ORowSetDataColumns(
) : connectivity::sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector)
,m_aColumns(_rColumns)
{
- DBG_CTOR(ORowSetDataColumns ,NULL);
}
ORowSetDataColumns::~ORowSetDataColumns()
{
- DBG_DTOR(ORowSetDataColumns ,NULL);
}
sdbcx::ObjectType ORowSetDataColumns::createObject(const OUString& _rName)
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index c30cd723570e..3b1c298429ca 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -55,7 +55,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::io;
using namespace ::osl;
-DBG_NAME(OCacheSet)
OCacheSet::OCacheSet(sal_Int32 i_nMaxRows)
:m_nMaxRows(i_nMaxRows)
@@ -64,7 +63,6 @@ OCacheSet::OCacheSet(sal_Int32 i_nMaxRows)
,m_bDeleted(sal_False)
{
SAL_INFO("dbaccess", "OCacheSet::OCacheSet" );
- DBG_CTOR(OCacheSet,NULL);
}
@@ -136,7 +134,6 @@ OCacheSet::~OCacheSet()
SAL_WARN("dbaccess", "Unknown Exception occurred");
}
- DBG_DTOR(OCacheSet,NULL);
}
void OCacheSet::fillTableName(const Reference<XPropertySet>& _xTable) throw(SQLException, RuntimeException)
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index e02e69931bf4..79628f984099 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -102,7 +102,6 @@ namespace
}
}
-DBG_NAME(OKeySet)
OKeySet::OKeySet(const connectivity::OSQLTable& _xTable,
const Reference< XIndexAccess>& _xTableKeys,
@@ -125,7 +124,6 @@ OKeySet::OKeySet(const connectivity::OSQLTable& _xTable,
,m_bRowCountFinal(sal_False)
{
SAL_INFO("dbaccess", "OKeySet::OKeySet" );
- DBG_CTOR(OKeySet,NULL);
}
@@ -143,7 +141,6 @@ OKeySet::~OKeySet()
m_xComposer = NULL;
- DBG_DTOR(OKeySet,NULL);
}
void OKeySet::initColumns()
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 931bd57d88d6..341cbf84875f 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -82,7 +82,6 @@ namespace
}
}
-DBG_NAME(OptimisticSet)
OptimisticSet::OptimisticSet(const Reference<XComponentContext>& _rContext,
const Reference< XConnection>& i_xConnection,
@@ -96,12 +95,10 @@ OptimisticSet::OptimisticSet(const Reference<XComponentContext>& _rContext,
,m_bResultSetChanged(false)
{
SAL_INFO("dbaccess", "OptimisticSet::OptimisticSet" );
- DBG_CTOR(OptimisticSet,NULL);
}
OptimisticSet::~OptimisticSet()
{
- DBG_DTOR(OptimisticSet,NULL);
}
void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter)
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 0b6d9a218a91..7cbb193161c2 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -2743,7 +2743,6 @@ void ORowSet::impl_rebuild_throw(::osl::ResettableMutexGuard& _rGuard)
// ***********************************************************
// ORowSetClone
// ***********************************************************
-DBG_NAME(ORowSetClone);
ORowSetClone::ORowSetClone( const Reference<XComponentContext>& _rContext, ORowSet& rParent, ::osl::Mutex* _pMutex )
:OSubComponent(m_aMutex, rParent)
@@ -2753,7 +2752,6 @@ ORowSetClone::ORowSetClone( const Reference<XComponentContext>& _rContext, ORowS
,m_nFetchSize(rParent.m_nFetchSize)
,m_bIsBookmarkable(sal_True)
{
- DBG_CTOR(ORowSetClone, NULL);
m_nResultSetType = rParent.m_nResultSetType;
m_nResultSetConcurrency = ResultSetConcurrency::READ_ONLY;
@@ -2833,7 +2831,6 @@ ORowSetClone::ORowSetClone( const Reference<XComponentContext>& _rContext, ORowS
ORowSetClone::~ORowSetClone()
{
- DBG_DTOR(ORowSetClone, NULL);
}
// com::sun::star::XTypeProvider
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index 2b41f105d406..c3b2e7a88eaf 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -74,7 +74,6 @@ connectivity::sdbcx::ObjectType OEmptyCollection::createObject(const OUString& /
}
// ORowSetBase
-DBG_NAME(ORowSetBase)
ORowSetBase::ORowSetBase( const Reference<XComponentContext>& _rContext, ::cppu::OBroadcastHelper& _rBHelper, ::osl::Mutex* _pMutex )
:OPropertyStateContainer(_rBHelper)
@@ -96,7 +95,6 @@ ORowSetBase::ORowSetBase( const Reference<XComponentContext>& _rContext, ::cppu:
,m_bIsInsertRow(sal_False)
{
SAL_INFO("dbaccess", "ORowSetBase::ORowSetBase" );
- DBG_CTOR(ORowSetBase,NULL);
sal_Int32 nRBT = PropertyAttribute::READONLY | PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT;
@@ -120,7 +118,6 @@ ORowSetBase::~ORowSetBase()
if ( m_pEmptyCollection )
delete m_pEmptyCollection;
- DBG_DTOR(ORowSetBase,NULL);
}
// com::sun::star::lang::XTypeProvider
@@ -1455,7 +1452,6 @@ struct ORowSetNotifierImpl
};
-DBG_NAME(ORowSetNotifier)
ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet )
:m_pRowSet( _pRowSet )
@@ -1465,7 +1461,6 @@ ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet )
,m_bNotifyCalled( sal_False )
#endif
{
- DBG_CTOR(ORowSetNotifier,NULL);
OSL_ENSURE( m_pRowSet, "ORowSetNotifier::ORowSetNotifier: invalid row set. This wil crash." );
@@ -1487,7 +1482,6 @@ ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet,const ORowSetValueVector
,m_bNotifyCalled( sal_False )
#endif
{
- DBG_CTOR(ORowSetNotifier,NULL);
OSL_ENSURE( m_pRowSet, "ORowSetNotifier::ORowSetNotifier: invalid row set. This wil crash." );
m_pImpl->aRow = i_aRow; // yes, create a copy to store the old values
@@ -1496,7 +1490,6 @@ ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet,const ORowSetValueVector
ORowSetNotifier::~ORowSetNotifier( )
{
SAL_INFO("dbaccess", "ORowSetNotifier::~ORowSetNotifier" );
- DBG_DTOR(ORowSetNotifier,NULL);
}
void ORowSetNotifier::fire()
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index 17c1522a966d..f2a965f6e685 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -77,7 +77,6 @@ using namespace ::osl;
// until m_pCacheSet is moved (or refreshed) again.
// So always make sure m_pCacheSet is moved or refreshed before accessing column values.
-DBG_NAME(ORowSetCache)
ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
const Reference< XSingleSelectQueryAnalyzer >& _xAnalyzer,
@@ -108,7 +107,6 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
,m_bModified(_bModified)
,m_bNew(_bNew)
{
- DBG_CTOR(ORowSetCache,NULL);
// first try if the result can be used to do inserts and updates
Reference< XPropertySet> xProp(_xRs,UNO_QUERY);
@@ -376,7 +374,6 @@ ORowSetCache::~ORowSetCache()
m_xMetaData = NULL;
m_aUpdateTable = NULL;
- DBG_DTOR(ORowSetCache,NULL);
}
void ORowSetCache::setFetchSize(sal_Int32 _nSize)
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 9142e2f062d1..a5b3d5ec5dd0 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -215,7 +215,6 @@ namespace
}
-DBG_NAME(OSingleSelectQueryComposer)
OSingleSelectQueryComposer::OSingleSelectQueryComposer(const Reference< XNameAccess>& _rxTables,
const Reference< XConnection>& _xConnection,
@@ -235,7 +234,6 @@ OSingleSelectQueryComposer::OSingleSelectQueryComposer(const Reference< XNameAcc
,m_nCommandType(CommandType::COMMAND)
{
SAL_INFO("dbaccess", "OSingleSelectQueryComposer::OSingleSelectQueryComposer" );
- DBG_CTOR(OSingleSelectQueryComposer,NULL);
if ( !m_aContext.is() || !m_xConnection.is() || !m_xConnectionTables.is() )
throw IllegalArgumentException();
@@ -269,7 +267,6 @@ OSingleSelectQueryComposer::OSingleSelectQueryComposer(const Reference< XNameAcc
OSingleSelectQueryComposer::~OSingleSelectQueryComposer()
{
- DBG_DTOR(OSingleSelectQueryComposer,NULL);
::std::vector<OPrivateColumns*>::iterator aColIter = m_aColumnsCollection.begin();
::std::vector<OPrivateColumns*>::iterator aEnd = m_aColumnsCollection.end();
for(;aColIter != aEnd;++aColIter)
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index d46fe96ddf82..9d94317fb54c 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -57,7 +57,6 @@ using namespace ::dbtools;
using namespace ::cppu;
// ODBTableDecorator
-DBG_NAME(ODBTableDecorator)
ODBTableDecorator::ODBTableDecorator( const Reference< XConnection >& _rxConnection, const Reference< XColumnsSupplier >& _rxNewTable,
const Reference< XNumberFormatsSupplier >& _rxNumberFormats, const Reference< XNameAccess >& _xColumnDefinitions ) throw(SQLException)
@@ -72,13 +71,11 @@ ODBTableDecorator::ODBTableDecorator( const Reference< XConnection >& _rxConnect
,m_pColumns(NULL)
{
SAL_INFO("dbaccess", "ODBTableDecorator::ODBTableDecorator" );
- DBG_CTOR(ODBTableDecorator, NULL);
ODataSettings::registerPropertiesFor(this);
}
ODBTableDecorator::~ODBTableDecorator()
{
- DBG_DTOR(ODBTableDecorator, NULL);
if ( m_pColumns )
delete m_pColumns;
}
diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx
index 9d523b2b0c40..ba6b85136011 100644
--- a/dbaccess/source/core/api/column.cxx
+++ b/dbaccess/source/core/api/column.cxx
@@ -61,14 +61,12 @@ using namespace ::osl;
using namespace ::comphelper;
using namespace ::cppu;
-DBG_NAME(OColumn)
// OColumn
OColumn::OColumn( const bool _bNameIsReadOnly )
:OColumnBase( m_aMutex )
,::comphelper::OPropertyContainer( OColumnBase::rBHelper )
{
- DBG_CTOR(OColumn, NULL);
registerProperty( PROPERTY_NAME, PROPERTY_ID_NAME, _bNameIsReadOnly ? PropertyAttribute::READONLY : 0,
&m_sName, ::getCppuType( &m_sName ) );
@@ -76,7 +74,6 @@ OColumn::OColumn( const bool _bNameIsReadOnly )
OColumn::~OColumn()
{
- DBG_DTOR(OColumn, NULL);
}
// com::sun::star::lang::XTypeProvider
@@ -152,7 +149,6 @@ void OColumn::registerPropertyNoMember( const OUString& _rName, sal_Int32 _nHand
}
// OColumns
-DBG_NAME(OColumns);
OColumns::OColumns(::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex,
@@ -171,7 +167,6 @@ OColumns::OColumns(::cppu::OWeakObject& _rParent,
,m_bAddColumn(_bAddColumn)
,m_bDropColumn(_bDropColumn)
{
- DBG_CTOR(OColumns, NULL);
}
OColumns::OColumns(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
@@ -191,12 +186,10 @@ OColumns::OColumns(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
,m_bAddColumn(_bAddColumn)
,m_bDropColumn(_bDropColumn)
{
- DBG_CTOR(OColumns, NULL);
}
OColumns::~OColumns()
{
- DBG_DTOR(OColumns, NULL);
}
// XServiceInfo
diff --git a/dbaccess/source/core/api/columnsettings.cxx b/dbaccess/source/core/api/columnsettings.cxx
index 58eb794e5efb..cb7e65ea2aa8 100644
--- a/dbaccess/source/core/api/columnsettings.cxx
+++ b/dbaccess/source/core/api/columnsettings.cxx
@@ -48,17 +48,14 @@ namespace dbaccess
namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute;
// OColumnSettings
- DBG_NAME( OColumnSettings )
OColumnSettings::OColumnSettings()
:m_bHidden(sal_False)
{
- DBG_CTOR( OColumnSettings, NULL );
}
OColumnSettings::~OColumnSettings()
{
- DBG_DTOR( OColumnSettings, NULL );
}
void OColumnSettings::registerProperties( IPropertyContainer& _rPropertyContainer )
diff --git a/dbaccess/source/core/api/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx
index 421d23df8be3..49ce7b083cf5 100644
--- a/dbaccess/source/core/api/datacolumn.cxx
+++ b/dbaccess/source/core/api/datacolumn.cxx
@@ -38,7 +38,6 @@ using namespace ::osl;
using namespace ::comphelper;
using namespace ::cppu;
-DBG_NAME(ODataColumn)
ODataColumn::ODataColumn(
const Reference < XResultSetMetaData >& _xMetaData,
@@ -50,12 +49,10 @@ ODataColumn::ODataColumn(
,m_xRow(_xRow)
,m_xRowUpdate(_xRowUpdate)
{
- DBG_CTOR(ODataColumn,NULL);
}
ODataColumn::~ODataColumn()
{
- DBG_DTOR(ODataColumn,NULL);
}
// com::sun::star::lang::XTypeProvider
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index 962011bc862b..2884f7db65ea 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -130,18 +130,15 @@ void SAL_CALL OTableColumnDescriptor::setParent( const Reference< XInterface >&
}
// OTableColumn
-DBG_NAME(OTableColumn);
OTableColumn::OTableColumn( const OUString& _rName )
:OTableColumnDescriptor( false /* do not act as descriptor */ )
{
- DBG_CTOR(OTableColumn,NULL);
m_sName = _rName;
}
OTableColumn::~OTableColumn()
{
- DBG_DTOR(OTableColumn,NULL);
}
IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumn )
@@ -162,7 +159,6 @@ OUString OTableColumn::getImplementationName( ) throw (RuntimeException)
}
// OQueryColumn
-DBG_NAME( OQueryColumn );
OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, const Reference< XConnection >& _rxConnection, const OUString &i_sLabel )
:OTableColumnDescriptor( false /* do not act as descriptor */ )
@@ -175,7 +171,6 @@ OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, co
registerProperty( PROPERTY_REALNAME, PROPERTY_ID_REALNAME, nPropAttr, &m_sRealName, ::getCppuType( &m_sRealName ) );
registerProperty( PROPERTY_LABEL, PROPERTY_ID_LABEL, nPropAttr, &m_sLabel, ::getCppuType( &m_sLabel ) );
- DBG_CTOR( OQueryColumn, NULL );
OSL_VERIFY( _rxParserColumn->getPropertyValue( PROPERTY_TYPENAME ) >>= m_aTypeName );
OSL_VERIFY( _rxParserColumn->getPropertyValue( PROPERTY_ISNULLABLE ) >>= m_nIsNullable );
@@ -221,7 +216,6 @@ OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, co
OQueryColumn::~OQueryColumn()
{
- DBG_DTOR( OQueryColumn, NULL );
}
Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const Reference< XConnection >& _rxConnection )
@@ -318,14 +312,12 @@ void SAL_CALL OQueryColumn::getFastPropertyValue( Any& _rValue, sal_Int32 _nHand
}
// OColumnWrapper
-DBG_NAME(OColumnWrapper);
OColumnWrapper::OColumnWrapper( const Reference< XPropertySet > & rCol, const bool _bNameIsReadOnly )
:OColumn( _bNameIsReadOnly )
,m_xAggregate(rCol)
,m_nColTypeID(-1)
{
- DBG_CTOR(OColumnWrapper,NULL);
// which type of aggregate property do we have?
// we distingish the properties by the containment of optional properties
m_nColTypeID = 0;
@@ -346,7 +338,6 @@ OColumnWrapper::OColumnWrapper( const Reference< XPropertySet > & rCol, const bo
OColumnWrapper::~OColumnWrapper()
{
- DBG_DTOR(OColumnWrapper,NULL);
}
OUString OColumnWrapper::impl_getPropertyNameFromHandle( const sal_Int32 _nHandle ) const
diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx
index 9e6b5e25524c..9e0e56601471 100644
--- a/dbaccess/source/core/api/preparedstatement.cxx
+++ b/dbaccess/source/core/api/preparedstatement.cxx
@@ -43,13 +43,11 @@ using namespace ::cppu;
using namespace ::osl;
using namespace dbaccess;
-DBG_NAME(OPreparedStatement)
OPreparedStatement::OPreparedStatement(const Reference< XConnection > & _xConn,
const Reference< XInterface > & _xStatement)
:OStatementBase(_xConn, _xStatement)
{
- DBG_CTOR(OPreparedStatement, NULL);
m_xAggregateAsParameters = Reference< XParameters >( m_xAggregateAsSet, UNO_QUERY_THROW );
Reference<XDatabaseMetaData> xMeta = _xConn->getMetaData();
@@ -62,7 +60,6 @@ OPreparedStatement::~OPreparedStatement()
m_pColumns->disposing();
delete m_pColumns;
- DBG_DTOR(OPreparedStatement, NULL);
}
// com::sun::star::lang::XTypeProvider
diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx
index 12d959a8aba0..79e9662cf6fc 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -66,7 +66,6 @@ namespace dbaccess
{
// OQuery
-DBG_NAME(OQuery)
OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition
,const Reference< XConnection >& _rxConn
@@ -81,7 +80,6 @@ OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition
,m_bCaseSensitiv(sal_True)
,m_eDoingCurrently(NONE)
{
- DBG_CTOR(OQuery, NULL);
registerProperties();
ODataSettings::registerPropertiesFor(this);
@@ -108,7 +106,6 @@ OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition
OQuery::~OQuery()
{
- DBG_DTOR(OQuery, NULL);
}
IMPLEMENT_IMPLEMENTATION_ID(OQuery);
diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx
index ca71328b95eb..244e1b17e550 100644
--- a/dbaccess/source/core/api/querycomposer.cxx
+++ b/dbaccess/source/core/api/querycomposer.cxx
@@ -62,13 +62,11 @@ using namespace ::osl;
using namespace ::utl;
-DBG_NAME(OQueryComposer)
OQueryComposer::OQueryComposer(const Reference< XConnection>& _xConnection)
: OSubComponent(m_aMutex,_xConnection)
{
SAL_INFO("dbaccess", "OQueryComposer::OQueryComposer" );
- DBG_CTOR(OQueryComposer,NULL);
OSL_ENSURE(_xConnection.is()," Connection cant be null!");
Reference<XMultiServiceFactory> xFac( _xConnection, UNO_QUERY_THROW );
@@ -78,7 +76,6 @@ OQueryComposer::OQueryComposer(const Reference< XConnection>& _xConnection)
OQueryComposer::~OQueryComposer()
{
- DBG_DTOR(OQueryComposer,NULL);
}
void SAL_CALL OQueryComposer::disposing()
diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx
index fca43df761d3..f969d4f7b6d8 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -58,7 +58,6 @@ namespace dbaccess
{
// OQueryContainer
-DBG_NAME(OQueryContainer)
OQueryContainer::OQueryContainer(
const Reference< XNameContainer >& _rxCommandDefinitions
@@ -70,7 +69,6 @@ OQueryContainer::OQueryContainer(
,m_xCommandDefinitions(_rxCommandDefinitions)
,m_xConnection(_rxConn)
{
- DBG_CTOR(OQueryContainer, NULL);
}
void OQueryContainer::init()
@@ -110,7 +108,6 @@ rtl::Reference<OQueryContainer> OQueryContainer::create(
OQueryContainer::~OQueryContainer()
{
- DBG_DTOR(OQueryContainer, NULL);
// dispose();
// maybe we're already disposed, but this should be uncritical
}
diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx
index e08e751672d9..a3dca17bb91e 100644
--- a/dbaccess/source/core/api/querydescriptor.cxx
+++ b/dbaccess/source/core/api/querydescriptor.cxx
@@ -44,13 +44,11 @@ namespace dbaccess
{
// OQueryDescriptor
-DBG_NAME(OQueryDescriptor)
OQueryDescriptor::OQueryDescriptor()
:OQueryDescriptor_Base(m_aMutex,*this)
,ODataSettings(m_aBHelper,sal_True)
{
- DBG_CTOR(OQueryDescriptor,NULL);
registerProperties();
ODataSettings::registerPropertiesFor(this);
}
@@ -59,14 +57,12 @@ OQueryDescriptor::OQueryDescriptor(const OQueryDescriptor_Base& _rSource)
:OQueryDescriptor_Base(_rSource,*this)
,ODataSettings(m_aBHelper,sal_True)
{
- DBG_CTOR(OQueryDescriptor,NULL);
registerProperties();
ODataSettings::registerPropertiesFor(this);
}
OQueryDescriptor::~OQueryDescriptor()
{
- DBG_DTOR(OQueryDescriptor,NULL);
}
IMPLEMENT_TYPEPROVIDER2(OQueryDescriptor,OQueryDescriptor_Base,ODataSettings);
@@ -115,13 +111,11 @@ Reference< XPropertySetInfo > SAL_CALL OQueryDescriptor::getPropertySetInfo( )
return new ::cppu::OPropertyArrayHelper(aProps);
}
-DBG_NAME(OQueryDescriptor_Base);
OQueryDescriptor_Base::OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWeakObject& _rMySelf)
:m_bColumnsOutOfDate(sal_True)
,m_rMutex(_rMutex)
{
- DBG_CTOR(OQueryDescriptor_Base,NULL);
m_pColumns = new OColumns(_rMySelf, m_rMutex, sal_True,::std::vector< OUString>(), this,this);
}
@@ -129,7 +123,6 @@ OQueryDescriptor_Base::OQueryDescriptor_Base(const OQueryDescriptor_Base& _rSour
:m_bColumnsOutOfDate(sal_True)
,m_rMutex(_rSource.m_rMutex)
{
- DBG_CTOR(OQueryDescriptor_Base,NULL);
m_pColumns = new OColumns(_rMySelf, m_rMutex, sal_True,::std::vector< OUString>(), this,this);
m_sCommand = _rSource.m_sCommand;
@@ -146,7 +139,6 @@ OQueryDescriptor_Base::~OQueryDescriptor_Base()
m_pColumns->disposing();
delete m_pColumns;
- DBG_DTOR(OQueryDescriptor_Base,NULL);
}
sal_Int64 SAL_CALL OQueryDescriptor_Base::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) throw(RuntimeException)
diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx
index d47a6327c6a7..28774f4ecd44 100644
--- a/dbaccess/source/core/api/resultcolumn.cxx
+++ b/dbaccess/source/core/api/resultcolumn.cxx
@@ -41,7 +41,6 @@ using namespace ::comphelper;
using namespace ::cppu;
using namespace dbaccess;
-DBG_NAME(OResultColumn)
OResultColumn::OResultColumn( const Reference < XResultSetMetaData >& _xMetaData, sal_Int32 _nPos,
const Reference< XDatabaseMetaData >& _rxDBMeta )
@@ -50,7 +49,6 @@ OResultColumn::OResultColumn( const Reference < XResultSetMetaData >& _xMetaData
,m_xDBMetaData( _rxDBMeta )
,m_nPos( _nPos )
{
- DBG_CTOR(OResultColumn,NULL);
}
void OResultColumn::impl_determineIsRowVersion_nothrow()
@@ -100,7 +98,6 @@ void OResultColumn::impl_determineIsRowVersion_nothrow()
OResultColumn::~OResultColumn()
{
- DBG_DTOR(OResultColumn,NULL);
}
// com::sun::star::lang::XTypeProvider
diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx
index d0b5834a6510..9e9cb593b4b9 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -48,7 +48,6 @@ using namespace ::osl;
using namespace dbaccess;
using namespace dbtools;
-DBG_NAME(OResultSet)
OResultSet::OResultSet(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& _xResultSet,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xStatement,
@@ -60,7 +59,6 @@ OResultSet::OResultSet(const ::com::sun::star::uno::Reference< ::com::sun::star:
,m_bIsBookmarkable(sal_False)
{
SAL_INFO("dbaccess", "OResultSet::OResultSet" );
- DBG_CTOR(OResultSet, NULL);
m_pColumns = new OColumns(*this, m_aMutex, _bCaseSensitive, ::std::vector< OUString>(), NULL,NULL);
@@ -99,7 +97,6 @@ OResultSet::~OResultSet()
m_pColumns->disposing();
delete m_pColumns;
- DBG_DTOR(OResultSet, NULL);
}
// com::sun::star::lang::XTypeProvider
diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx
index b6b35e9d9f5f..b19ae0b79dbd 100644
--- a/dbaccess/source/core/api/statement.cxx
+++ b/dbaccess/source/core/api/statement.cxx
@@ -41,7 +41,6 @@ using namespace ::osl;
using namespace dbaccess;
using namespace dbtools;
-DBG_NAME(OStatementBase)
OStatementBase::OStatementBase(const Reference< XConnection > & _xConn,
const Reference< XInterface > & _xStatement)
@@ -52,7 +51,6 @@ OStatementBase::OStatementBase(const Reference< XConnection > & _xConn,
{
SAL_INFO("dbaccess", "OStatementBase::OStatementBase" );
- DBG_CTOR(OStatementBase, NULL);
OSL_ENSURE(_xStatement.is() ,"Statement is NULL!");
m_xAggregateAsSet.set(_xStatement,UNO_QUERY);
m_xAggregateAsCancellable = Reference< ::com::sun::star::util::XCancellable > (m_xAggregateAsSet, UNO_QUERY);
@@ -60,7 +58,6 @@ OStatementBase::OStatementBase(const Reference< XConnection > & _xConn,
OStatementBase::~OStatementBase()
{
- DBG_DTOR(OStatementBase, NULL);
}
// com::sun::star::lang::XTypeProvider
diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx
index 55bcc6870d4c..c3085d80b644 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -61,7 +61,6 @@ using namespace ::comphelper;
using namespace ::cppu;
// ODBTable
-DBG_NAME(ODBTable)
ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables
,const Reference< XConnection >& _rxConn
@@ -76,7 +75,6 @@ ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables
,m_nPrivileges(0)
{
SAL_INFO("dbaccess", "ODBTable::ODBTable" );
- DBG_CTOR(ODBTable, NULL);
OSL_ENSURE(getMetaData().is(), "ODBTable::ODBTable : invalid conn !");
OSL_ENSURE(!_rName.isEmpty(), "ODBTable::ODBTable : name !");
// TODO : think about collecting the privileges here, as we can't ensure that in getFastPropertyValue, where
@@ -91,13 +89,11 @@ ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables
:OTable_Base(_pTables,_rxConn, _rxConn->getMetaData().is() && _rxConn->getMetaData()->supportsMixedCaseQuotedIdentifiers())
,m_nPrivileges(-1)
{
- DBG_CTOR(ODBTable, NULL);
SAL_INFO("dbaccess", "ODBTable::ODBTable" );
}
ODBTable::~ODBTable()
{
- DBG_DTOR(ODBTable, NULL);
}
IMPLEMENT_FORWARD_REFCOUNT(ODBTable,OTable_Base)
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index 1dcc68efcf17..94845c15382d 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -94,7 +94,6 @@ namespace
}
// OTableContainer
-DBG_NAME(OTableContainer)
OTableContainer::OTableContainer(::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex,
@@ -109,13 +108,11 @@ OTableContainer::OTableContainer(::cppu::OWeakObject& _rParent,
,m_pTableMediator( NULL )
,m_bInDrop(sal_False)
{
- DBG_CTOR(OTableContainer, NULL);
}
OTableContainer::~OTableContainer()
{
SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::OTableContainer" );
- DBG_DTOR(OTableContainer, NULL);
}
void OTableContainer::removeMasterContainerListener()
diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx
index 23af3b0b31e9..aeb36cbdd5f1 100644
--- a/dbaccess/source/core/api/viewcontainer.cxx
+++ b/dbaccess/source/core/api/viewcontainer.cxx
@@ -57,7 +57,6 @@ using namespace ::cppu;
using namespace ::connectivity::sdbcx;
// OViewContainer
-DBG_NAME(OViewContainer)
OViewContainer::OViewContainer(::cppu::OWeakObject& _rParent
,::osl::Mutex& _rMutex
@@ -69,12 +68,10 @@ OViewContainer::OViewContainer(::cppu::OWeakObject& _rParent
:OFilteredContainer(_rParent,_rMutex,_xCon,_bCase,_pRefreshListener,_pWarningsContainer,_nInAppend)
,m_bInElementRemoved(false)
{
- DBG_CTOR(OViewContainer, NULL);
}
OViewContainer::~OViewContainer()
{
- DBG_DTOR(OViewContainer, NULL);
}
// XServiceInfo
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index 9765d8a47123..6f7231954bed 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -74,20 +74,16 @@ public:
void clear() { m_pComponent = NULL; }
};
-DBG_NAME(OComponentDefinition_Impl)
OComponentDefinition_Impl::OComponentDefinition_Impl()
{
- DBG_CTOR(OComponentDefinition_Impl,NULL);
}
OComponentDefinition_Impl::~OComponentDefinition_Impl()
{
- DBG_DTOR(OComponentDefinition_Impl,NULL);
}
// OComponentDefinition
-DBG_NAME(OComponentDefinition)
void OComponentDefinition::initialize( const Sequence< Any >& aArguments ) throw(Exception)
{
@@ -132,13 +128,11 @@ OComponentDefinition::OComponentDefinition(const Reference< XComponentContext >&
,ODataSettings(OContentHelper::rBHelper,!_bTable)
,m_bTable(_bTable)
{
- DBG_CTOR(OComponentDefinition, NULL);
registerProperties();
}
OComponentDefinition::~OComponentDefinition()
{
- DBG_DTOR(OComponentDefinition, NULL);
}
OComponentDefinition::OComponentDefinition( const Reference< XInterface >& _rxContainer
@@ -150,7 +144,6 @@ OComponentDefinition::OComponentDefinition( const Reference< XInterface >& _rxCo
,ODataSettings(OContentHelper::rBHelper,!_bTable)
,m_bTable(_bTable)
{
- DBG_CTOR(OComponentDefinition, NULL);
registerProperties();
m_pImpl->m_aProps.aTitle = _rElementName;
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 88aaf2fd57ab..0246433688b6 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -50,15 +50,12 @@ using namespace ::com::sun::star::container;
using namespace ::comphelper;
using namespace ::cppu;
-DBG_NAME(OContentHelper_Impl)
OContentHelper_Impl::OContentHelper_Impl()
{
- DBG_CTOR(OContentHelper_Impl,NULL);
}
OContentHelper_Impl::~OContentHelper_Impl()
{
- DBG_DTOR(OContentHelper_Impl,NULL);
}
OContentHelper::OContentHelper(const Reference< XComponentContext >& _xORB
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index ae1f9b987b60..2e35c7a81a49 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -107,7 +107,6 @@ bool VosMutexFacade::tryToAcquire()
}
// DocumentStorageAccess
-DBG_NAME( DocumentStorageAccess )
class DocumentStorageAccess : public ::cppu::WeakImplHelper2< XDocumentSubStorageSupplier
, XTransactionListener >
{
@@ -126,13 +125,11 @@ public:
,m_bPropagateCommitToRoot( true )
,m_bDisposingSubStorages( false )
{
- DBG_CTOR( DocumentStorageAccess, NULL );
}
protected:
~DocumentStorageAccess()
{
- DBG_DTOR( DocumentStorageAccess, NULL );
}
public:
@@ -392,7 +389,6 @@ void SAL_CALL DocumentStorageAccess::disposing( const css::lang::EventObject& So
}
// ODatabaseModelImpl
-DBG_NAME(ODatabaseModelImpl)
ODatabaseModelImpl::ODatabaseModelImpl( const Reference< XComponentContext >& _rxContext, ODatabaseContext& _rDBContext )
:m_xModel()
@@ -419,7 +415,6 @@ ODatabaseModelImpl::ODatabaseModelImpl( const Reference< XComponentContext >& _r
,m_nControllerLockCount(0)
{
// some kind of default
- DBG_CTOR(ODatabaseModelImpl,NULL);
m_sConnectURL = "jdbc:";
m_aTableFilter.realloc(1);
m_aTableFilter[0] = "%";
@@ -455,13 +450,11 @@ ODatabaseModelImpl::ODatabaseModelImpl(
,m_pSharedConnectionManager(NULL)
,m_nControllerLockCount(0)
{
- DBG_CTOR(ODatabaseModelImpl,NULL);
impl_construct_nothrow();
}
ODatabaseModelImpl::~ODatabaseModelImpl()
{
- DBG_DTOR(ODatabaseModelImpl,NULL);
}
void ODatabaseModelImpl::impl_construct_nothrow()
diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx
index 4bbd822294a5..5f5fbd601ce6 100644
--- a/dbaccess/source/core/dataaccess/SharedConnection.cxx
+++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx
@@ -29,17 +29,14 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container;
using namespace connectivity;
-DBG_NAME(OSharedConnection)
OSharedConnection::OSharedConnection(Reference< XAggregation >& _rxProxyConnection)
: OSharedConnection_BASE(m_aMutex)
{
- DBG_CTOR(OSharedConnection,NULL);
setDelegation(_rxProxyConnection,m_refCount);
}
OSharedConnection::~OSharedConnection()
{
- DBG_DTOR(OSharedConnection,NULL);
}
void SAL_CALL OSharedConnection::disposing(void)
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
index 3750da83474c..7a32031864b0 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
@@ -44,14 +44,12 @@ namespace dbaccess
{
// OBookmarkContainer
-DBG_NAME(OBookmarkContainer)
OBookmarkContainer::OBookmarkContainer(OWeakObject& _rParent, Mutex& _rMutex)
:m_rParent(_rParent)
,m_aContainerListeners(_rMutex)
,m_rMutex(_rMutex)
{
- DBG_CTOR(OBookmarkContainer, NULL);
}
void OBookmarkContainer::dispose()
@@ -79,7 +77,6 @@ void SAL_CALL OBookmarkContainer::release( ) throw()
OBookmarkContainer::~OBookmarkContainer()
{
- DBG_DTOR(OBookmarkContainer, NULL);
}
// XServiceInfo
diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx b/dbaccess/source/core/dataaccess/commandcontainer.cxx
index 4154675da695..dd24395e7fb4 100644
--- a/dbaccess/source/core/dataaccess/commandcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx
@@ -38,7 +38,6 @@ namespace dbaccess
{
// OCommandContainer
-DBG_NAME(OCommandContainer)
OCommandContainer::OCommandContainer( const Reference< ::com::sun::star::uno::XComponentContext >& _xORB
,const Reference< XInterface >& _xParentContainer
@@ -48,12 +47,10 @@ OCommandContainer::OCommandContainer( const Reference< ::com::sun::star::uno::XC
:ODefinitionContainer(_xORB,_xParentContainer,_pImpl,!_bTables)
,m_bTables(_bTables)
{
- DBG_CTOR(OCommandContainer, NULL);
}
OCommandContainer::~OCommandContainer()
{
- DBG_DTOR(OCommandContainer, NULL);
}
IMPLEMENT_FORWARD_XINTERFACE2( OCommandContainer,ODefinitionContainer,OCommandContainer_BASE)
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index ece84a5a35ff..842686ec86fa 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -46,7 +46,6 @@ extern "C" void SAL_CALL createRegistryInfo_OCommandDefinition()
static ::dba::OAutoRegistration< OCommandDefinition > aAutoRegistration;
}
-DBG_NAME(OCommandDefinition)
void OCommandDefinition::registerProperties()
{
@@ -129,13 +128,11 @@ OCommandDefinition::OCommandDefinition(const Reference< XComponentContext >& _xO
,const TContentPtr& _pImpl)
:OComponentDefinition(_xORB,_rxContainer,_pImpl,sal_False)
{
- DBG_CTOR(OCommandDefinition, NULL);
registerProperties();
}
OCommandDefinition::~OCommandDefinition()
{
- DBG_DTOR(OCommandDefinition, NULL);
}
OCommandDefinition::OCommandDefinition( const Reference< XInterface >& _rxContainer
@@ -144,7 +141,6 @@ OCommandDefinition::OCommandDefinition( const Reference< XInterface >& _rxContai
,const TContentPtr& _pImpl)
:OComponentDefinition(_rxContainer,_rElementName,_xORB,_pImpl,sal_False)
{
- DBG_CTOR(OCommandDefinition, NULL);
registerProperties();
}
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index e275cbb0e73a..7f0bccc20e79 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -280,7 +280,6 @@ void OConnection::setTypeMap(const Reference< XNameAccess > & typeMap) throw( SQ
}
// OConnection
-DBG_NAME(OConnection)
OConnection::OConnection(ODatabaseSource& _rDB
, Reference< XConnection >& _rxMaster
@@ -302,7 +301,6 @@ OConnection::OConnection(ODatabaseSource& _rDB
,m_bSupportsGroups(sal_False)
{
SAL_INFO("dbaccess", "OConnection::OConnection" );
- DBG_CTOR(OConnection,NULL);
osl_atomic_increment(&m_refCount);
try
@@ -385,7 +383,6 @@ OConnection::~OConnection()
{
delete m_pTables;
delete m_pViews;
- DBG_DTOR(OConnection,NULL);
}
// XWarningsSupplier
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 007a3b3ab804..37e4688d9f62 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -146,7 +146,6 @@ bool ViewMonitor::onSetCurrentController( const Reference< XController >& _rxCon
}
// ODatabaseDocument
-DBG_NAME(ODatabaseDocument)
extern "C" void SAL_CALL createRegistryInfo_ODatabaseDocument()
{
@@ -168,7 +167,6 @@ ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference<ODatabaseModelImpl>&
,m_bAllowDocumentScripting( false )
,m_bHasBeenRecovered( false )
{
- DBG_CTOR(ODatabaseDocument,NULL);
OSL_TRACE( "DD: ctor: %p: %p", this, m_pImpl.get() );
osl_atomic_increment( &m_refCount );
@@ -205,7 +203,6 @@ ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference<ODatabaseModelImpl>&
ODatabaseDocument::~ODatabaseDocument()
{
OSL_TRACE( "DD: dtor: %p: %p", this, m_pImpl.get() );
- DBG_DTOR(ODatabaseDocument,NULL);
if ( !ODatabaseDocument_OfficeDocument::rBHelper.bInDispose && !ODatabaseDocument_OfficeDocument::rBHelper.bDisposed )
{
acquire();
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index b1a994cf73ca..299d31bbbe74 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -132,12 +132,10 @@ protected:
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
};
-DBG_NAME( FlushNotificationAdapter )
FlushNotificationAdapter::FlushNotificationAdapter( const Reference< XFlushable >& _rxBroadcaster, const Reference< XFlushListener >& _rxListener )
:m_aBroadcaster( _rxBroadcaster )
,m_aListener( _rxListener )
{
- DBG_CTOR( FlushNotificationAdapter, NULL );
OSL_ENSURE( _rxBroadcaster.is(), "FlushNotificationAdapter::FlushNotificationAdapter: invalid flushable!" );
osl_atomic_increment( &m_refCount );
@@ -151,7 +149,6 @@ FlushNotificationAdapter::FlushNotificationAdapter( const Reference< XFlushable
FlushNotificationAdapter::~FlushNotificationAdapter()
{
- DBG_DTOR( FlushNotificationAdapter, NULL );
}
void SAL_CALL FlushNotificationAdapter::impl_dispose( bool _bRevokeListener )
@@ -320,16 +317,13 @@ public:
void addEventListener(const Reference<XConnection>& _rxConnection,TConnectionMap::iterator& _rIter);
};
-DBG_NAME(OSharedConnectionManager)
OSharedConnectionManager::OSharedConnectionManager(const Reference< XComponentContext >& _rxContext)
{
- DBG_CTOR(OSharedConnectionManager,NULL);
m_xProxyFactory.set( ProxyFactory::create( _rxContext ) );
}
OSharedConnectionManager::~OSharedConnectionManager()
{
- DBG_DTOR(OSharedConnectionManager,NULL);
}
void SAL_CALL OSharedConnectionManager::disposing( const ::com::sun::star::lang::EventObject& Source ) throw(RuntimeException)
@@ -482,7 +476,6 @@ namespace
}
// ODatabaseContext
-DBG_NAME(ODatabaseSource)
extern "C" void SAL_CALL createRegistryInfo_ODatabaseSource()
{
@@ -497,14 +490,12 @@ ODatabaseSource::ODatabaseSource(const ::rtl::Reference<ODatabaseModelImpl>& _pI
,m_aFlushListeners( getMutex() )
{
// some kind of default
- DBG_CTOR(ODatabaseSource,NULL);
SAL_INFO("dbaccess", "DS: ctor: " << std::hex << this << ": " << std::hex << m_pImpl.get() );
}
ODatabaseSource::~ODatabaseSource()
{
SAL_INFO("dbaccess", "DS: dtor: " << std::hex << this << ": " << std::hex << m_pImpl.get() );
- DBG_DTOR(ODatabaseSource,NULL);
if ( !ODatabaseSource_Base::rBHelper.bInDispose && !ODatabaseSource_Base::rBHelper.bDisposed )
{
acquire();
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index f08758736f98..9b942c6cfe95 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -85,7 +85,6 @@ ODefinitionContainer_Impl::iterator ODefinitionContainer_Impl::find( TContentPtr
}
// ODefinitionContainer
-DBG_NAME(ODefinitionContainer)
ODefinitionContainer::ODefinitionContainer( const Reference< XComponentContext >& _xORB
, const Reference< XInterface >& _xParentContainer
@@ -111,7 +110,6 @@ ODefinitionContainer::ODefinitionContainer( const Reference< XComponentContext
m_aDocumentMap.insert(
Documents::value_type( aDefinition->first, Documents::mapped_type() ) ).first );
- DBG_CTOR(ODefinitionContainer, NULL);
}
void SAL_CALL ODefinitionContainer::disposing()
@@ -147,7 +145,6 @@ void SAL_CALL ODefinitionContainer::disposing()
ODefinitionContainer::~ODefinitionContainer()
{
- DBG_DTOR(ODefinitionContainer, NULL);
}
IMPLEMENT_FORWARD_XINTERFACE2( ODefinitionContainer,OContentHelper,ODefinitionContainer_Base)
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 11bba72a4d93..9d694b53c94f 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -87,7 +87,6 @@ void SAL_CALL LocalNameApproval::approveElement( const OUString& _rName, const R
}
// ODocumentContainer
-DBG_NAME(ODocumentContainer)
ODocumentContainer::ODocumentContainer(const Reference< XComponentContext >& _xORB
,const Reference< XInterface >& _xParentContainer
@@ -98,7 +97,6 @@ ODocumentContainer::ODocumentContainer(const Reference< XComponentContext >& _xO
,OPropertyStateContainer(OContentHelper::rBHelper)
,m_bFormsContainer(_bFormsContainer)
{
- DBG_CTOR(ODocumentContainer, NULL);
registerProperty(PROPERTY_NAME, PROPERTY_ID_NAME, PropertyAttribute::BOUND | PropertyAttribute::READONLY | PropertyAttribute::CONSTRAINED,
&m_pImpl->m_aProps.aTitle, ::getCppuType(&m_pImpl->m_aProps.aTitle));
@@ -107,7 +105,6 @@ ODocumentContainer::ODocumentContainer(const Reference< XComponentContext >& _xO
ODocumentContainer::~ODocumentContainer()
{
- DBG_DTOR(ODocumentContainer, NULL);
if ( !OContentHelper::rBHelper.bInDispose && !OContentHelper::rBHelper.bDisposed )
{
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 941443a3f173..d17fd8cade12 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -411,7 +411,6 @@ OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const OUString& _
}
// ODocumentDefinition
-DBG_NAME(ODocumentDefinition)
ODocumentDefinition::ODocumentDefinition( const Reference< XInterface >& _rxContainer, const Reference< XComponentContext >& _xORB,
const TContentPtr& _pImpl, sal_Bool _bForm )
@@ -424,7 +423,6 @@ ODocumentDefinition::ODocumentDefinition( const Reference< XInterface >& _rxCont
,m_bRemoveListener(sal_False)
,m_pClientHelper(NULL)
{
- DBG_CTOR(ODocumentDefinition, NULL);
registerProperties();
}
@@ -440,7 +438,6 @@ void ODocumentDefinition::initialLoad( const Sequence< sal_Int8 >& i_rClassID, c
ODocumentDefinition::~ODocumentDefinition()
{
- DBG_DTOR(ODocumentDefinition, NULL);
if ( !OContentHelper::rBHelper.bInDispose && !OContentHelper::rBHelper.bDisposed )
{
acquire();
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index 5cfd72e4b360..ac6faff1a11b 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -74,7 +74,6 @@ void SAL_CALL OInterceptor::dispose()
}
-DBG_NAME(OInterceptor)
OInterceptor::OInterceptor( ODocumentDefinition* _pContentHolder )
:m_pContentHolder( _pContentHolder )
@@ -82,7 +81,6 @@ OInterceptor::OInterceptor( ODocumentDefinition* _pContentHolder )
,m_pDisposeEventListeners(0)
,m_pStatCL(0)
{
- DBG_CTOR(OInterceptor,NULL);
OSL_ENSURE(DISPATCH_RELOAD < m_aInterceptedURL.getLength(),"Illegal size.");
@@ -103,7 +101,6 @@ OInterceptor::~OInterceptor()
if(m_pStatCL)
delete m_pStatCL;
- DBG_DTOR(OInterceptor,NULL);
}
struct DispatchHelper
diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
index 60d06b4e172b..73389cc61535 100644
--- a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
+++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
@@ -89,20 +89,17 @@ DataSupplier_Impl::~DataSupplier_Impl()
}
// DataSupplier Implementation.
-DBG_NAME(DataSupplier)
DataSupplier::DataSupplier( const rtl::Reference< ODocumentContainer >& rContent,
sal_Int32 nOpenMode )
: m_pImpl( new DataSupplier_Impl( rContent,nOpenMode ) )
{
- DBG_CTOR(DataSupplier,NULL);
}
DataSupplier::~DataSupplier()
{
- DBG_DTOR(DataSupplier,NULL);
}
OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex )
diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx
index fae5b202d591..e872d9311465 100644
--- a/dbaccess/source/core/misc/ContainerMediator.cxx
+++ b/dbaccess/source/core/misc/ContainerMediator.cxx
@@ -39,14 +39,12 @@ namespace dbaccess
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
-DBG_NAME(OContainerMediator)
OContainerMediator::OContainerMediator( const Reference< XContainer >& _xContainer, const Reference< XNameAccess >& _xSettings,
const Reference< XConnection >& _rxConnection )
: m_xSettings( _xSettings )
, m_xContainer( _xContainer )
, m_aConnection( _rxConnection )
{
- DBG_CTOR(OContainerMediator,NULL);
if ( _xSettings.is() && _xContainer.is() )
{
@@ -73,7 +71,6 @@ OContainerMediator::OContainerMediator( const Reference< XContainer >& _xContain
OContainerMediator::~OContainerMediator()
{
- DBG_DTOR(OContainerMediator,NULL);
acquire();
impl_cleanup_nothrow();
}
diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx
index a58cfe47f0b7..69e8cfdbbaad 100644
--- a/dbaccess/source/core/misc/PropertyForward.cxx
+++ b/dbaccess/source/core/misc/PropertyForward.cxx
@@ -37,7 +37,6 @@ namespace dbaccess
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::lang;
- DBG_NAME(OPropertyForward)
OPropertyForward::OPropertyForward( const Reference< XPropertySet>& _xSource, const Reference< XNameAccess>& _xDestContainer,
const OUString& _sName, const ::std::vector< OUString>& _aPropertyList )
@@ -46,7 +45,6 @@ namespace dbaccess
,m_sName( _sName )
,m_bInInsert( sal_False )
{
- DBG_CTOR(OPropertyForward,NULL);
osl_atomic_increment(&m_refCount);
try
@@ -70,7 +68,6 @@ namespace dbaccess
OPropertyForward::~OPropertyForward()
{
- DBG_DTOR(OPropertyForward,NULL);
}
void SAL_CALL OPropertyForward::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException)
diff --git a/dbaccess/source/core/misc/apitools.cxx b/dbaccess/source/core/misc/apitools.cxx
index d0fbfb19e1f2..b717090c4ae3 100644
--- a/dbaccess/source/core/misc/apitools.cxx
+++ b/dbaccess/source/core/misc/apitools.cxx
@@ -31,12 +31,10 @@ using namespace osl;
// various helper functions
// OSubComponent
-DBG_NAME(OSubComponent)
OSubComponent::OSubComponent(Mutex& _rMutex, const Reference< XInterface > & xParent)
:OComponentHelper(_rMutex)
,m_xParent(xParent)
{
- DBG_CTOR(OSubComponent,NULL);
}
@@ -44,7 +42,6 @@ OSubComponent::~OSubComponent()
{
m_xParent = NULL;
- DBG_DTOR(OSubComponent,NULL);
}
// com::sun::star::lang::XTypeProvider
diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index da1b59ef12b8..cb21950e70cb 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -50,7 +50,6 @@ namespace dbaccess
}
}
// ODsnTypeCollection
-DBG_NAME(ODsnTypeCollection)
ODsnTypeCollection::ODsnTypeCollection(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext)
:m_aDriverConfig(_xContext)
,m_xContext(_xContext)
@@ -58,7 +57,6 @@ ODsnTypeCollection::ODsnTypeCollection(const ::com::sun::star::uno::Reference< :
,m_nLivingIterators(0)
#endif
{
- DBG_CTOR(ODsnTypeCollection,NULL);
const uno::Sequence< OUString > aURLs = m_aDriverConfig.getURLs();
const OUString* pIter = aURLs.getConstArray();
const OUString* pEnd = pIter + aURLs.getLength();
@@ -74,7 +72,6 @@ ODsnTypeCollection::ODsnTypeCollection(const ::com::sun::star::uno::Reference< :
ODsnTypeCollection::~ODsnTypeCollection()
{
- DBG_DTOR(ODsnTypeCollection,NULL);
OSL_ENSURE(0 == m_nLivingIterators, "ODsnTypeCollection::~ODsnTypeCollection : there are still living iterator objects!");
}
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index c4e6a8bf1874..157743582fd3 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 c8faf141dd9d..976a0773c74e 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 b541b019ba32..4627516d6de7 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 7bb13c554eb1..74f5ae0a4729 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 8bd009670569..759ba462a5a5 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 d5625e895d06..b315e58a514a 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 e39966eeab9e..8fd6654b46e3 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 b2c8a7a0ea6b..e187ee1d7116 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 8d9460ec9bd1..2e14cacb2ac5 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 573b30c5b7f0..a043aa84f282 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 34ba88501eb3..967ee8744cf4 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 b3102490bb93..25cd46d7a63c 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 696740b17feb..61d93708f7d4 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 126dbe865552..4b9d676893e0 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 94ca65199703..6157ec37e155 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 8a1313d06928..5abc7bf1500d 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 8565ffeaea78..b35e18755d43 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 e77503b54169..82606fe19f61 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 e055d9c6bb37..06502559eec2 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 73b64e72354b..8d00021c2bf2 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 2d1b69827500..876d85d4578d 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 70cca6b63454..2caf2fc68e5d 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 c6dff59d343a..48c2cbdfb180 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 3bda64eb25ac..a204280be9d3 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 cbd9b18b1bae..f5da59101f8e 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 c8a7dda3ad48..919d25c82f6d 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 08d657ad654d..f08fcd03eeb0 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 2cfccd12bcad..752ac35d7179 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 97f6cc0259ba..49452b465326 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 384ed8eaf067..381ed4a11871 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 6083b2ea4657..d35e8cdd9b11 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 68b554eda569..bf05ab0a3dd0 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 9a2c0ecdc2a9..17107ca38bc8 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 d7a2d0cce3b8..edecf45dfa24 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 7426382ce785..eba8139a5849 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 f53375a3670e..6ddc0f930475 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 a321c068f62d..196674a09f2f 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 0914360af0a8..c31e70550e6e 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);
m_pTreeListBox = new DBTreeListBox(this, WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT);
m_pTreeListBox->EnableCheckButton(NULL);
@@ -47,7 +45,6 @@ DBTreeView::DBTreeView( Window* pParent, WinBits nBits)
DBTreeView::~DBTreeView()
{
- DBG_DTOR(DBTreeView,NULL);
if (m_pTreeListBox)
{
if (m_pTreeListBox->GetModel())
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx
index 888f79389934..da5d2f1cd5fa 100644
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@ -58,21 +58,18 @@ Any SAL_CALL SbaExternalSourceBrowser::queryInterface(const Type& _rType) throw
return aRet;
}
-DBG_NAME(SbaExternalSourceBrowser)
SbaExternalSourceBrowser::SbaExternalSourceBrowser(const Reference< ::com::sun::star::uno::XComponentContext >& _rM)
:SbaXDataBrowserController(_rM)
,m_aModifyListeners(getMutex())
,m_pDataSourceImpl(NULL)
,m_bInQueryDispatch( sal_False )
{
- DBG_CTOR(SbaExternalSourceBrowser,NULL);
}
SbaExternalSourceBrowser::~SbaExternalSourceBrowser()
{
- DBG_DTOR(SbaExternalSourceBrowser,NULL);
}
::comphelper::StringSequence SAL_CALL SbaExternalSourceBrowser::getSupportedServiceNames() throw(RuntimeException)
diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx
index befc96c4c60b..09c3a80ea97c 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -38,7 +38,6 @@ using namespace ::com::sun::star::container;
// SbaXFormAdapter
-DBG_NAME(SbaXFormAdapter)
SbaXFormAdapter::SbaXFormAdapter()
:m_aLoadListeners(*this, m_aMutex)
,m_aRowSetListeners(*this, m_aMutex)
@@ -54,14 +53,12 @@ SbaXFormAdapter::SbaXFormAdapter()
,m_aContainerListeners(m_aMutex)
,m_nNamePropHandle(-1)
{
- DBG_CTOR(SbaXFormAdapter,NULL);
}
SbaXFormAdapter::~SbaXFormAdapter()
{
- DBG_DTOR(SbaXFormAdapter,NULL);
}
Sequence< Type > SAL_CALL SbaXFormAdapter::getTypes( ) throw (RuntimeException)
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index d356093c0c40..c318ea352d4e 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -159,7 +159,6 @@ struct OGenericUnoController_Data
};
// OGenericUnoController
-DBG_NAME(OGenericUnoController)
OGenericUnoController::OGenericUnoController(const Reference< XComponentContext >& _rM)
:OGenericUnoController_Base( getMutex() )
,m_pView(NULL)
@@ -181,7 +180,6 @@ OGenericUnoController::OGenericUnoController(const Reference< XComponentContext
}
osl_atomic_decrement( &m_refCount );
- DBG_CTOR(OGenericUnoController,NULL);
try
{
@@ -225,7 +223,6 @@ OGenericUnoController::OGenericUnoController()
OGenericUnoController::~OGenericUnoController()
{
- DBG_DTOR(OGenericUnoController,NULL);
}
sal_Bool OGenericUnoController::Construct(Window* /*pParent*/)
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 96b50f210675..b4d0e769eba1 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -136,16 +136,13 @@ Sequence< OUString> SbaXGridControl::getSupportedServiceNames_Static(void) throw
return aSupported;
}
-DBG_NAME(SbaXGridControl );
SbaXGridControl::SbaXGridControl(const Reference< XComponentContext >& _rM)
: FmXGridControl(_rM)
{
- DBG_CTOR(SbaXGridControl ,NULL);
}
SbaXGridControl::~SbaXGridControl()
{
- DBG_DTOR(SbaXGridControl ,NULL);
}
FmXGridPeer* SbaXGridControl::imp_CreatePeer(Window* pParent)
@@ -301,17 +298,14 @@ void SAL_CALL SbaXGridControl::dispose(void) throw( RuntimeException )
}
// SbaXGridPeer
-DBG_NAME(SbaXGridPeer )
SbaXGridPeer::SbaXGridPeer(const Reference< XComponentContext >& _rM)
: FmXGridPeer(_rM)
,m_aStatusListeners(m_aMutex)
{
- DBG_CTOR(SbaXGridPeer ,NULL);
}
SbaXGridPeer::~SbaXGridPeer()
{
- DBG_DTOR(SbaXGridPeer ,NULL);
}
void SAL_CALL SbaXGridPeer::dispose(void) throw( RuntimeException )
@@ -721,7 +715,6 @@ void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupM
}
// SbaGridControl
-DBG_NAME(SbaGridControl );
SbaGridControl::SbaGridControl(Reference< XComponentContext > _rM,
Window* pParent, FmXGridPeer* _pPeer, WinBits nBits)
:FmGridControl(_rM,pParent, _pPeer, nBits)
@@ -730,12 +723,10 @@ SbaGridControl::SbaGridControl(Reference< XComponentContext > _rM,
,m_nCurrentActionColId((sal_uInt16)-1)
,m_bActivatingForDrop(sal_False)
{
- DBG_CTOR(SbaGridControl ,NULL);
}
SbaGridControl::~SbaGridControl()
{
- DBG_DTOR(SbaGridControl ,NULL);
if (m_nAsyncDropEvent)
Application::RemoveUserEvent(m_nAsyncDropEvent);
}
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 6b2d8346eabe..087dbe49363a 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -206,7 +206,6 @@ Reference< XInterface > SAL_CALL SbaTableQueryBrowser::Create(const Reference<XM
return *(new SbaTableQueryBrowser(comphelper::getComponentContext(_rxFactory)));
}
-DBG_NAME(SbaTableQueryBrowser);
SbaTableQueryBrowser::SbaTableQueryBrowser(const Reference< XComponentContext >& _rM)
:SbaXDataBrowserController(_rM)
,m_aSelectionListeners( getMutex() )
@@ -223,12 +222,10 @@ SbaTableQueryBrowser::SbaTableQueryBrowser(const Reference< XComponentContext >&
,m_bInSuspend(sal_False)
,m_bEnableBrowser(sal_True)
{
- DBG_CTOR(SbaTableQueryBrowser,NULL);
}
SbaTableQueryBrowser::~SbaTableQueryBrowser()
{
- DBG_DTOR(SbaTableQueryBrowser,NULL);
if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
{
SAL_WARN("dbaccess.ui", "Please check who doesn't dispose this component!");
diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx
index 2c56383404ed..7e08c5df71ae 100644
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@ -35,7 +35,6 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::lang;
// OColumnControlWindow
-DBG_NAME(OColumnControlWindow)
OColumnControlWindow::OColumnControlWindow(Window* pParent
,const Reference<XComponentContext>& _rxContext)
: OFieldDescControl(pParent,NULL)
@@ -43,7 +42,6 @@ OColumnControlWindow::OColumnControlWindow(Window* pParent
, m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES))
, m_bAutoIncrementEnabled(sal_True)
{
- DBG_CTOR(OColumnControlWindow,NULL);
setRightAligned();
m_aLocale = SvtSysLocale().GetLanguageTag().getLocale();
@@ -52,7 +50,6 @@ OColumnControlWindow::OColumnControlWindow(Window* pParent
OColumnControlWindow::~OColumnControlWindow()
{
- DBG_DTOR(OColumnControlWindow,NULL);
}
void OColumnControlWindow::ActivateAggregate( EControlType eType )
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index b5d5584ca4a5..f242fec4210e 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -94,7 +94,6 @@ namespace
// class OFieldDescControl
-DBG_NAME(OFieldDescControl)
OFieldDescControl::OFieldDescControl( Window* pParent, const ResId& rResId, OTableDesignHelpBar* pHelpBar)
:TabPage( pParent, rResId )
@@ -139,7 +138,6 @@ OFieldDescControl::OFieldDescControl( Window* pParent, const ResId& rResId, OTab
,m_bRightAligned(false)
,pActFieldDescr(NULL)
{
- DBG_CTOR(OFieldDescControl,NULL);
Contruct();
}
@@ -187,7 +185,6 @@ OFieldDescControl::OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHel
,m_bRightAligned(false)
,pActFieldDescr(NULL)
{
- DBG_CTOR(OFieldDescControl,NULL);
Contruct();
}
@@ -213,7 +210,6 @@ void OFieldDescControl::Contruct()
OFieldDescControl::~OFieldDescControl()
{
- DBG_DTOR(OFieldDescControl,NULL);
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -460,7 +456,6 @@ sal_Int32 OFieldDescControl::GetMaxControlHeight() const
void OFieldDescControl::SetReadOnly( sal_Bool bReadOnly )
{
- DBG_CHKTHIS(OFieldDescControl,NULL);
// Enable/disable Controls
Control* ppAggregates[] = { pRequired, pNumType
, pAutoIncrement, pDefault
@@ -488,7 +483,6 @@ void OFieldDescControl::SetReadOnly( sal_Bool bReadOnly )
OUString OFieldDescControl::GetControlText( sal_uInt16 nControlId )
{
- DBG_CHKTHIS(OFieldDescControl,NULL);
// Read out the Controls' texts
switch( nControlId )
{
@@ -544,7 +538,6 @@ OUString OFieldDescControl::GetControlText( sal_uInt16 nControlId )
void OFieldDescControl::SetControlText( sal_uInt16 nControlId, const OUString& rText )
{
- DBG_CHKTHIS(OFieldDescControl,NULL);
// Set the Controls' texts
switch( nControlId )
{
@@ -621,7 +614,6 @@ void OFieldDescControl::SetControlText( sal_uInt16 nControlId, const OUString& r
IMPL_LINK( OFieldDescControl, FormatClickHdl, Button *, /*pButton*/ )
{
- DBG_CHKTHIS(OFieldDescControl,NULL);
// Create temporary Column, which is used for data exchange with Dialog
if( !pActFieldDescr )
return 0;
@@ -661,7 +653,6 @@ void OFieldDescControl::SetModified(sal_Bool /*bModified*/)
IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox *, pListBox )
{
- DBG_CHKTHIS(OFieldDescControl,NULL);
if ( !pActFieldDescr )
return 0;
@@ -736,7 +727,6 @@ IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox *, pListBox )
// of the DescriptionPage
void OFieldDescControl::ArrangeAggregates()
{
- DBG_CHKTHIS(OFieldDescControl,NULL);
// A Control's description
struct AGGREGATE_DESCRIPTION
{
@@ -810,7 +800,6 @@ void OFieldDescControl::ArrangeAggregates()
void OFieldDescControl::ActivateAggregate( EControlType eType )
{
- DBG_CHKTHIS(OFieldDescControl,NULL);
// Create Controls
switch( eType )
{
@@ -1027,7 +1016,6 @@ OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(sal_uInt16 _nHelpS
void OFieldDescControl::DeactivateAggregate( EControlType eType )
{
- DBG_CHKTHIS(OFieldDescControl,NULL);
pLastFocusWindow = NULL;
// Destroy Controls
switch( eType )
@@ -1090,7 +1078,6 @@ void OFieldDescControl::DeactivateAggregate( EControlType eType )
void OFieldDescControl::SetPosSize( Control** ppControl, long nRow, sal_uInt16 nCol )
{
- DBG_CHKTHIS(OFieldDescControl,NULL);
// Calculate size
const sal_Int32 nControlHeight = GetMaxControlHeight();
@@ -1156,7 +1143,6 @@ void OFieldDescControl::SetPosSize( Control** ppControl, long nRow, sal_uInt16 n
void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
{
- DBG_CHKTHIS(OFieldDescControl,NULL);
pActFieldDescr = pFieldDescr;
if(!pFieldDescr)
{
@@ -1562,7 +1548,6 @@ IMPL_LINK(OFieldDescControl, OnControlFocusLost, Control*, pControl )
void OFieldDescControl::SaveData( OFieldDescription* pFieldDescr )
{
- DBG_CHKTHIS(OFieldDescControl,NULL);
if( !pFieldDescr )
return;
@@ -1612,7 +1597,6 @@ void OFieldDescControl::UpdateFormatSample(OFieldDescription* pFieldDescr)
void OFieldDescControl::GetFocus()
{
- DBG_CHKTHIS(OFieldDescControl,NULL);
// Set the Focus to the Control that has been active last
TabPage::GetFocus();
if( pLastFocusWindow )
@@ -1624,7 +1608,6 @@ void OFieldDescControl::GetFocus()
void OFieldDescControl::implFocusLost(Window* _pWhich)
{
- DBG_CHKTHIS(OFieldDescControl,NULL);
OSL_ENSURE(!_pWhich || IsChild(_pWhich), "OFieldDescControl::implFocusLost : invalid window !");
// Remember the active Control
@@ -1638,7 +1621,6 @@ void OFieldDescControl::implFocusLost(Window* _pWhich)
void OFieldDescControl::LoseFocus()
{
- DBG_CHKTHIS(OFieldDescControl,NULL);
implFocusLost(NULL);
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index 26e6587bd19e..35687a2b2709 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -123,24 +123,20 @@ namespace dbaui
};
// class ORelationControl
- DBG_NAME(ORelationControl)
ORelationControl::ORelationControl( OTableListBoxControl* pParent )
:EditBrowseBox( pParent, EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE, WB_TABSTOP | WB_BORDER | BROWSER_AUTOSIZE_LASTCOL)
,m_pBoxControl(pParent)
,m_xSourceDef( NULL )
,m_xDestDef( NULL )
{
- DBG_CTOR(ORelationControl,NULL);
}
ORelationControl::~ORelationControl()
{
- DBG_DTOR(ORelationControl,NULL);
}
void ORelationControl::Init(const TTableConnectionData::value_type& _pConnData)
{
- DBG_CHKTHIS(ORelationControl,NULL);
m_pConnData = _pConnData;
OSL_ENSURE(m_pConnData, "No data supplied!");
@@ -179,7 +175,6 @@ namespace dbaui
}
void ORelationControl::Resize()
{
- DBG_CHKTHIS(ORelationControl,NULL);
EditBrowseBox::Resize();
long nOutputWidth = GetOutputSizePixel().Width();
SetColumnWidth(1, (nOutputWidth / 2));
@@ -188,7 +183,6 @@ namespace dbaui
bool ORelationControl::PreNotify(NotifyEvent& rNEvt)
{
- DBG_CHKTHIS(ORelationControl,NULL);
if (rNEvt.GetType() == EVENT_LOSEFOCUS && !HasChildPathFocus() )
PostUserEvent(LINK(this, ORelationControl, AsynchDeactivate));
else if (rNEvt.GetType() == EVENT_GETFOCUS)
@@ -211,7 +205,6 @@ namespace dbaui
sal_Bool ORelationControl::IsTabAllowed(sal_Bool bForward) const
{
- DBG_CHKTHIS(ORelationControl,NULL);
long nRow = GetCurRow();
sal_uInt16 nCol = GetCurColumnId();
@@ -223,7 +216,6 @@ namespace dbaui
sal_Bool ORelationControl::SaveModified()
{
- DBG_CHKTHIS(ORelationControl,NULL);
long nRow = GetCurRow();
if ( nRow != BROWSER_ENDOFSELECTION )
{
@@ -272,7 +264,6 @@ namespace dbaui
OUString ORelationControl::GetCellText( long nRow, sal_uInt16 nColId ) const
{
- DBG_CHKTHIS(ORelationControl,NULL);
OUString sText;
if ( m_pConnData->GetConnLineDataList()->size() > static_cast<size_t>(nRow) )
{
@@ -292,7 +283,6 @@ namespace dbaui
void ORelationControl::InitController( CellControllerRef& /*rController*/, long nRow, sal_uInt16 nColumnId )
{
- DBG_CHKTHIS(ORelationControl,NULL);
OString sHelpId( HID_RELATIONDIALOG_LEFTFIELDCELL );
@@ -329,20 +319,17 @@ namespace dbaui
CellController* ORelationControl::GetController( long /*nRow*/, sal_uInt16 /*nColumnId*/ )
{
- DBG_CHKTHIS(ORelationControl,NULL);
return new ListBoxCellController( m_pListCell.get() );
}
sal_Bool ORelationControl::SeekRow( long nRow )
{
- DBG_CHKTHIS(ORelationControl,NULL);
m_nDataPos = nRow;
return sal_True;
}
void ORelationControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const
{
- DBG_CHKTHIS(ORelationControl,NULL);
OUString aText = const_cast< ORelationControl*>(this)->GetCellText( m_nDataPos, nColumnId );
Point aPos( rRect.TopLeft() );
@@ -432,7 +419,6 @@ namespace dbaui
}
void ORelationControl::CellModified()
{
- DBG_CHKTHIS(ORelationControl,NULL);
EditBrowseBox::CellModified();
SaveModified();
#if OSL_DEBUG_LEVEL > 0
@@ -444,7 +430,6 @@ namespace dbaui
parent->NotifyCellChange();
}
// class OTableListBoxControl
-DBG_NAME(OTableListBoxControl)
OTableListBoxControl::OTableListBoxControl( Window* _pParent
,const ResId& _rResId
@@ -470,14 +455,12 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
m_lmbRightTable.SetSelectHdl(aLink);
FreeResource();
- DBG_CTOR(OTableListBoxControl,NULL);
}
OTableListBoxControl::~OTableListBoxControl()
{
ORelationControl* pTemp = m_pRC_Tables;
m_pRC_Tables = NULL;
delete pTemp;
- DBG_DTOR(OTableListBoxControl,NULL);
}
void OTableListBoxControl::fillListBoxes()
{
diff --git a/dbaccess/source/ui/control/ScrollHelper.cxx b/dbaccess/source/ui/control/ScrollHelper.cxx
index 3e73655c444d..a15fb7693d25 100644
--- a/dbaccess/source/ui/control/ScrollHelper.cxx
+++ b/dbaccess/source/ui/control/ScrollHelper.cxx
@@ -23,16 +23,13 @@
#define LISTBOX_SCROLLING_AREA 12
namespace dbaui
{
-DBG_NAME(OScrollHelper)
OScrollHelper::OScrollHelper()
{
- DBG_CTOR(OScrollHelper,NULL);
}
OScrollHelper::~OScrollHelper()
{
- DBG_DTOR(OScrollHelper,NULL);
}
void OScrollHelper::scroll(const Point& _rPoint, const Size& _rOutputSize)
{
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index 5286eaddb3a1..bec832a98d40 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -44,7 +44,6 @@ const sal_uInt16 COL_ALTER = 6;
const sal_uInt16 COL_REF = 7;
const sal_uInt16 COL_DROP = 8;
-DBG_NAME(OTableGrantControl)
// OTableGrantControl
OTableGrantControl::OTableGrantControl( Window* pParent,const ResId& _RsId)
@@ -54,7 +53,6 @@ OTableGrantControl::OTableGrantControl( Window* pParent,const ResId& _RsId)
,m_nDataPos( 0 )
,m_nDeactivateEvent(0)
{
- DBG_CTOR(OTableGrantControl,NULL);
// Spalten einfuegen
sal_uInt16 i=1;
InsertDataColumn( i, OUString(ModuleRes(STR_TABLE_PRIV_NAME) ), 75);
@@ -73,7 +71,6 @@ OTableGrantControl::OTableGrantControl( Window* pParent,const ResId& _RsId)
OTableGrantControl::~OTableGrantControl()
{
- DBG_DTOR(OTableGrantControl,NULL);
if (m_nDeactivateEvent)
{
Application::RemoveUserEvent(m_nDeactivateEvent);
@@ -120,7 +117,6 @@ void OTableGrantControl::UpdateTables()
void OTableGrantControl::Init()
{
- DBG_CHKTHIS(OTableGrantControl,NULL);
EditBrowseBox::Init();
// ComboBox instanzieren
@@ -144,13 +140,11 @@ void OTableGrantControl::Init()
void OTableGrantControl::Resize()
{
- DBG_CHKTHIS(OTableGrantControl,NULL);
EditBrowseBox::Resize();
}
bool OTableGrantControl::PreNotify(NotifyEvent& rNEvt)
{
- DBG_CHKTHIS(OTableGrantControl,NULL);
if (rNEvt.GetType() == EVENT_LOSEFOCUS)
if (!HasChildPathFocus())
{
@@ -183,7 +177,6 @@ IMPL_LINK_NOARG(OTableGrantControl, AsynchDeactivate)
sal_Bool OTableGrantControl::IsTabAllowed(sal_Bool bForward) const
{
- DBG_CHKTHIS(OTableGrantControl,NULL);
long nRow = GetCurRow();
sal_uInt16 nCol = GetCurColumnId();
@@ -204,7 +197,6 @@ sal_Bool OTableGrantControl::IsTabAllowed(sal_Bool bForward) const
sal_Bool OTableGrantControl::SaveModified()
{
- DBG_CHKTHIS(OTableGrantControl,NULL);
sal_Int32 nRow = GetCurRow();
if(nRow == -1 || nRow >= m_aTableNames.getLength())
@@ -263,7 +255,6 @@ sal_Bool OTableGrantControl::SaveModified()
OUString OTableGrantControl::GetCellText( long nRow, sal_uInt16 nColId ) const
{
- DBG_CHKTHIS(OTableGrantControl,NULL);
if(COL_TABLE_NAME == nColId)
return m_aTableNames[nRow];
@@ -277,7 +268,6 @@ OUString OTableGrantControl::GetCellText( long nRow, sal_uInt16 nColId ) const
void OTableGrantControl::InitController( CellControllerRef& /*rController*/, long nRow, sal_uInt16 nColumnId )
{
- DBG_CHKTHIS(OTableGrantControl,NULL);
OUString sTablename = m_aTableNames[nRow];
// special case for tablename
if(nColumnId == COL_TABLE_NAME)
@@ -365,7 +355,6 @@ void OTableGrantControl::setGrantUser(const Reference< XAuthorizable>& _xGrantUs
CellController* OTableGrantControl::GetController( long nRow, sal_uInt16 nColumnId )
{
- DBG_CHKTHIS(OTableGrantControl,NULL);
CellController* pController = NULL;
switch( nColumnId )
@@ -393,7 +382,6 @@ CellController* OTableGrantControl::GetController( long nRow, sal_uInt16 nColumn
sal_Bool OTableGrantControl::SeekRow( long nRow )
{
- DBG_CHKTHIS(OTableGrantControl,NULL);
m_nDataPos = nRow;
return (nRow <= m_aTableNames.getLength());
@@ -401,7 +389,6 @@ sal_Bool OTableGrantControl::SeekRow( long nRow )
void OTableGrantControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const
{
- DBG_CHKTHIS(OTableGrantControl,NULL);
if(nColumnId != COL_TABLE_NAME)
{
@@ -433,7 +420,6 @@ void OTableGrantControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect,
void OTableGrantControl::CellModified()
{
- DBG_CHKTHIS(OTableGrantControl,NULL);
EditBrowseBox::CellModified();
SaveModified();
}
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx
index c6db93c4b350..fa9cb5447967 100644
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ b/dbaccess/source/ui/control/VertSplitView.cxx
@@ -27,20 +27,17 @@
using namespace ::dbaui;
// class OSplitterView
-DBG_NAME(OSplitterView)
OSplitterView::OSplitterView(Window* _pParent,sal_Bool _bVertical) : Window(_pParent,WB_DIALOGCONTROL) // ,WB_BORDER
,m_pSplitter( NULL )
,m_pLeft(NULL)
,m_pRight(NULL)
,m_bVertical(_bVertical)
{
- DBG_CTOR(OSplitterView,NULL);
ImplInitSettings( sal_True, sal_True, sal_True );
}
OSplitterView::~OSplitterView()
{
- DBG_DTOR(OSplitterView,NULL);
m_pRight = m_pLeft = NULL;
}
diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx
index d49c8acf08fb..7f9b50dc1f8f 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -23,7 +23,6 @@
namespace dbaui
{
- DBG_NAME(OConnectionURLEdit)
// OConnectionURLEdit
OConnectionURLEdit::OConnectionURLEdit(Window* _pParent, const ResId& _rResId,sal_Bool _bShowPrefix)
:Edit(_pParent, _rResId)
@@ -31,12 +30,10 @@ OConnectionURLEdit::OConnectionURLEdit(Window* _pParent, const ResId& _rResId,sa
,m_pForcedPrefix(NULL)
,m_bShowPrefix(_bShowPrefix)
{
- DBG_CTOR(OConnectionURLEdit ,NULL);
}
OConnectionURLEdit::~OConnectionURLEdit()
{
- DBG_DTOR(OConnectionURLEdit ,NULL);
// delete my sub controls
Edit* pSubEdit = GetSubEdit();
SetSubEdit(NULL);
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 68b4dcba75c0..76edcddbfe97 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -52,7 +52,6 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::ui;
using namespace ::com::sun::star::view;
-DBG_NAME(DBTreeListBox)
#define SPACEBETWEENENTRIES 4
// class DBTreeListBox
DBTreeListBox::DBTreeListBox( Window* pParent, WinBits nWinStyle ,sal_Bool _bHandleEnterKey)
@@ -62,7 +61,6 @@ DBTreeListBox::DBTreeListBox( Window* pParent, WinBits nWinStyle ,sal_Bool _bHan
,m_pContextMenuProvider( NULL )
,m_bHandleEnterKey(_bHandleEnterKey)
{
- DBG_CTOR(DBTreeListBox,NULL);
init();
}
@@ -73,7 +71,6 @@ DBTreeListBox::DBTreeListBox( Window* pParent, const ResId& rResId,sal_Bool _bHa
,m_pContextMenuProvider( NULL )
,m_bHandleEnterKey(_bHandleEnterKey)
{
- DBG_CTOR(DBTreeListBox,NULL);
init();
}
@@ -97,7 +94,6 @@ void DBTreeListBox::init()
DBTreeListBox::~DBTreeListBox()
{
- DBG_DTOR(DBTreeListBox,NULL);
implStopSelectionTimer();
}
diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx
index f72a43cf82d3..f60b59d8d532 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -26,12 +26,10 @@ namespace dbaui
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-DBG_NAME(OMarkableTreeListBox)
OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, WinBits nWinStyle )
: DBTreeListBox(pParent, nWinStyle)
{
- DBG_CTOR(OMarkableTreeListBox,NULL);
InitButtonData();
}
@@ -39,7 +37,6 @@ OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, WinBits nWinStyle )
OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const ResId& rResId)
: DBTreeListBox(pParent, rResId)
{
- DBG_CTOR(OMarkableTreeListBox,NULL);
InitButtonData();
}
@@ -48,7 +45,6 @@ OMarkableTreeListBox::~OMarkableTreeListBox()
{
delete m_pCheckButton;
- DBG_DTOR(OMarkableTreeListBox,NULL);
}
void OMarkableTreeListBox::Paint(const Rectangle& _rRect)
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index d2c2c808e1f5..1418c218be49 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -64,14 +64,12 @@ private:
OSqlEdit & editor_;
};
-DBG_NAME(OSqlEdit)
OSqlEdit::OSqlEdit( OQueryTextView* pParent, WinBits nWinStyle ) :
MultiLineEditSyntaxHighlight( pParent, nWinStyle )
,m_pView(pParent)
,m_bAccelAction( sal_False )
,m_bStopTimer(sal_False )
{
- DBG_CTOR(OSqlEdit,NULL);
SetHelpId( HID_CTL_QRYSQLEDIT );
SetModifyHdl( LINK(this, OSqlEdit, ModifyHdl) );
@@ -106,7 +104,6 @@ OSqlEdit::OSqlEdit( OQueryTextView* pParent, WinBits nWinStyle ) :
OSqlEdit::~OSqlEdit()
{
- DBG_DTOR(OSqlEdit,NULL);
if (m_timerUndoActionCreation.IsActive())
m_timerUndoActionCreation.Stop();
css::uno::Reference< css::beans::XMultiPropertySet > n;
@@ -122,7 +119,6 @@ OSqlEdit::~OSqlEdit()
void OSqlEdit::KeyInput( const KeyEvent& rKEvt )
{
- DBG_CHKTHIS(OSqlEdit,NULL);
OJoinController& rController = m_pView->getContainerWindow()->getDesignView()->getController();
rController.InvalidateFeature(SID_CUT);
rController.InvalidateFeature(SID_COPY);
@@ -140,7 +136,6 @@ void OSqlEdit::KeyInput( const KeyEvent& rKEvt )
sal_Bool OSqlEdit::IsInAccelAct()
{
- DBG_CHKTHIS(OSqlEdit,NULL);
// Cut, Copy, Paste by Accel. runs the action in the Edit but also the
// corresponding slot in the View. Therefore, the action occurs twice.
// To prevent this, SlotExec in View can call this function.
@@ -150,7 +145,6 @@ sal_Bool OSqlEdit::IsInAccelAct()
void OSqlEdit::GetFocus()
{
- DBG_CHKTHIS(OSqlEdit,NULL);
m_strOrigText =GetText();
MultiLineEditSyntaxHighlight::GetFocus();
}
@@ -206,7 +200,6 @@ IMPL_LINK(OSqlEdit, ModifyHdl, void*, /*EMPTYTAG*/)
void OSqlEdit::SetText(const OUString& rNewText)
{
- DBG_CHKTHIS(OSqlEdit,NULL);
if (m_timerUndoActionCreation.IsActive())
{ // create the trailing undo-actions
m_timerUndoActionCreation.Stop();
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index d43c93ab473b..854b5f300246 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -56,7 +56,6 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::sdbc;
using namespace comphelper;
-DBG_NAME(OCollectionView)
OCollectionView::OCollectionView( Window * pParent
,const Reference< XContent>& _xContent
,const OUString& _sDefaultName
@@ -77,7 +76,6 @@ OCollectionView::OCollectionView( Window * pParent
, m_xContext(_rxContext)
, m_bCreateForm(sal_True)
{
- DBG_CTOR(OCollectionView,NULL);
FreeResource();
OSL_ENSURE(m_xContent.is(),"No valid content!");
@@ -102,7 +100,6 @@ OCollectionView::OCollectionView( Window * pParent
OCollectionView::~OCollectionView( )
{
- DBG_DTOR(OCollectionView,NULL);
}
Reference< XContent> OCollectionView::getSelectedFolder() const
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 1936193485c2..6021ee0a826c 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -88,7 +88,6 @@ namespace dbaui
using namespace ::dbtools;
using namespace ::svt;
-DBG_NAME(OConnectionHelper)
OConnectionHelper::OConnectionHelper( Window* pParent, const ResId& _rId, const SfxItemSet& _rCoreAttrs)
:OGenericAdministrationPage(pParent, _rId, _rCoreAttrs)
@@ -97,7 +96,6 @@ DBG_NAME(OConnectionHelper)
,m_aPB_Connection ( this, ResId( PB_AUTOBROWSEURL, *_rId.GetResMgr() ) )
,m_aPB_CreateDB ( this, ResId( PB_CREATEDB, *_rId.GetResMgr() ) )
{
- DBG_CTOR(OConnectionHelper,NULL);
// extract the datasource type collection from the item set
DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, _rCoreAttrs.GetItem(DSID_TYPECOLLECTION));
@@ -112,7 +110,6 @@ DBG_NAME(OConnectionHelper)
OConnectionHelper::~OConnectionHelper()
{
- DBG_DTOR(OConnectionHelper,NULL);
}
void OConnectionHelper::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue)
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index ed8311aac8eb..3b8baa01f3c2 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -88,7 +88,6 @@ namespace dbaui
return ( new OConnectionTabPage( pParent, _rAttrSet ) );
}
// OConnectionTabPage
- DBG_NAME(OConnectionTabPage)
OConnectionTabPage::OConnectionTabPage(Window* pParent, const SfxItemSet& _rCoreAttrs)
:OConnectionHelper(pParent, ModuleRes(PAGE_CONNECTION), _rCoreAttrs)
,m_aFL1(this, ModuleRes(FL_SEPARATOR1))
@@ -102,7 +101,6 @@ namespace dbaui
,m_aTestJavaDriver(this, ModuleRes(PB_TESTDRIVERCLASS))
,m_aTestConnection(this, ModuleRes(PB_TESTCONNECTION))
{
- DBG_CTOR(OConnectionTabPage,NULL);
m_aConnectionURL.SetModifyHdl(LINK(this, OConnectionTabPage, OnEditModified));
m_aJavaDriver.SetModifyHdl(getControlModifiedLink());
m_aJavaDriver.SetModifyHdl(LINK(this, OConnectionTabPage, OnEditModified));
@@ -119,7 +117,6 @@ namespace dbaui
OConnectionTabPage::~OConnectionTabPage()
{
- DBG_DTOR(OConnectionTabPage,NULL);
}
void OConnectionTabPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue)
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index f3330fadfeb5..76d0f9b24815 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -102,13 +102,11 @@ namespace dbaui
}
// OConnectionTabPageSetup
- DBG_NAME(OConnectionTabPageSetup)
OConnectionTabPageSetup::OConnectionTabPageSetup(Window* pParent, sal_uInt16 _rId, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId)
:OConnectionHelper(pParent, ModuleRes(_rId), _rCoreAttrs)
,m_bUserGrabFocus(sal_True)
,m_aFT_HelpText(this, ModuleRes(FT_AUTOWIZARDHELPTEXT))
{
- DBG_CTOR(OConnectionTabPageSetup, NULL);
if ( USHRT_MAX != _nHelpTextResId )
{
@@ -150,7 +148,6 @@ namespace dbaui
OConnectionTabPageSetup::~OConnectionTabPageSetup()
{
- DBG_DTOR(OConnectionTabPageSetup,NULL);
}
void OConnectionTabPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue)
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 293930b24fd1..a911493aafff 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -67,11 +67,9 @@ using namespace ::com::sun::star;
}
// OTextConnectionPageSetup
-DBG_NAME(OTextConnectionPageSetup)
OTextConnectionPageSetup::OTextConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs )
:OConnectionTabPageSetup(pParent, PAGE_DBWIZARD_TEXT, _rCoreAttrs, STR_TEXT_HELPTEXT, STR_TEXT_HEADERTEXT, STR_TEXT_PATH_OR_FILE)
{
- DBG_CTOR(OTextConnectionPageSetup,NULL);
m_pTextConnectionHelper = new OTextConnectionHelper( this, TC_EXTENSION | TC_SEPARATORS );
m_pTextConnectionHelper->SetClickHandler(LINK( this, OTextConnectionPageSetup, ImplGetExtensionHdl ) );
@@ -83,7 +81,6 @@ DBG_NAME(OTextConnectionPageSetup)
{
DELETEZ(m_pTextConnectionHelper);
- DBG_DTOR(OTextConnectionPageSetup,NULL);
}
IMPL_LINK(OTextConnectionPageSetup, ImplGetExtensionHdl, OTextConnectionHelper*, /*_pTextConnectionHelper*/)
@@ -228,7 +225,6 @@ DBG_NAME(OTextConnectionPageSetup)
return ( new OMySQLIntroPageSetup( _pParent, _rAttrSet) );
}
-DBG_NAME(OMySQLIntroPageSetup)
OMySQLIntroPageSetup::OMySQLIntroPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs )
:OGenericAdministrationPage(pParent, ModuleRes(PAGE_DBWIZARD_MYSQL_INTRO), _rCoreAttrs)
@@ -239,7 +235,6 @@ DBG_NAME(OMySQLIntroPageSetup)
,m_aFT_Helptext(this, ModuleRes(FT_MYSQL_HELPTEXT))
,m_aFT_Headertext(this, ModuleRes(FT_MYSQL_HEADERTEXT))
{
- DBG_CTOR(OMySQLIntroPageSetup,NULL);
SetControlFontWeight(&m_aFT_Headertext);
m_aRB_ODBCDatabase.SetToggleHdl(LINK(this, OMySQLIntroPageSetup, OnSetupModeSelected));
@@ -257,7 +252,6 @@ DBG_NAME(OMySQLIntroPageSetup)
OMySQLIntroPageSetup::~OMySQLIntroPageSetup()
{
- DBG_DTOR(OMySQLIntroPageSetup,NULL);
}
void OMySQLIntroPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool /*_bSaveValue*/)
@@ -643,13 +637,11 @@ DBG_NAME(OMySQLIntroPageSetup)
return ( new OSpreadSheetConnectionPageSetup( pParent, _rAttrSet ) );
}
-DBG_NAME(OSpreadSheetConnectionPageSetup)
OSpreadSheetConnectionPageSetup::OSpreadSheetConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs )
:OConnectionTabPageSetup(pParent, PAGE_DBWIZARD_SPREADSHEET, _rCoreAttrs, STR_SPREADSHEET_HELPTEXT, STR_SPREADSHEET_HEADERTEXT, STR_SPREADSHEETPATH)
, m_aCBPasswordrequired(this, ModuleRes(CB_SPREADSHEETPASSWORDREQUIRED))
{
- DBG_CTOR(OSpreadSheetConnectionPageSetup,NULL);
m_aCBPasswordrequired.SetToggleHdl(getControlModifiedLink());
FreeResource();
@@ -658,7 +650,6 @@ DBG_NAME(OSpreadSheetConnectionPageSetup)
OSpreadSheetConnectionPageSetup::~OSpreadSheetConnectionPageSetup()
{
- DBG_DTOR(OSpreadSheetConnectionPageSetup,NULL);
}
void OSpreadSheetConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& /*_rControlList*/)
@@ -689,7 +680,6 @@ DBG_NAME(OSpreadSheetConnectionPageSetup)
return ( new OAuthentificationPageSetup( pParent, _rAttrSet) );
}
-DBG_NAME(OAuthentificationPageSetup)
OAuthentificationPageSetup::OAuthentificationPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs )
:OGenericAdministrationPage(pParent, ModuleRes(PAGE_DBWIZARD_AUTHENTIFICATION), _rCoreAttrs )
@@ -700,7 +690,6 @@ DBG_NAME(OAuthentificationPageSetup)
, m_aCBPasswordRequired (this, ModuleRes(CB_GENERALPASSWORDREQUIRED))
, m_aPBTestConnection (this, ModuleRes(PB_TESTCONNECTION))
{
- DBG_CTOR(OAuthentificationPageSetup,NULL);
SetControlFontWeight(&m_aFTHeaderText);
m_aETUserName.SetModifyHdl(getControlModifiedLink());
@@ -714,7 +703,6 @@ DBG_NAME(OAuthentificationPageSetup)
OAuthentificationPageSetup::~OAuthentificationPageSetup()
{
- DBG_DTOR(OAuthentificationPageSetup,NULL);
}
void OAuthentificationPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList)
@@ -763,7 +751,6 @@ DBG_NAME(OAuthentificationPageSetup)
return ( new OFinalDBPageSetup( pParent, _rAttrSet) );
}
-DBG_NAME(OFinalDBPageSetup)
OFinalDBPageSetup::OFinalDBPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs )
:OGenericAdministrationPage(pParent, ModuleRes(PAGE_DBWIZARD_FINAL), _rCoreAttrs )
@@ -776,7 +763,6 @@ DBG_NAME(OFinalDBPageSetup)
, m_aCBStartTableWizard (this, ModuleRes(CB_STARTTABLEWIZARD))
, m_aFTFinalText (this, ModuleRes(FT_FINALTEXT))
{
- DBG_CTOR(OFinalDBPageSetup,NULL);
SetControlFontWeight(&m_aFTFinalHeader);
m_aCBOpenAfterwards.SetClickHdl(LINK(this, OFinalDBPageSetup, OnOpenSelected));
@@ -816,7 +802,6 @@ DBG_NAME(OFinalDBPageSetup)
OFinalDBPageSetup::~OFinalDBPageSetup()
{
- DBG_DTOR(OFinalDBPageSetup,NULL);
}
sal_Bool OFinalDBPageSetup::IsDatabaseDocumentToBeRegistered()
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index d211173ab422..17be35bb6738 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -48,7 +48,6 @@ using namespace ::dbaui;
using namespace ::dbtools;
// class ORelationDialog
-DBG_NAME(ORelationDialog)
ORelationDialog::ORelationDialog( OJoinTableView* pParent,
const TTableConnectionData::value_type& pConnectionData,
sal_Bool bAllowTableSelect )
@@ -73,7 +72,6 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent,
,m_pOrigConnData( pConnectionData )
,m_bTriedOneUpdate(sal_False)
{
- DBG_CTOR(ORelationDialog,NULL);
m_xConnection = pParent->getDesignView()->getController().getConnection();
@@ -145,7 +143,6 @@ void ORelationDialog::Init(const TTableConnectionData::value_type& _pConnectionD
ORelationDialog::~ORelationDialog()
{
- DBG_DTOR(ORelationDialog,NULL);
}
IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ )
diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
index f19080e9536e..a57b7538f7dd 100644
--- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
+++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
@@ -36,7 +36,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::container;
-DBG_NAME(OTableSubscriptionDialog)
// OTableSubscriptionDialog
OTableSubscriptionDialog::OTableSubscriptionDialog(Window* pParent
,SfxItemSet* _pItems
@@ -48,7 +47,6 @@ OTableSubscriptionDialog::OTableSubscriptionDialog(Window* pParent
, m_bStopExecution(sal_False)
, m_pOutSet(_pItems)
{
- DBG_CTOR(OTableSubscriptionDialog,NULL);
m_pImpl->setDataSourceOrName(_aDataSourceName);
Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource();
m_pOutSet = new SfxItemSet( *_pItems );
@@ -63,7 +61,6 @@ OTableSubscriptionDialog::OTableSubscriptionDialog(Window* pParent
OTableSubscriptionDialog::~OTableSubscriptionDialog()
{
- DBG_DTOR(OTableSubscriptionDialog,NULL);
delete m_pOutSet;
}
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index ad34c2423cab..f80510cb71a3 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -56,7 +56,6 @@
namespace dbaui
{
-DBG_NAME(OTextConnectionHelper)
OTextConnectionHelper::OTextConnectionHelper( Window* pParent, const short _nAvailableSections )
:Control( pParent, WB_DIALOGCONTROL )
@@ -84,7 +83,6 @@ DBG_NAME(OTextConnectionHelper)
,m_aTextNone (ModuleRes(STR_AUTOTEXT_FIELD_SEP_NONE))
,m_nAvailableSections( _nAvailableSections )
{
- DBG_CTOR(OTextConnectionHelper,NULL);
sal_Int32 nCnt = comphelper::string::getTokenCount(m_aFieldSeparatorList, '\t');
sal_Int32 i;
@@ -207,7 +205,6 @@ DBG_NAME(OTextConnectionHelper)
OTextConnectionHelper::~OTextConnectionHelper()
{
- DBG_DTOR(OTextConnectionHelper,NULL);
}
IMPL_LINK(OTextConnectionHelper, OnControlModified, Control*, /*EMPTYARG*/)
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index b07ae4d40459..1c3256cc1cb9 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -123,7 +123,6 @@ IMPL_LINK( OPasswordDialog, ModifiedHdl, Edit *, pEdit )
return 0;
}
-DBG_NAME(OUserAdmin);
// OUserAdmin
OUserAdmin::OUserAdmin(Window* pParent,const SfxItemSet& _rAttrSet)
: OGenericAdministrationPage( pParent, ModuleRes(TAB_PAGE_USERADMIN), _rAttrSet)
@@ -136,7 +135,6 @@ OUserAdmin::OUserAdmin(Window* pParent,const SfxItemSet& _rAttrSet)
,m_FL_TABLE_GRANTS( this , ModuleRes(FL_TABLE_GRANTS))
,m_TableCtrl( this , ModuleRes(CTRL_TABLE_GRANTS))
{
- DBG_CTOR(OUserAdmin,NULL);
m_LB_USER.SetSelectHdl(LINK(this, OUserAdmin, ListDblClickHdl));
m_PB_NEWUSER.SetClickHdl(LINK(this, OUserAdmin, UserHdl));
@@ -148,7 +146,6 @@ OUserAdmin::OUserAdmin(Window* pParent,const SfxItemSet& _rAttrSet)
OUserAdmin::~OUserAdmin()
{
- DBG_DTOR(OUserAdmin,NULL);
m_xConnection = NULL;
}
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index c5868d6de365..d14f4802fbb5 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -47,7 +47,6 @@ namespace dbaui
using namespace ::com::sun::star::sdbcx;
// OUserAdminDlg
-DBG_NAME(OUserAdminDlg)
OUserAdminDlg::OUserAdminDlg(Window* _pParent
, SfxItemSet* _pItems
,const Reference< XComponentContext >& _rxORB
@@ -58,7 +57,6 @@ DBG_NAME(OUserAdminDlg)
,m_xConnection(_xConnection)
,m_bOwnConnection(!_xConnection.is())
{
- DBG_CTOR(OUserAdminDlg,NULL);
m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,_pParent,this));
m_pImpl->setDataSourceOrName(_aDataSourceName);
@@ -92,7 +90,6 @@ DBG_NAME(OUserAdminDlg)
SetInputSet(NULL);
DELETEZ(pExampleSet);
- DBG_DTOR(OUserAdminDlg,NULL);
}
short OUserAdminDlg::Execute()
{
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index d1f53f9ac873..bd47c4f5830c 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -58,7 +58,6 @@ namespace dbaui
}
// OGenericAdministrationPage
- DBG_NAME(OGenericAdministrationPage)
OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent, const ResId& _rId, const SfxItemSet& _rAttrSet)
:SfxTabPage(_pParent, _rId, _rAttrSet)
,m_abEnableRoadmap(sal_False)
@@ -66,7 +65,6 @@ namespace dbaui
,m_pItemSetHelper(NULL)
,m_pFT_HeaderText(NULL)
{
- DBG_CTOR(OGenericAdministrationPage,NULL);
SetExchangeSupport(sal_True);
}
@@ -78,7 +76,6 @@ namespace dbaui
,m_pItemSetHelper(NULL)
,m_pFT_HeaderText(NULL)
{
- DBG_CTOR(OGenericAdministrationPage,NULL);
SetExchangeSupport(sal_True);
}
@@ -87,7 +84,6 @@ namespace dbaui
{
DELETEZ(m_pFT_HeaderText);
- DBG_DTOR(OGenericAdministrationPage,NULL);
}
int OGenericAdministrationPage::DeactivatePage(SfxItemSet* _pSet)
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index b8bdd5151fc0..d3053724bcf2 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -48,7 +48,6 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::container;
// ODbAdminDialog
-DBG_NAME(ODbAdminDialog)
ODbAdminDialog::ODbAdminDialog(Window* _pParent
, SfxItemSet* _pItems
, const Reference< XComponentContext >& _rxContext
@@ -58,7 +57,6 @@ ODbAdminDialog::ODbAdminDialog(Window* _pParent
,m_bUIEnabled( sal_True )
,m_nMainPageID( PAGE_CONNECTION )
{
- DBG_CTOR(ODbAdminDialog,NULL);
m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxContext,this,this));
@@ -76,7 +74,6 @@ ODbAdminDialog::~ODbAdminDialog()
SetInputSet(NULL);
DELETEZ(pExampleSet);
- DBG_DTOR(ODbAdminDialog,NULL);
}
short ODbAdminDialog::Ok()
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 4522ad090dbb..fbf0dfba8d96 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -40,7 +40,6 @@ using namespace ::svt;
const OString aGroupIdent("dBase III");
-DBG_NAME(ODbaseIndexDialog)
ODbaseIndexDialog::ODbaseIndexDialog( Window * pParent, OUString aDataSrcName )
: ModalDialog( pParent, ModuleRes(DLG_DBASE_INDEXES) ),
@@ -61,7 +60,6 @@ ODbaseIndexDialog::ODbaseIndexDialog( Window * pParent, OUString aDataSrcName )
m_aDSN(aDataSrcName),
m_bCaseSensitiv(sal_True)
{
- DBG_CTOR(ODbaseIndexDialog,NULL);
aCB_Tables.SetSelectHdl( LINK(this, ODbaseIndexDialog, TableSelectHdl) );
aIB_Add.SetClickHdl( LINK(this, ODbaseIndexDialog, AddClickHdl) );
@@ -82,7 +80,6 @@ ODbaseIndexDialog::ODbaseIndexDialog( Window * pParent, OUString aDataSrcName )
ODbaseIndexDialog::~ODbaseIndexDialog()
{
- DBG_DTOR(ODbaseIndexDialog,NULL);
}
sal_Bool ODbaseIndexDialog::GetTable(const OUString& _rName, TableInfoList::iterator& _rPosition)
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index ae57cc294190..85c2beef440e 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -62,7 +62,6 @@ using namespace com::sun::star::container;
#define ADDITIONAL_USERDEFINED 11
#define ADDITIONAL_PAGE_MYSQL_NATIVE 12
-DBG_NAME(ODbTypeWizDialog)
// ODbTypeWizDialog
ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent
,SfxItemSet* _pItems
@@ -75,7 +74,6 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent
,m_bApplied(sal_False)
,m_bUIEnabled( sal_True )
{
- DBG_CTOR(ODbTypeWizDialog,NULL);
m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,this,this));
m_pImpl->setDataSourceOrName(_aDataSourceName);
Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource();
@@ -106,7 +104,6 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent
ODbTypeWizDialog::~ODbTypeWizDialog()
{
- DBG_DTOR(ODbTypeWizDialog,NULL);
delete m_pOutSet;
}
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 32b00df23b6f..f08047aa49e3 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -104,7 +104,6 @@ using namespace ::com::sun::star::document;
using namespace ::comphelper;
using namespace ::cppu;
-DBG_NAME(ODbTypeWizDialogSetup)
// ODbTypeWizDialogSetup
ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent
,SfxItemSet* _pItems
@@ -139,7 +138,6 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent
, m_pFinalPage( NULL )
, m_pCollection( NULL )
{
- DBG_CTOR(ODbTypeWizDialogSetup,NULL);
// no local resources needed anymore
// extract the datasource type collection from the item set
DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, _pItems->GetItem(DSID_TYPECOLLECTION));
@@ -278,7 +276,6 @@ OUString ODbTypeWizDialogSetup::getStateDisplayName( WizardState _nState ) const
ODbTypeWizDialogSetup::~ODbTypeWizDialogSetup()
{
delete m_pOutSet;
- DBG_DTOR(ODbTypeWizDialogSetup,NULL);
}
IMPL_LINK(ODbTypeWizDialogSetup, OnTypeSelected, OGeneralPage*, /*_pTabPage*/)
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 936e451016f4..fe4afacbb944 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -59,7 +59,6 @@ namespace dbaui
using namespace ::dbtools;
// OCommonBehaviourTabPage
- DBG_NAME(OCommonBehaviourTabPage)
OCommonBehaviourTabPage::OCommonBehaviourTabPage(Window* pParent, sal_uInt16 nResId, const SfxItemSet& _rCoreAttrs,
sal_uInt32 nControlFlags,bool _bFreeResource)
@@ -77,7 +76,6 @@ namespace dbaui
,m_pAutoRetrieving(NULL)
,m_nControlFlags(nControlFlags)
{
- DBG_CTOR(OCommonBehaviourTabPage,NULL);
if ((m_nControlFlags & CBTP_USE_OPTIONS) == CBTP_USE_OPTIONS)
{
@@ -134,7 +132,6 @@ namespace dbaui
DELETEZ(m_pAutoRetrievingLabel);
DELETEZ(m_pAutoRetrieving);
- DBG_DTOR(OCommonBehaviourTabPage,NULL);
}
void OCommonBehaviourTabPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList)
@@ -204,7 +201,6 @@ namespace dbaui
}
// ODbaseDetailsPage
- DBG_NAME(ODbaseDetailsPage)
ODbaseDetailsPage::ODbaseDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
:OCommonBehaviourTabPage(pParent, PAGE_DBASE, _rCoreAttrs, CBTP_USE_CHARSET ,false)
,m_aShowDeleted (this, ModuleRes(CB_SHOWDELETEDROWS))
@@ -212,7 +208,6 @@ namespace dbaui
,m_aFT_Message (this, ModuleRes( FT_SPECIAL_MESSAGE) )
,m_aIndexes (this, ModuleRes(PB_INDICIES))
{
- DBG_CTOR(ODbaseDetailsPage,NULL);
m_aIndexes.SetClickHdl(LINK(this, ODbaseDetailsPage, OnButtonClicked));
m_aShowDeleted.SetClickHdl(LINK(this, ODbaseDetailsPage, OnButtonClicked));
@@ -226,7 +221,6 @@ namespace dbaui
ODbaseDetailsPage::~ODbaseDetailsPage()
{
- DBG_DTOR(ODbaseDetailsPage,NULL);
}
SfxTabPage* ODriversSettings::CreateDbase( Window* pParent, const SfxItemSet& _rAttrSet )
@@ -297,18 +291,15 @@ namespace dbaui
}
// OAdoDetailsPage
- DBG_NAME(OAdoDetailsPage)
OAdoDetailsPage::OAdoDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
:OCommonBehaviourTabPage(pParent, PAGE_ADO, _rCoreAttrs, CBTP_USE_CHARSET )
{
- DBG_CTOR(OAdoDetailsPage,NULL);
}
OAdoDetailsPage::~OAdoDetailsPage()
{
- DBG_DTOR(OAdoDetailsPage,NULL);
}
SfxTabPage* ODriversSettings::CreateAdo( Window* pParent, const SfxItemSet& _rAttrSet )
{
@@ -794,11 +785,9 @@ namespace dbaui
}
// OTextDetailsPage
- DBG_NAME(OTextDetailsPage)
OTextDetailsPage::OTextDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
:OCommonBehaviourTabPage(pParent, PAGE_TEXT, _rCoreAttrs, 0, false )
{
- DBG_CTOR(OTextDetailsPage,NULL);
m_pTextConnectionHelper = new OTextConnectionHelper( this, TC_EXTENSION | TC_HEADER | TC_SEPARATORS | TC_CHARSET );
FreeResource();
@@ -808,7 +797,6 @@ namespace dbaui
{
DELETEZ(m_pTextConnectionHelper);
- DBG_DTOR(OTextDetailsPage,NULL);
}
SfxTabPage* ODriversSettings::CreateText( Window* pParent, const SfxItemSet& _rAttrSet )
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index ef2084fea9dd..ceabc44dab44 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -35,7 +35,6 @@ namespace dbaui
using namespace ::com::sun::star::lang;
// DirectSQLDialog
-DBG_NAME(DirectSQLDialog)
DirectSQLDialog::DirectSQLDialog( Window* _pParent, const Reference< XConnection >& _rxConn )
:ModalDialog(_pParent, "DirectSQLDialog" , "dbaccess/ui/directsqldialog.ui")
,m_nHistoryLimit(20)
@@ -57,7 +56,6 @@ DBG_NAME(DirectSQLDialog)
m_pOutput->set_height_request(aSize.Height());
get(m_pClose,"close");
- DBG_CTOR(DirectSQLDialog,NULL);
m_pSQL->GrabFocus();
@@ -83,7 +81,6 @@ DBG_NAME(DirectSQLDialog)
stopAllComponentListening();
}
- DBG_DTOR(DirectSQLDialog,NULL);
}
void DirectSQLDialog::_disposing( const EventObject& _rSource )
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index a882d0c07910..0a83ba3e8bc4 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -33,14 +33,12 @@
#include "moduledbu.hxx"
using namespace dbaui;
-DBG_NAME(SbaSbAttrDlg)
SbaSbAttrDlg::SbaSbAttrDlg(Window* pParent, const SfxItemSet* pCellAttrs,
SvNumberFormatter* pFormatter, bool bHasFormat, bool bRow)
: SfxTabDialog(pParent, "FieldDialog", "dbaccess/ui/fielddialog.ui", pCellAttrs)
, m_nNumberFormatId(0)
{
- DBG_CTOR(SbaSbAttrDlg,NULL);
pNumberInfoItem = new SvxNumberInfoItem( pFormatter, 0 );
@@ -55,7 +53,6 @@ SbaSbAttrDlg::~SbaSbAttrDlg()
{
delete pNumberInfoItem;
- DBG_DTOR(SbaSbAttrDlg,NULL);
}
void SbaSbAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx
index c7645146e107..757176a4ffdd 100644
--- a/dbaccess/source/ui/dlg/dlgsize.cxx
+++ b/dbaccess/source/ui/dlg/dlgsize.cxx
@@ -27,7 +27,6 @@ namespace dbaui
#define DEF_ROW_HEIGHT 45
#define DEF_COL_WIDTH 227
-DBG_NAME(DlgSize)
DlgSize::DlgSize( Window* pParent, sal_Int32 nVal, sal_Bool bRow, sal_Int32 _nAlternativeStandard )
: ModalDialog(pParent, bRow ? OString("RowHeightDialog") : OString("ColWidthDialog"),
bRow ? OUString("dbaccess/ui/rowheightdialog.ui") : OUString("dbaccess/ui/colwidthdialog.ui"))
diff --git a/dbaccess/source/ui/dlg/finteraction.cxx b/dbaccess/source/ui/dlg/finteraction.cxx
index ba4adf9f3881..dde1f813a96f 100644
--- a/dbaccess/source/ui/dlg/finteraction.cxx
+++ b/dbaccess/source/ui/dlg/finteraction.cxx
@@ -29,18 +29,15 @@ namespace dbaui
using namespace ::com::sun::star::ucb;
// OFilePickerInteractionHandler
- DBG_NAME( OFilePickerInteractionHandler )
OFilePickerInteractionHandler::OFilePickerInteractionHandler( const Reference< XInteractionHandler >& _rxMaster )
:m_xMaster( _rxMaster )
,m_bDoesNotExist(sal_False)
{
- DBG_CTOR( OFilePickerInteractionHandler, NULL );
OSL_ENSURE( m_xMaster.is(), "OFilePickerInteractionHandler::OFilePickerInteractionHandler: invalid master handler!" );
}
OFilePickerInteractionHandler::~OFilePickerInteractionHandler( )
{
- DBG_DTOR( OFilePickerInteractionHandler, NULL );
}
void SAL_CALL OFilePickerInteractionHandler::handle( const Reference< XInteractionRequest >& _rxRequest ) throw (RuntimeException)
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index f9c264b00806..3dcea07934ef 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -153,7 +153,6 @@ namespace dbaui
}
// DbaIndexDialog
-DBG_NAME(DbaIndexDialog)
DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence< OUString >& _rFieldNames,
const Reference< XNameAccess >& _rxIndexes,
const Reference< XConnection >& _rxConnection,
@@ -176,7 +175,6 @@ DBG_NAME(DbaIndexDialog)
,m_bEditAgain(sal_False)
,m_xContext(_rxContext)
{
- DBG_CTOR(DbaIndexDialog,NULL);
FreeResource();
@@ -304,7 +302,6 @@ DBG_NAME(DbaIndexDialog)
delete m_pIndexes;
delete m_pFields;
- DBG_DTOR(DbaIndexDialog,NULL);
}
sal_Bool DbaIndexDialog::implCommit(SvTreeListEntry* _pEntry)
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index e697807c394b..824abc2ce0c8 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -88,7 +88,6 @@ namespace dbaui
}
// IndexFieldsControl
-DBG_NAME(IndexFieldsControl)
IndexFieldsControl::IndexFieldsControl( Window* _pParent, const ResId& _rId ,sal_Int32 _nMaxColumnsInIndex,sal_Bool _bAddIndexAppendix)
:EditBrowseBox(_pParent, _rId, EBBF_SMART_TAB_TRAVEL | EBBF_ACTIVATE_ON_BUTTONDOWN, BROWSER_STANDARD_FLAGS)
,m_aSeekRow(m_aFields.end())
@@ -97,7 +96,6 @@ DBG_NAME(IndexFieldsControl)
,m_nMaxColumnsInIndex(_nMaxColumnsInIndex)
,m_bAddIndexAppendix(_bAddIndexAppendix)
{
- DBG_CTOR(IndexFieldsControl,NULL);
SetUniqueId( UID_DLGINDEX_INDEXDETAILS_BACK );
GetDataWindow().SetUniqueId( UID_DLGINDEX_INDEXDETAILS_MAIN );
@@ -108,7 +106,6 @@ DBG_NAME(IndexFieldsControl)
delete m_pSortingCell;
delete m_pFieldNameCell;
- DBG_DTOR(IndexFieldsControl,NULL);
}
sal_Bool IndexFieldsControl::SeekRow(long nRow)
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index e462ff45bfad..f54b3f2ad19f 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -103,12 +103,10 @@ typedef SQLRETURN (SQL_API* TSQLDataSources) (SQLHENV EnvironmentHandle, SQLUSMA
#endif
// OOdbcLibWrapper
-DBG_NAME(OOdbcLibWrapper)
#ifdef HAVE_ODBC_SUPPORT
OOdbcLibWrapper::OOdbcLibWrapper()
:m_pOdbcLib(NULL)
{
- DBG_CTOR(OOdbcLibWrapper,NULL);
}
@@ -146,7 +144,6 @@ OOdbcLibWrapper::~OOdbcLibWrapper()
{
unload();
- DBG_DTOR(OOdbcLibWrapper,NULL);
}
// OOdbcEnumeration
@@ -160,7 +157,6 @@ struct OdbcTypesImpl
#endif
};
-DBG_NAME(OOdbcEnumeration)
OOdbcEnumeration::OOdbcEnumeration()
#ifdef HAVE_ODBC_SUPPORT
:m_pAllocHandle(NULL)
@@ -169,7 +165,6 @@ OOdbcEnumeration::OOdbcEnumeration()
,m_pImpl(new OdbcTypesImpl)
#endif
{
- DBG_CTOR(OOdbcEnumeration,NULL);
sal_Bool bLoaded = load(ODBC_LIBRARY);
#ifdef ODBC_LIBRARY_1
@@ -201,7 +196,6 @@ OOdbcEnumeration::~OOdbcEnumeration()
freeEnv();
delete m_pImpl;
- DBG_DTOR(OOdbcEnumeration,NULL);
}
sal_Bool OOdbcEnumeration::allocEnv()
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index 8849d60f3ee4..3e6b657ac8a0 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -50,7 +50,6 @@ namespace dbaui
// OParameterDialog
-DBG_NAME(OParameterDialog)
OParameterDialog::OParameterDialog(
Window* pParent, const Reference< XIndexAccess > & rParamContainer,
@@ -68,7 +67,6 @@ DBG_NAME(OParameterDialog)
,m_aPredicateInput( rxContext, _rxConnection, getParseContext() )
,m_bNeedErrorOnCurrent(sal_True)
{
- DBG_CTOR(OParameterDialog,NULL);
if (rxContext.is())
m_xFormatter = Reference< XNumberFormatter>( NumberFormatter::create( rxContext ), UNO_QUERY_THROW);
@@ -127,7 +125,6 @@ DBG_NAME(OParameterDialog)
if (m_aResetVisitFlag.IsActive())
m_aResetVisitFlag.Stop();
- DBG_DTOR(OParameterDialog,NULL);
}
void OParameterDialog::Construct()
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index 47a81a314872..3b55949e99cf 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -62,7 +62,6 @@ void Replace_SQL_PlaceHolder(OUString& aString)
aString = aString.replaceAll( "_", "?" );
}
-DBG_NAME(DlgFilterCrit);
DlgFilterCrit::DlgFilterCrit(Window * pParent,
const Reference< XComponentContext >& rxContext,
@@ -98,7 +97,6 @@ DlgFilterCrit::DlgFilterCrit(Window * pParent,
,m_xMetaData( _rxConnection->getMetaData() )
,m_aPredicateInput( rxContext, _rxConnection, getParseContext() )
{
- DBG_CTOR(DlgFilterCrit,NULL);
// Write the String for noEntry into the ListBoxes of the field names
aLB_WHEREFIELD1.InsertEntry( aSTR_NOENTRY );
aLB_WHEREFIELD2.InsertEntry( aSTR_NOENTRY );
@@ -201,7 +199,6 @@ DlgFilterCrit::DlgFilterCrit(Window * pParent,
DlgFilterCrit::~DlgFilterCrit()
{
- DBG_DTOR(DlgFilterCrit,NULL);
}
#define LbText(x) ((x).GetSelectEntry())
@@ -466,7 +463,6 @@ IMPL_LINK( DlgFilterCrit, PredicateLoseFocus, Edit*, _pField )
void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Bool _bOr )
{
- DBG_CHKTHIS(DlgFilterCrit,NULL);
OUString aCondition;
_rItem.Value >>= aCondition;
OUString aStr = aCondition;
@@ -563,7 +559,6 @@ void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Boo
void DlgFilterCrit::SelectField( ListBox& rBox, const OUString& rField )
{
- DBG_CHKTHIS(DlgFilterCrit,NULL);
sal_uInt16 nCnt = rBox.GetEntryCount();
for( sal_uInt16 i=0 ; i<nCnt ; i++ )
@@ -580,7 +575,6 @@ void DlgFilterCrit::SelectField( ListBox& rBox, const OUString& rField )
void DlgFilterCrit::EnableLines()
{
- DBG_CHKTHIS(DlgFilterCrit,NULL);
// enabling/disabling of whole lines
if( LbPos(aLB_WHEREFIELD1) == 0 )
{
@@ -749,7 +743,6 @@ IMPL_LINK_INLINE_END( DlgFilterCrit, ListSelectCompHdl, ListBox *, pListBox )
void DlgFilterCrit::BuildWherePart()
{
- DBG_CHKTHIS(DlgFilterCrit,NULL);
Sequence<Sequence<PropertyValue> > aFilter,aHaving;
aFilter.realloc(1);
aHaving.realloc(1);
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index 3909cfffdd7f..d7c9b67f84fe 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -42,7 +42,6 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::beans;
-DBG_NAME(DlgOrderCrit)
DlgOrderCrit::DlgOrderCrit(Window * pParent,
const Reference< XConnection>& _rxConnection,
@@ -54,7 +53,6 @@ DlgOrderCrit::DlgOrderCrit(Window * pParent,
, m_xColumns(_rxCols)
, m_xConnection(_rxConnection)
{
- DBG_CTOR(DlgOrderCrit,NULL);
get(m_pLB_ORDERFIELD1, "field1");
get(m_pLB_ORDERVALUE1, "value1");
@@ -128,12 +126,10 @@ DlgOrderCrit::DlgOrderCrit(Window * pParent,
DlgOrderCrit::~DlgOrderCrit()
{
- DBG_DTOR(DlgOrderCrit,NULL);
}
IMPL_LINK_INLINE_START( DlgOrderCrit, FieldListSelectHdl, ListBox *, /*pListBox*/ )
{
- DBG_CHKTHIS(DlgOrderCrit,NULL);
EnableLines();
return 0;
}
@@ -174,7 +170,6 @@ void DlgOrderCrit::impl_initializeOrderList_nothrow()
void DlgOrderCrit::EnableLines()
{
- DBG_CHKTHIS(DlgOrderCrit,NULL);
if ( m_pLB_ORDERFIELD1->GetSelectEntryPos() == 0 )
{
@@ -207,7 +202,6 @@ void DlgOrderCrit::EnableLines()
OUString DlgOrderCrit::GetOrderList( ) const
{
- DBG_CHKTHIS(DlgOrderCrit,NULL);
Reference<XDatabaseMetaData> xMetaData = m_xConnection->getMetaData();
OUString sQuote = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : OUString();
static const OUString sDESC(" DESC ");
@@ -236,7 +230,6 @@ OUString DlgOrderCrit::GetOrderList( ) const
void DlgOrderCrit::BuildOrderPart()
{
- DBG_CHKTHIS(DlgOrderCrit,NULL);
m_xQueryComposer->setOrder(GetOrderList());
}
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index f5689c2979b7..7bdd1725b7f1 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -313,7 +313,6 @@ protected:
DECL_LINK(OnExceptionSelected, void*);
};
-DBG_NAME(OExceptionChainDialog)
OExceptionChainDialog::OExceptionChainDialog( Window* pParent, const ExceptionDisplayChain& _rExceptions )
:ModalDialog(pParent, ModuleRes(DLG_SQLEXCEPTIONCHAIN))
,m_aFrame (this, ModuleRes(FL_DETAILS))
@@ -324,7 +323,6 @@ OExceptionChainDialog::OExceptionChainDialog( Window* pParent, const ExceptionDi
,m_aOK (this, ModuleRes(PB_OK))
,m_aExceptions( _rExceptions )
{
- DBG_CTOR(OExceptionChainDialog,NULL);
m_sStatusLabel = ModuleRes( STR_EXCEPTION_STATUS );
m_sErrorCodeLabel = ModuleRes( STR_EXCEPTION_ERRORCODE );
@@ -370,7 +368,6 @@ OExceptionChainDialog::OExceptionChainDialog( Window* pParent, const ExceptionDi
OExceptionChainDialog::~OExceptionChainDialog()
{
- DBG_DTOR(OExceptionChainDialog,NULL);
}
IMPL_LINK_NOARG(OExceptionChainDialog, OnExceptionSelected)
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index d2cad30a1c8f..cddc248d7f7c 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -70,8 +70,6 @@ namespace dbaui
using namespace ::comphelper;
// OTableSubscriptionPage
-DBG_NAME(OTableSubscriptionPage)
-
OTableSubscriptionPage::OTableSubscriptionPage(Window* pParent, const SfxItemSet& _rCoreAttrs,
OTableSubscriptionDialog* _pTablesDlg)
: OGenericAdministrationPage(pParent, "TablesFilterPage",
@@ -85,8 +83,6 @@ DBG_NAME(OTableSubscriptionPage)
m_pTablesList->set_width_request(56 * m_pTablesList->approximate_char_width());
m_pTablesList->set_height_request(12 * m_pTablesList->GetTextHeight());
- DBG_CTOR(OTableSubscriptionPage,NULL);
-
m_pTablesList->SetCheckHandler(getControlModifiedLink());
// initialize the TabListBox
@@ -110,7 +106,6 @@ DBG_NAME(OTableSubscriptionPage)
}
catch (RuntimeException&) { }
- DBG_DTOR(OTableSubscriptionPage,NULL);
}
void OTableSubscriptionPage::StateChanged( StateChangedType nType )
diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx
index 8e899fc6d7ad..a5cb656acb97 100644
--- a/dbaccess/source/ui/inc/TableConnection.hxx
+++ b/dbaccess/source/ui/inc/TableConnection.hxx
@@ -36,7 +36,6 @@ namespace dbaui
class OJoinTableView;
class OConnectionLine;
- DBG_NAMEEX(OTableConnection)
class OTableConnection : public Window
{
::std::vector<OConnectionLine*> m_vConnLine;
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index bd5cdbbfa9a6..0ee5e2c63e51 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -81,7 +81,6 @@ using namespace ::com::sun::star::awt;
namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOperation;
// ODatabaseExport
-DBG_NAME(ODatabaseExport)
ODatabaseExport::ODatabaseExport(sal_Int32 nRows,
const TPositions &_rColumnPositions,
const Reference< XNumberFormatter >& _rxNumberF,
@@ -113,7 +112,6 @@ ODatabaseExport::ODatabaseExport(sal_Int32 nRows,
,m_bAppendFirstLine(false)
{
SAL_INFO("dbaccess.ui", "ODatabaseExport::ODatabaseExport" );
- DBG_CTOR(ODatabaseExport,NULL);
m_nRows += nRows;
sal_Int32 nCount = 0;
@@ -170,7 +168,6 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection,
,m_bAppendFirstLine(false)
{
SAL_INFO("dbaccess.ui", "ODatabaseExport::ODatabaseExport" );
- DBG_CTOR(ODatabaseExport,NULL);
try
{
SvtSysLocale aSysLocale;
@@ -291,7 +288,6 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection,
ODatabaseExport::~ODatabaseExport()
{
- DBG_DTOR(ODatabaseExport,NULL);
m_pFormatter = NULL;
ODatabaseExport::TColumns::iterator aIter = m_aDestColumns.begin();
ODatabaseExport::TColumns::iterator aEnd = m_aDestColumns.end();
@@ -305,7 +301,6 @@ ODatabaseExport::~ODatabaseExport()
void ODatabaseExport::insertValueIntoColumn()
{
SAL_INFO("dbaccess.ui", "ODatabaseExport::insertValueIntoColumn" );
- DBG_CHKTHIS(ODatabaseExport,NULL);
if(m_nColumnPos < sal_Int32(m_vDestVector.size()))
{
OFieldDescription* pField = m_vDestVector[m_nColumnPos]->second;
@@ -420,7 +415,6 @@ void ODatabaseExport::insertValueIntoColumn()
sal_Int16 ODatabaseExport::CheckString(const OUString& aCheckToken, sal_Int16 _nOldNumberFormat)
{
SAL_INFO("dbaccess.ui", "ODatabaseExport::CheckString" );
- DBG_CHKTHIS(ODatabaseExport,NULL);
double fOutNumber = 0.0;
sal_Int16 nNumberFormat = 0;
@@ -568,7 +562,6 @@ sal_Int16 ODatabaseExport::CheckString(const OUString& aCheckToken, sal_Int16 _n
void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfoMap* _pInfoMap)
{
SAL_INFO("dbaccess.ui", "ODatabaseExport::SetColumnTypes" );
- DBG_CHKTHIS(ODatabaseExport,NULL);
if(_pList && _pInfoMap)
{
OSL_ENSURE(m_vNumberFormat.size() == m_vColumnSize.size() && m_vColumnSize.size() == _pList->size(),"Illegal columns in list");
@@ -641,7 +634,6 @@ void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfo
void ODatabaseExport::CreateDefaultColumn(const OUString& _rColumnName)
{
SAL_INFO("dbaccess.ui", "ODatabaseExport::CreateDefaultColumn" );
- DBG_CHKTHIS(ODatabaseExport,NULL);
Reference< XDatabaseMetaData> xDestMetaData(m_xConnection->getMetaData());
sal_Int32 nMaxNameLen(xDestMetaData->getMaxColumnNameLength());
OUString aAlias = _rColumnName;
@@ -694,7 +686,6 @@ void ODatabaseExport::CreateDefaultColumn(const OUString& _rColumnName)
sal_Bool ODatabaseExport::createRowSet()
{
SAL_INFO("dbaccess.ui", "ODatabaseExport::createRowSet" );
- DBG_CHKTHIS(ODatabaseExport,NULL);
m_pUpdateHelper.reset(new OParameterUpdateHelper(createPreparedStatment(m_xConnection->getMetaData(),m_xTable,m_vColumns)));
return m_pUpdateHelper.get() != NULL;
@@ -703,7 +694,6 @@ sal_Bool ODatabaseExport::createRowSet()
sal_Bool ODatabaseExport::executeWizard(const OUString& _rTableName,const Any& _aTextColor,const FontDescriptor& _rFont)
{
SAL_INFO("dbaccess.ui", "ODatabaseExport::executeWizard" );
- DBG_CHKTHIS(ODatabaseExport,NULL);
bool bHaveDefaultTable = !m_sDefaultTableName.isEmpty();
OUString sTableName( bHaveDefaultTable ? m_sDefaultTableName : _rTableName );
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index 540c5d387d94..e2755b4231ca 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -66,7 +66,6 @@ using namespace ::com::sun::star::awt;
#define DBAUI_HTML_FONTSIZES 8 // like export, HTML-Options
-DBG_NAME(OHTMLReader)
// OHTMLReader
OHTMLReader::OHTMLReader(SvStream& rIn,const SharedConnection& _rxConnection,
const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF,
@@ -81,7 +80,6 @@ OHTMLReader::OHTMLReader(SvStream& rIn,const SharedConnection& _rxConnection,
,m_bSDNum(sal_False)
{
SAL_INFO("dbaccess.ui", "OHTMLReader::OHTMLReader" );
- DBG_CTOR(OHTMLReader,NULL);
SetSrcEncoding( GetExtendedCompatibilityTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) );
// If the file starts with a BOM, switch to UCS2.
SetSwitchToUCS2( sal_True );
@@ -103,7 +101,6 @@ OHTMLReader::OHTMLReader(SvStream& rIn,
,m_bSDNum(sal_False)
{
SAL_INFO("dbaccess.ui", "OHTMLReader::OHTMLReader" );
- DBG_CTOR(OHTMLReader,NULL);
SetSrcEncoding( GetExtendedCompatibilityTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) );
// If the file starts with a BOM, switch to UCS2.
SetSwitchToUCS2( sal_True );
@@ -111,13 +108,11 @@ OHTMLReader::OHTMLReader(SvStream& rIn,
OHTMLReader::~OHTMLReader()
{
- DBG_DTOR(OHTMLReader,NULL);
}
SvParserState OHTMLReader::CallParser()
{
SAL_INFO("dbaccess.ui", "OHTMLReader::CallParser" );
- DBG_CHKTHIS(OHTMLReader,NULL);
rInput.Seek(STREAM_SEEK_TO_BEGIN);
rInput.ResetError();
SvParserState eParseState = HTMLParser::CallParser();
@@ -128,7 +123,6 @@ SvParserState OHTMLReader::CallParser()
void OHTMLReader::NextToken( int nToken )
{
SAL_INFO("dbaccess.ui", "OHTMLReader::NextToken" );
- DBG_CHKTHIS(OHTMLReader,NULL);
if(m_bError || !m_nRows) // if there is an error or no more rows to check, return immediatelly
return;
if ( nToken == HTML_META )
@@ -320,7 +314,6 @@ void OHTMLReader::fetchOptions()
void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal)
{
SAL_INFO("dbaccess.ui", "OHTMLReader::TableDataOn" );
- DBG_CHKTHIS(OHTMLReader,NULL);
const HTMLOptions& rHtmlOptions = GetOptions();
for (size_t i = 0, n = rHtmlOptions.size(); i < n; ++i)
{
@@ -350,7 +343,6 @@ void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal)
void OHTMLReader::TableFontOn(FontDescriptor& _rFont,sal_Int32 &_rTextColor)
{
SAL_INFO("dbaccess.ui", "OHTMLReader::TableFontOn" );
- DBG_CHKTHIS(OHTMLReader,NULL);
const HTMLOptions& rHtmlOptions = GetOptions();
for (size_t i = 0, n = rHtmlOptions.size(); i < n; ++i)
{
@@ -400,7 +392,6 @@ void OHTMLReader::TableFontOn(FontDescriptor& _rFont,sal_Int32 &_rTextColor)
sal_Int16 OHTMLReader::GetWidthPixel( const HTMLOption& rOption )
{
SAL_INFO("dbaccess.ui", "OHTMLReader::GetWidthPixel" );
- DBG_CHKTHIS(OHTMLReader,NULL);
const OUString& rOptVal = rOption.GetString();
if ( rOptVal.indexOf('%') != -1 )
{ // percentage
@@ -422,7 +413,6 @@ sal_Int16 OHTMLReader::GetWidthPixel( const HTMLOption& rOption )
sal_Bool OHTMLReader::CreateTable(int nToken)
{
SAL_INFO("dbaccess.ui", "OHTMLReader::CreateTable" );
- DBG_CHKTHIS(OHTMLReader,NULL);
OUString aTempName(ModuleRes(STR_TBL_TITLE));
aTempName = aTempName.getToken(0,' ');
aTempName = ::dbtools::createUniqueName(m_xTables, aTempName);
@@ -533,7 +523,6 @@ sal_Bool OHTMLReader::CreateTable(int nToken)
void OHTMLReader::setTextEncoding()
{
SAL_INFO("dbaccess.ui", "OHTMLReader::setTextEncoding" );
- DBG_CHKTHIS(OHTMLReader,NULL);
m_bMetaOptions = sal_True;
ParseMetaOptions(NULL, NULL);
}
@@ -541,14 +530,12 @@ void OHTMLReader::setTextEncoding()
void OHTMLReader::release()
{
SAL_INFO("dbaccess.ui", "OHTMLReader::release" );
- DBG_CHKTHIS(OHTMLReader,NULL);
ReleaseRef();
}
TypeSelectionPageFactory OHTMLReader::getTypeSelectionPageFactory()
{
SAL_INFO("dbaccess.ui", "OHTMLReader::getTypeSelectionPageFactory" );
- DBG_CHKTHIS(OHTMLReader,NULL);
return &OWizHTMLExtend::Create;
}
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx
index b3a1b48e29ae..9951a4d1419e 100644
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@@ -55,7 +55,6 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::awt;
-DBG_NAME(ORTFReader)
// ORTFReader
ORTFReader::ORTFReader( SvStream& rIn,
const SharedConnection& _rxConnection,
@@ -67,7 +66,6 @@ ORTFReader::ORTFReader( SvStream& rIn,
,ODatabaseExport( _rxConnection, _rxNumberF, _rxContext, pList, _pInfoMap, rIn )
{
SAL_INFO("dbaccess.ui", "ORTFReader::ORTFReader" );
- DBG_CTOR(ORTFReader,NULL);
m_bAppendFirstLine = false;
}
@@ -83,19 +81,16 @@ ORTFReader::ORTFReader(SvStream& rIn,
,ODatabaseExport( nRows, _rColumnPositions, _rxNumberF, _rxContext, pList, _pInfoMap, _bAutoIncrementEnabled, rIn )
{
SAL_INFO("dbaccess.ui", "ORTFReader::ORTFReader" );
- DBG_CTOR(ORTFReader,NULL);
m_bAppendFirstLine = false;
}
ORTFReader::~ORTFReader()
{
- DBG_DTOR(ORTFReader,NULL);
}
SvParserState ORTFReader::CallParser()
{
SAL_INFO("dbaccess.ui", "ORTFReader::CallParser" );
- DBG_CHKTHIS(ORTFReader,NULL);
rInput.Seek(STREAM_SEEK_TO_BEGIN);
rInput.ResetError();
SvParserState eParseState = SvRTFParser::CallParser();
@@ -106,7 +101,6 @@ SvParserState ORTFReader::CallParser()
void ORTFReader::NextToken( int nToken )
{
SAL_INFO("dbaccess.ui", "ORTFReader::NextToken" );
- DBG_CHKTHIS(ORTFReader,NULL);
if(m_bError || !m_nRows) // if there is an error or no more rows to check, return immediatelly
return;
@@ -259,7 +253,6 @@ void ORTFReader::NextToken( int nToken )
sal_Bool ORTFReader::CreateTable(int nToken)
{
SAL_INFO("dbaccess.ui", "ORTFReader::CreateTable" );
- DBG_CHKTHIS(ORTFReader,NULL);
OUString aTableName(ModuleRes(STR_TBL_TITLE));
aTableName = aTableName.getToken(0,' ');
aTableName = ::dbtools::createUniqueName(m_xTables, aTableName);
@@ -343,14 +336,12 @@ sal_Bool ORTFReader::CreateTable(int nToken)
void ORTFReader::release()
{
SAL_INFO("dbaccess.ui", "ORTFReader::release" );
- DBG_CHKTHIS(ORTFReader,NULL);
ReleaseRef();
}
TypeSelectionPageFactory ORTFReader::getTypeSelectionPageFactory()
{
SAL_INFO("dbaccess.ui", "ORTFReader::getTypeSelectionPageFactory" );
- DBG_CHKTHIS(ORTFReader,NULL);
return &OWizRTFExtend::Create;
}
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index e57d8bc8dafc..fc6b67f54c85 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -80,7 +80,6 @@ const static char sFontSize[] = "font-size: ";
#define SBA_FORMAT_SELECTION_COUNT 4
#define CELL_X 1437
-DBG_NAME(ODatabaseImportExport)
ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor& _aDataDescriptor,
const Reference< XComponentContext >& _rM,
const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF,
@@ -96,7 +95,6 @@ ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor&
,m_bCheckOnly(sal_False)
{
SAL_INFO("dbaccess.ui", "ODatabaseImportExport::ODatabaseImportExport" );
- DBG_CTOR(ODatabaseImportExport,NULL);
m_eDestEnc = osl_getThreadTextEncoding();
@@ -128,7 +126,6 @@ ODatabaseImportExport::ODatabaseImportExport( const ::dbtools::SharedConnection&
,m_bCheckOnly(sal_False)
{
SAL_INFO("dbaccess.ui", "ODatabaseImportExport::ODatabaseImportExport" );
- DBG_CTOR(ODatabaseImportExport,NULL);
m_eDestEnc = osl_getThreadTextEncoding();
try
{
@@ -142,7 +139,6 @@ ODatabaseImportExport::ODatabaseImportExport( const ::dbtools::SharedConnection&
ODatabaseImportExport::~ODatabaseImportExport()
{
- DBG_DTOR(ODatabaseImportExport,NULL);
acquire();
dispose();
@@ -155,7 +151,6 @@ ODatabaseImportExport::~ODatabaseImportExport()
void ODatabaseImportExport::dispose()
{
SAL_INFO("dbaccess.ui", "ODatabaseImportExport::disposing" );
- DBG_CHKTHIS(ODatabaseImportExport,NULL);
// remove me as listener
Reference< XComponent > xComponent(m_xConnection, UNO_QUERY);
if (xComponent.is())
@@ -178,7 +173,6 @@ void ODatabaseImportExport::dispose()
void SAL_CALL ODatabaseImportExport::disposing( const EventObject& Source ) throw(::com::sun::star::uno::RuntimeException)
{
SAL_INFO("dbaccess.ui", "ODatabaseImportExport::disposing" );
- DBG_CHKTHIS(ODatabaseImportExport,NULL);
Reference<XConnection> xCon(Source.Source,UNO_QUERY);
if(m_xConnection.is() && m_xConnection == xCon)
{
@@ -197,7 +191,6 @@ void ODatabaseImportExport::initialize( const ODataAccessDescriptor& _aDataDescr
void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor& _aDataDescriptor, bool _bPlusDefaultInit)
{
SAL_INFO("dbaccess.ui", "ODatabaseImportExport::impl_initFromDescriptor" );
- DBG_CHKTHIS(ODatabaseImportExport,NULL);
if ( !_bPlusDefaultInit )
{
m_sDataSourceName = _aDataDescriptor.getDataSource();
@@ -260,7 +253,6 @@ void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor
void ODatabaseImportExport::initialize()
{
SAL_INFO("dbaccess.ui", "ODatabaseImportExport::initialize" );
- DBG_CHKTHIS(ODatabaseImportExport,NULL);
m_bInInitialize = sal_True;
m_bNeedToReInitialize = false;
diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx
index 86bfb4034ecc..dae1258b3783 100644
--- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx
+++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx
@@ -27,12 +27,10 @@
namespace dbaui
{
- DBG_NAME(OToolBoxHelper)
OToolBoxHelper::OToolBoxHelper()
: m_nSymbolsSize(-1 )
, m_pToolBox(NULL)
{
- DBG_CTOR(OToolBoxHelper,NULL);
OSL_ENSURE(m_nSymbolsSize != SvtMiscOptions().GetCurrentSymbolsSize(),"SymbolsSize should not be identical");
SvtMiscOptions().AddListenerLink( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) );
@@ -42,7 +40,6 @@ namespace dbaui
{
SvtMiscOptions().RemoveListenerLink( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) );
Application::RemoveEventListener( LINK( this, OToolBoxHelper, SettingsChanged ) );
- DBG_DTOR(OToolBoxHelper,NULL);
}
void OToolBoxHelper::checkImageList()
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index ad6439f56833..ae2d42216130 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -51,7 +51,6 @@ using namespace ::com::sun::star::sdbcx;
namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOperation;
// Klasse OCopyTable
-DBG_NAME(OCopyTable)
OCopyTable::OCopyTable( Window * pParent )
:OWizardPage( pParent, ModuleRes(TAB_WIZ_COPYTABLE) )
,m_ftTableName( this, ModuleRes( FT_TABLENAME ) )
@@ -69,7 +68,6 @@ OCopyTable::OCopyTable( Window * pParent )
,m_pPage3(NULL)
,m_bUseHeaderAllowed(sal_True)
{
- DBG_CTOR(OCopyTable,NULL);
m_edTableName.SetMaxTextLen(EDIT_NOLIMIT);
@@ -108,12 +106,10 @@ OCopyTable::OCopyTable( Window * pParent )
OCopyTable::~OCopyTable()
{
- DBG_DTOR(OCopyTable,NULL);
}
IMPL_LINK( OCopyTable, AppendDataClickHdl, Button*, /*pButton*/ )
{
- DBG_CHKTHIS(OCopyTable,NULL);
SetAppendDataRadio();
return 0;
@@ -130,7 +126,6 @@ void OCopyTable::SetAppendDataRadio()
IMPL_LINK( OCopyTable, RadioChangeHdl, Button*, pButton )
{
- DBG_CHKTHIS(OCopyTable,NULL);
m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,pButton != &m_aRB_View);
sal_Bool bKey = m_bPKeyAllowed && pButton != &m_aRB_View;
m_aFT_KeyName.Enable(bKey && m_aCB_PrimaryColumn.IsChecked());
@@ -151,7 +146,6 @@ IMPL_LINK( OCopyTable, RadioChangeHdl, Button*, pButton )
IMPL_LINK( OCopyTable, KeyClickHdl, Button*, /*pButton*/ )
{
- DBG_CHKTHIS(OCopyTable,NULL);
m_edKeyName.Enable(m_aCB_PrimaryColumn.IsChecked());
m_aFT_KeyName.Enable(m_aCB_PrimaryColumn.IsChecked());
return 0;
@@ -159,7 +153,6 @@ IMPL_LINK( OCopyTable, KeyClickHdl, Button*, /*pButton*/ )
sal_Bool OCopyTable::LeavePage()
{
- DBG_CHKTHIS(OCopyTable,NULL);
m_pParent->m_bCreatePrimaryKeyColumn = (m_bPKeyAllowed && m_aCB_PrimaryColumn.IsEnabled()) ? m_aCB_PrimaryColumn.IsChecked() : sal_False;
m_pParent->m_aKeyName = m_pParent->m_bCreatePrimaryKeyColumn ? m_edKeyName.GetText() : OUString();
m_pParent->setUseHeaderLine( m_aCB_UseHeaderLine.IsChecked() );
@@ -245,7 +238,6 @@ sal_Bool OCopyTable::LeavePage()
void OCopyTable::ActivatePage()
{
- DBG_CHKTHIS(OCopyTable,NULL);
m_pParent->GetOKButton().Enable( sal_True );
m_nOldOperation = m_pParent->getOperation();
m_edTableName.GrabFocus();
@@ -254,13 +246,11 @@ void OCopyTable::ActivatePage()
OUString OCopyTable::GetTitle() const
{
- DBG_CHKTHIS(OCopyTable,NULL);
return ModuleRes(STR_WIZ_TABLE_COPY);
}
void OCopyTable::Reset()
{
- DBG_CHKTHIS(OCopyTable,NULL);
m_bFirstTime = sal_False;
m_edTableName.SetText( m_pParent->m_sName );
@@ -269,7 +259,6 @@ void OCopyTable::Reset()
sal_Bool OCopyTable::checkAppendData()
{
- DBG_CHKTHIS(OCopyTable,NULL);
m_pParent->clearDestColumns();
Reference< XPropertySet > xTable;
Reference< XTablesSupplier > xSup( m_pParent->m_xDestConnection, UNO_QUERY );
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index ff4a6eb5aaaf..7b88e533f59c 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -52,7 +52,6 @@ OWizardPage::OWizardPage( Window* pParent, const ResId& rResId )
}
// OWizColumnSelect
-DBG_NAME(OWizColumnSelect);
OWizColumnSelect::OWizColumnSelect( Window* pParent)
:OWizardPage( pParent, ModuleRes( TAB_WIZ_COLUMN_SELECT ))
,m_flColumns( this, ModuleRes( FL_COLUMN_SELECT ) )
@@ -63,7 +62,6 @@ OWizColumnSelect::OWizColumnSelect( Window* pParent)
,m_ibColumns_LH( this, ModuleRes( IB_COLUMNS_LH ) )
,m_lbNewColumnNames( this, ModuleRes( LB_NEW_COLUMN_NAMES ) )
{
- DBG_CTOR(OWizColumnSelect,NULL);
m_ibColumn_RH.SetClickHdl(LINK(this,OWizColumnSelect,ButtonClickHdl));
m_ibColumn_LH.SetClickHdl(LINK(this,OWizColumnSelect,ButtonClickHdl));
m_ibColumns_RH.SetClickHdl(LINK(this,OWizColumnSelect,ButtonClickHdl));
@@ -79,7 +77,6 @@ OWizColumnSelect::OWizColumnSelect( Window* pParent)
OWizColumnSelect::~OWizColumnSelect()
{
- DBG_DTOR(OWizColumnSelect,NULL);
while ( m_lbNewColumnNames.GetEntryCount() )
{
void* pData = m_lbNewColumnNames.GetEntryData(0);
@@ -94,7 +91,6 @@ OWizColumnSelect::~OWizColumnSelect()
void OWizColumnSelect::Reset()
{
// restore original state
- DBG_CHKTHIS(OWizColumnSelect,NULL);
clearListBox(m_lbOrgColumnNames);
clearListBox(m_lbNewColumnNames);
@@ -119,7 +115,6 @@ void OWizColumnSelect::Reset()
void OWizColumnSelect::ActivatePage( )
{
- DBG_CHKTHIS(OWizColumnSelect,NULL);
// if there are no dest columns reset the left side with the origibnal columns
if(m_pParent->getDestColumns()->empty())
Reset();
@@ -143,7 +138,6 @@ void OWizColumnSelect::ActivatePage( )
sal_Bool OWizColumnSelect::LeavePage()
{
- DBG_CHKTHIS(OWizColumnSelect,NULL);
m_pParent->clearDestColumns();
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 053fa5c63acd..a8b8bfafd662 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -80,7 +80,6 @@ namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOper
#define MAX_PAGES 4 // max. number of pages, which are shown
-DBG_NAME(OCopyTableWizard)
namespace
{
void clearColumns(ODatabaseExport::TColumns& _rColumns, ODatabaseExport::TColumnVector& _rColumnsVec)
@@ -527,7 +526,6 @@ OCopyTableWizard::OCopyTableWizard( Window * pParent, const OUString& _rDefaultN
,m_bCreatePrimaryKeyColumn(sal_False)
{
SAL_INFO("dbaccess.ui", "OCopyTableWizard::OCopyTableWizard" );
- DBG_CTOR(OCopyTableWizard,NULL);
construct();
// extract table name
@@ -626,7 +624,6 @@ OCopyTableWizard::OCopyTableWizard( Window* pParent, const OUString& _rDefaultNa
,m_bCreatePrimaryKeyColumn(sal_False)
{
SAL_INFO("dbaccess.ui", "OCopyTableWizard::OCopyTableWizard" );
- DBG_CTOR(OCopyTableWizard,NULL);
construct();
ODatabaseExport::TColumnVector::const_iterator aIter = _rSourceColVec.begin();
ODatabaseExport::TColumnVector::const_iterator aEnd = _rSourceColVec.end();
@@ -689,7 +686,6 @@ void OCopyTableWizard::construct()
OCopyTableWizard::~OCopyTableWizard()
{
- DBG_DTOR(OCopyTableWizard,NULL);
for ( ;; )
{
TabPage *pPage = GetPage(0);
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 958b0640bbb7..284f267cb381 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -30,7 +30,6 @@
using namespace ::dbaui;
// OWizColumnSelect
-DBG_NAME(OWizNameMatching)
OWizNameMatching::OWizNameMatching( Window* pParent)
:OWizardPage( pParent, ModuleRes( TAB_WIZ_NAME_MATCHING ) )
,m_FT_TABLE_LEFT( this, ModuleRes( FT_TABLE_LEFT ) )
@@ -45,7 +44,6 @@ OWizNameMatching::OWizNameMatching( Window* pParent)
,m_pbNone( this, ModuleRes( PB_NONE ) )
{
- DBG_CTOR(OWizNameMatching,NULL);
m_ibColumn_up.SetClickHdl(LINK(this,OWizNameMatching,ButtonClickHdl));
m_ibColumn_down.SetClickHdl(LINK(this,OWizNameMatching,ButtonClickHdl));
@@ -73,13 +71,11 @@ OWizNameMatching::OWizNameMatching( Window* pParent)
OWizNameMatching::~OWizNameMatching()
{
- DBG_DTOR(OWizNameMatching,NULL);
}
void OWizNameMatching::Reset()
{
// urspr"unglichen zustand wiederherstellen
- DBG_CHKTHIS(OWizNameMatching,NULL);
// the left tree contains bitmaps so i need to resize the right one
if(m_bFirstTime)
{
@@ -95,7 +91,6 @@ void OWizNameMatching::Reset()
void OWizNameMatching::ActivatePage( )
{
- DBG_CHKTHIS(OWizNameMatching,NULL);
// set source table name
OUString aName = m_sSourceText;
@@ -123,7 +118,6 @@ void OWizNameMatching::ActivatePage( )
sal_Bool OWizNameMatching::LeavePage()
{
- DBG_CHKTHIS(OWizNameMatching,NULL);
const ODatabaseExport::TColumnVector* pSrcColumns = m_pParent->getSrcVector();
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index b1c3c970f645..4b16adf0e7d2 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -42,18 +42,15 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star::sdbc;
// OWizTypeSelectControl
-DBG_NAME(OWizTypeSelectControl)
OWizTypeSelectControl::OWizTypeSelectControl(Window* pParent, const ResId& rResId,OTableDesignHelpBar* pHelpBar)
: OFieldDescControl(pParent,rResId,pHelpBar)
{
- DBG_CTOR(OWizTypeSelectControl,NULL);
}
OWizTypeSelectControl::~OWizTypeSelectControl()
{
- DBG_DTOR(OWizTypeSelectControl,NULL);
}
void OWizTypeSelectControl::ActivateAggregate( EControlType eType )
@@ -212,7 +209,6 @@ OUString OWizTypeSelectControl::getAutoIncrementValue() const
return ((OWizTypeSelect*)GetParent())->m_sAutoIncrementValue;
}
-DBG_NAME(OWizTypeSelect);
#define IMG_PRIMARY_KEY 1
OWizTypeSelect::OWizTypeSelect( Window* pParent, SvStream* _pStream )
:OWizardPage( pParent, ModuleRes( TAB_WIZ_TYPE_SELECT ))
@@ -228,7 +224,6 @@ OWizTypeSelect::OWizTypeSelect( Window* pParent, SvStream* _pStream )
,m_bAutoIncrementEnabled(sal_False)
,m_bDuplicateName(sal_False)
{
- DBG_CTOR(OWizTypeSelect,NULL);
m_lbColumnNames.SetSelectHdl(LINK(this,OWizTypeSelect,ColumnSelectHdl));
ModuleRes aModuleRes(IMG_JOINS);
@@ -257,18 +252,15 @@ OWizTypeSelect::OWizTypeSelect( Window* pParent, SvStream* _pStream )
OWizTypeSelect::~OWizTypeSelect()
{
- DBG_DTOR(OWizTypeSelect,NULL);
}
OUString OWizTypeSelect::GetTitle() const
{
- DBG_CHKTHIS(OWizTypeSelect,NULL);
return ModuleRes(STR_WIZ_TYPE_SELECT_TITEL);
}
void OWizTypeSelect::Resize()
{
- DBG_CHKTHIS(OWizTypeSelect,NULL);
}
IMPL_LINK( OWizTypeSelect, ColumnSelectHdl, MultiListBox *, /*pListBox*/ )
@@ -286,7 +278,6 @@ IMPL_LINK( OWizTypeSelect, ColumnSelectHdl, MultiListBox *, /*pListBox*/ )
void OWizTypeSelect::Reset()
{
// restore original state
- DBG_CHKTHIS(OWizTypeSelect,NULL);
while(m_lbColumnNames.GetEntryCount())
m_lbColumnNames.RemoveEntry(0);
@@ -311,7 +302,6 @@ void OWizTypeSelect::Reset()
void OWizTypeSelect::ActivatePage( )
{
- DBG_CHKTHIS(OWizTypeSelect,NULL);
sal_Bool bOldFirstTime = m_bFirstTime;
Reset();
m_bFirstTime = bOldFirstTime;
@@ -323,7 +313,6 @@ void OWizTypeSelect::ActivatePage( )
sal_Bool OWizTypeSelect::LeavePage()
{
- DBG_CHKTHIS(OWizTypeSelect,NULL);
OUString aColumnName( m_lbColumnNames.GetSelectEntry() );
sal_Bool bDuplicateName = sal_False;
@@ -338,7 +327,6 @@ sal_Bool OWizTypeSelect::LeavePage()
void OWizTypeSelect::EnableAuto(sal_Bool bEnable)
{
- DBG_CHKTHIS(OWizTypeSelect,NULL);
m_ftAuto.Show(bEnable);
m_etAuto.Show(bEnable);
m_pbAuto.Show(bEnable);
@@ -347,7 +335,6 @@ void OWizTypeSelect::EnableAuto(sal_Bool bEnable)
IMPL_LINK( OWizTypeSelect, ButtonClickHdl, Button *, /*pButton*/ )
{
- DBG_CHKTHIS(OWizTypeSelect,NULL);
sal_Int32 nBreakPos;
m_pParent->CheckColumns(nBreakPos);
fillColumnList(m_etAuto.GetText().toInt32());
@@ -359,7 +346,6 @@ IMPL_LINK( OWizTypeSelect, ButtonClickHdl, Button *, /*pButton*/ )
sal_Bool OWizTypeSelectList::IsPrimaryKeyAllowed() const
{
- DBG_CHKTHIS(OWizTypeSelect,NULL);
sal_uInt16 nCount = GetSelectEntryCount();
sal_uInt16 j;
@@ -445,7 +431,6 @@ bool OWizTypeSelectList::PreNotify( NotifyEvent& rEvt )
void OWizTypeSelect::fillColumnList(sal_uInt32 nRows)
{
- DBG_CHKTHIS(OWizTypeSelect,NULL);
if(m_pParserStream)
{
sal_uInt32 nTell = m_pParserStream->Tell(); // might change seek position of stream
diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx
index 56220db3f8dc..4ead10d78709 100644
--- a/dbaccess/source/ui/misc/linkeddocuments.cxx
+++ b/dbaccess/source/ui/misc/linkeddocuments.cxx
@@ -103,7 +103,6 @@ namespace dbaui
}
// OLinkedDocumentsAccess
- DBG_NAME(OLinkedDocumentsAccess)
OLinkedDocumentsAccess::OLinkedDocumentsAccess( Window* _pDialogParent, const Reference< XDatabaseDocumentUI >& i_rDocumentUI,
const Reference< XComponentContext >& _rxContext, const Reference< XNameAccess >& _rxContainer,
const Reference< XConnection>& _xConnection, const OUString& _sDataSourceName )
@@ -114,13 +113,11 @@ namespace dbaui
,m_pDialogParent(_pDialogParent)
,m_sDataSourceName(_sDataSourceName)
{
- DBG_CTOR(OLinkedDocumentsAccess,NULL);
OSL_ENSURE(m_xContext.is(), "OLinkedDocumentsAccess::OLinkedDocumentsAccess: invalid service factory!");
OSL_ENSURE(m_pDialogParent, "OLinkedDocumentsAccess::OLinkedDocumentsAccess: really need a dialog parent!");
}
OLinkedDocumentsAccess::~OLinkedDocumentsAccess()
{
- DBG_DTOR(OLinkedDocumentsAccess,NULL);
}
Reference< XComponent> OLinkedDocumentsAccess::impl_open( const OUString& _rLinkName, Reference< XComponent >& _xDefinition,
ElementOpenMode _eOpenMode, const ::comphelper::NamedValueCollection& _rAdditionalArgs )
diff --git a/dbaccess/source/ui/misc/moduledbu.cxx b/dbaccess/source/ui/misc/moduledbu.cxx
index d8dae7f4e652..050c69b5a785 100644
--- a/dbaccess/source/ui/misc/moduledbu.cxx
+++ b/dbaccess/source/ui/misc/moduledbu.cxx
@@ -46,11 +46,9 @@ public:
ResMgr* getResManager();
};
-DBG_NAME(OModuleImpl)
OModuleImpl::OModuleImpl()
:m_pResources(NULL)
{
- DBG_CTOR(OModuleImpl,NULL);
}
@@ -59,7 +57,6 @@ OModuleImpl::~OModuleImpl()
if (m_pResources)
delete m_pResources;
- DBG_DTOR(OModuleImpl,NULL);
}
ResMgr* OModuleImpl::getResManager()
diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
index f134f5bb46fe..36afe62d77f1 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
@@ -109,24 +109,20 @@ namespace
}
// class OConnectionLine
-DBG_NAME(OConnectionLine)
OConnectionLine::OConnectionLine( OTableConnection* _pConn, OConnectionLineDataRef _pLineData )
: m_pTabConn( _pConn )
,m_pData( _pLineData )
{
- DBG_CTOR(OConnectionLine,NULL);
}
OConnectionLine::OConnectionLine( const OConnectionLine& _rLine )
{
- DBG_CTOR(OConnectionLine,NULL);
m_pData = new OConnectionLineData( *_rLine.GetData() );
*this = _rLine;
}
OConnectionLine::~OConnectionLine()
{
- DBG_DTOR(OConnectionLine,NULL);
}
OConnectionLine& OConnectionLine::operator=( const OConnectionLine& rLine )
diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
index 95165a31f3e0..aa854421f8c4 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
@@ -189,7 +189,6 @@ namespace dbaui
}
OTableConnection::~OTableConnection()
{
- DBG_DTOR(OTableConnection,NULL);
// clear vector
clearLineData();
}
diff --git a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx
index a81a965d21c7..178a4508f927 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx
@@ -21,30 +21,25 @@
#include <tools/debug.hxx>
using namespace dbaui;
-DBG_NAME(OConnectionLineData)
//class OConnectionLineData
OConnectionLineData::OConnectionLineData()
{
- DBG_CTOR(OConnectionLineData,NULL);
}
OConnectionLineData::OConnectionLineData( const OUString& rSourceFieldName, const OUString& rDestFieldName )
:m_aSourceFieldName( rSourceFieldName )
,m_aDestFieldName( rDestFieldName )
{
- DBG_CTOR(OConnectionLineData,NULL);
}
OConnectionLineData::OConnectionLineData( const OConnectionLineData& rConnLineData )
: ::salhelper::SimpleReferenceObject()
{
- DBG_CTOR(OConnectionLineData,NULL);
*this = rConnLineData;
}
OConnectionLineData::~OConnectionLineData()
{
- DBG_DTOR(OConnectionLineData,NULL);
}
void OConnectionLineData::CopyFrom(const OConnectionLineData& rSource)
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index f49fdefa6fbb..6ae5c32e3637 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -148,17 +148,14 @@ OJoinTableView* AddTableDialogContext::getTableView() const
// OJoinController
-DBG_NAME(OJoinController)
OJoinController::OJoinController(const Reference< XComponentContext >& _rM)
:OJoinController_BASE(_rM)
,m_pAddTableDialog(NULL)
{
- DBG_CTOR(OJoinController,NULL);
}
OJoinController::~OJoinController()
{
- DBG_DTOR(OJoinController,NULL);
}
void SAL_CALL OJoinController::disposing( const EventObject& _rSource ) throw(RuntimeException)
diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx
index 70007d70601a..05a44d22ff17 100644
--- a/dbaccess/source/ui/querydesign/JoinExchange.cxx
+++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx
@@ -31,19 +31,16 @@ namespace dbaui
OUString OJoinExchObj::m_sJoinFormat;
// class OJoinExchObj
- DBG_NAME(OJoinExchObj)
OJoinExchObj::OJoinExchObj(const OJoinExchangeData& jxdSource,sal_Bool _bFirstEntry)
:m_bFirstEntry(_bFirstEntry)
,m_jxdSourceDescription(jxdSource)
,m_pDragListener(NULL)
{
- DBG_CTOR(OJoinExchObj,NULL);
// add available types to list
}
OJoinExchObj::~OJoinExchObj()
{
- DBG_DTOR(OJoinExchObj,NULL);
}
void OJoinExchObj::StartDrag( Window* _pWindow, sal_Int8 _nDragSourceActions, IDragTransferableListener* _pListener )
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 0d804f53e01c..718c7c5cf82b 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -62,14 +62,12 @@ using namespace ::com::sun::star::lang;
#define TABWIN_WIDTH_STD 120
#define TABWIN_HEIGHT_STD 120
-DBG_NAME(OScrollWindowHelper)
OScrollWindowHelper::OScrollWindowHelper( Window* pParent) : Window( pParent)
,m_aHScrollBar( this, WB_HSCROLL|WB_REPEAT|WB_DRAG )
,m_aVScrollBar( this, WB_VSCROLL|WB_REPEAT|WB_DRAG )
,m_pCornerWindow(new ScrollBarBox(this, WB_3DLOOK))
,m_pTableView(NULL)
{
- DBG_CTOR(OScrollWindowHelper,NULL);
// ScrollBars
@@ -89,7 +87,6 @@ OScrollWindowHelper::OScrollWindowHelper( Window* pParent) : Window( pParent)
OScrollWindowHelper::~OScrollWindowHelper()
{
- DBG_DTOR(OScrollWindowHelper,NULL);
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pCornerWindow);
SAL_WNODEPRECATED_DECLARATIONS_POP
@@ -155,7 +152,6 @@ void OScrollWindowHelper::Resize()
// class OJoinTableView
-DBG_NAME(OJoinTableView);
OJoinTableView::OJoinTableView( Window* pParent, OJoinDesignView* pView )
:Window( pParent,WB_BORDER )
,DropTargetHelper(this)
@@ -169,7 +165,6 @@ OJoinTableView::OJoinTableView( Window* pParent, OJoinDesignView* pView )
,m_pView( pView )
,m_pAccessible(NULL)
{
- DBG_CTOR(OJoinTableView,NULL);
SetSizePixel( Size(1000, 1000) );
InitColors();
@@ -179,7 +174,6 @@ OJoinTableView::OJoinTableView( Window* pParent, OJoinDesignView* pView )
OJoinTableView::~OJoinTableView()
{
- DBG_DTOR(OJoinTableView,NULL);
if( m_pAccessible )
{
m_pAccessible->clearTableView();
@@ -199,7 +193,6 @@ IMPL_LINK( OJoinTableView, ScrollHdl, ScrollBar*, pScrollBar )
void OJoinTableView::Resize()
{
- DBG_CHKTHIS(OJoinTableView,NULL);
Window::Resize();
m_aOutputSize = GetSizePixel();
@@ -232,13 +225,11 @@ void OJoinTableView::Resize()
sal_uLong OJoinTableView::GetTabWinCount()
{
- DBG_CHKTHIS(OJoinTableView,NULL);
return m_aTableMap.size();
}
bool OJoinTableView::RemoveConnection( OTableConnection* _pConn,sal_Bool _bDelete )
{
- DBG_CHKTHIS(OJoinTableView,NULL);
DeselectConn(_pConn);
// to force a redraw
@@ -264,7 +255,6 @@ bool OJoinTableView::RemoveConnection( OTableConnection* _pConn,sal_Bool _bDelet
OTableWindow* OJoinTableView::GetTabWindow( const OUString& rName )
{
- DBG_CHKTHIS(OJoinTableView,NULL);
OTableWindowMap::iterator aIter = m_aTableMap.find(rName);
return aIter == m_aTableMap.end() ? NULL : aIter->second;
@@ -313,7 +303,6 @@ OTableWindowData* OJoinTableView::CreateImpl(const OUString& _rComposedName
void OJoinTableView::AddTabWin(const OUString& _rComposedName, const OUString& rWinName, sal_Bool /*bNewTable*/)
{
- DBG_CHKTHIS(OJoinTableView,NULL);
OSL_ENSURE(!_rComposedName.isEmpty(),"There must be a table name supplied!");
TTableWindowData::value_type pNewTabWinData(createTableWindowData( _rComposedName, rWinName,rWinName ));
@@ -347,7 +336,6 @@ void OJoinTableView::AddTabWin(const OUString& _rComposedName, const OUString& r
void OJoinTableView::RemoveTabWin( OTableWindow* pTabWin )
{
- DBG_CHKTHIS(OJoinTableView,NULL);
// first delete all connections of this window to others
bool bRemove = true;
TTableWindowData::value_type pData = pTabWin->GetData();
@@ -519,7 +507,6 @@ void OJoinTableView::EnsureVisible(const Point& _rPoint,const Size& _rSize)
void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin )
{
- DBG_CHKTHIS(OJoinTableView,NULL);
// determine position:
// the window is divided into lines with height TABWIN_SPACING_Y+TABWIN_HEIGHT_STD.
// Then for each line is checked, if there is space for another window.
@@ -599,7 +586,6 @@ void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin )
void OJoinTableView::DataChanged(const DataChangedEvent& rDCEvt)
{
- DBG_CHKTHIS(OJoinTableView,NULL);
if (rDCEvt.GetType() == DATACHANGED_SETTINGS)
{
// consider the worst case: the colors changed, so adjust me
@@ -611,7 +597,6 @@ void OJoinTableView::DataChanged(const DataChangedEvent& rDCEvt)
void OJoinTableView::InitColors()
{
- DBG_CHKTHIS(OJoinTableView,NULL);
// the colors for the illustration should be the system colors
StyleSettings aSystemStyle = Application::GetSettings().GetStyleSettings();
SetBackground(Wallpaper(Color(aSystemStyle.GetDialogColor())));
@@ -619,7 +604,6 @@ void OJoinTableView::InitColors()
void OJoinTableView::BeginChildMove( OTableWindow* pTabWin, const Point& rMousePos )
{
- DBG_CHKTHIS(OJoinTableView,NULL);
if (m_pView->getController().isReadOnly())
return;
@@ -635,14 +619,12 @@ void OJoinTableView::BeginChildMove( OTableWindow* pTabWin, const Point& rMouseP
void OJoinTableView::NotifyTitleClicked( OTableWindow* pTabWin, const Point rMousePos )
{
- DBG_CHKTHIS(OJoinTableView,NULL);
DeselectConn(GetSelectedConn());
BeginChildMove(pTabWin, rMousePos);
}
void OJoinTableView::BeginChildSizing( OTableWindow* pTabWin, const Pointer& rPointer )
{
- DBG_CHKTHIS(OJoinTableView,NULL);
if (m_pView->getController().isReadOnly())
return;
@@ -654,7 +636,6 @@ void OJoinTableView::BeginChildSizing( OTableWindow* pTabWin, const Pointer& rPo
sal_Bool OJoinTableView::ScrollPane( long nDelta, sal_Bool bHoriz, sal_Bool bPaintScrollBars )
{
- DBG_CHKTHIS(OJoinTableView,NULL);
sal_Bool bRet = sal_True;
// adjust ScrollBar-Positions
@@ -732,7 +713,6 @@ sal_Bool OJoinTableView::ScrollPane( long nDelta, sal_Bool bHoriz, sal_Bool bPai
void OJoinTableView::Tracking( const TrackingEvent& rTEvt )
{
- DBG_CHKTHIS(OJoinTableView,NULL);
HideTracking();
if (rTEvt.IsTrackingEnded())
@@ -824,19 +804,16 @@ void OJoinTableView::Tracking( const TrackingEvent& rTEvt )
void OJoinTableView::ConnDoubleClicked( OTableConnection* /*pConnection*/ )
{
- DBG_CHKTHIS(OJoinTableView,NULL);
}
void OJoinTableView::MouseButtonDown( const MouseEvent& rEvt )
{
- DBG_CHKTHIS(OJoinTableView,NULL);
GrabFocus();
Window::MouseButtonDown(rEvt);
}
void OJoinTableView::MouseButtonUp( const MouseEvent& rEvt )
{
- DBG_CHKTHIS(OJoinTableView,NULL);
Window::MouseButtonUp(rEvt);
// Has a connection been selected?
if( !m_vTableConnection.empty() )
@@ -863,7 +840,6 @@ void OJoinTableView::MouseButtonUp( const MouseEvent& rEvt )
void OJoinTableView::KeyInput( const KeyEvent& rEvt )
{
- DBG_CHKTHIS(OJoinTableView,NULL);
sal_uInt16 nCode = rEvt.GetKeyCode().GetCode();
sal_Bool bShift = rEvt.GetKeyCode().IsShift();
sal_Bool bCtrl = rEvt.GetKeyCode().IsMod1();
@@ -879,7 +855,6 @@ void OJoinTableView::KeyInput( const KeyEvent& rEvt )
void OJoinTableView::DeselectConn(OTableConnection* pConn)
{
- DBG_CHKTHIS(OJoinTableView,NULL);
if (!pConn || !pConn->IsSelected())
return;
@@ -898,7 +873,6 @@ void OJoinTableView::DeselectConn(OTableConnection* pConn)
void OJoinTableView::SelectConn(OTableConnection* pConn)
{
- DBG_CHKTHIS(OJoinTableView,NULL);
DeselectConn(GetSelectedConn());
pConn->Select();
@@ -953,13 +927,11 @@ void OJoinTableView::SelectConn(OTableConnection* pConn)
void OJoinTableView::Paint( const Rectangle& rRect )
{
- DBG_CHKTHIS(OJoinTableView,NULL);
DrawConnections( rRect );
}
void OJoinTableView::InvalidateConnections()
{
- DBG_CHKTHIS(OJoinTableView,NULL);
// draw Joins
::std::for_each(m_vTableConnection.begin(),m_vTableConnection.end(),
::std::mem_fun(& OTableConnection::InvalidateConnection));
@@ -967,7 +939,6 @@ void OJoinTableView::InvalidateConnections()
void OJoinTableView::DrawConnections( const Rectangle& rRect )
{
- DBG_CHKTHIS(OJoinTableView,NULL);
// draw Joins
::std::for_each(m_vTableConnection.begin(),m_vTableConnection.end(),boost::bind( &OTableConnection::Draw, _1, boost::cref( rRect )));
// finally redraw the selected one above all others
@@ -991,13 +962,11 @@ sal_Int32 OJoinTableView::getConnectionCount(const OTableWindow* _pFromWin) cons
sal_Bool OJoinTableView::ExistsAConn(const OTableWindow* pFrom) const
{
- DBG_CHKTHIS(OJoinTableView,NULL);
return getTableConnections(pFrom) != m_vTableConnection.end();
}
void OJoinTableView::ClearAll()
{
- DBG_CHKTHIS(OJoinTableView,NULL);
SetUpdateMode(sal_False);
HideTabWins();
@@ -1020,7 +989,6 @@ void OJoinTableView::ClearAll()
sal_Bool OJoinTableView::ScrollWhileDragging()
{
- DBG_CHKTHIS(OJoinTableView,NULL);
OSL_ENSURE(m_pDragWin != NULL, "OJoinTableView::ScrollWhileDragging must not be called when a window is being dragged !");
// kill the timer
@@ -1109,7 +1077,6 @@ void OJoinTableView::invalidateAndModify(SfxUndoAction *_pAction)
void OJoinTableView::TabWinMoved(OTableWindow* ptWhich, const Point& ptOldPosition)
{
- DBG_CHKTHIS(OJoinTableView,NULL);
Point ptThumbPos(GetHScrollBar()->GetThumbPos(), GetVScrollBar()->GetThumbPos());
ptWhich->GetData()->SetPosition(ptWhich->GetPosPixel() + ptThumbPos);
@@ -1118,7 +1085,6 @@ void OJoinTableView::TabWinMoved(OTableWindow* ptWhich, const Point& ptOldPositi
void OJoinTableView::TabWinSized(OTableWindow* ptWhich, const Point& ptOldPosition, const Size& szOldSize)
{
- DBG_CHKTHIS(OJoinTableView,NULL);
ptWhich->GetData()->SetSize(ptWhich->GetSizePixel());
ptWhich->GetData()->SetPosition(ptWhich->GetPosPixel());
@@ -1127,7 +1093,6 @@ void OJoinTableView::TabWinSized(OTableWindow* ptWhich, const Point& ptOldPositi
sal_Bool OJoinTableView::IsAddAllowed()
{
- DBG_CHKTHIS(OJoinTableView,NULL);
// not, if Db readonly
if (m_pView->getController().isReadOnly())
@@ -1169,7 +1134,6 @@ void OJoinTableView::executePopup(const Point& _aPos,OTableConnection* _pSelConn
void OJoinTableView::Command(const CommandEvent& rEvt)
{
- DBG_CHKTHIS(OJoinTableView,NULL);
sal_Bool bHandled = sal_False;
@@ -1509,7 +1473,6 @@ void OJoinTableView::StateChanged( StateChangedType nType )
void OJoinTableView::HideTabWins()
{
- DBG_CHKTHIS(OJoinTableView,NULL);
SetUpdateMode(sal_False);
OTableWindowMap* pTabWins = GetTabWinMap();
diff --git a/dbaccess/source/ui/querydesign/QTableConnection.cxx b/dbaccess/source/ui/querydesign/QTableConnection.cxx
index 48ce949d29c2..879bdaee6817 100644
--- a/dbaccess/source/ui/querydesign/QTableConnection.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnection.cxx
@@ -23,25 +23,21 @@
#include "ConnectionLine.hxx"
using namespace dbaui;
// class OQueryTableConnection
-DBG_NAME(OQueryTableConnection)
OQueryTableConnection::OQueryTableConnection(OQueryTableView* pContainer, const TTableConnectionData::value_type& pTabConnData)
:OTableConnection(pContainer, pTabConnData)
,m_bVisited(sal_False)
{
- DBG_CTOR(OQueryTableConnection,NULL);
}
OQueryTableConnection::OQueryTableConnection(const OQueryTableConnection& rConn)
:OTableConnection( rConn )
{
- DBG_CTOR(OQueryTableConnection,NULL);
// no own members, so base class functionality is sufficient
}
OQueryTableConnection::~OQueryTableConnection()
{
- DBG_DTOR(OQueryTableConnection,NULL);
}
OQueryTableConnection& OQueryTableConnection::operator=(const OQueryTableConnection& rConn)
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
index 429e32a11352..81f53ba7f52f 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
@@ -24,19 +24,16 @@
using namespace dbaui;
// class OQueryTableConnectionData
-DBG_NAME(OQueryTableConnectionData)
OQueryTableConnectionData::OQueryTableConnectionData()
:OTableConnectionData()
,m_eJoinType (INNER_JOIN)
,m_bNatural(false)
{
- DBG_CTOR(OQueryTableConnectionData,NULL);
}
OQueryTableConnectionData::OQueryTableConnectionData( const OQueryTableConnectionData& rConnData )
:OTableConnectionData( rConnData )
{
- DBG_CTOR(OQueryTableConnectionData,NULL);
m_nFromEntryIndex = rConnData.m_nFromEntryIndex;
m_nDestEntryIndex = rConnData.m_nDestEntryIndex;
@@ -57,37 +54,31 @@ OQueryTableConnectionData::OQueryTableConnectionData(const TTableWindowData::val
,m_eFromType(TAB_NORMAL_FIELD)
,m_eDestType(TAB_NORMAL_FIELD)
{
- DBG_CTOR(OQueryTableConnectionData,NULL);
}
OQueryTableConnectionData::~OQueryTableConnectionData()
{
- DBG_DTOR(OQueryTableConnectionData,NULL);
}
OConnectionLineDataRef OQueryTableConnectionData::CreateLineDataObj()
{
- DBG_CHKTHIS(OQueryTableConnectionData,NULL);
// no specializing of LineDatas, so it is an instance of standard class
return new OConnectionLineData();
}
OConnectionLineDataRef OQueryTableConnectionData::CreateLineDataObj( const OConnectionLineData& rConnLineData )
{
- DBG_CHKTHIS(OQueryTableConnectionData,NULL);
return new OConnectionLineData( rConnLineData );
}
void OQueryTableConnectionData::CopyFrom(const OTableConnectionData& rSource)
{
- DBG_CHKTHIS(OQueryTableConnectionData,NULL);
// same as in base class, use of (non-virtual) operator=
*this = (const OQueryTableConnectionData&)rSource;
}
OQueryTableConnectionData& OQueryTableConnectionData::operator=(const OQueryTableConnectionData& rConnData)
{
- DBG_CHKTHIS(OQueryTableConnectionData,NULL);
if (&rConnData == this)
return *this;
@@ -106,13 +97,11 @@ OQueryTableConnectionData& OQueryTableConnectionData::operator=(const OQueryTabl
OUString OQueryTableConnectionData::GetAliasName(EConnectionSide nWhich) const
{
- DBG_CHKTHIS(OQueryTableConnectionData,NULL);
return nWhich == JTCS_FROM ? m_pReferencingTable->GetWinName() : m_pReferencedTable->GetWinName();
}
void OQueryTableConnectionData::InitFromDrag(const OTableFieldDescRef& rDragLeft, const OTableFieldDescRef& rDragRight)
{
- DBG_CHKTHIS(OQueryTableConnectionData,NULL);
// convert Information in rDrag into parameters for the base class init
OQueryTableWindow* pSourceWin = static_cast<OQueryTableWindow*>(rDragLeft->GetTabWindow());
OQueryTableWindow* pDestWin = static_cast<OQueryTableWindow*>(rDragRight->GetTabWindow());
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index 43e96642b95f..31fc0d5373a6 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -49,12 +49,10 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::beans;
using namespace dbaui;
// class OQueryTableWindow
-DBG_NAME(OQueryTableWindow)
OQueryTableWindow::OQueryTableWindow( Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias)
:OTableWindow( pParent, pTabWinData )
,m_nAliasNum(0)
{
- DBG_CTOR(OQueryTableWindow,NULL);
if (pszInitialAlias != NULL)
m_strInitialAlias = OUString(pszInitialAlias);
else
@@ -70,7 +68,6 @@ OQueryTableWindow::OQueryTableWindow( Window* pParent, const TTableWindowData::v
OQueryTableWindow::~OQueryTableWindow()
{
- DBG_DTOR(OQueryTableWindow,NULL);
}
sal_Bool OQueryTableWindow::Init()
diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.cxx b/dbaccess/source/ui/querydesign/QTableWindowData.cxx
index 238ea80b616f..9f825975e7bc 100644
--- a/dbaccess/source/ui/querydesign/QTableWindowData.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindowData.cxx
@@ -24,17 +24,14 @@ using namespace dbaui;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::uno;
-DBG_NAME(OQueryTableWindowData)
// class OQueryTableWindowData
OQueryTableWindowData::OQueryTableWindowData(const OUString& _rComposedName, const OUString& rTableName, const OUString& rTableAlias )
:OTableWindowData(NULL,_rComposedName, rTableName, rTableAlias)
{
- DBG_CTOR(OQueryTableWindowData,NULL);
}
OQueryTableWindowData::~OQueryTableWindowData()
{
- DBG_DTOR(OQueryTableWindowData,NULL);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 80d6b1f3bd21..723e120c4021 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2487,7 +2487,6 @@ namespace
}
// end of anonymouse namespace
-DBG_NAME(OQueryDesignView)
OQueryDesignView::OQueryDesignView( OQueryContainerWindow* _pParent,
OQueryController& _rController,
@@ -2497,7 +2496,6 @@ OQueryDesignView::OQueryDesignView( OQueryContainerWindow* _pParent,
,m_eChildFocus(NONE)
,m_bInSplitHandler( sal_False )
{
- DBG_CTOR(OQueryDesignView,NULL);
try
{
@@ -2528,7 +2526,6 @@ OQueryDesignView::~OQueryDesignView()
SAL_WNODEPRECATED_DECLARATIONS_POP
m_pSelectionBox = NULL;
- DBG_DTOR(OQueryDesignView,NULL);
}
IMPL_LINK( OQueryDesignView, SplitHdl, void*, /*p*/ )
diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
index 0ad9239d1899..8e0a95e70d26 100644
--- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
@@ -27,10 +27,8 @@
using namespace dbaui;
-DBG_NAME(OQueryTabConnUndoAction)
OQueryTabConnUndoAction::~OQueryTabConnUndoAction()
{
- DBG_DTOR(OQueryTabConnUndoAction,NULL);
if (m_bOwnerOfConn)
{ // I have the connection -> delete
m_pOwner->DeselectConn(m_pConnection);
@@ -43,7 +41,6 @@ OQueryTabConnUndoAction::OQueryTabConnUndoAction(OQueryTableView* pOwner, sal_uI
,m_pConnection(NULL)
,m_bOwnerOfConn(sal_False)
{
- DBG_CTOR(OQueryTabConnUndoAction,NULL);
}
OQueryAddTabConnUndoAction::OQueryAddTabConnUndoAction(OQueryTableView* pOwner)
diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
index bda12abf833b..ea760d1c7c5e 100644
--- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
@@ -27,32 +27,26 @@
#include "QueryTableView.hxx"
using namespace dbaui;
-DBG_NAME(OQueryDesignFieldUndoAct)
OQueryDesignFieldUndoAct::OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, sal_uInt16 nCommentID)
: OCommentUndoAction(nCommentID)
, pOwner(pSelBrwBox)
, m_nColumnPostion(BROWSER_INVALIDID)
{
- DBG_CTOR(OQueryDesignFieldUndoAct,NULL);
}
OQueryDesignFieldUndoAct::~OQueryDesignFieldUndoAct()
{
- DBG_DTOR(OQueryDesignFieldUndoAct,NULL);
pOwner = NULL;
}
-DBG_NAME(OQueryTabWinUndoAct )
OQueryTabWinUndoAct::OQueryTabWinUndoAct(OQueryTableView* pOwner, sal_uInt16 nCommentID)
:OQueryDesignUndoAction(pOwner, nCommentID)
,m_pTabWin(NULL)
{
- DBG_CTOR(OQueryTabWinUndoAct ,NULL);
}
OQueryTabWinUndoAct::~OQueryTabWinUndoAct()
{
- DBG_DTOR(OQueryTabWinUndoAct ,NULL);
if (m_bOwnerOfObjects)
{
// I should take care to delete the window if I am the only owner
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 08cb6a174367..8397a6a78ccd 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -222,22 +222,18 @@ namespace
}
// class OQueryTableView
-DBG_NAME(OQueryTableView)
OQueryTableView::OQueryTableView( Window* pParent,OQueryDesignView* pView)
: OJoinTableView( pParent,pView)
{
- DBG_CTOR(OQueryTableView,NULL);
SetHelpId(HID_CTL_QRYDGNTAB);
}
OQueryTableView::~OQueryTableView()
{
- DBG_DTOR(OQueryTableView,NULL);
}
sal_Int32 OQueryTableView::CountTableAlias(const OUString& rName, sal_Int32& rMax)
{
- DBG_CHKTHIS(OQueryTableView,NULL);
sal_Int32 nRet = 0;
OTableWindowMap::iterator aIter = GetTabWinMap()->find(rName);
@@ -254,7 +250,6 @@ sal_Int32 OQueryTableView::CountTableAlias(const OUString& rName, sal_Int32& rMa
void OQueryTableView::ReSync()
{
- DBG_CHKTHIS(OQueryTableView,NULL);
TTableWindowData* pTabWinDataList = m_pView->getController().getTableWindowData();
OSL_ENSURE((getTableConnections()->size()==0) && (GetTabWinMap()->size()==0),
"before calling OQueryTableView::ReSync() please call ClearAll !");
@@ -321,7 +316,6 @@ void OQueryTableView::ReSync()
void OQueryTableView::ClearAll()
{
- DBG_CHKTHIS(OQueryTableView,NULL);
OJoinTableView::ClearAll();
SetUpdateMode(sal_True);
@@ -335,7 +329,6 @@ OTableWindow* OQueryTableView::createWindow(const TTableWindowData::value_type&
void OQueryTableView::NotifyTabConnection(const OQueryTableConnection& rNewConn, sal_Bool _bCreateUndoAction)
{
- DBG_CHKTHIS(OQueryTableView,NULL);
// let's first check if I have the connection already
OQueryTableConnection* pTabConn = NULL;
const ::std::vector<OTableConnection*>* pConnections = getTableConnections();
@@ -382,7 +375,6 @@ OTableWindowData* OQueryTableView::CreateImpl(const OUString& _rComposedName
void OQueryTableView::AddTabWin(const OUString& _rTableName, const OUString& _rAliasName, sal_Bool bNewTable)
{
- DBG_CHKTHIS(OQueryTableView,NULL);
// this method has been inherited from the base class, linking back to the parent and which constructs
// an Alias and which passes on to my other AddTabWin
@@ -446,7 +438,6 @@ Reference<XPropertySet> getKeyReferencedTo(const Reference<XIndexAccess>& _rxKey
void OQueryTableView::AddTabWin(const OUString& _rComposedName, const OUString& _rTableName, const OUString& strAlias, sal_Bool bNewTable)
{
- DBG_CHKTHIS(OQueryTableView,NULL);
OSL_ENSURE(!_rTableName.isEmpty() || !strAlias.isEmpty(), "OQueryTableView::AddTabWin : no tables or aliases !");
// If the table is not set, then it is a dummy window, but at least the alias must be set
@@ -597,7 +588,6 @@ void OQueryTableView::AddTabWin(const OUString& _rComposedName, const OUString&
void OQueryTableView::AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest)
{
- DBG_CHKTHIS(OQueryTableView,NULL);
OQueryTableWindow* pSourceWin = static_cast< OQueryTableWindow*>(jxdSource.pListBox->GetTabWin());
OQueryTableWindow* pDestWin = static_cast< OQueryTableWindow*>(jxdDest.pListBox->GetTabWin());
@@ -657,7 +647,6 @@ void OQueryTableView::AddConnection(const OJoinExchangeData& jxdSource, const OJ
void OQueryTableView::ConnDoubleClicked(OTableConnection* pConnection)
{
- DBG_CHKTHIS(OQueryTableView,NULL);
if( openJoinDialog(this,pConnection->GetData(),sal_False) )
{
connectionModified(this,pConnection,sal_False);
@@ -696,7 +685,6 @@ void OQueryTableView::createNewConnection()
bool OQueryTableView::RemoveConnection( OTableConnection* _pConnection,sal_Bool /*_bDelete*/ )
{
- DBG_CHKTHIS(OQueryTableView,NULL);
// we don't want that our connection will be deleted, we put it in the undo manager
bool bRet = OJoinTableView::RemoveConnection( _pConnection,sal_False);
@@ -711,13 +699,11 @@ bool OQueryTableView::RemoveConnection( OTableConnection* _pConnection,sal_Bool
void OQueryTableView::KeyInput( const KeyEvent& rEvt )
{
- DBG_CHKTHIS(OQueryTableView,NULL);
OJoinTableView::KeyInput( rEvt );
}
OQueryTableWindow* OQueryTableView::FindTable(const OUString& rAliasName)
{
- DBG_CHKTHIS(OQueryTableView,NULL);
OSL_ENSURE(!rAliasName.isEmpty(), "OQueryTableView::FindTable : the AliasName should not be empty !");
// (it is harmless but does not make sense and indicates that there is probably an error in the caller)
OTableWindowMap::const_iterator aIter = GetTabWinMap()->find(rAliasName);
@@ -728,7 +714,6 @@ OQueryTableWindow* OQueryTableView::FindTable(const OUString& rAliasName)
sal_Bool OQueryTableView::FindTableFromField(const OUString& rFieldName, OTableFieldDescRef& rInfo, sal_uInt16& rCnt)
{
- DBG_CHKTHIS(OQueryTableView,NULL);
rCnt = 0;
OTableWindowMap::const_iterator aIter = GetTabWinMap()->begin();
OTableWindowMap::const_iterator aEnd = GetTabWinMap()->end();
@@ -762,7 +747,6 @@ bool OQueryTableView::ContainsTabWin(const OTableWindow& rTabWin)
void OQueryTableView::RemoveTabWin(OTableWindow* pTabWin)
{
- DBG_CHKTHIS(OQueryTableView,NULL);
OSL_ENSURE(pTabWin != NULL, "OQueryTableView::RemoveTabWin : Window should not be NULL !");
if(pTabWin && ContainsTabWin(*pTabWin)) // #i122589# check if registered before deleting
@@ -803,7 +787,6 @@ void OQueryTableView::RemoveTabWin(OTableWindow* pTabWin)
void OQueryTableView::EnsureVisible(const OTableWindow* pWin)
{
- DBG_CHKTHIS(OQueryTableView,NULL);
Invalidate(INVALIDATE_NOCHILDREN);
OJoinTableView::EnsureVisible(pWin);
@@ -811,7 +794,6 @@ void OQueryTableView::EnsureVisible(const OTableWindow* pWin)
void OQueryTableView::GetConnection(OQueryTableConnection* pConn)
{
- DBG_CHKTHIS(OQueryTableView,NULL);
// add to me and the document
addConnection( pConn );
@@ -819,7 +801,6 @@ void OQueryTableView::GetConnection(OQueryTableConnection* pConn)
void OQueryTableView::DropConnection(OQueryTableConnection* pConn)
{
- DBG_CHKTHIS(OQueryTableView,NULL);
// Pay attention to the selection
// remove from me and the document
RemoveConnection( pConn ,sal_False);
@@ -827,7 +808,6 @@ void OQueryTableView::DropConnection(OQueryTableConnection* pConn)
void OQueryTableView::HideTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction )
{
- DBG_CHKTHIS(OQueryTableView,NULL);
OTableWindowMap* pTabWins = GetTabWinMap();
OSL_ENSURE(pTabWins != NULL, "OQueryTableView::HideTabWin : have no TabWins !");
@@ -900,7 +880,6 @@ void OQueryTableView::HideTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUndoAc
sal_Bool OQueryTableView::ShowTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction,sal_Bool _bAppend )
{
- DBG_CHKTHIS(OQueryTableView,NULL);
sal_Bool bSuccess = sal_False;
@@ -974,14 +953,12 @@ sal_Bool OQueryTableView::ShowTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUn
void OQueryTableView::InsertField(const OTableFieldDescRef& rInfo)
{
- DBG_CHKTHIS(OQueryTableView,NULL);
OSL_ENSURE(getDesignView() != NULL, "OQueryTableView::InsertField : has no Parent !");
static_cast<OQueryDesignView*>(getDesignView())->InsertField(rInfo);
}
sal_Bool OQueryTableView::ExistsAVisitedConn(const OQueryTableWindow* pFrom) const
{
- DBG_CHKTHIS(OQueryTableView,NULL);
const ::std::vector<OTableConnection*>* pList = getTableConnections();
if (pList)
{
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index a42e3b9767d4..a63c6a4cb23d 100644
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@@ -38,11 +38,9 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::frame;
// end of temp classes
-DBG_NAME(OQueryTextView)
OQueryTextView::OQueryTextView(OQueryContainerWindow* _pParent)
:Window(_pParent)
{
- DBG_CTOR(OQueryTextView,NULL);
m_pEdit = new OSqlEdit(this);
m_pEdit->SetRightToLeft(sal_False);
m_pEdit->ClearModifyFlag();
@@ -53,7 +51,6 @@ OQueryTextView::OQueryTextView(OQueryContainerWindow* _pParent)
OQueryTextView::~OQueryTextView()
{
- DBG_DTOR(OQueryTextView,NULL);
::std::auto_ptr<Window> aTemp(m_pEdit);
m_pEdit = NULL;
}
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index bf470cdbbad5..21fbabb84256 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -31,11 +31,9 @@ using namespace dbaui;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-DBG_NAME(OQueryViewSwitch)
OQueryViewSwitch::OQueryViewSwitch(OQueryContainerWindow* _pParent, OQueryController& _rController,const Reference< XComponentContext >& _rxContext)
: m_bAddTableDialogWasVisible(sal_False)
{
- DBG_CTOR(OQueryViewSwitch,NULL);
m_pTextView = new OQueryTextView(_pParent);
m_pDesignView = new OQueryDesignView( _pParent, _rController, _rxContext );
@@ -43,7 +41,6 @@ OQueryViewSwitch::OQueryViewSwitch(OQueryContainerWindow* _pParent, OQueryContro
OQueryViewSwitch::~OQueryViewSwitch()
{
- DBG_DTOR(OQueryViewSwitch,NULL);
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pTextView);
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index c3b0184724d4..3c6442973d8c 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -96,7 +96,6 @@ namespace
}
}
-DBG_NAME(OSelectionBrowseBox)
OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent )
:EditBrowseBox( pParent,EBBF_NOROWPICTURE, WB_3DLOOK, BROWSER_COLUMNSELECTION | BROWSER_KEEPSELECTION | BROWSER_HIDESELECT |
BROWSER_HIDECURSOR | BROWSER_HLINESFULL | BROWSER_VLINESFULL )
@@ -110,7 +109,6 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent )
,m_bDisableErrorBox(sal_False)
,m_bInUndoMode(sal_False)
{
- DBG_CTOR(OSelectionBrowseBox,NULL);
SetHelpId(HID_CTL_QRYDGNCRIT);
m_nMode = BROWSER_COLUMNSELECTION | BROWSER_HIDESELECT
@@ -155,7 +153,6 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent )
OSelectionBrowseBox::~OSelectionBrowseBox()
{
- DBG_DTOR(OSelectionBrowseBox,NULL);
delete m_pTextCell;
delete m_pVisibleCell;
@@ -229,14 +226,12 @@ void OSelectionBrowseBox::initialize()
OQueryDesignView* OSelectionBrowseBox::getDesignView()
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
OSL_ENSURE(static_cast<const OQueryDesignView*>(GetParent()),"Parent isn't an OQueryDesignView!");
return static_cast<OQueryDesignView*>(GetParent());
}
OQueryDesignView* OSelectionBrowseBox::getDesignView() const
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
OSL_ENSURE(static_cast<const OQueryDesignView*>(GetParent()),"Parent isn't an OQueryDesignView!");
return static_cast<OQueryDesignView*>(GetParent());
}
@@ -322,7 +317,6 @@ void OSelectionBrowseBox::ColumnMoved( sal_uInt16 nColId,sal_Bool _bCreateUndo )
void OSelectionBrowseBox::Init()
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
EditBrowseBox::Init();
@@ -376,7 +370,6 @@ void OSelectionBrowseBox::Init()
void OSelectionBrowseBox::PreFill()
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
SetUpdateMode(sal_False);
if (GetCurRow() != 0)
@@ -393,7 +386,6 @@ void OSelectionBrowseBox::PreFill()
void OSelectionBrowseBox::ClearAll()
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
SetUpdateMode(sal_False);
OTableFields::reverse_iterator aIter = getFields().rbegin();
@@ -427,7 +419,6 @@ void OSelectionBrowseBox::SetReadOnly(sal_Bool bRO)
CellController* OSelectionBrowseBox::GetController(long nRow, sal_uInt16 nColId)
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
if ( nColId > getFields().size() )
return NULL;
OTableFieldDescRef pEntry = getFields()[nColId-1];
@@ -459,7 +450,6 @@ CellController* OSelectionBrowseBox::GetController(long nRow, sal_uInt16 nColId)
void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, long nRow, sal_uInt16 nColId)
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
OSL_ENSURE(nColId != BROWSER_INVALIDID,"An Invalid Id was set!");
if ( nColId == BROWSER_INVALIDID )
return;
@@ -897,7 +887,6 @@ sal_Bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRe
sal_Bool OSelectionBrowseBox::SaveModified()
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
OQueryController& rController = static_cast<OQueryController&>(getDesignView()->getController());
OTableFieldDescRef pEntry = NULL;
sal_uInt16 nCurrentColumnPos = GetColumnPos(GetCurColumnId());
@@ -1219,7 +1208,6 @@ sal_Bool OSelectionBrowseBox::SaveModified()
sal_Bool OSelectionBrowseBox::SeekRow(long nRow)
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
sal_Bool bRet = sal_False;
m_nSeekRow = nRow;
@@ -1231,7 +1219,6 @@ sal_Bool OSelectionBrowseBox::SeekRow(long nRow)
void OSelectionBrowseBox::PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
rDev.SetClipRegion(Region(rRect));
OTableFieldDescRef pEntry = NULL;
@@ -1253,7 +1240,6 @@ void OSelectionBrowseBox::PaintCell(OutputDevice& rDev, const Rectangle& rRect,
void OSelectionBrowseBox::PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
Rectangle aRect(rRect);
aRect.TopLeft().Y() -= 2;
OUString aLabel(ModuleRes(STR_QUERY_HANDLETEXT));
@@ -1266,7 +1252,6 @@ void OSelectionBrowseBox::PaintStatusCell(OutputDevice& rDev, const Rectangle& r
void OSelectionBrowseBox::RemoveColumn(sal_uInt16 _nColumnId)
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
OQueryController& rController = static_cast<OQueryController&>(getDesignView()->getController());
sal_uInt16 nPos = GetColumnPos(_nColumnId);
@@ -1300,7 +1285,6 @@ void OSelectionBrowseBox::RemoveColumn(sal_uInt16 _nColumnId)
void OSelectionBrowseBox::RemoveField(sal_uInt16 nColumnId )
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
OQueryController& rController = static_cast<OQueryController&>(getDesignView()->getController());
sal_uInt16 nPos = GetColumnPos(nColumnId);
@@ -1353,7 +1337,6 @@ void OSelectionBrowseBox::adjustSelectionMode( sal_Bool _bClickedOntoHeader, sal
void OSelectionBrowseBox::MouseButtonDown(const BrowserMouseEvent& rEvt)
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
if( rEvt.IsLeft() )
{
sal_Bool bOnHandle = HANDLE_ID == rEvt.GetColumnId();
@@ -1365,14 +1348,12 @@ void OSelectionBrowseBox::MouseButtonDown(const BrowserMouseEvent& rEvt)
void OSelectionBrowseBox::MouseButtonUp(const BrowserMouseEvent& rEvt)
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
EditBrowseBox::MouseButtonUp( rEvt );
static_cast<OQueryController&>(getDesignView()->getController()).InvalidateFeature( ID_BROWSER_QUERY_EXECUTE );
}
void OSelectionBrowseBox::KeyInput( const KeyEvent& rEvt )
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
if (IsColumnSelected(GetCurColumnId()))
{
if (rEvt.GetKeyCode().GetCode() == KEY_DELETE && // Delete rows
@@ -1388,7 +1369,6 @@ void OSelectionBrowseBox::KeyInput( const KeyEvent& rEvt )
sal_Int8 OSelectionBrowseBox::AcceptDrop( const BrowserAcceptDropEvent& rEvt )
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
sal_Int8 nDropAction = DND_ACTION_NONE;
if ( rEvt.GetRow() >= -1 )
{
@@ -1410,7 +1390,6 @@ sal_Int8 OSelectionBrowseBox::AcceptDrop( const BrowserAcceptDropEvent& rEvt )
sal_Int8 OSelectionBrowseBox::ExecuteDrop( const BrowserExecuteDropEvent& _rEvt )
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
TransferableDataHelper aDropped(_rEvt.maDropEvent.Transferable);
if (!OJoinExchObj::isFormatAvailable(aDropped.GetDataFlavorExVector()))
@@ -1429,7 +1408,6 @@ sal_Int8 OSelectionBrowseBox::ExecuteDrop( const BrowserExecuteDropEvent& _rEvt
OTableFieldDescRef OSelectionBrowseBox::AppendNewCol( sal_uInt16 nCnt)
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
// one or more can be created, but the first one will is not returned
sal_uInt32 nCount = getFields().size();
for (sal_uInt16 i=0 ; i<nCnt ; i++)
@@ -1447,7 +1425,6 @@ OTableFieldDescRef OSelectionBrowseBox::AppendNewCol( sal_uInt16 nCnt)
void OSelectionBrowseBox::DeleteFields(const OUString& rAliasName)
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
if (!getFields().empty())
{
sal_uInt16 nColId = GetCurColumnId();
@@ -1476,7 +1453,6 @@ void OSelectionBrowseBox::DeleteFields(const OUString& rAliasName)
void OSelectionBrowseBox::SetColWidth(sal_uInt16 nColId, long nNewWidth)
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
sal_Bool bWasEditing = IsEditing();
if (bWasEditing)
DeactivateCell();
@@ -1495,7 +1471,6 @@ void OSelectionBrowseBox::SetColWidth(sal_uInt16 nColId, long nNewWidth)
Rectangle OSelectionBrowseBox::GetInvalidRect( sal_uInt16 nColId )
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
// The rectangle is the full output area of the window
Rectangle aInvalidRect( Point(0,0), GetOutputSizePixel() );
@@ -1508,7 +1483,6 @@ Rectangle OSelectionBrowseBox::GetInvalidRect( sal_uInt16 nColId )
void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, sal_uInt16& _nColumnPosition)
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
// the control should have exactly one more column: the HandleColumn
OSL_ENSURE(_nColumnPosition == BROWSER_INVALIDID || (_nColumnPosition <= (long)getFields().size()), "OSelectionBrowseBox::InsertColumn : invalid parameter nColId.");
// -1 means at the end. Count means at the end, others denotes a correct position
@@ -1571,7 +1545,6 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, sal_uInt16& _n
OTableFieldDescRef OSelectionBrowseBox::InsertField(const OJoinExchangeData& jxdSource, sal_uInt16 _nColumnPosition, sal_Bool bVis, sal_Bool bActivate)
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
OQueryTableWindow* pSourceWin = static_cast<OQueryTableWindow*>(jxdSource.pListBox->GetTabWin());
if (!pSourceWin)
return NULL;
@@ -1596,7 +1569,6 @@ OTableFieldDescRef OSelectionBrowseBox::InsertField(const OJoinExchangeData& jxd
OTableFieldDescRef OSelectionBrowseBox::InsertField(const OTableFieldDescRef& _rInfo, sal_uInt16 _nColumnPosition, sal_Bool bVis, sal_Bool bActivate)
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
if(m_nMaxColumns && m_nMaxColumns <= FieldsCount())
return NULL;
@@ -1624,7 +1596,6 @@ OTableFieldDescRef OSelectionBrowseBox::InsertField(const OTableFieldDescRef& _r
sal_uInt16 OSelectionBrowseBox::FieldsCount()
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
OTableFields::iterator aIter = getFields().begin();
sal_uInt16 nCount = 0;
@@ -1640,7 +1611,6 @@ sal_uInt16 OSelectionBrowseBox::FieldsCount()
OTableFieldDescRef OSelectionBrowseBox::FindFirstFreeCol(sal_uInt16& _rColumnPosition )
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
OTableFields::iterator aIter = getFields().begin();
OTableFields::iterator aEnd = getFields().end();
@@ -1660,7 +1630,6 @@ OTableFieldDescRef OSelectionBrowseBox::FindFirstFreeCol(sal_uInt16& _rColumnPos
void OSelectionBrowseBox::CheckFreeColumns(sal_uInt16& _rColumnPosition)
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
if (FindFirstFreeCol(_rColumnPosition) == NULL)
{
// it is full, append a Packen column
@@ -1674,7 +1643,6 @@ void OSelectionBrowseBox::AddGroupBy( const OTableFieldDescRef& rInfo , sal_uInt
Reference< XConnection> xConnection = static_cast<OQueryController&>(getDesignView()->getController()).getConnection();
if(!xConnection.is())
return;
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
OSL_ENSURE(!rInfo->IsEmpty(),"AddGroupBy:: OTableFieldDescRef sollte nicht Empty sein!");
OTableFieldDescRef pEntry;
const Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData();
@@ -1727,7 +1695,6 @@ void OSelectionBrowseBox::AddGroupBy( const OTableFieldDescRef& rInfo , sal_uInt
void OSelectionBrowseBox::DuplicateConditionLevel( const sal_uInt16 nLevel)
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
const sal_uInt16 nNewLevel = nLevel +1;
OTableFields& rFields = getFields();
OTableFields::iterator aIter = rFields.begin();
@@ -1756,7 +1723,6 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const O
Reference< XConnection> xConnection = static_cast<OQueryController&>(getDesignView()->getController()).getConnection();
if(!xConnection.is())
return;
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
OSL_ENSURE(rInfo.is() && !rInfo->IsEmpty(),"AddCondition:: OTableFieldDescRef sollte nicht Empty sein!");
OTableFieldDescRef pLastEntry;
@@ -1850,7 +1816,6 @@ void OSelectionBrowseBox::AddOrder( const OTableFieldDescRef& rInfo, const EOrde
Reference< XConnection> xConnection = static_cast<OQueryController&>(getDesignView()->getController()).getConnection();
if(!xConnection.is())
return;
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
OSL_ENSURE(!rInfo->IsEmpty(),"AddOrder:: OTableFieldDescRef should not be Empty!");
OTableFieldDescRef pEntry;
Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData();
@@ -1899,13 +1864,11 @@ void OSelectionBrowseBox::AddOrder( const OTableFieldDescRef& rInfo, const EOrde
void OSelectionBrowseBox::ArrangeControls(sal_uInt16& nX, sal_uInt16 nY)
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
EditBrowseBox::ArrangeControls(nX, nY);
}
sal_Bool OSelectionBrowseBox::Save()
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
sal_Bool bRet = sal_True;
if (IsModified())
bRet = SaveModified();
@@ -1914,7 +1877,6 @@ sal_Bool OSelectionBrowseBox::Save()
void OSelectionBrowseBox::CellModified()
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
long nRow = GetRealRow(GetCurRow());
switch (nRow)
{
@@ -1941,7 +1903,6 @@ void OSelectionBrowseBox::CellModified()
void OSelectionBrowseBox::Fill()
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
OSL_ENSURE(ColCount() >= 1, "OSelectionBrowseBox::Fill : please call only after inserting the handle column !");
sal_uInt16 nColCount = ColCount() - 1;
@@ -1961,7 +1922,6 @@ Size OSelectionBrowseBox::CalcOptimalSize( const Size& _rAvailable )
void OSelectionBrowseBox::Command(const CommandEvent& rEvt)
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
switch (rEvt.GetCommand())
{
case COMMAND_CONTEXTMENU:
@@ -2065,7 +2025,6 @@ sal_Bool OSelectionBrowseBox::IsRowVisible(sal_uInt16 _nWhich) const
void OSelectionBrowseBox::SetRowVisible(sal_uInt16 _nWhich, sal_Bool _bVis)
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
OSL_ENSURE(_nWhich<m_bVisibleRow.size(), "OSelectionBrowseBox::SetRowVisible : invalid parameter !");
sal_Bool bWasEditing = IsEditing();
@@ -2104,7 +2063,6 @@ long OSelectionBrowseBox::GetBrowseRow(long nRowId) const
long OSelectionBrowseBox::GetRealRow(long nRowId) const
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
long nErg=0,i;
const long nCount = m_bVisibleRow.size();
for(i=0;i < nCount; ++i)
@@ -2157,7 +2115,6 @@ void OSelectionBrowseBox::SetNoneVisbleRow(long nRows)
OUString OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
sal_uInt16 nPos = GetColumnPos(nColId);
@@ -2208,7 +2165,6 @@ OUString OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const
sal_Bool OSelectionBrowseBox::GetFunctionName(sal_uInt32 _nFunctionTokenId, OUString& rFkt)
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
sal_Bool bErg=sal_True;
switch(_nFunctionTokenId)
{
@@ -2279,7 +2235,6 @@ sal_Bool OSelectionBrowseBox::GetFunctionName(sal_uInt32 _nFunctionTokenId, OUSt
OUString OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, sal_uInt16 nColId)
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
if ( GetCurColumnId() == nColId && !m_bInUndoMode )
SaveModified();
@@ -2305,7 +2260,6 @@ OUString OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, sal_uInt16 n
void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, sal_uInt16 nColId, const OUString& strNewText)
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
sal_Bool bWasEditing = IsEditing() && (GetCurColumnId() == nColId) && IsRowVisible(static_cast<sal_uInt16>(nRow)) && (GetCurRow() == static_cast<sal_uInt16>(GetBrowseRow(nRow)));
if (bWasEditing)
DeactivateCell();
@@ -2372,7 +2326,6 @@ void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, sal_uInt16 nColId, con
sal_uInt32 OSelectionBrowseBox::GetTotalCellWidth(long nRow, sal_uInt16 nColId) const
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
long nRowId = GetRealRow(nRow);
if (nRowId == BROW_VIS_ROW)
@@ -2389,7 +2342,6 @@ void OSelectionBrowseBox::ColumnResized(sal_uInt16 nColId)
// fake. It's not _that_ bad : the user may change column widths while in read-only mode to see all details
// but the changes aren't permanent ...
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
sal_uInt16 nPos = GetColumnPos(nColId);
OSL_ENSURE(nPos <= getFields().size(),"ColumnResized:: nColId sollte nicht groesser als List::count sein!");
OTableFieldDescRef pEntry = getEntry(nPos-1);
@@ -2413,7 +2365,6 @@ void OSelectionBrowseBox::ColumnResized(sal_uInt16 nColId)
sal_uInt32 OSelectionBrowseBox::GetTotalCellWidth(long nRowId, sal_uInt16 nColId)
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
sal_uInt16 nPos = GetColumnPos(nColId);
OSL_ENSURE((nPos == 0) || (nPos <= getFields().size()), "OSelectionBrowseBox::GetTotalCellWidth : invalid parameter nColId");
@@ -2427,7 +2378,6 @@ sal_uInt32 OSelectionBrowseBox::GetTotalCellWidth(long nRowId, sal_uInt16 nColId
sal_uInt16 OSelectionBrowseBox::GetDefaultColumnWidth(const OUString& /*rName*/) const
{
- DBG_CHKTHIS(OSelectionBrowseBox,NULL);
// the base class makes it dependent on the text. I have no column headers, therefore I
// like to have a new Default-value
return static_cast<sal_uInt16>(DEFAULT_SIZE);
diff --git a/dbaccess/source/ui/querydesign/TableConnection.cxx b/dbaccess/source/ui/querydesign/TableConnection.cxx
index 8a60793f2962..59351429d11b 100644
--- a/dbaccess/source/ui/querydesign/TableConnection.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnection.cxx
@@ -33,14 +33,12 @@ using namespace ::com::sun::star::accessibility;
// class OTableConnection
namespace dbaui
{
- DBG_NAME(OTableConnection)
OTableConnection::OTableConnection( OJoinTableView* _pContainer,const TTableConnectionData::value_type& _pTabConnData )
:Window(_pContainer)
,m_pData( _pTabConnData )
,m_pParent( _pContainer )
,m_bSelected( sal_False )
{
- DBG_CTOR(OTableConnection,NULL);
Init();
Show();
}
@@ -48,7 +46,6 @@ namespace dbaui
OTableConnection::OTableConnection( const OTableConnection& _rConn ) : Window(_rConn.m_pParent)
,m_pData(_rConn.GetData()->NewInstance())
{
- DBG_CTOR(OTableConnection,NULL);
*this = _rConn;
}
diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
index 77f16ccf6d10..d5a7f54b91b6 100644
--- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
@@ -24,10 +24,8 @@
using namespace dbaui;
// class OTableConnectionData
-DBG_NAME(OTableConnectionData)
OTableConnectionData::OTableConnectionData()
{
- DBG_CTOR(OTableConnectionData,NULL);
Init();
}
@@ -38,7 +36,6 @@ OTableConnectionData::OTableConnectionData(const TTableWindowData::value_type& _
,m_pReferencedTable(_pReferencedTable)
,m_aConnName( rConnName )
{
- DBG_CTOR(OTableConnectionData,NULL);
Init();
}
@@ -52,7 +49,6 @@ void OTableConnectionData::Init()
OTableConnectionData::OTableConnectionData( const OTableConnectionData& rConnData )
{
- DBG_CTOR(OTableConnectionData,NULL);
*this = rConnData;
}
@@ -64,7 +60,6 @@ void OTableConnectionData::CopyFrom(const OTableConnectionData& rSource)
OTableConnectionData::~OTableConnectionData()
{
- DBG_DTOR(OTableConnectionData,NULL);
// delete LineDataList
OConnectionLineDataVec().swap(m_vConnLineData);
}
diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
index 92cd40c0c81c..65f4e05f36a3 100644
--- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
+++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
@@ -30,7 +30,6 @@ using namespace ::com::sun::star::beans;
using namespace comphelper;
using namespace dbaui;
-DBG_NAME(OTableFieldDesc)
OTableFieldDesc::OTableFieldDesc()
:m_pTabWindow(0)
,m_eDataType(1000)
@@ -43,14 +42,12 @@ OTableFieldDesc::OTableFieldDesc()
,m_bGroupBy(sal_False)
,m_bVisible(sal_False)
{
- DBG_CTOR(OTableFieldDesc,NULL);
}
OTableFieldDesc::OTableFieldDesc(const OTableFieldDesc& rRS)
: ::salhelper::SimpleReferenceObject()
{
- DBG_CTOR(OTableFieldDesc,NULL);
*this = rRS;
}
@@ -62,13 +59,11 @@ OTableFieldDesc::OTableFieldDesc(const OUString& rT, const OUString& rF )
,m_bGroupBy(sal_False)
,m_bVisible(sal_False)
{
- DBG_CTOR(OTableFieldDesc,NULL);
SetField( rF ); SetTable( rT );
}
OTableFieldDesc::~OTableFieldDesc()
{
- DBG_DTOR(OTableFieldDesc,NULL);
}
OTableFieldDesc& OTableFieldDesc::operator=( const OTableFieldDesc& rRS )
@@ -98,7 +93,6 @@ OTableFieldDesc& OTableFieldDesc::operator=( const OTableFieldDesc& rRS )
sal_Bool OTableFieldDesc::operator==( const OTableFieldDesc& rDesc )
{
- DBG_CHKTHIS(OTableFieldDesc,NULL);
return ( m_eOrderDir != rDesc.GetOrderDir() ||
m_eDataType != rDesc.GetDataType() ||
@@ -114,7 +108,6 @@ sal_Bool OTableFieldDesc::operator==( const OTableFieldDesc& rDesc )
void OTableFieldDesc::SetCriteria( sal_uInt16 nIdx, const OUString& rCrit)
{
- DBG_CHKTHIS(OTableFieldDesc,NULL);
if (nIdx < m_aCriteria.size())
m_aCriteria[nIdx] = rCrit;
else
@@ -127,7 +120,6 @@ void OTableFieldDesc::SetCriteria( sal_uInt16 nIdx, const OUString& rCrit)
OUString OTableFieldDesc::GetCriteria( sal_uInt16 nIdx ) const
{
- DBG_CHKTHIS(OTableFieldDesc,NULL);
OUString aRetStr;
if( nIdx < m_aCriteria.size())
aRetStr = m_aCriteria[nIdx];
@@ -150,7 +142,6 @@ namespace
void OTableFieldDesc::Load( const ::com::sun::star::beans::PropertyValue& i_rSettings, const bool i_bIncludingCriteria )
{
- DBG_CHKTHIS(OTableFieldDesc,NULL);
::comphelper::NamedValueCollection aFieldDesc( i_rSettings.Value );
m_aAliasName = aFieldDesc.getOrDefault( "AliasName", m_aAliasName );
@@ -182,7 +173,6 @@ void OTableFieldDesc::Load( const ::com::sun::star::beans::PropertyValue& i_rSet
void OTableFieldDesc::Save( ::comphelper::NamedValueCollection& o_rSettings, const bool i_bIncludingCriteria )
{
- DBG_CHKTHIS(OTableFieldDesc,NULL);
o_rSettings.put( "AliasName", m_aAliasName );
o_rSettings.put( "TableName", m_aTableName );
diff --git a/dbaccess/source/ui/querydesign/TableFieldInfo.cxx b/dbaccess/source/ui/querydesign/TableFieldInfo.cxx
index 9c608cfd4c7a..759d74a9864d 100644
--- a/dbaccess/source/ui/querydesign/TableFieldInfo.cxx
+++ b/dbaccess/source/ui/querydesign/TableFieldInfo.cxx
@@ -23,17 +23,14 @@
using namespace dbaui;
// class OTableFieldInfo
-DBG_NAME(OTableFieldInfo)
OTableFieldInfo::OTableFieldInfo() :
m_eDataType(1000)
{
- DBG_CTOR(OTableFieldInfo,NULL);
m_eFieldType = TAB_NORMAL_FIELD;
}
OTableFieldInfo::~OTableFieldInfo()
{
- DBG_DTOR(OTableFieldInfo,NULL);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index beedbae5e4c0..8041308c9127 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -61,7 +61,6 @@ using namespace ::com::sun::star::accessibility;
#define TABWIN_HEIGHT_MIN 80
// class OTableWindow
-DBG_NAME(OTableWindow)
OTableWindow::OTableWindow( Window* pParent, const TTableWindowData::value_type& pTabWinData )
: ::comphelper::OContainerListener(m_aMutex)
,Window( pParent, WB_3DLOOK|WB_MOVEABLE )
@@ -75,7 +74,6 @@ OTableWindow::OTableWindow( Window* pParent, const TTableWindowData::value_type&
,m_nSizingFlags( SIZING_NONE )
,m_bActive( sal_False )
{
- DBG_CTOR(OTableWindow,NULL);
// Set position and size
if( GetData()->HasPosition() )
@@ -96,7 +94,6 @@ OTableWindow::OTableWindow( Window* pParent, const TTableWindowData::value_type&
OTableWindow::~OTableWindow()
{
- DBG_DTOR(OTableWindow,NULL);
if (m_pListBox)
{
diff --git a/dbaccess/source/ui/querydesign/TableWindowData.cxx b/dbaccess/source/ui/querydesign/TableWindowData.cxx
index df5168f5a045..2c4eb37c5c6a 100644
--- a/dbaccess/source/ui/querydesign/TableWindowData.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowData.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
// class OTableWindowData
-DBG_NAME(OTableWindowData)
OTableWindowData::OTableWindowData( const Reference< XPropertySet>& _xTable
,const OUString& _rComposedName
,const OUString& rTableName
@@ -51,7 +50,6 @@ OTableWindowData::OTableWindowData( const Reference< XPropertySet>& _xTable
,m_bIsQuery(false)
,m_bIsValid(true)
{
- DBG_CTOR(OTableWindowData,NULL);
if( m_aWinName.isEmpty() )
m_aWinName = m_aTableName;
@@ -60,7 +58,6 @@ OTableWindowData::OTableWindowData( const Reference< XPropertySet>& _xTable
OTableWindowData::~OTableWindowData()
{
- DBG_DTOR(OTableWindowData,NULL);
Reference<XComponent> xComponent( m_xTable, UNO_QUERY );
if ( xComponent.is() )
stopComponentListening( xComponent );
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index 746947dbcaa9..c692f65eadbc 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -40,7 +40,6 @@ OJoinExchangeData::OJoinExchangeData(OTableWindowListBox* pBox)
const sal_uLong SCROLLING_TIMESPAN = 500;
const long LISTBOX_SCROLLING_AREA = 6;
// class OTableWindowListBox
-DBG_NAME(OTableWindowListBox)
OTableWindowListBox::OTableWindowListBox( OTableWindow* pParent )
:SvTreeListBox( pParent, WB_HASBUTTONS | WB_BORDER)
,m_aMousePos( Point(0,0) )
@@ -49,7 +48,6 @@ OTableWindowListBox::OTableWindowListBox( OTableWindow* pParent )
,m_nUiEvent(0)
,m_bReallyScrolled( sal_False )
{
- DBG_CTOR(OTableWindowListBox,NULL);
m_aScrollTimer.SetTimeout( SCROLLING_TIMESPAN );
SetDoubleClickHdl( LINK(this, OTableWindowListBox, OnDoubleClick) );
@@ -70,7 +68,6 @@ void OTableWindowListBox::dragFinished( )
OTableWindowListBox::~OTableWindowListBox()
{
- DBG_DTOR(OTableWindowListBox,NULL);
if (m_nDropEvent)
Application::RemoveUserEvent(m_nDropEvent);
if (m_nUiEvent)
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index 2d113d0d9a36..7b104816ec3f 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -38,12 +38,10 @@ using namespace dbaui;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::uno;
// class OTableWindowTitle
-DBG_NAME(OTableWindowTitle)
OTableWindowTitle::OTableWindowTitle( OTableWindow* pParent ) :
FixedText( pParent, WB_3DLOOK|WB_LEFT|WB_NOLABEL|WB_VCENTER )
,m_pTabWin( pParent )
{
- DBG_CTOR(OTableWindowTitle,NULL);
// set background- and text colour
StyleSettings aSystemStyle = Application::GetSettings().GetStyleSettings();
SetBackground(Wallpaper(Color(aSystemStyle.GetFaceColor())));
@@ -56,7 +54,6 @@ OTableWindowTitle::OTableWindowTitle( OTableWindow* pParent ) :
OTableWindowTitle::~OTableWindowTitle()
{
- DBG_DTOR(OTableWindowTitle,NULL);
m_pTabWin = NULL;
}
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index 79abb14feef1..c549510ca52e 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -40,13 +40,11 @@ namespace dbaui
using namespace ::com::sun::star::beans;
// OQueryContainerWindow
- DBG_NAME(OQueryContainerWindow)
OQueryContainerWindow::OQueryContainerWindow(Window* pParent, OQueryController& _rController,const Reference< XComponentContext >& _rxContext)
:ODataView( pParent, _rController, _rxContext )
,m_pViewSwitch(NULL)
,m_pBeamer(NULL)
{
- DBG_CTOR(OQueryContainerWindow,NULL);
m_pViewSwitch = new OQueryViewSwitch( this, _rController, _rxContext );
m_pSplitter = new Splitter(this,WB_VSCROLL);
@@ -56,7 +54,6 @@ namespace dbaui
}
OQueryContainerWindow::~OQueryContainerWindow()
{
- DBG_DTOR(OQueryContainerWindow,NULL);
{
::std::auto_ptr<OQueryViewSwitch> aTemp(m_pViewSwitch);
m_pViewSwitch = NULL;
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index f1b4e594054b..28077ea68612 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -326,7 +326,6 @@ Reference< XInterface > SAL_CALL OQueryController::Create(const Reference<XMulti
return *(new OQueryController(comphelper::getComponentContext(_rxFactory)));
}
-DBG_NAME(OQueryController);
OQueryController::OQueryController(const Reference< XComponentContext >& _rM)
:OJoinController(_rM)
,OQueryController_PBase( getBroadcastHelper() )
@@ -344,7 +343,6 @@ OQueryController::OQueryController(const Reference< XComponentContext >& _rM)
,m_bViewFunction(sal_False)
,m_bEscapeProcessing(sal_True)
{
- DBG_CTOR(OQueryController,NULL);
InvalidateAll();
registerProperty( PROPERTY_ACTIVECOMMAND, PROPERTY_ID_ACTIVECOMMAND, PropertyAttribute::READONLY | PropertyAttribute::BOUND,
@@ -355,7 +353,6 @@ OQueryController::OQueryController(const Reference< XComponentContext >& _rM)
OQueryController::~OQueryController()
{
- DBG_DTOR(OQueryController,NULL);
if ( !getBroadcastHelper().bDisposed && !getBroadcastHelper().bInDispose )
{
OSL_FAIL("Please check who doesn't dispose this component!");
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx
index 8066f995b7a6..99e1988d9cfa 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -60,7 +60,6 @@ OJoinControl::OJoinControl(Window* _pParent,const ResId& _rResId)
} // dbaui
-DBG_NAME(DlgQryJoin)
DlgQryJoin::DlgQryJoin( OQueryTableView * pParent,
const TTableConnectionData::value_type& _pData,
OJoinTableView::OTableWindowMap* _pTableMap,
@@ -79,7 +78,6 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent,
,m_pOrigConnData(_pData)
,m_xConnection(_xConnection)
{
- DBG_CTOR(DlgQryJoin,NULL);
aML_HelpText.SetControlBackground( GetSettings().GetStyleSettings().GetFaceColor() );
// Connection kopieren
@@ -162,14 +160,12 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent,
DlgQryJoin::~DlgQryJoin()
{
- DBG_DTOR(DlgQryJoin,NULL);
delete m_pJoinControl;
delete m_pTableControl;
}
IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ )
{
- DBG_CHKTHIS(DlgQryJoin,NULL);
if (m_pJoinControl->aLB_JoinType.GetSelectEntryPos() == m_pJoinControl->aLB_JoinType.GetSavedValue() )
return 1;
@@ -258,7 +254,6 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ )
IMPL_LINK( DlgQryJoin, OKClickHdl, Button*, /*pButton*/ )
{
- DBG_CHKTHIS(DlgQryJoin,NULL);
m_pConnData->Update();
m_pOrigConnData->CopyFrom( *m_pConnData );
@@ -269,7 +264,6 @@ IMPL_LINK( DlgQryJoin, OKClickHdl, Button*, /*pButton*/ )
IMPL_LINK( DlgQryJoin, NaturalToggleHdl, CheckBox*, /*pButton*/ )
{
- DBG_CHKTHIS(DlgQryJoin,NULL);
sal_Bool bChecked = m_pJoinControl->m_aCBNatural.IsChecked();
static_cast<OQueryTableConnectionData*>(m_pConnData.get())->setNatural(bChecked);
m_pTableControl->enableRelation(!bChecked);
diff --git a/dbaccess/source/ui/querydesign/queryview.cxx b/dbaccess/source/ui/querydesign/queryview.cxx
index e2946c73940c..4a125c0b877f 100644
--- a/dbaccess/source/ui/querydesign/queryview.cxx
+++ b/dbaccess/source/ui/querydesign/queryview.cxx
@@ -24,18 +24,15 @@
using namespace dbaui;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-DBG_NAME(OQueryView)
OQueryView::OQueryView(Window* _pParent, OQueryController& _rController,const Reference< XComponentContext >& _rxContext)
:OJoinDesignView( _pParent, _rController, _rxContext )
{
- DBG_CTOR(OQueryView,NULL);
}
OQueryView::~OQueryView()
{
- DBG_DTOR(OQueryView,NULL);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx
index a9d4bc3f1fbe..cdd1ad4a4955 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx
@@ -25,29 +25,24 @@
using namespace dbaui;
// class ORelationTableConnection
-DBG_NAME(ORelationTableConnection)
ORelationTableConnection::ORelationTableConnection( ORelationTableView* pContainer,
const TTableConnectionData::value_type& pTabConnData )
:OTableConnection( pContainer, pTabConnData )
{
- DBG_CTOR(ORelationTableConnection,NULL);
}
ORelationTableConnection::ORelationTableConnection( const ORelationTableConnection& rConn )
: OTableConnection( rConn )
{
- DBG_CTOR(ORelationTableConnection,NULL);
// keine eigenen Members, also reicht die Basisklassenfunktionalitaet
}
ORelationTableConnection::~ORelationTableConnection()
{
- DBG_DTOR(ORelationTableConnection,NULL);
}
ORelationTableConnection& ORelationTableConnection::operator=( const ORelationTableConnection& rConn )
{
- DBG_CHKTHIS(ORelationTableConnection,NULL);
// nicht dass es was aendern wuerde, da die Basisklasse das auch testet und ich keine eigenen Members zu kopieren habe
if (&rConn == this)
return *this;
@@ -58,7 +53,6 @@ ORelationTableConnection& ORelationTableConnection::operator=( const ORelationTa
void ORelationTableConnection::Draw( const Rectangle& rRect )
{
- DBG_CHKTHIS(ORelationTableConnection,NULL);
OTableConnection::Draw( rRect );
ORelationTableConnectionData* pData = static_cast< ORelationTableConnectionData* >(GetData().get());
if ( pData && (pData->GetCardinality() == CARDINAL_UNDEFINED) )
diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
index fce8d4afe2db..aa7c5c83a606 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
@@ -42,7 +42,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-DBG_NAME(ORelationTableConnectionData)
// class ORelationTableConnectionData
ORelationTableConnectionData::ORelationTableConnectionData()
:OTableConnectionData()
@@ -50,7 +49,6 @@ ORelationTableConnectionData::ORelationTableConnectionData()
,m_nDeleteRules(KeyRule::NO_ACTION)
,m_nCardinality(CARDINAL_UNDEFINED)
{
- DBG_CTOR(ORelationTableConnectionData,NULL);
}
ORelationTableConnectionData::ORelationTableConnectionData( const TTableWindowData::value_type& _pReferencingTable,
@@ -61,7 +59,6 @@ ORelationTableConnectionData::ORelationTableConnectionData( const TTableWindowDa
,m_nDeleteRules(KeyRule::NO_ACTION)
,m_nCardinality(CARDINAL_UNDEFINED)
{
- DBG_CTOR(ORelationTableConnectionData,NULL);
m_aConnName = rConnName;
if ( !m_aConnName.isEmpty() )
@@ -71,18 +68,15 @@ ORelationTableConnectionData::ORelationTableConnectionData( const TTableWindowDa
ORelationTableConnectionData::ORelationTableConnectionData( const ORelationTableConnectionData& rConnData )
:OTableConnectionData( rConnData )
{
- DBG_CTOR(ORelationTableConnectionData,NULL);
*this = rConnData;
}
ORelationTableConnectionData::~ORelationTableConnectionData()
{
- DBG_DTOR(ORelationTableConnectionData,NULL);
}
sal_Bool ORelationTableConnectionData::DropRelation()
{
- DBG_CHKTHIS(ORelationTableConnectionData,NULL);
::osl::MutexGuard aGuard( m_aMutex );
// Relation loeschen
Reference< XIndexAccess> xKeys = getReferencingTable()->getKeys();
@@ -113,7 +107,6 @@ sal_Bool ORelationTableConnectionData::DropRelation()
void ORelationTableConnectionData::ChangeOrientation()
{
- DBG_CHKTHIS(ORelationTableConnectionData,NULL);
// Source- und DestFieldName der Linien austauschen
OUString sTempString;
OConnectionLineDataVec::iterator aIter = m_vConnLineData.begin();
@@ -133,7 +126,6 @@ void ORelationTableConnectionData::ChangeOrientation()
void ORelationTableConnectionData::SetCardinality()
{
- DBG_CHKTHIS(ORelationTableConnectionData,NULL);
::osl::MutexGuard aGuard( m_aMutex );
m_nCardinality = CARDINAL_UNDEFINED;
@@ -190,7 +182,6 @@ sal_Bool ORelationTableConnectionData::checkPrimaryKey(const Reference< XPropert
sal_Bool ORelationTableConnectionData::IsConnectionPossible()
{
- DBG_CHKTHIS(ORelationTableConnectionData,NULL);
::osl::MutexGuard aGuard( m_aMutex );
// Wenn die SourceFelder ein PrimKey sind, ist nur die Orientierung falsch
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 27d8303ac35e..b5f7f755e453 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -118,19 +118,16 @@ Reference< XInterface > SAL_CALL ORelationController::Create(const Reference<XMu
return *(new ORelationController(comphelper::getComponentContext(_rxFactory)));
}
-DBG_NAME(ORelationController);
ORelationController::ORelationController(const Reference< XComponentContext >& _rM)
: OJoinController(_rM)
,m_nThreadEvent(0)
,m_bRelationsPossible(sal_True)
{
- DBG_CTOR(ORelationController,NULL);
InvalidateAll();
}
ORelationController::~ORelationController()
{
- DBG_DTOR(ORelationController,NULL);
}
FeatureState ORelationController::GetState(sal_uInt16 _nId) const
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index b97fe50eb370..469f4e27b3d9 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@@ -45,16 +45,13 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
-DBG_NAME(ORelationDesignView)
ORelationDesignView::ORelationDesignView(Window* _pParent, ORelationController& _rController,const Reference< XComponentContext >& _rxContext)
:OJoinDesignView( _pParent, _rController, _rxContext )
{
- DBG_CTOR(ORelationDesignView,NULL);
}
ORelationDesignView::~ORelationDesignView()
{
- DBG_DTOR(ORelationDesignView,NULL);
}
void ORelationDesignView::Construct()
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index fecd015de5fb..ea7b14200f73 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -61,7 +61,6 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::accessibility;
// class ORelationTableView
-DBG_NAME(ORelationTableView)
ORelationTableView::ORelationTableView( Window* pParent, ORelationDesignView* pView )
:OJoinTableView( pParent, pView )
, ::comphelper::OContainerListener(m_aMutex)
@@ -69,20 +68,17 @@ ORelationTableView::ORelationTableView( Window* pParent, ORelationDesignView* pV
,m_bInRemove(false)
{
- DBG_CTOR(ORelationTableView,NULL);
SetHelpId(HID_CTL_RELATIONTAB);
}
ORelationTableView::~ORelationTableView()
{
- DBG_DTOR(ORelationTableView,NULL);
if ( m_pContainerListener.is() )
m_pContainerListener->dispose();
}
void ORelationTableView::ReSync()
{
- DBG_CHKTHIS(ORelationTableView,NULL);
if ( !m_pContainerListener.is() )
{
Reference< XConnection> xConnection = m_pView->getController().getConnection();
@@ -156,14 +152,12 @@ void ORelationTableView::ReSync()
sal_Bool ORelationTableView::IsAddAllowed()
{
- DBG_CHKTHIS(ORelationTableView,NULL);
return !m_pView->getController().isReadOnly();
}
void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest)
{
- DBG_CHKTHIS(ORelationTableView,NULL);
// Aus selektierten Feldnamen LineDataObject setzen
// check if relation already exists
OTableWindow* pSourceWin = jxdSource.pListBox->GetTabWin();
@@ -222,7 +216,6 @@ void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const
void ORelationTableView::ConnDoubleClicked( OTableConnection* pConnection )
{
- DBG_CHKTHIS(ORelationTableView,NULL);
ORelationDialog aRelDlg( this, pConnection->GetData() );
switch (aRelDlg.Execute())
{
@@ -249,7 +242,6 @@ void ORelationTableView::ConnDoubleClicked( OTableConnection* pConnection )
void ORelationTableView::AddNewRelation()
{
- DBG_CHKTHIS(ORelationTableView,NULL);
TTableConnectionData::value_type pNewConnData( new ORelationTableConnectionData() );
ORelationDialog aRelDlg(this, pNewConnData, sal_True);
@@ -265,7 +257,6 @@ void ORelationTableView::AddNewRelation()
bool ORelationTableView::RemoveConnection( OTableConnection* pConn ,sal_Bool /*_bDelete*/)
{
- DBG_CHKTHIS(ORelationTableView,NULL);
ORelationTableConnectionData* pTabConnData = (ORelationTableConnectionData*)pConn->GetData().get();
try
{
@@ -285,7 +276,6 @@ bool ORelationTableView::RemoveConnection( OTableConnection* pConn ,sal_Bool /*_
void ORelationTableView::AddTabWin(const OUString& _rComposedName, const OUString& rWinName, sal_Bool /*bNewTable*/)
{
- DBG_CHKTHIS(ORelationTableView,NULL);
OSL_ENSURE(!_rComposedName.isEmpty(),"There must be a table name supplied!");
OJoinTableView::OTableWindowMap::iterator aIter = GetTabWinMap()->find(_rComposedName);
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
index 4c7fd621b2d2..8ddece24afb3 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
@@ -28,11 +28,9 @@ using namespace dbaui;
// class OFieldDescGenWin
-DBG_NAME(OFieldDescGenWin)
OFieldDescGenWin::OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelp ) :
TabPage( pParent, WB_3DLOOK | WB_DIALOGCONTROL )
{
- DBG_CTOR(OFieldDescGenWin,NULL);
m_pFieldControl = new OTableFieldControl(this,pHelp);
m_pFieldControl->SetHelpId(HID_TAB_DESIGN_FIELDCONTROL);
m_pFieldControl->Show();
@@ -40,7 +38,6 @@ OFieldDescGenWin::OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelp
OFieldDescGenWin::~OFieldDescGenWin()
{
- DBG_DTOR(OFieldDescGenWin,NULL);
::std::auto_ptr<Window> aTemp(m_pFieldControl);
m_pFieldControl = NULL;
}
@@ -60,27 +57,23 @@ void OFieldDescGenWin::Resize()
void OFieldDescGenWin::SetReadOnly( sal_Bool bReadOnly )
{
- DBG_CHKTHIS(OFieldDescGenWin,NULL);
m_pFieldControl->SetReadOnly(bReadOnly);
}
OUString OFieldDescGenWin::GetControlText( sal_uInt16 nControlId )
{
- DBG_CHKTHIS(OFieldDescGenWin,NULL);
return m_pFieldControl->GetControlText(nControlId);
}
void OFieldDescGenWin::SetControlText( sal_uInt16 nControlId, const OUString& rText )
{
- DBG_CHKTHIS(OFieldDescGenWin,NULL);
// Texte der Controls setzen
m_pFieldControl->SetControlText(nControlId,rText);
}
void OFieldDescGenWin::DisplayData( OFieldDescription* pFieldDescr )
{
- DBG_CHKTHIS(OFieldDescGenWin,NULL);
m_pFieldControl->DisplayData(pFieldDescr);
}
@@ -88,7 +81,6 @@ void OFieldDescGenWin::DisplayData( OFieldDescription* pFieldDescr )
#if OSL_DEBUG_LEVEL > 0
OTableEditorCtrl* OFieldDescGenWin::GetEditorCtrl()
{
- DBG_CHKTHIS(OFieldDescGenWin,NULL);
OTableDesignView* pDesignWin = static_cast<OTableDesignView*>(GetParent()->GetParent()->GetParent());
return pDesignWin->GetEditorCtrl();
}
@@ -96,13 +88,11 @@ OTableEditorCtrl* OFieldDescGenWin::GetEditorCtrl()
#endif
void OFieldDescGenWin::SaveData( OFieldDescription* pFieldDescr )
{
- DBG_CHKTHIS(OFieldDescGenWin,NULL);
m_pFieldControl->SaveData(pFieldDescr);
}
void OFieldDescGenWin::GetFocus()
{
- DBG_CHKTHIS(OFieldDescGenWin,NULL);
// Setzt den Focus auf das zuletzt aktive Control
TabPage::GetFocus();
if(m_pFieldControl)
@@ -112,7 +102,6 @@ void OFieldDescGenWin::GetFocus()
void OFieldDescGenWin::LoseFocus()
{
- DBG_CHKTHIS(OFieldDescGenWin,NULL);
m_pFieldControl->LoseFocus();
TabPage::LoseFocus();
}
diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
index 1eb193aaf79a..e8668f9a1806 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
@@ -40,7 +40,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::util;
// class OFieldDescription
-DBG_NAME(OFieldDescription)
OFieldDescription::OFieldDescription()
:m_pType()
,m_nType(DataType::VARCHAR)
@@ -54,7 +53,6 @@ OFieldDescription::OFieldDescription()
,m_bIsCurrency(sal_False)
,m_bHidden(sal_False)
{
- DBG_CTOR(OFieldDescription,NULL);
}
OFieldDescription::OFieldDescription( const OFieldDescription& rDescr )
@@ -80,12 +78,10 @@ OFieldDescription::OFieldDescription( const OFieldDescription& rDescr )
,m_bIsCurrency(rDescr.m_bIsCurrency)
,m_bHidden(rDescr.m_bHidden)
{
- DBG_CTOR(OFieldDescription,NULL);
}
OFieldDescription::~OFieldDescription()
{
- DBG_DTOR(OFieldDescription,NULL);
}
OFieldDescription::OFieldDescription(const Reference< XPropertySet >& xAffectedCol,sal_Bool _bUseAsDest)
@@ -101,7 +97,6 @@ OFieldDescription::OFieldDescription(const Reference< XPropertySet >& xAffectedC
,m_bIsCurrency(sal_False)
,m_bHidden(sal_False)
{
- DBG_CTOR(OFieldDescription,NULL);
OSL_ENSURE(xAffectedCol.is(),"PropetySet can notbe null!");
if ( xAffectedCol.is() )
{
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 664d4c9dc92e..40f149ce4dae 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -67,7 +67,6 @@ namespace dbaui
}
// TYPEINIT1(OTableEditorCtrl, DBView);
-DBG_NAME(OTableEditorCtrl)
#define HANDLE_ID 0
@@ -79,11 +78,9 @@ DBG_NAME(OTableEditorCtrl)
// Maximum length in description field
#define MAX_DESCR_LEN 256
-DBG_NAME(ClipboardInvalidator)
OTableEditorCtrl::ClipboardInvalidator::ClipboardInvalidator(sal_uLong nTimeout,OTableEditorCtrl* _pOwner)
: m_pOwner(_pOwner)
{
- DBG_CTOR(ClipboardInvalidator,NULL);
m_aInvalidateTimer.SetTimeout(nTimeout);
m_aInvalidateTimer.SetTimeoutHdl(LINK(this, OTableEditorCtrl::ClipboardInvalidator, OnInvalidate));
@@ -94,7 +91,6 @@ OTableEditorCtrl::ClipboardInvalidator::~ClipboardInvalidator()
{
m_aInvalidateTimer.Stop();
- DBG_DTOR(ClipboardInvalidator,NULL);
}
IMPL_LINK_NOARG(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate)
@@ -107,7 +103,6 @@ IMPL_LINK_NOARG(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate)
void OTableEditorCtrl::Init()
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
OTableRowView::Init();
// Should it be opened ReadOnly ?
@@ -141,7 +136,6 @@ void OTableEditorCtrl::Init()
void OTableEditorCtrl::UpdateAll()
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
RowRemoved(0, GetRowCount(), sal_False);
m_nDataPos = 0;
@@ -168,7 +162,6 @@ OTableEditorCtrl::OTableEditorCtrl(Window* pWindow)
,bReadOnly(sal_True)
,m_aInvalidate(500,this)
{
- DBG_CTOR(OTableEditorCtrl,NULL);
SetHelpId(HID_TABDESIGN_BACKGROUND);
GetDataWindow().SetHelpId(HID_CTL_TABLEEDIT);
@@ -184,7 +177,6 @@ SfxUndoManager& OTableEditorCtrl::GetUndoManager() const
sal_Bool OTableEditorCtrl::IsReadOnly()
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
return bReadOnly;
}
@@ -196,7 +188,6 @@ void OTableEditorCtrl::SetReadOnly( sal_Bool bRead )
// or worse, this action may not be reversed afterwards
return;
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
bReadOnly = bRead;
// Disable active cells
@@ -217,7 +208,6 @@ void OTableEditorCtrl::SetReadOnly( sal_Bool bRead )
void OTableEditorCtrl::InitCellController()
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
// Cell Field name
sal_Int32 nMaxTextLen = EDIT_NOLIMIT;
OUString sExtraNameChars;
@@ -274,7 +264,6 @@ void OTableEditorCtrl::InitCellController()
void OTableEditorCtrl::ClearModified()
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
pNameCell->ClearModifyFlag();
pDescrCell->ClearModifyFlag();
pHelpTextCell->ClearModifyFlag();
@@ -283,7 +272,6 @@ void OTableEditorCtrl::ClearModified()
OTableEditorCtrl::~OTableEditorCtrl()
{
- DBG_DTOR(OTableEditorCtrl,NULL);
// Reset the Undo-Manager
GetUndoManager().Clear();
@@ -308,7 +296,6 @@ OTableEditorCtrl::~OTableEditorCtrl()
sal_Bool OTableEditorCtrl::SetDataPtr( long nRow )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
if(nRow == -1)
return sal_False;
@@ -324,7 +311,6 @@ sal_Bool OTableEditorCtrl::SeekRow(long _nRow)
// Call the Base class to remember which row must be repainted
EditBrowseBox::SeekRow(_nRow);
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
m_nCurrentPos = _nRow;
return SetDataPtr(_nRow);
}
@@ -332,7 +318,6 @@ sal_Bool OTableEditorCtrl::SeekRow(long _nRow)
void OTableEditorCtrl::PaintCell(OutputDevice& rDev, const Rectangle& rRect,
sal_uInt16 nColumnId ) const
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
const OUString aText( GetCellText( m_nCurrentPos, nColumnId ));
rDev.Push( PUSH_CLIPREGION );
@@ -343,7 +328,6 @@ void OTableEditorCtrl::PaintCell(OutputDevice& rDev, const Rectangle& rRect,
CellController* OTableEditorCtrl::GetController(long nRow, sal_uInt16 nColumnId)
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
// If EditorCtrl is ReadOnly, editing is forbidden
Reference<XPropertySet> xTable = GetView()->getController().getTable();
if (IsReadOnly() || ( xTable.is() &&
@@ -382,7 +366,6 @@ CellController* OTableEditorCtrl::GetController(long nRow, sal_uInt16 nColumnId)
void OTableEditorCtrl::InitController(CellControllerRef&, long nRow, sal_uInt16 nColumnId)
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
SeekRow( nRow == -1 ? GetCurRow() : nRow);
OFieldDescription* pActFieldDescr = pActRow->GetActFieldDescr();
OUString aInitString;
@@ -432,7 +415,6 @@ void OTableEditorCtrl::InitController(CellControllerRef&, long nRow, sal_uInt16
EditBrowseBox::RowStatus OTableEditorCtrl::GetRowStatus(long nRow) const
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
const_cast<OTableEditorCtrl*>(this)->SetDataPtr( nRow );
if( !pActRow )
return EditBrowseBox::CLEAN;
@@ -452,7 +434,6 @@ EditBrowseBox::RowStatus OTableEditorCtrl::GetRowStatus(long nRow) const
sal_Bool OTableEditorCtrl::SaveCurRow()
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
if (GetFieldDescr(GetCurRow()) == NULL)
// there is no data in the current row
return sal_True;
@@ -493,7 +474,6 @@ void OTableEditorCtrl::DisplayData(long nRow, sal_Bool bGrabFocus)
void OTableEditorCtrl::CursorMoved()
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
// New line ?
m_nDataPos = GetCurRow();
if( m_nDataPos != nOldDataPos && m_nDataPos != -1)
@@ -510,7 +490,6 @@ void OTableEditorCtrl::CursorMoved()
sal_Int32 OTableEditorCtrl::HasFieldName( const OUString& rFieldName )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
Reference<XConnection> xCon = GetView()->getController().getConnection();
Reference< XDatabaseMetaData> xMetaData = xCon.is() ? xCon->getMetaData() : Reference< XDatabaseMetaData>();
@@ -532,7 +511,6 @@ sal_Int32 OTableEditorCtrl::HasFieldName( const OUString& rFieldName )
sal_Bool OTableEditorCtrl::SaveData(long nRow, sal_uInt16 nColId)
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
// Store the cell content
SetDataPtr( nRow == -1 ? GetCurRow() : nRow);
OFieldDescription* pActFieldDescr = pActRow->GetActFieldDescr();
@@ -620,7 +598,6 @@ sal_Bool OTableEditorCtrl::SaveData(long nRow, sal_uInt16 nColId)
sal_Bool OTableEditorCtrl::SaveModified()
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
sal_uInt16 nColId = GetCurColumnId();
switch( nColId )
@@ -638,7 +615,6 @@ sal_Bool OTableEditorCtrl::SaveModified()
sal_Bool OTableEditorCtrl::CursorMoving(long nNewRow, sal_uInt16 nNewCol)
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
if (!EditBrowseBox::CursorMoving(nNewRow, nNewCol))
return sal_False;
@@ -664,7 +640,6 @@ sal_Bool OTableEditorCtrl::CursorMoving(long nNewRow, sal_uInt16 nNewCol)
IMPL_LINK( OTableEditorCtrl, InvalidateFieldType, void*, /*EMPTYTAG*/ )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
nInvalidateTypeEvent = 0;
Invalidate( GetFieldRectPixel(nOldDataPos, FIELD_TYPE) );
@@ -673,7 +648,6 @@ IMPL_LINK( OTableEditorCtrl, InvalidateFieldType, void*, /*EMPTYTAG*/ )
void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
// If the description is null, use the default
if(nRow == -1)
@@ -743,7 +717,6 @@ void OTableEditorCtrl::resetType()
void OTableEditorCtrl::CellModified()
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
CellModified( GetCurRow(), GetCurColumnId() );
}
@@ -756,20 +729,17 @@ void OTableEditorCtrl::InvalidateFeatures()
void OTableEditorCtrl::Undo()
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
InvalidateFeatures();
}
void OTableEditorCtrl::Redo()
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
InvalidateFeatures();
}
void OTableEditorCtrl::CopyRows()
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
// set to the right row and save it
if( SetDataPtr(m_nDataPos) )
pDescrWin->SaveData( pActRow->GetActFieldDescr() );
@@ -800,7 +770,6 @@ void OTableEditorCtrl::CopyRows()
OUString OTableEditorCtrl::GenerateName( const OUString& rName )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
// Create a base name for appending numbers to
OUString aBaseName;
Reference<XConnection> xCon = GetView()->getController().getConnection();
@@ -827,7 +796,6 @@ OUString OTableEditorCtrl::GenerateName( const OUString& rName )
void OTableEditorCtrl::InsertRows( long nRow )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
::std::vector< ::boost::shared_ptr<OTableRow> > vInsertedUndoRedoRows; // need for undo/redo handling
// get rows from clipboard
@@ -878,7 +846,6 @@ void OTableEditorCtrl::InsertRows( long nRow )
void OTableEditorCtrl::DeleteRows()
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
OSL_ENSURE(GetView()->getController().isDropAllowed(),"Call of DeleteRows not valid here. Please check isDropAllowed!");
// Create the Undo-Action
GetUndoManager().AddUndoAction( new OTableEditorDelUndoAct(this) );
@@ -916,7 +883,6 @@ void OTableEditorCtrl::DeleteRows()
void OTableEditorCtrl::InsertNewRows( long nRow )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
OSL_ENSURE(GetView()->getController().isAddAllowed(),"Call of InsertNewRows not valid here. Please check isAppendAllowed!");
// Create Undo-Action
long nInsertRows = GetSelectRowCount();
@@ -934,7 +900,6 @@ void OTableEditorCtrl::InsertNewRows( long nRow )
OUString OTableEditorCtrl::GetControlText( long nRow, sal_uInt16 nColId )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
// Read the Browser Controls
if( nColId < FIELD_FIRST_VIRTUAL_COLUMN )
{
@@ -954,7 +919,6 @@ OUString OTableEditorCtrl::GetControlText( long nRow, sal_uInt16 nColId )
void OTableEditorCtrl::SetControlText( long nRow, sal_uInt16 nColId, const OUString& rText )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
// Set the Browser Controls
if( nColId < FIELD_FIRST_VIRTUAL_COLUMN )
{
@@ -976,7 +940,6 @@ void OTableEditorCtrl::SetControlText( long nRow, sal_uInt16 nColId, const OUStr
void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
// Relocate the current pointer
if( nRow == -1 )
nRow = GetCurRow();
@@ -998,7 +961,6 @@ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const TOTypeIn
void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const ::com::sun::star::uno::Any& _rNewData )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
// Relocate the current pointer
if( nRow == -1 )
nRow = GetCurRow();
@@ -1079,7 +1041,6 @@ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const ::com::s
Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
OFieldDescription* pFieldDescr = GetFieldDescr( nRow );
if( !pFieldDescr )
return Any();
@@ -1149,7 +1110,6 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId )
OUString OTableEditorCtrl::GetCellText( long nRow, sal_uInt16 nColId ) const
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
OUString sCellText;
const_cast< OTableEditorCtrl* >( this )->GetCellData( nRow, nColId ) >>= sCellText;
return sCellText;
@@ -1157,13 +1117,11 @@ OUString OTableEditorCtrl::GetCellText( long nRow, sal_uInt16 nColId ) const
sal_uInt32 OTableEditorCtrl::GetTotalCellWidth(long nRow, sal_uInt16 nColId)
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
return GetTextWidth(GetCellText(nRow, nColId)) + 2 * GetTextWidth(OUString('0'));
}
OFieldDescription* OTableEditorCtrl::GetFieldDescr( long nRow )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
std::vector< ::boost::shared_ptr<OTableRow> >::size_type nListCount(
m_pRowList->size());
if( (nRow<0) || (sal::static_int_cast< unsigned long >(nRow)>=nListCount) )
@@ -1179,7 +1137,6 @@ OFieldDescription* OTableEditorCtrl::GetFieldDescr( long nRow )
sal_Bool OTableEditorCtrl::IsCutAllowed( long nRow )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
sal_Bool bIsCutAllowed = (GetView()->getController().isAddAllowed() && GetView()->getController().isDropAllowed()) ||
GetView()->getController().isAlterAllowed();
@@ -1210,7 +1167,6 @@ sal_Bool OTableEditorCtrl::IsCutAllowed( long nRow )
sal_Bool OTableEditorCtrl::IsCopyAllowed( long /*nRow*/ )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
sal_Bool bIsCopyAllowed = sal_False;
if(m_eChildFocus == DESCRIPTION )
bIsCopyAllowed = !pDescrCell->GetSelected().isEmpty();
@@ -1244,7 +1200,6 @@ sal_Bool OTableEditorCtrl::IsCopyAllowed( long /*nRow*/ )
sal_Bool OTableEditorCtrl::IsPasteAllowed( long /*nRow*/ )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
sal_Bool bAllowed = GetView()->getController().isAddAllowed();
if ( bAllowed )
{
@@ -1345,14 +1300,12 @@ void OTableEditorCtrl::paste()
sal_Bool OTableEditorCtrl::IsDeleteAllowed( long /*nRow*/ )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
return GetSelectRowCount() != 0 && GetView()->getController().isDropAllowed();
}
sal_Bool OTableEditorCtrl::IsInsertNewAllowed( long nRow )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
sal_Bool bInsertNewAllowed = GetView()->getController().isAddAllowed();
// If fields can be added, Paste in the new fields
@@ -1368,7 +1321,6 @@ sal_Bool OTableEditorCtrl::IsInsertNewAllowed( long nRow )
sal_Bool OTableEditorCtrl::IsPrimaryKeyAllowed( long /*nRow*/ )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
if( !GetSelectRowCount() )
return sal_False;
@@ -1415,7 +1367,6 @@ sal_Bool OTableEditorCtrl::IsPrimaryKeyAllowed( long /*nRow*/ )
void OTableEditorCtrl::Command(const CommandEvent& rEvt)
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
switch (rEvt.GetCommand())
{
case COMMAND_CONTEXTMENU:
@@ -1574,7 +1525,6 @@ IMPL_LINK( OTableEditorCtrl, DelayedDelete, void*, /*EMPTYTAG*/ )
IMPL_LINK( OTableEditorCtrl, DelayedInsNewRows, void*, /*EMPTYTAG*/ )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
nInsNewRowsEvent = 0;
sal_Int32 nPastePosition = GetView()->getController().getFirstEmptyRowPosition();
if ( !GetView()->getController().getTable().is() )
@@ -1616,7 +1566,6 @@ void OTableEditorCtrl::AdjustFieldDescription(OFieldDescription* _pFieldDesc,
void OTableEditorCtrl::SetPrimaryKey( sal_Bool bSet )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
// Delete any existing Primary Keys
MultiSelection aDeletedPrimKeys;
aDeletedPrimKeys.SetTotalRange( Range(0,GetRowCount()) );
@@ -1662,7 +1611,6 @@ void OTableEditorCtrl::SetPrimaryKey( sal_Bool bSet )
sal_Bool OTableEditorCtrl::IsPrimaryKey()
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
// Are all marked fields part of the Primary Key ?
long nPrimaryKeys = 0;
::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter = m_pRowList->begin();
@@ -1681,7 +1629,6 @@ sal_Bool OTableEditorCtrl::IsPrimaryKey()
void OTableEditorCtrl::SwitchType( const TOTypeInfoSP& _pType )
{
- DBG_CHKTHIS(OTableEditorCtrl,NULL);
// if there is no assigned field name
long nRow(GetCurRow());
OFieldDescription* pActFieldDescr = GetFieldDescr( nRow );
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index ceba53a3b18a..f6dace202c9f 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -138,14 +138,12 @@ Reference< XInterface > SAL_CALL OTableController::Create(const Reference<XMulti
return *(new OTableController(comphelper::getComponentContext(_rxFactory)));
}
-DBG_NAME(OTableController)
OTableController::OTableController(const Reference< XComponentContext >& _rM) : OTableController_BASE(_rM)
,m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES))
,m_pTypeInfo()
,m_bAllowAutoIncrementValue(sal_False)
,m_bNew(sal_True)
{
- DBG_CTOR(OTableController,NULL);
InvalidateAll();
m_pTypeInfo = TOTypeInfoSP(new OTypeInfo());
@@ -157,7 +155,6 @@ OTableController::~OTableController()
m_aTypeInfoIndex.clear();
m_aTypeInfo.clear();
- DBG_DTOR(OTableController,NULL);
}
void OTableController::startTableListening()
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index a4aecb4e22b9..ec7986dac4d1 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -34,7 +34,6 @@ using namespace ::com::sun::star::util;
//--- Defines
#define HANDLE_ID 0
-DBG_NAME(OTableRowView)
OTableRowView::OTableRowView(Window* pParent)
:EditBrowseBox(pParent, ModuleRes(RID_DB_TAB_EDITOR),EBBF_NONE,
BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_AUTOSIZE_LASTCOL |
@@ -46,14 +45,12 @@ OTableRowView::OTableRowView(Window* pParent)
,m_bUpdatable(sal_False)
,m_bClipboardFilled(sal_False)
{
- DBG_CTOR(OTableRowView,NULL);
}
OTableRowView::~OTableRowView()
{
- DBG_DTOR(OTableRowView,NULL);
}
void OTableRowView::Init()
diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
index e2681b021ba3..912ee70128db 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
@@ -25,11 +25,9 @@
using namespace dbaui;
#define STANDARD_MARGIN 6
// class OTableDesignHelpBar
-DBG_NAME(OTableDesignHelpBar)
OTableDesignHelpBar::OTableDesignHelpBar( Window* pParent ) :
TabPage( pParent, WB_3DLOOK )
{
- DBG_CTOR(OTableDesignHelpBar,NULL);
m_pTextWin = new MultiLineEdit( this, WB_VSCROLL | WB_LEFT | WB_BORDER | WB_NOTABSTOP | WB_READONLY);
m_pTextWin->SetHelpId(HID_TABLE_DESIGN_HELP_WINDOW);
m_pTextWin->SetReadOnly();
@@ -39,14 +37,12 @@ OTableDesignHelpBar::OTableDesignHelpBar( Window* pParent ) :
OTableDesignHelpBar::~OTableDesignHelpBar()
{
- DBG_DTOR(OTableDesignHelpBar,NULL);
::std::auto_ptr<Window> aTemp(m_pTextWin);
m_pTextWin = NULL;
}
void OTableDesignHelpBar::SetHelpText( const OUString& rText )
{
- DBG_CHKTHIS(OTableDesignHelpBar,NULL);
if(m_pTextWin)
m_pTextWin->SetText( rText );
Invalidate();
@@ -54,7 +50,6 @@ void OTableDesignHelpBar::SetHelpText( const OUString& rText )
void OTableDesignHelpBar::Resize()
{
- DBG_CHKTHIS(OTableDesignHelpBar,NULL);
// Abmessungen parent window
Size aOutputSize( GetOutputSizePixel() );
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index c459c7615035..92e286e34484 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -39,11 +39,9 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
// class OTableBorderWindow
-DBG_NAME(OTableBorderWindow)
OTableBorderWindow::OTableBorderWindow(Window* pParent) : Window(pParent,WB_BORDER)
,m_aHorzSplitter( this )
{
- DBG_CTOR(OTableBorderWindow,NULL);
ImplInitSettings( sal_True, sal_True, sal_True );
// Children erzeugen
@@ -80,7 +78,6 @@ OTableBorderWindow::~OTableBorderWindow()
m_pFieldDescWin = NULL;
}
- DBG_DTOR(OTableBorderWindow,NULL);
}
void OTableBorderWindow::Resize()
@@ -172,7 +169,6 @@ void OTableBorderWindow::GetFocus()
}
// class OTableDesignView
-DBG_NAME(OTableDesignView);
OTableDesignView::OTableDesignView( Window* pParent,
const Reference< XComponentContext >& _rxOrb,
OTableController& _rController
@@ -181,7 +177,6 @@ OTableDesignView::OTableDesignView( Window* pParent,
,m_rController( _rController )
,m_eChildFocus(NONE)
{
- DBG_CTOR(OTableDesignView,NULL);
try
{
@@ -197,7 +192,6 @@ OTableDesignView::OTableDesignView( Window* pParent,
OTableDesignView::~OTableDesignView()
{
- DBG_DTOR(OTableDesignView,NULL);
m_pWin->Hide();
{
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index fd6633619786..da5c37e4e67c 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -44,11 +44,9 @@
using namespace dbaui;
// class OTableFieldDescWin
-DBG_NAME(OTableFieldDescWin)
OTableFieldDescWin::OTableFieldDescWin( Window* pParent)
:TabPage(pParent, WB_3DLOOK)
{
- DBG_CTOR(OTableFieldDescWin,NULL);
// Header
m_pHeader = new FixedText( this, WB_CENTER | WB_INFO ); // | WB_3DLOOK
m_pHeader->SetText( OUString(ModuleRes(STR_TAB_PROPERTIES)) );
@@ -66,7 +64,6 @@ OTableFieldDescWin::OTableFieldDescWin( Window* pParent)
OTableFieldDescWin::~OTableFieldDescWin()
{
- DBG_DTOR(OTableFieldDescWin,NULL);
// Children zerstoeren
m_pHelpBar->Hide();
getGenPage()->Hide();
@@ -100,25 +97,21 @@ void OTableFieldDescWin::Init()
void OTableFieldDescWin::SetReadOnly( sal_Bool bRead )
{
- DBG_CHKTHIS(OTableFieldDescWin,NULL);
getGenPage()->SetReadOnly( bRead );
}
void OTableFieldDescWin::DisplayData( OFieldDescription* pFieldDescr )
{
- DBG_CHKTHIS(OTableFieldDescWin,NULL);
getGenPage()->DisplayData( pFieldDescr );
}
void OTableFieldDescWin::SaveData( OFieldDescription* pFieldDescr )
{
- DBG_CHKTHIS(OTableFieldDescWin,NULL);
getGenPage()->SaveData( pFieldDescr );
}
void OTableFieldDescWin::Paint( const Rectangle& /*rRect*/ )
{
- DBG_CHKTHIS(OTableFieldDescWin,NULL);
// 3D-Linie am oberen Fensterrand
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -133,7 +126,6 @@ void OTableFieldDescWin::Paint( const Rectangle& /*rRect*/ )
void OTableFieldDescWin::Resize()
{
- DBG_CHKTHIS(OTableFieldDescWin,NULL);
// Abmessungen parent window
Size aOutputSize( GetOutputSizePixel() );
long nOutputWidth = aOutputSize.Width();
diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx
index 03dfe087ee19..a67cbd48ac23 100644
--- a/dbaccess/source/ui/tabledesign/TableRow.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRow.cxx
@@ -29,14 +29,12 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
// class OTableRow
-DBG_NAME(OTableRow)
OTableRow::OTableRow()
:m_pActFieldDescr( NULL )
,m_nPos( -1 )
,m_bReadOnly( false )
,m_bOwnsDescriptions(false)
{
- DBG_CTOR(OTableRow,NULL);
}
OTableRow::OTableRow(const Reference< XPropertySet >& xAffectedCol)
@@ -45,7 +43,6 @@ OTableRow::OTableRow(const Reference< XPropertySet >& xAffectedCol)
,m_bReadOnly( false )
,m_bOwnsDescriptions(true)
{
- DBG_CTOR(OTableRow,NULL);
m_pActFieldDescr = new OFieldDescription(xAffectedCol);
}
@@ -55,7 +52,6 @@ OTableRow::OTableRow( const OTableRow& rRow, long nPosition )
,m_bReadOnly(rRow.IsReadOnly())
,m_bOwnsDescriptions(false)
{
- DBG_CTOR(OTableRow,NULL);
OFieldDescription* pSrcField = rRow.GetActFieldDescr();
if(pSrcField)
@@ -67,27 +63,23 @@ OTableRow::OTableRow( const OTableRow& rRow, long nPosition )
OTableRow::~OTableRow()
{
- DBG_DTOR(OTableRow,NULL);
if(m_bOwnsDescriptions)
delete m_pActFieldDescr;
}
void OTableRow::SetPrimaryKey( sal_Bool bSet )
{
- DBG_CHKTHIS(OTableRow,NULL);
if(m_pActFieldDescr)
m_pActFieldDescr->SetPrimaryKey(bSet);
}
sal_Bool OTableRow::IsPrimaryKey() const
{
- DBG_CHKTHIS(OTableRow,NULL);
return m_pActFieldDescr && m_pActFieldDescr->IsPrimaryKey();
}
void OTableRow::SetFieldType( const TOTypeInfoSP& _pType, sal_Bool _bForce )
{
- DBG_CHKTHIS(OTableRow,NULL);
if ( _pType.get() )
{
if( !m_pActFieldDescr )
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx
index 5445f1c6ff9d..b4ef8f109513 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.cxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx
@@ -41,17 +41,14 @@ TYPEINIT1( OTableEditorInsNewUndoAct, OTableEditorUndoAct );
TYPEINIT1( OPrimKeyUndoAct, OTableEditorUndoAct );
// class OTableDesignUndoAct
-DBG_NAME(OTableDesignUndoAct);
OTableDesignUndoAct::OTableDesignUndoAct( OTableRowView* pOwner,sal_uInt16 nCommentID ) : OCommentUndoAction(nCommentID)
,m_pTabDgnCtrl( pOwner )
{
- DBG_CTOR(OTableDesignUndoAct,NULL);
m_pTabDgnCtrl->m_nCurUndoActId++;
}
OTableDesignUndoAct::~OTableDesignUndoAct()
{
- DBG_DTOR(OTableDesignUndoAct,NULL);
}
void OTableDesignUndoAct::Undo()
@@ -79,20 +76,17 @@ void OTableDesignUndoAct::Redo()
}
// class OTableDesignCellUndoAct
-DBG_NAME(OTableDesignCellUndoAct);
OTableDesignCellUndoAct::OTableDesignCellUndoAct( OTableRowView* pOwner, long nRowID, sal_uInt16 nColumn ) :
OTableDesignUndoAct( pOwner ,STR_TABED_UNDO_CELLMODIFIED)
,m_nCol( nColumn )
,m_nRow( nRowID )
{
- DBG_CTOR(OTableDesignCellUndoAct,NULL);
// read text at position (m_nRow, m_nCol)
m_sOldText = m_pTabDgnCtrl->GetCellData( m_nRow, m_nCol );
}
OTableDesignCellUndoAct::~OTableDesignCellUndoAct()
{
- DBG_DTOR(OTableDesignCellUndoAct,NULL);
}
void OTableDesignCellUndoAct::Undo()
@@ -124,33 +118,27 @@ void OTableDesignCellUndoAct::Redo()
}
// class OTableEditorUndoAct
-DBG_NAME(OTableEditorUndoAct);
OTableEditorUndoAct::OTableEditorUndoAct( OTableEditorCtrl* pOwner,sal_uInt16 _nCommentID ) :
OTableDesignUndoAct( pOwner ,_nCommentID)
,pTabEdCtrl(pOwner)
{
- DBG_CTOR(OTableEditorUndoAct,NULL);
}
OTableEditorUndoAct::~OTableEditorUndoAct()
{
- DBG_DTOR(OTableEditorUndoAct,NULL);
}
// class OTableEditorTypeSelUndoAct
-DBG_NAME(OTableEditorTypeSelUndoAct);
OTableEditorTypeSelUndoAct::OTableEditorTypeSelUndoAct( OTableEditorCtrl* pOwner, long nRowID, sal_uInt16 nColumn, const TOTypeInfoSP& _pOldType )
:OTableEditorUndoAct( pOwner ,STR_TABED_UNDO_TYPE_CHANGED)
,m_nCol( nColumn )
,m_nRow( nRowID )
,m_pOldType( _pOldType )
{
- DBG_CTOR(OTableEditorTypeSelUndoAct,NULL);
}
OTableEditorTypeSelUndoAct::~OTableEditorTypeSelUndoAct()
{
- DBG_DTOR(OTableEditorTypeSelUndoAct,NULL);
}
void OTableEditorTypeSelUndoAct::Undo()
@@ -177,11 +165,9 @@ void OTableEditorTypeSelUndoAct::Redo()
}
// class OTableEditorDelUndoAct
-DBG_NAME(OTableEditorDelUndoAct);
OTableEditorDelUndoAct::OTableEditorDelUndoAct( OTableEditorCtrl* pOwner) :
OTableEditorUndoAct( pOwner ,STR_TABED_UNDO_ROWDELETED)
{
- DBG_CTOR(OTableEditorDelUndoAct,NULL);
// fill DeletedRowList
::std::vector< ::boost::shared_ptr<OTableRow> >* pOriginalRows = pOwner->GetRowList();
long nIndex = pOwner->FirstSelectedRow();
@@ -200,7 +186,6 @@ OTableEditorDelUndoAct::OTableEditorDelUndoAct( OTableEditorCtrl* pOwner) :
OTableEditorDelUndoAct::~OTableEditorDelUndoAct()
{
- DBG_DTOR(OTableEditorDelUndoAct,NULL);
m_aDeletedRows.clear();
}
@@ -246,7 +231,6 @@ void OTableEditorDelUndoAct::Redo()
}
// class OTableEditorInsUndoAct
-DBG_NAME(OTableEditorInsUndoAct);
OTableEditorInsUndoAct::OTableEditorInsUndoAct( OTableEditorCtrl* pOwner,
long nInsertPosition ,
const ::std::vector< ::boost::shared_ptr<OTableRow> >& _vInsertedRows)
@@ -254,12 +238,10 @@ OTableEditorInsUndoAct::OTableEditorInsUndoAct( OTableEditorCtrl* pOwner,
,m_vInsertedRows(_vInsertedRows)
,m_nInsPos( nInsertPosition )
{
- DBG_CTOR(OTableEditorInsUndoAct,NULL);
}
OTableEditorInsUndoAct::~OTableEditorInsUndoAct()
{
- DBG_DTOR(OTableEditorInsUndoAct,NULL);
m_vInsertedRows.clear();
}
@@ -300,18 +282,15 @@ void OTableEditorInsUndoAct::Redo()
}
// class OTableEditorInsNewUndoAct
-DBG_NAME(OTableEditorInsNewUndoAct);
OTableEditorInsNewUndoAct::OTableEditorInsNewUndoAct( OTableEditorCtrl* pOwner, long nInsertPosition, long nInsertedRows ) :
OTableEditorUndoAct( pOwner ,STR_TABED_UNDO_NEWROWINSERTED)
,m_nInsPos( nInsertPosition )
,m_nInsRows( nInsertedRows )
{
- DBG_CTOR(OTableEditorInsNewUndoAct,NULL);
}
OTableEditorInsNewUndoAct::~OTableEditorInsNewUndoAct()
{
- DBG_DTOR(OTableEditorInsNewUndoAct,NULL);
}
void OTableEditorInsNewUndoAct::Undo()
@@ -345,19 +324,16 @@ void OTableEditorInsNewUndoAct::Redo()
}
// class OPrimKeyUndoAct
-DBG_NAME(OPrimKeyUndoAct);
OPrimKeyUndoAct::OPrimKeyUndoAct( OTableEditorCtrl* pOwner, MultiSelection aDeletedKeys, MultiSelection aInsertedKeys) :
OTableEditorUndoAct( pOwner ,STR_TABLEDESIGN_UNDO_PRIMKEY)
,m_aDelKeys( aDeletedKeys )
,m_aInsKeys( aInsertedKeys )
,m_pEditorCtrl( pOwner )
{
- DBG_CTOR(OPrimKeyUndoAct,NULL);
}
OPrimKeyUndoAct::~OPrimKeyUndoAct()
{
- DBG_DTOR(OPrimKeyUndoAct,NULL);
}
void OPrimKeyUndoAct::Undo()
diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx
index 9b4615cd4b01..4a20af80f610 100644
--- a/dbaccess/source/ui/uno/ColumnModel.cxx
+++ b/dbaccess/source/ui/uno/ColumnModel.cxx
@@ -45,7 +45,6 @@ using namespace ::com::sun::star::io;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util;
-DBG_NAME(OColumnControlModel)
OColumnControlModel::OColumnControlModel(const Reference<XMultiServiceFactory>& _rxFactory)
:OPropertyContainer(m_aBHelper)
,OColumnControlModel_BASE(m_aMutex)
@@ -55,7 +54,6 @@ OColumnControlModel::OColumnControlModel(const Reference<XMultiServiceFactory>&
,m_nBorder(0)
,m_nWidth(50)
{
- DBG_CTOR(OColumnControlModel,NULL);
registerProperties();
}
@@ -69,13 +67,11 @@ OColumnControlModel::OColumnControlModel(const OColumnControlModel* _pSource,con
,m_nBorder(_pSource->m_nBorder)
,m_nWidth(50)
{
- DBG_CTOR(OColumnControlModel,NULL);
registerProperties();
}
OColumnControlModel::~OColumnControlModel()
{
- DBG_DTOR(OColumnControlModel,NULL);
if ( !OColumnControlModel_BASE::rBHelper.bDisposed && !OColumnControlModel_BASE::rBHelper.bInDispose )
{
acquire();
diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx
index 04d21bd18374..137f615266ad 100644
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@@ -53,11 +53,9 @@ namespace dbaui
using namespace ::com::sun::star::sdb;
// ComposerDialog
- DBG_NAME(ComposerDialog)
ComposerDialog::ComposerDialog(const Reference< XComponentContext >& _rxORB)
:OGenericUnoDialog( _rxORB )
{
- DBG_CTOR(ComposerDialog,NULL);
registerProperty( PROPERTY_QUERYCOMPOSER, PROPERTY_ID_QUERYCOMPOSER, PropertyAttribute::TRANSIENT,
&m_xComposer, ::getCppuType( &m_xComposer ) );
@@ -68,7 +66,6 @@ namespace dbaui
ComposerDialog::~ComposerDialog()
{
- DBG_DTOR(ComposerDialog,NULL);
}
IMPLEMENT_IMPLEMENTATION_ID( ComposerDialog )
diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx
index ac3ead395dfd..5165bd98220e 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.cxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.cxx
@@ -46,18 +46,15 @@ namespace dbaui
using namespace ::com::sun::star::sdb;
// ODirectSQLDialog
-DBG_NAME(ODirectSQLDialog)
ODirectSQLDialog::ODirectSQLDialog(const Reference< XComponentContext >& _rxORB)
:ODirectSQLDialog_BASE( _rxORB )
{
- DBG_CTOR(ODirectSQLDialog,NULL);
}
ODirectSQLDialog::~ODirectSQLDialog()
{
- DBG_DTOR(ODirectSQLDialog,NULL);
}
IMPLEMENT_IMPLEMENTATION_ID( ODirectSQLDialog )
diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx
index e88e253aead7..6a5030bd9c3f 100644
--- a/dbaccess/source/ui/uno/unoadmin.cxx
+++ b/dbaccess/source/ui/uno/unoadmin.cxx
@@ -41,7 +41,6 @@ namespace dbaui
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
-DBG_NAME(ODatabaseAdministrationDialog)
ODatabaseAdministrationDialog::ODatabaseAdministrationDialog(const Reference< XComponentContext >& _rxORB)
:ODatabaseAdministrationDialogBase(_rxORB)
,m_pDatasourceItems(NULL)
@@ -49,7 +48,6 @@ ODatabaseAdministrationDialog::ODatabaseAdministrationDialog(const Reference< XC
,m_pItemPoolDefaults(NULL)
,m_pCollection(NULL)
{
- DBG_CTOR(ODatabaseAdministrationDialog,NULL);
m_pCollection = new ::dbaccess::ODsnTypeCollection(_rxORB);
ODbAdminDialog::createItemSet(m_pDatasourceItems, m_pItemPool, m_pItemPoolDefaults, m_pCollection);
@@ -69,7 +67,6 @@ ODatabaseAdministrationDialog::~ODatabaseAdministrationDialog()
delete m_pCollection;
m_pCollection = NULL;
- DBG_DTOR(ODatabaseAdministrationDialog,NULL);
}
void ODatabaseAdministrationDialog::destroyDialog()