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>

29 files changed, 0 insertions, 213 deletions

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: */