diff options
author | Arnaud Versini <arnaud.versini@gmail.com> | 2014-01-19 15:51:52 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-21 16:20:10 +0000 |
commit | 5b2ba8ed5d6406492205b08ef25fe640253f66a1 (patch) | |
tree | 166e6fd0c9e802a5cf8fb8d9895ef828a88daea1 /dbaccess/source/ui/relationdesign | |
parent | de2d5d9abb7f625269cd4ee54c983c6dfde33767 (diff) |
DBACCESS : Remove usage of DBG_CTOR and DBG_DTOR.
Valgrind is capable of detecting such bugs. No need for extra macros.
Conflicts:
dbaccess/source/ui/dlg/tablespage.cxx
Change-Id: I25ea9174a042050efdb371246417ee7f2edae997
Reviewed-on: https://gerrit.libreoffice.org/7532
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess/source/ui/relationdesign')
5 files changed, 0 insertions, 31 deletions
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); |