summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorArnaud Versini <arnaud.versini@gmail.com>2014-03-02 16:08:50 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-03-03 09:19:11 -0600
commit0feaf45541ab82a3e1d8e644380734cb85152446 (patch)
tree7f6109fe6e8084d376b0621a5ea005913868e2fd /svtools
parentff71f4e55c32f903fc4f988cc3e726d0c691841e (diff)
SVTOOLS : Remove usage of DBG_CTOR and DBG_DTOR.
Valgrind is capable of detecting such bugs. No need for extra macros. Change-Id: I83e39d69deaf2aa1c5ca455c92d070a2d33def3f Reviewed-on: https://gerrit.libreoffice.org/8421 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/brwbox/brwbox1.cxx53
-rw-r--r--svtools/source/brwbox/brwbox2.cxx41
-rw-r--r--svtools/source/brwbox/editbrowsebox.cxx7
-rw-r--r--svtools/source/contnr/svlbitm.cxx47
-rw-r--r--svtools/source/contnr/treelist.cxx22
-rw-r--r--svtools/source/contnr/treelistbox.cxx164
-rw-r--r--svtools/source/contnr/viewdataentry.cxx4
-rw-r--r--svtools/source/control/accessibleruler.cxx3
-rw-r--r--svtools/source/control/fmtfield.cxx29
-rw-r--r--svtools/source/control/vclxaccessibleheaderbaritem.cxx2
-rw-r--r--svtools/source/dialogs/roadmapwizard.cxx12
-rw-r--r--svtools/source/misc/imap.cxx3
-rw-r--r--svtools/source/misc/itemdel.cxx4
-rw-r--r--svtools/source/misc/templatefoldercache.cxx3
-rw-r--r--svtools/source/table/tablecontrol_impl.cxx4
-rw-r--r--svtools/source/uno/unocontroltablemodel.cxx4
16 files changed, 0 insertions, 402 deletions
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 0e3ec67a5130..a9ad6baf9c17 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -32,7 +32,6 @@
#include <tools/multisel.hxx>
#include "brwimpl.hxx"
-DBG_NAME(BrowseBox)
extern const char* BrowseBoxCheckInvariants( const void* pVoid );
@@ -46,8 +45,6 @@ using com::sun::star::lang::XComponent;
using namespace ::com::sun::star::uno;
using namespace svt;
-
-
namespace
{
void disposeAndClearHeaderCell(::svt::BrowseBoxImpl::THeaderCellMap& _rHeaderCell)
@@ -124,7 +121,6 @@ BrowseBox::BrowseBox( Window* pParent, WinBits nBits, BrowserMode nMode )
,DropTargetHelper( this )
,aHScroll( this, WinBits( WB_HSCROLL ) )
{
- DBG_CTOR( BrowseBox, NULL );
ConstructImpl( nMode );
}
@@ -136,14 +132,12 @@ BrowseBox::BrowseBox( Window* pParent, const ResId& rId, BrowserMode nMode )
,DropTargetHelper( this )
,aHScroll( this, WinBits(WB_HSCROLL) )
{
- DBG_CTOR( BrowseBox, NULL );
ConstructImpl(nMode);
}
BrowseBox::~BrowseBox()
{
- DBG_DTOR(BrowseBox,BrowseBoxCheckInvariants);
OSL_TRACE( "BrowseBox: %p~", this );
if ( m_pImpl->m_pAccessible )
@@ -221,7 +215,6 @@ void BrowseBox::SetRealRowCount( const OUString &rRealRowCount )
void BrowseBox::SetFont( const Font& rNewFont )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
pDataWin->SetFont( rNewFont );
ImpGetDataRowHeight();
}
@@ -237,7 +230,6 @@ sal_uLong BrowseBox::GetDefaultColumnWidth( const OUString& _rText ) const
void BrowseBox::InsertHandleColumn( sal_uLong nWidth )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
#if OSL_DEBUG_LEVEL > 0
OSL_ENSURE( ColCount() == 0 || (*pCols)[0]->GetId() != HandleColumnId , "BrowseBox::InsertHandleColumn: there is already a handle column" );
@@ -270,7 +262,6 @@ void BrowseBox::InsertHandleColumn( sal_uLong nWidth )
void BrowseBox::InsertDataColumn( sal_uInt16 nItemId, const OUString& rText,
long nWidth, HeaderBarItemBits nBits, sal_uInt16 nPos )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
OSL_ENSURE( nItemId != HandleColumnId, "BrowseBox::InsertDataColumn: nItemId is HandleColumnId" );
OSL_ENSURE( nItemId != BROWSER_INVALIDID, "BrowseBox::InsertDataColumn: nItemId is reserved value BROWSER_INVALIDID" );
@@ -335,7 +326,6 @@ void BrowseBox::SetToggledSelectedColumn(sal_uInt16 _nSelectedColumnId)
void BrowseBox::FreezeColumn( sal_uInt16 nItemId, sal_Bool bFreeze )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// never unfreeze the handle-column
if ( nItemId == HandleColumnId && !bFreeze )
@@ -534,7 +524,6 @@ void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos )
void BrowseBox::SetColumnTitle( sal_uInt16 nItemId, const OUString& rTitle )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// never set title of the handle-column
if ( nItemId == HandleColumnId )
@@ -580,7 +569,6 @@ void BrowseBox::SetColumnTitle( sal_uInt16 nItemId, const OUString& rTitle )
void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// get the position in the current array
size_t nItemPos = GetColumnPos( nItemId );
@@ -702,7 +690,6 @@ void BrowseBox::AutoSizeLastColumn()
void BrowseBox::RemoveColumn( sal_uInt16 nItemId )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// get column position
sal_uInt16 nPos = GetColumnPos(nItemId);
@@ -786,7 +773,6 @@ void BrowseBox::RemoveColumn( sal_uInt16 nItemId )
void BrowseBox::RemoveColumns()
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
size_t nOldCount = pCols->size();
@@ -858,7 +844,6 @@ void BrowseBox::RemoveColumns()
OUString BrowseBox::GetColumnTitle( sal_uInt16 nId ) const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
sal_uInt16 nItemPos = GetColumnPos( nId );
if ( nItemPos >= pCols->size() )
@@ -877,7 +862,6 @@ long BrowseBox::GetRowCount() const
sal_uInt16 BrowseBox::ColCount() const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
return (sal_uInt16) pCols->size();
}
@@ -886,7 +870,6 @@ sal_uInt16 BrowseBox::ColCount() const
long BrowseBox::ImpGetDataRowHeight() const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
BrowseBox *pThis = (BrowseBox*)this;
pThis->nDataRowHeight = pThis->CalcReverseZoom(pDataWin->GetTextHeight() + 2);
@@ -899,7 +882,6 @@ long BrowseBox::ImpGetDataRowHeight() const
void BrowseBox::SetDataRowHeight( long nPixel )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
nDataRowHeight = CalcReverseZoom(nPixel);
Resize();
@@ -910,7 +892,6 @@ void BrowseBox::SetDataRowHeight( long nPixel )
void BrowseBox::SetTitleLines( sal_uInt16 nLines )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
nTitleLines = nLines;
}
@@ -919,7 +900,6 @@ void BrowseBox::SetTitleLines( sal_uInt16 nLines )
long BrowseBox::ScrollColumns( long nCols )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
if ( nFirstCol + nCols < 0 ||
nFirstCol + nCols >= (long)pCols->size() )
@@ -1063,7 +1043,6 @@ long BrowseBox::ScrollColumns( long nCols )
long BrowseBox::ScrollRows( long nRows )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// out of range?
if ( getDataWindow()->bNoScrollBack && nRows < 0 )
@@ -1121,7 +1100,6 @@ long BrowseBox::ScrollRows( long nRows )
void BrowseBox::RowModified( long nRow, sal_uInt16 nColId )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
if ( !GetUpdateMode() )
return;
@@ -1143,7 +1121,6 @@ void BrowseBox::RowModified( long nRow, sal_uInt16 nColId )
void BrowseBox::Clear()
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// adjust the total number of rows
DoHideCursor( "Clear" );
@@ -1208,7 +1185,6 @@ void BrowseBox::Clear()
void BrowseBox::RowInserted( long nRow, long nNumRows, sal_Bool bDoPaint, sal_Bool bKeepSelection )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
if (nRow < 0)
nRow = 0;
@@ -1314,7 +1290,6 @@ void BrowseBox::RowInserted( long nRow, long nNumRows, sal_Bool bDoPaint, sal_Bo
void BrowseBox::RowRemoved( long nRow, long nNumRows, sal_Bool bDoPaint )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
if ( nRow < 0 )
nRow = 0;
@@ -1494,7 +1469,6 @@ sal_Bool BrowseBox::GoToRow( long nRow)
sal_Bool BrowseBox::GoToRow( long nRow, sal_Bool bRowColMove, sal_Bool bKeepSelection )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
long nOldCurRow = nCurRow;
@@ -1588,7 +1562,6 @@ sal_Bool BrowseBox::GoToColumnId( sal_uInt16 nColId)
sal_Bool BrowseBox::GoToColumnId( sal_uInt16 nColId, sal_Bool bMakeVisible, sal_Bool bRowColMove)
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
if (!bColumnCursor)
return sal_False;
@@ -1634,7 +1607,6 @@ sal_Bool BrowseBox::GoToColumnId( sal_uInt16 nColId, sal_Bool bMakeVisible, sal_
sal_Bool BrowseBox::GoToRowColumnId( long nRow, sal_uInt16 nColId )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// out of range?
if ( nRow < 0 || nRow >= nRowCount )
@@ -1666,7 +1638,6 @@ sal_Bool BrowseBox::GoToRowColumnId( long nRow, sal_uInt16 nColId )
void BrowseBox::SetNoSelection()
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// is there no selection
if ( ( !pColSel || !pColSel->GetSelectCount() ) &&
@@ -1707,7 +1678,6 @@ void BrowseBox::SetNoSelection()
void BrowseBox::SelectAll()
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
if ( !bMultiSelection )
return;
@@ -1774,7 +1744,6 @@ void BrowseBox::SelectAll()
void BrowseBox::SelectRow( long nRow, sal_Bool _bSelect, sal_Bool bExpand )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
if ( !bMultiSelection )
{
@@ -1848,7 +1817,6 @@ void BrowseBox::SelectRow( long nRow, sal_Bool _bSelect, sal_Bool bExpand )
long BrowseBox::GetSelectRowCount() const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
return bMultiSelection ? uRow.pSel->GetSelectCount() :
uRow.nSel == BROWSER_ENDOFSELECTION ? 0 : 1;
@@ -1858,7 +1826,6 @@ long BrowseBox::GetSelectRowCount() const
void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, sal_Bool _bSelect, sal_Bool bMakeVisible )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
if ( !bColumnCursor || nNewColPos == BROWSER_INVALIDID )
return;
@@ -1924,7 +1891,6 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, sal_Bool _bSelect, sal_B
sal_uInt16 BrowseBox::GetSelectColumnCount() const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// while bAutoSelect (==!pColSel), 1 if any rows (yes rows!) else none
return pColSel ? (sal_uInt16) pColSel->GetSelectCount() :
@@ -1941,7 +1907,6 @@ long BrowseBox::FirstSelectedColumn( ) const
long BrowseBox::FirstSelectedRow( sal_Bool bInverse )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
return bMultiSelection ? uRow.pSel->FirstSelected(bInverse) : uRow.nSel;
}
@@ -1950,7 +1915,6 @@ long BrowseBox::FirstSelectedRow( sal_Bool bInverse )
long BrowseBox::NextSelectedRow()
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
return bMultiSelection ? uRow.pSel->NextSelected() : BROWSER_ENDOFSELECTION;
}
@@ -1959,7 +1923,6 @@ long BrowseBox::NextSelectedRow()
long BrowseBox::LastSelectedRow()
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
return bMultiSelection ? uRow.pSel->LastSelected() : uRow.nSel;
}
@@ -1968,7 +1931,6 @@ long BrowseBox::LastSelectedRow()
bool BrowseBox::IsRowSelected( long nRow ) const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
return bMultiSelection ? uRow.pSel->IsSelected(nRow) : nRow == uRow.nSel;
}
@@ -1977,7 +1939,6 @@ bool BrowseBox::IsRowSelected( long nRow ) const
bool BrowseBox::IsColumnSelected( sal_uInt16 nColumnId ) const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
return pColSel ? pColSel->IsSelected( GetColumnPos(nColumnId) ) :
nCurColId == nColumnId;
@@ -2068,7 +2029,6 @@ sal_Bool BrowseBox::MakeFieldVisible
sal_Bool BrowseBox::IsFieldVisible( long nRow, sal_uInt16 nColumnId,
sal_Bool bCompletely ) const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// hidden by frozen column?
sal_uInt16 nColPos = GetColumnPos( nColumnId );
@@ -2095,7 +2055,6 @@ sal_Bool BrowseBox::IsFieldVisible( long nRow, sal_uInt16 nColumnId,
Rectangle BrowseBox::GetFieldRectPixel( long nRow, sal_uInt16 nColumnId,
sal_Bool bRelToBrowser) const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// get the rectangle relative to DataWin
Rectangle aRect( ImplFieldRectPixel( nRow, nColumnId ) );
@@ -2117,7 +2076,6 @@ Rectangle BrowseBox::GetFieldRectPixel( long nRow, sal_uInt16 nColumnId,
Rectangle BrowseBox::GetRowRectPixel( long nRow, sal_Bool bRelToBrowser ) const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// get the rectangle relative to DataWin
Rectangle aRect;
@@ -2146,7 +2104,6 @@ Rectangle BrowseBox::GetRowRectPixel( long nRow, sal_Bool bRelToBrowser ) const
Rectangle BrowseBox::ImplFieldRectPixel( long nRow, sal_uInt16 nColumnId ) const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// compute the X-coordinate relative to DataWin by accumulation
long nColX = 0;
@@ -2177,7 +2134,6 @@ Rectangle BrowseBox::ImplFieldRectPixel( long nRow, sal_uInt16 nColumnId ) const
long BrowseBox::GetRowAtYPosPixel( long nY, sal_Bool bRelToBrowser ) const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// compute the Y-coordinate
if ( bRelToBrowser )
@@ -2198,7 +2154,6 @@ long BrowseBox::GetRowAtYPosPixel( long nY, sal_Bool bRelToBrowser ) const
Rectangle BrowseBox::GetFieldRect( sal_uInt16 nColumnId ) const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
return GetFieldRectPixel( nCurRow, nColumnId );
}
@@ -2207,7 +2162,6 @@ Rectangle BrowseBox::GetFieldRect( sal_uInt16 nColumnId ) const
sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX, sal_Bool ) const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// accumulate the widths of the visible columns
long nColX = 0;
@@ -2228,7 +2182,6 @@ sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX, sal_Bool ) const
void BrowseBox::ReserveControlArea( sal_uInt16 nWidth )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
if ( nWidth != nControlAreaWidth )
{
@@ -2242,7 +2195,6 @@ void BrowseBox::ReserveControlArea( sal_uInt16 nWidth )
Rectangle BrowseBox::GetControlArea() const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
return Rectangle(
Point( 0, GetOutputSizePixel().Height() - aHScroll.GetSizePixel().Height() ),
@@ -2254,7 +2206,6 @@ Rectangle BrowseBox::GetControlArea() const
void BrowseBox::SetMode( BrowserMode nMode )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
getDataWindow()->bAutoHScroll = BROWSER_AUTO_HSCROLL == ( nMode & BROWSER_AUTO_HSCROLL );
getDataWindow()->bAutoVScroll = BROWSER_AUTO_VSCROLL == ( nMode & BROWSER_AUTO_VSCROLL );
@@ -2385,7 +2336,6 @@ void BrowseBox::SetMode( BrowserMode nMode )
void BrowseBox::VisibleRowsChanged( long, sal_uInt16 )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// old behavior: automatically correct NumRows:
if ( nRowCount < GetRowCount() )
@@ -2494,7 +2444,6 @@ long BrowseBox::CalcReverseZoom(long nVal)
void BrowseBox::CursorMoved()
{
// before implementing more here, please adjust the EditBrowseBox
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
if ( isAccessibleAlive() && HasFocus() )
commitTableEvent(
@@ -2508,7 +2457,6 @@ void BrowseBox::CursorMoved()
void BrowseBox::LoseFocus()
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
OSL_TRACE( "BrowseBox: %p->LoseFocus", this );
if ( bHasFocus )
@@ -2531,7 +2479,6 @@ void BrowseBox::LoseFocus()
void BrowseBox::GetFocus()
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
OSL_TRACE( "BrowseBox: %p->GetFocus", this );
if ( !bHasFocus )
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index 86f2ff252c77..c813386717aa 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -34,7 +34,6 @@ using namespace ::com::sun::star::datatransfer;
-DBG_NAMEEX(BrowseBox)
@@ -44,7 +43,6 @@ extern const char* BrowseBoxCheckInvariants( const void * pVoid );
void BrowseBox::StartDrag( sal_Int8 /* _nAction */, const Point& /* _rPosPixel */ )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// not interested in this event
}
@@ -72,7 +70,6 @@ sal_Int8 BrowseBox::ExecuteDrop( const ExecuteDropEvent& _rEvt )
sal_Int8 BrowseBox::AcceptDrop( const BrowserAcceptDropEvent& )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// not interested in this event
return DND_ACTION_NONE;
}
@@ -81,7 +78,6 @@ sal_Int8 BrowseBox::AcceptDrop( const BrowserAcceptDropEvent& )
sal_Int8 BrowseBox::ExecuteDrop( const BrowserExecuteDropEvent& )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// not interested in this event
return DND_ACTION_NONE;
}
@@ -217,21 +213,18 @@ void BrowseBox::StateChanged( StateChangedType nStateChange )
void BrowseBox::Select()
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
}
void BrowseBox::DoubleClick( const BrowserMouseEvent & )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
}
long BrowseBox::QueryMinimumRowHeight()
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
return CalcZoom( 5 );
}
@@ -239,35 +232,30 @@ long BrowseBox::QueryMinimumRowHeight()
void BrowseBox::ImplStartTracking()
{
- DBG_CHKTHIS( BrowseBox, BrowseBoxCheckInvariants );
}
void BrowseBox::ImplTracking()
{
- DBG_CHKTHIS( BrowseBox, BrowseBoxCheckInvariants );
}
void BrowseBox::ImplEndTracking()
{
- DBG_CHKTHIS( BrowseBox, BrowseBoxCheckInvariants );
}
void BrowseBox::RowHeightChanged()
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
}
long BrowseBox::QueryColumnResize( sal_uInt16, long nWidth )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
return nWidth;
}
@@ -275,21 +263,18 @@ long BrowseBox::QueryColumnResize( sal_uInt16, long nWidth )
void BrowseBox::ColumnResized( sal_uInt16 )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
}
void BrowseBox::ColumnMoved( sal_uInt16 )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
}
void BrowseBox::StartScroll()
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
DoHideCursor( "StartScroll" );
}
@@ -297,7 +282,6 @@ void BrowseBox::StartScroll()
void BrowseBox::EndScroll()
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
UpdateScrollbars();
AutoSizeLastColumn();
DoShowCursor( "EndScroll" );
@@ -307,7 +291,6 @@ void BrowseBox::EndScroll()
void BrowseBox::ToggleSelection( sal_Bool bForce )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// selection highlight-toggling allowed?
if ( bHideSelect )
@@ -452,7 +435,6 @@ void BrowseBox::DrawCursor()
sal_uLong BrowseBox::GetColumnWidth( sal_uInt16 nId ) const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
sal_uInt16 nItemPos = GetColumnPos( nId );
if ( nItemPos >= pCols->size() )
@@ -464,7 +446,6 @@ sal_uLong BrowseBox::GetColumnWidth( sal_uInt16 nId ) const
sal_uInt16 BrowseBox::GetColumnId( sal_uInt16 nPos ) const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
if ( nPos >= pCols->size() )
return BROWSER_INVALIDID;
@@ -475,7 +456,6 @@ sal_uInt16 BrowseBox::GetColumnId( sal_uInt16 nPos ) const
sal_uInt16 BrowseBox::GetColumnPos( sal_uInt16 nId ) const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
for ( sal_uInt16 nPos = 0; nPos < pCols->size(); ++nPos )
if ( (*pCols)[ nPos ]->GetId() == nId )
@@ -487,7 +467,6 @@ sal_uInt16 BrowseBox::GetColumnPos( sal_uInt16 nId ) const
sal_Bool BrowseBox::IsFrozen( sal_uInt16 nColumnId ) const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
for ( size_t nPos = 0; nPos < pCols->size(); ++nPos )
if ( (*pCols)[ nPos ]->GetId() == nColumnId )
@@ -499,7 +478,6 @@ sal_Bool BrowseBox::IsFrozen( sal_uInt16 nColumnId ) const
void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
DoHideCursor( "ExpandRowSelection" );
@@ -565,7 +543,6 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt )
void BrowseBox::Resize()
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
if ( !bBootstrapped && IsReallyVisible() )
BrowseBox::StateChanged( STATE_CHANGE_INITSHOW );
if ( pCols->empty() )
@@ -644,7 +621,6 @@ void BrowseBox::Resize()
void BrowseBox::Paint( const Rectangle& rRect )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// initializations
if ( !bBootstrapped && IsReallyVisible() )
@@ -1135,7 +1111,6 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_
void BrowseBox::PaintData( Window& rWin, const Rectangle& rRect )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
if ( !bBootstrapped && IsReallyVisible() )
BrowseBox::StateChanged( STATE_CHANGE_INITSHOW );
@@ -1153,7 +1128,6 @@ void BrowseBox::PaintData( Window& rWin, const Rectangle& rRect )
void BrowseBox::UpdateScrollbars()
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
if ( !bBootstrapped || !IsUpdateMode() )
return;
@@ -1328,7 +1302,6 @@ void BrowseBox::UpdateScrollbars()
void BrowseBox::SetUpdateMode( sal_Bool bUpdate )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
sal_Bool bWasUpdate = IsUpdateMode();
if ( bWasUpdate == bUpdate )
@@ -1359,7 +1332,6 @@ void BrowseBox::SetUpdateMode( sal_Bool bUpdate )
sal_Bool BrowseBox::GetUpdateMode() const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
return getDataWindow()->IsUpdateMode();
}
@@ -1368,7 +1340,6 @@ sal_Bool BrowseBox::GetUpdateMode() const
long BrowseBox::GetFrozenWidth() const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
long nWidth = 0;
for ( size_t nCol = 0;
@@ -1382,7 +1353,6 @@ long BrowseBox::GetFrozenWidth() const
void BrowseBox::ColumnInserted( sal_uInt16 nPos )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
if ( pColSel )
pColSel->Insert( nPos );
@@ -1393,7 +1363,6 @@ void BrowseBox::ColumnInserted( sal_uInt16 nPos )
sal_uInt16 BrowseBox::FrozenColCount() const
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
sal_uInt16 nCol;
for ( nCol = 0;
nCol < pCols->size() && (*pCols)[ nCol ]->IsFrozen();
@@ -1406,7 +1375,6 @@ sal_uInt16 BrowseBox::FrozenColCount() const
IMPL_LINK(BrowseBox,ScrollHdl,ScrollBar*,pBar)
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
if ( pBar->GetDelta() == 0 )
return 0;
@@ -1429,7 +1397,6 @@ IMPL_LINK(BrowseBox,ScrollHdl,ScrollBar*,pBar)
IMPL_LINK_NOARG(BrowseBox, EndScrollHdl)
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
if ( getDataWindow()->bNoScrollBack )
{
@@ -1453,7 +1420,6 @@ IMPL_LINK( BrowseBox, StartDragHdl, HeaderBar*, pBar )
void BrowseBox::MouseButtonDown( const MouseEvent& rEvt )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
GrabFocus();
@@ -1509,7 +1475,6 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt )
void BrowseBox::MouseMove( const MouseEvent& rEvt )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
OSL_TRACE( "BrowseBox::MouseMove( MouseEvent )" );
Pointer aNewPointer;
@@ -1563,7 +1528,6 @@ void BrowseBox::MouseMove( const MouseEvent& rEvt )
void BrowseBox::MouseButtonUp( const MouseEvent & rEvt )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
if ( bResizing )
{
@@ -1603,7 +1567,6 @@ sal_Bool bFieldMode = sal_False;
void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
GrabFocus();
@@ -1752,14 +1715,12 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt )
void BrowseBox::MouseMove( const BrowserMouseEvent& )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
}
void BrowseBox::MouseButtonUp( const BrowserMouseEvent &rEvt )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
// D&D was possible, but did not occur
if ( bHit )
@@ -1806,7 +1767,6 @@ void BrowseBox::KeyInput( const KeyEvent& rEvt )
sal_Bool BrowseBox::ProcessKey( const KeyEvent& rEvt )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
sal_uInt16 nCode = rEvt.GetKeyCode().GetCode();
sal_Bool bShift = rEvt.GetKeyCode().IsShift();
@@ -1877,7 +1837,6 @@ sal_Bool BrowseBox::ProcessKey( const KeyEvent& rEvt )
void BrowseBox::Dispatch( sal_uInt16 nId )
{
- DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
long nRowsOnPage = pDataWin->GetSizePixel().Height() / GetDataRowHeight();
sal_Bool bDone = sal_False;
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 517fc230df0f..783aa72b63ad 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -118,7 +118,6 @@ namespace svt
}
- DBG_NAME(EditBrowseBox);
void EditBrowseBox::impl_construct()
{
m_aImpl.reset(new EditBrowseBoxImpl());
@@ -149,7 +148,6 @@ namespace svt
,bActiveBeforeTracking( sal_False )
,m_nBrowserFlags(nBrowserFlags)
{
- DBG_CTOR(EditBrowseBox,NULL);
impl_construct();
}
@@ -171,7 +169,6 @@ namespace svt
,m_nBrowserFlags(nBrowserFlags)
,pHeader(NULL)
{
- DBG_CTOR(EditBrowseBox,NULL);
impl_construct();
}
@@ -194,7 +191,6 @@ namespace svt
delete pCheckBoxPaint;
- DBG_DTOR(EditBrowseBox,NULL);
}
@@ -1336,13 +1332,11 @@ namespace svt
}
- DBG_NAME(CellController);
CellController::CellController(Control* pW)
:pWindow( pW )
,bSuspended( true )
{
- DBG_CTOR(CellController,NULL);
DBG_ASSERT(pWindow, "CellController::CellController: missing the window!");
DBG_ASSERT(!pWindow->IsVisible(), "CellController::CellController: window should not be visible!");
@@ -1352,7 +1346,6 @@ namespace svt
CellController::~CellController()
{
- DBG_DTOR(CellController,NULL);
}
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index c759d068fbe8..fa9db5ff4a61 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -36,7 +36,6 @@ struct SvLBoxButtonData_Impl
};
-DBG_NAME(SvLBoxButtonData)
void SvLBoxButtonData::InitData( sal_Bool bImagesFromDefault, bool _bRadioBtn, const Control* pCtrl )
{
@@ -53,21 +52,18 @@ void SvLBoxButtonData::InitData( sal_Bool bImagesFromDefault, bool _bRadioBtn, c
SvLBoxButtonData::SvLBoxButtonData( const Control* pControlForSettings )
{
- DBG_CTOR(SvLBoxButtonData,0);
InitData( sal_True, false, pControlForSettings );
}
SvLBoxButtonData::SvLBoxButtonData( const Control* pControlForSettings, bool _bRadioBtn )
{
- DBG_CTOR(SvLBoxButtonData,0);
InitData( sal_True, _bRadioBtn, pControlForSettings );
}
SvLBoxButtonData::~SvLBoxButtonData()
{
- DBG_DTOR(SvLBoxButtonData,0);
delete pImpl;
#ifdef DBG_UTIL
@@ -77,13 +73,11 @@ SvLBoxButtonData::~SvLBoxButtonData()
void SvLBoxButtonData::CallLink()
{
- DBG_CHKTHIS(SvLBoxButtonData,0);
aLink.Call( this );
}
sal_uInt16 SvLBoxButtonData::GetIndex( sal_uInt16 nItemState )
{
- DBG_CHKTHIS(SvLBoxButtonData,0);
nItemState &= 0x000F;
sal_uInt16 nIdx;
switch( nItemState )
@@ -108,7 +102,6 @@ sal_uInt16 SvLBoxButtonData::GetIndex( sal_uInt16 nItemState )
void SvLBoxButtonData::SetWidthAndHeight()
{
- DBG_CHKTHIS(SvLBoxButtonData,0);
Size aSize = aBmps[0].GetSizePixel();
nWidth = aSize.Width();
nHeight = aSize.Height();
@@ -118,14 +111,12 @@ void SvLBoxButtonData::SetWidthAndHeight()
void SvLBoxButtonData::StoreButtonState( SvTreeListEntry* pActEntry, sal_uInt16 nItemFlags )
{
- DBG_CHKTHIS(SvLBoxButtonData,0);
pImpl->pEntry = pActEntry;
eState = ConvertToButtonState( nItemFlags );
}
SvButtonState SvLBoxButtonData::ConvertToButtonState( sal_uInt16 nItemFlags ) const
{
- DBG_CHKTHIS(SvLBoxButtonData,0);
nItemFlags &= (SV_ITEMSTATE_UNCHECKED |
SV_ITEMSTATE_CHECKED |
SV_ITEMSTATE_TRISTATE);
@@ -187,28 +178,23 @@ sal_Bool SvLBoxButtonData::IsRadio() {
// class SvLBoxString
// ***************************************************************
-DBG_NAME(SvLBoxString);
SvLBoxString::SvLBoxString(SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rStr)
: SvLBoxItem(pEntry, nFlags)
{
- DBG_CTOR(SvLBoxString,0);
SetText(rStr);
}
SvLBoxString::SvLBoxString() : SvLBoxItem()
{
- DBG_CTOR(SvLBoxString,0);
}
SvLBoxString::~SvLBoxString()
{
- DBG_DTOR(SvLBoxString,0);
}
sal_uInt16 SvLBoxString::GetType() const
{
- DBG_CHKTHIS(SvLBoxString,0);
return SV_ITEM_ID_LBOXSTRING;
}
@@ -216,7 +202,6 @@ void SvLBoxString::Paint(
const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/,
const SvTreeListEntry* pEntry)
{
- DBG_CHKTHIS(SvLBoxString,0);
if (pEntry)
{
sal_uInt16 nStyle = rDev.IsEnabled() ? 0 : TEXT_DRAW_DISABLE;
@@ -231,20 +216,17 @@ void SvLBoxString::Paint(
SvLBoxItem* SvLBoxString::Create() const
{
- DBG_CHKTHIS(SvLBoxString,0);
return new SvLBoxString;
}
void SvLBoxString::Clone( SvLBoxItem* pSource )
{
- DBG_CHKTHIS(SvLBoxString,0);
maText = ((SvLBoxString*)pSource)->maText;
}
void SvLBoxString::InitViewData(
SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData)
{
- DBG_CHKTHIS(SvLBoxString,0);
if( !pViewData )
pViewData = pView->GetViewDataItem( pEntry, this );
@@ -272,28 +254,23 @@ void SvLBoxString::InitViewData(
// class SvLBoxBmp
// ***************************************************************
-DBG_NAME(SvLBoxBmp);
SvLBoxBmp::SvLBoxBmp() : SvLBoxItem()
{
- DBG_CTOR(SvLBoxBmp,0);
}
SvLBoxBmp::~SvLBoxBmp()
{
- DBG_DTOR(SvLBoxBmp,0);
}
sal_uInt16 SvLBoxBmp::GetType() const
{
- DBG_CHKTHIS(SvLBoxBmp,0);
return SV_ITEM_ID_LBOXBMP;
}
void SvLBoxBmp::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry,
SvViewDataItem* pViewData)
{
- DBG_CHKTHIS(SvLBoxBmp,0);
if( !pViewData )
pViewData = pView->GetViewDataItem( pEntry, this );
pViewData->maSize = aBmp.GetSizePixel();
@@ -303,20 +280,17 @@ void SvLBoxBmp::Paint(
const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/,
const SvTreeListEntry* /*pEntry*/)
{
- DBG_CHKTHIS(SvLBoxBmp,0);
sal_uInt16 nStyle = rDev.IsEnabled() ? 0 : IMAGE_DRAW_DISABLE;
rDev.DrawImage( rPos, aBmp ,nStyle);
}
SvLBoxItem* SvLBoxBmp::Create() const
{
- DBG_CHKTHIS(SvLBoxBmp,0);
return new SvLBoxBmp;
}
void SvLBoxBmp::Clone( SvLBoxItem* pSource )
{
- DBG_CHKTHIS(SvLBoxBmp,0);
aBmp = ((SvLBoxBmp*)pSource)->aBmp;
}
@@ -324,13 +298,11 @@ void SvLBoxBmp::Clone( SvLBoxItem* pSource )
// class SvLBoxButton
// ***************************************************************
-DBG_NAME(SvLBoxButton);
SvLBoxButton::SvLBoxButton( SvTreeListEntry* pEntry, SvLBoxButtonKind eTheKind,
sal_uInt16 nFlags, SvLBoxButtonData* pBData )
: SvLBoxItem( pEntry, nFlags )
{
- DBG_CTOR(SvLBoxButton,0);
eKind = eTheKind;
nBaseOffs = 0;
nItemFlags = 0;
@@ -341,7 +313,6 @@ SvLBoxButton::SvLBoxButton( SvTreeListEntry* pEntry, SvLBoxButtonKind eTheKind,
SvLBoxButton::SvLBoxButton() : SvLBoxItem()
{
- DBG_CTOR(SvLBoxButton,0);
eKind = SvLBoxButtonKind_enabledCheckbox;
nItemFlags = 0;
SetStateUnchecked();
@@ -349,18 +320,15 @@ SvLBoxButton::SvLBoxButton() : SvLBoxItem()
SvLBoxButton::~SvLBoxButton()
{
- DBG_DTOR(SvLBoxButton,0);
}
sal_uInt16 SvLBoxButton::GetType() const
{
- DBG_CHKTHIS(SvLBoxButton,0);
return SV_ITEM_ID_LBOXBUTTON;
}
sal_Bool SvLBoxButton::ClickHdl( SvTreeListBox*, SvTreeListEntry* pEntry )
{
- DBG_CHKTHIS(SvLBoxButton,0);
if ( CheckModification() )
{
if ( IsStateChecked() )
@@ -377,7 +345,6 @@ void SvLBoxButton::Paint(
const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/,
const SvTreeListEntry* /*pEntry*/)
{
- DBG_CHKTHIS(SvLBoxButton,0);
sal_uInt16 nIndex = eKind == SvLBoxButtonKind_staticImage
? SV_BMP_STATICIMAGE : pData->GetIndex( nItemFlags );
sal_uInt16 nStyle = eKind != SvLBoxButtonKind_disabledCheckbox &&
@@ -417,13 +384,11 @@ void SvLBoxButton::Paint(
SvLBoxItem* SvLBoxButton::Create() const
{
- DBG_CHKTHIS(SvLBoxButton,0);
return new SvLBoxButton;
}
void SvLBoxButton::Clone( SvLBoxItem* pSource )
{
- DBG_CHKTHIS(SvLBoxButton,0);
pData = ((SvLBoxButton*)pSource)->pData;
}
@@ -461,7 +426,6 @@ void SvLBoxButton::ImplAdjustBoxSize( Size& io_rSize, ControlType i_eType, Windo
void SvLBoxButton::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry,
SvViewDataItem* pViewData )
{
- DBG_CHKTHIS(SvLBoxButton,0);
if( !pViewData )
pViewData = pView->GetViewDataItem( pEntry, this );
Size aSize( pData->Width(), pData->Height() );
@@ -495,7 +459,6 @@ struct SvLBoxContextBmp_Impl
};
// ***************************************************************
-DBG_NAME(SvLBoxContextBmp)
SvLBoxContextBmp::SvLBoxContextBmp(
SvTreeListEntry* pEntry, sal_uInt16 nItemFlags, Image aBmp1, Image aBmp2,
@@ -503,7 +466,6 @@ SvLBoxContextBmp::SvLBoxContextBmp(
:SvLBoxItem( pEntry, nItemFlags )
,m_pImpl( new SvLBoxContextBmp_Impl )
{
- DBG_CTOR(SvLBoxContextBmp,0);
m_pImpl->m_bExpanded = bExpanded;
SetModeImages( aBmp1, aBmp2 );
@@ -514,24 +476,20 @@ SvLBoxContextBmp::SvLBoxContextBmp()
,m_pImpl( new SvLBoxContextBmp_Impl )
{
m_pImpl->m_bExpanded = false;
- DBG_CTOR(SvLBoxContextBmp,0);
}
SvLBoxContextBmp::~SvLBoxContextBmp()
{
delete m_pImpl;
- DBG_DTOR(SvLBoxContextBmp,0);
}
sal_uInt16 SvLBoxContextBmp::GetType() const
{
- DBG_CHKTHIS(SvLBoxContextBmp,0);
return SV_ITEM_ID_LBOXCONTEXTBMP;
}
sal_Bool SvLBoxContextBmp::SetModeImages( const Image& _rBitmap1, const Image& _rBitmap2 )
{
- DBG_CHKTHIS(SvLBoxContextBmp,0);
sal_Bool bSuccess = sal_True;
m_pImpl->m_aImage1 = _rBitmap1;
@@ -541,7 +499,6 @@ sal_Bool SvLBoxContextBmp::SetModeImages( const Image& _rBitmap1, const Image& _
Image& SvLBoxContextBmp::implGetImageStore( sal_Bool _bFirst )
{
- DBG_CHKTHIS(SvLBoxContextBmp,0);
// OJ: #i27071# wrong mode so we just return the normal images
return _bFirst ? m_pImpl->m_aImage1 : m_pImpl->m_aImage2;
@@ -550,7 +507,6 @@ Image& SvLBoxContextBmp::implGetImageStore( sal_Bool _bFirst )
void SvLBoxContextBmp::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry,
SvViewDataItem* pViewData)
{
- DBG_CHKTHIS(SvLBoxContextBmp,0);
if( !pViewData )
pViewData = pView->GetViewDataItem( pEntry, this );
pViewData->maSize = m_pImpl->m_aImage1.GetSizePixel();
@@ -560,7 +516,6 @@ void SvLBoxContextBmp::Paint(
const Point& _rPos, SvTreeListBox& _rDev,
const SvViewDataEntry* pView, const SvTreeListEntry* pEntry)
{
- DBG_CHKTHIS(SvLBoxContextBmp,0);
// get the image.
const Image& rImage = implGetImageStore(pView->IsExpanded() != m_pImpl->m_bExpanded);
@@ -575,13 +530,11 @@ void SvLBoxContextBmp::Paint(
SvLBoxItem* SvLBoxContextBmp::Create() const
{
- DBG_CHKTHIS(SvLBoxContextBmp,0);
return new SvLBoxContextBmp;
}
void SvLBoxContextBmp::Clone( SvLBoxItem* pSource )
{
- DBG_CHKTHIS(SvLBoxContextBmp,0);
m_pImpl->m_aImage1 = static_cast< SvLBoxContextBmp* >( pSource )->m_pImpl->m_aImage1;
m_pImpl->m_aImage2 = static_cast< SvLBoxContextBmp* >( pSource )->m_pImpl->m_aImage2;
m_pImpl->m_bExpanded = static_cast<SvLBoxContextBmp*>(pSource)->m_pImpl->m_bExpanded;
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index 17597f4ca16b..e6f3b110eaa2 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1139,11 +1139,9 @@ std::pair<SvTreeListEntries::iterator, SvTreeListEntries::iterator>
return aRet;
}
-DBG_NAME(SvListView);
SvListView::SvListView()
{
- DBG_CTOR(SvListView,0);
pModel = 0;
nSelectionCount = 0;
nVisibleCount = 0;
@@ -1153,13 +1151,11 @@ SvListView::SvListView()
SvListView::~SvListView()
{
- DBG_DTOR(SvListView,0);
maDataTable.clear();
}
void SvListView::InitTable()
{
- DBG_CHKTHIS(SvListView,0);
DBG_ASSERT(pModel,"InitTable:No Model");
DBG_ASSERT(!nSelectionCount&&!nVisibleCount&&!bVisPositionsValid,"InitTable: Not cleared!");
@@ -1194,7 +1190,6 @@ void SvListView::InitTable()
SvViewDataEntry* SvListView::CreateViewData( SvTreeListEntry* )
{
- DBG_CHKTHIS(SvListView,0);
return new SvViewDataEntry;
}
@@ -1216,7 +1211,6 @@ void SvListView::Clear()
void SvListView::SetModel( SvTreeList* pNewModel )
{
- DBG_CHKTHIS(SvListView,0);
sal_Bool bBroadcastCleared = sal_False;
if ( pModel )
{
@@ -1236,34 +1230,28 @@ void SvListView::SetModel( SvTreeList* pNewModel )
void SvListView::ModelHasCleared()
{
- DBG_CHKTHIS(SvListView,0);
}
void SvListView::ModelHasInserted( SvTreeListEntry* )
{
- DBG_CHKTHIS(SvListView,0);
}
void SvListView::ModelHasInsertedTree( SvTreeListEntry* )
{
- DBG_CHKTHIS(SvListView,0);
}
void SvListView::ModelIsMoving( SvTreeListEntry* /* pSource */ ,
SvTreeListEntry* /* pTargetParent */ , sal_uLong /* nPos */ )
{
- DBG_CHKTHIS(SvListView,0);
}
void SvListView::ModelHasMoved( SvTreeListEntry* )
{
- DBG_CHKTHIS(SvListView,0);
}
void SvListView::ModelIsRemoving( SvTreeListEntry* )
{
- DBG_CHKTHIS(SvListView,0);
}
void SvListView::ModelHasRemoved( SvTreeListEntry* )
@@ -1271,17 +1259,14 @@ void SvListView::ModelHasRemoved( SvTreeListEntry* )
//WARNING WARNING WARNING
//The supplied pointer should have been deleted
//before this call. Be careful not to use it!!!
- DBG_CHKTHIS(SvListView,0);
}
void SvListView::ModelHasEntryInvalidated( SvTreeListEntry*)
{
- DBG_CHKTHIS(SvListView,0);
}
void SvListView::ActionMoving( SvTreeListEntry* pEntry,SvTreeListEntry*,sal_uLong)
{
- DBG_CHKTHIS(SvListView,0);
SvTreeListEntry* pParent = pEntry->pParent;
DBG_ASSERT(pParent,"Model not consistent");
if (pParent != pModel->pRootItem && pParent->maChildren.size() == 1)
@@ -1298,14 +1283,12 @@ void SvListView::ActionMoved( SvTreeListEntry* /* pEntry */ ,
SvTreeListEntry* /* pTargetPrnt */ ,
sal_uLong /* nChildPos */ )
{
- DBG_CHKTHIS(SvListView,0);
nVisibleCount = 0;
bVisPositionsValid = sal_False;
}
void SvListView::ActionInserted( SvTreeListEntry* pEntry )
{
- DBG_CHKTHIS(SvListView,0);
DBG_ASSERT(pEntry,"Insert:No Entry");
SvViewDataEntry* pData = CreateViewData( pEntry );
InitViewData( pData, pEntry );
@@ -1323,7 +1306,6 @@ void SvListView::ActionInserted( SvTreeListEntry* pEntry )
void SvListView::ActionInsertedTree( SvTreeListEntry* pEntry )
{
- DBG_CHKTHIS(SvListView,0);
if ( pModel->IsEntryVisible( this, pEntry ))
{
nVisibleCount = 0;
@@ -1361,7 +1343,6 @@ void SvListView::RemoveViewData( SvTreeListEntry* pParent )
void SvListView::ActionRemoving( SvTreeListEntry* pEntry )
{
- DBG_CHKTHIS(SvListView,0);
DBG_ASSERT(pEntry,"Remove:No Entry");
SvViewDataEntry* pViewData = maDataTable.find( pEntry )->second;
@@ -1397,19 +1378,16 @@ void SvListView::ActionRemoving( SvTreeListEntry* pEntry )
void SvListView::ActionRemoved( SvTreeListEntry* /* pEntry */ )
{
- DBG_CHKTHIS(SvListView,0);
}
void SvListView::ActionClear()
{
- DBG_CHKTHIS(SvListView,0);
Clear();
}
void SvListView::ModelNotification( sal_uInt16 nActionId, SvTreeListEntry* pEntry1,
SvTreeListEntry* pEntry2, sal_uLong nPos )
{
- DBG_CHKTHIS(SvListView,0);
switch( nActionId )
{
case LISTACTION_INSERTED:
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 7a13b011638d..88829aee26f8 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -51,7 +51,6 @@ using namespace ::com::sun::star::accessibility;
static SvTreeListBox* pDDSource = NULL;
static SvTreeListBox* pDDTarget = NULL;
-DBG_NAME(SvInplaceEdit2)
#define SVLBOX_ACC_RETURN 1
#define SVLBOX_ACC_ESCAPE 2
@@ -130,7 +129,6 @@ SvInplaceEdit2::SvInplaceEdit2
bAlreadyInCallBack ( sal_False )
{
- DBG_CTOR(SvInplaceEdit2,0);
if( bMulti )
pEdit = new MyMultiEdit_Impl( pParent, this );
@@ -163,7 +161,6 @@ SvInplaceEdit2::SvInplaceEdit2
SvInplaceEdit2::~SvInplaceEdit2()
{
- DBG_DTOR(SvInplaceEdit2,0);
if( !bAlreadyInCallBack )
{
GetpApp()->RemoveAccel( &aAccReturn );
@@ -185,7 +182,6 @@ void SvInplaceEdit2::Hide()
IMPL_LINK_NOARG_INLINE_START(SvInplaceEdit2, ReturnHdl_Impl)
{
- DBG_CHKTHIS(SvInplaceEdit2,0);
bCanceled = sal_False;
CallCallBackHdl_Impl();
return 1;
@@ -194,7 +190,6 @@ IMPL_LINK_NOARG_INLINE_END(SvInplaceEdit2, ReturnHdl_Impl)
IMPL_LINK_NOARG_INLINE_START(SvInplaceEdit2, EscapeHdl_Impl)
{
- DBG_CHKTHIS(SvInplaceEdit2,0);
bCanceled = sal_True;
CallCallBackHdl_Impl();
return 1;
@@ -204,7 +199,6 @@ IMPL_LINK_NOARG_INLINE_END(SvInplaceEdit2, EscapeHdl_Impl)
sal_Bool SvInplaceEdit2::KeyInput( const KeyEvent& rKEvt )
{
- DBG_CHKTHIS(SvInplaceEdit2,0);
KeyCode aCode = rKEvt.GetKeyCode();
sal_uInt16 nCode = aCode.GetCode();
@@ -225,7 +219,6 @@ sal_Bool SvInplaceEdit2::KeyInput( const KeyEvent& rKEvt )
void SvInplaceEdit2::StopEditing( sal_Bool bCancel )
{
- DBG_CHKTHIS(SvInplaceEdit2,0);
if ( !bAlreadyInCallBack )
{
bCanceled = bCancel;
@@ -235,7 +228,6 @@ void SvInplaceEdit2::StopEditing( sal_Bool bCancel )
void SvInplaceEdit2::LoseFocus()
{
- DBG_CHKTHIS(SvInplaceEdit2,0);
if ( !bAlreadyInCallBack
&& ((!Application::GetFocusWindow()) || !pEdit->IsChild( Application::GetFocusWindow()) )
)
@@ -249,7 +241,6 @@ void SvInplaceEdit2::LoseFocus()
IMPL_LINK_NOARG_INLINE_START(SvInplaceEdit2, Timeout_Impl)
{
- DBG_CHKTHIS(SvInplaceEdit2,0);
CallCallBackHdl_Impl();
return 0;
}
@@ -257,7 +248,6 @@ IMPL_LINK_NOARG_INLINE_END(SvInplaceEdit2, Timeout_Impl)
void SvInplaceEdit2::CallCallBackHdl_Impl()
{
- DBG_CHKTHIS(SvInplaceEdit2,0);
aTimer.Stop();
if ( !bAlreadyInCallBack )
{
@@ -278,11 +268,9 @@ OUString SvInplaceEdit2::GetText() const
// class SvLBoxTab
// ***************************************************************
-DBG_NAME(SvLBoxTab);
SvLBoxTab::SvLBoxTab()
{
- DBG_CTOR(SvLBoxTab,0);
nPos = 0;
pUserData = 0;
nFlags = 0;
@@ -290,7 +278,6 @@ SvLBoxTab::SvLBoxTab()
SvLBoxTab::SvLBoxTab( long nPosition, sal_uInt16 nTabFlags )
{
- DBG_CTOR(SvLBoxTab,0);
nPos = nPosition;
pUserData = 0;
nFlags = nTabFlags;
@@ -298,7 +285,6 @@ SvLBoxTab::SvLBoxTab( long nPosition, sal_uInt16 nTabFlags )
SvLBoxTab::SvLBoxTab( const SvLBoxTab& rTab )
{
- DBG_CTOR(SvLBoxTab,0);
nPos = rTab.nPos;
pUserData = rTab.pUserData;
nFlags = rTab.nFlags;
@@ -306,13 +292,11 @@ SvLBoxTab::SvLBoxTab( const SvLBoxTab& rTab )
SvLBoxTab::~SvLBoxTab()
{
- DBG_DTOR(SvLBoxTab,0);
}
long SvLBoxTab::CalcOffset( long nItemWidth, long nTabWidth )
{
- DBG_CHKTHIS(SvLBoxTab,0);
long nOffset = 0;
if ( nFlags & SV_LBOXTAB_ADJUST_RIGHT )
{
@@ -344,26 +328,21 @@ long SvLBoxTab::CalcOffset( long nItemWidth, long nTabWidth )
// class SvLBoxItem
// ***************************************************************
-DBG_NAME(SvLBoxItem);
SvLBoxItem::SvLBoxItem( SvTreeListEntry*, sal_uInt16 )
{
- DBG_CTOR(SvLBoxItem,0);
}
SvLBoxItem::SvLBoxItem()
{
- DBG_CTOR(SvLBoxItem,0);
}
SvLBoxItem::~SvLBoxItem()
{
- DBG_DTOR(SvLBoxItem,0);
}
const Size& SvLBoxItem::GetSize(const SvTreeListBox* pView, const SvTreeListEntry* pEntry) const
{
- DBG_CHKTHIS(SvLBoxItem,0);
const SvViewDataItem* pViewData = pView->GetViewDataItem( pEntry, this );
return pViewData->maSize;
}
@@ -394,7 +373,6 @@ struct SvTreeListBoxImpl
m_aQuickSelectionEngine(_rBox) {}
};
-DBG_NAME(SvTreeListBox);
SvTreeListBox::SvTreeListBox(Window* pParent, WinBits nWinStyle) :
Control(pParent, nWinStyle | WB_CLIPCHILDREN),
@@ -405,7 +383,6 @@ SvTreeListBox::SvTreeListBox(Window* pParent, WinBits nWinStyle) :
eSelMode(NO_SELECTION),
nMinWidthInChars(0)
{
- DBG_CTOR(SvTreeListBox,0);
nDragOptions = DND_ACTION_COPYMOVE | DND_ACTION_LINK;
nImpFlags = 0;
pTargetEntry = 0;
@@ -435,7 +412,6 @@ SvTreeListBox::SvTreeListBox(Window* pParent, const ResId& rResId) :
eSelMode(NO_SELECTION),
nMinWidthInChars(0)
{
- DBG_CTOR(SvTreeListBox,0);
pTargetEntry = 0;
nImpFlags = 0;
nDragOptions = DND_ACTION_COPYMOVE | DND_ACTION_LINK;
@@ -466,7 +442,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvTreeListBox(Window *pPare
void SvTreeListBox::Clear()
{
- DBG_CHKTHIS(SvTreeListBox,0);
pModel->Clear(); // Model calls SvTreeListBox::ModelHasCleared()
}
@@ -486,52 +461,44 @@ bool SvTreeListBox::IsEntryMnemonicsEnabled() const
IMPL_LINK_INLINE_START( SvTreeListBox, CloneHdl_Impl, SvTreeListEntry*, pEntry )
{
- DBG_CHKTHIS(SvTreeListBox,0);
return (sal_IntPtr)(CloneEntry((SvTreeListEntry*)pEntry));
}
IMPL_LINK_INLINE_END( SvTreeListBox, CloneHdl_Impl, SvTreeListEntry*, pEntry )
sal_uLong SvTreeListBox::Insert( SvTreeListEntry* pEntry, SvTreeListEntry* pParent, sal_uLong nPos )
{
- DBG_CHKTHIS(SvTreeListBox,0);
sal_uLong nInsPos = pModel->Insert( pEntry, pParent, nPos );
return nInsPos;
}
sal_uLong SvTreeListBox::Insert( SvTreeListEntry* pEntry,sal_uLong nRootPos )
{
- DBG_CHKTHIS(SvTreeListBox,0);
sal_uLong nInsPos = pModel->Insert( pEntry, nRootPos );
return nInsPos;
}
bool SvTreeListBox::ExpandingHdl()
{
- DBG_CHKTHIS(SvTreeListBox,0);
return !aExpandingHdl.IsSet() || aExpandingHdl.Call( this );
}
void SvTreeListBox::ExpandedHdl()
{
- DBG_CHKTHIS(SvTreeListBox,0);
aExpandedHdl.Call( this );
}
void SvTreeListBox::SelectHdl()
{
- DBG_CHKTHIS(SvTreeListBox,0);
aSelectHdl.Call( this );
}
void SvTreeListBox::DeselectHdl()
{
- DBG_CHKTHIS(SvTreeListBox,0);
aDeselectHdl.Call( this );
}
sal_Bool SvTreeListBox::DoubleClickHdl()
{
- DBG_CHKTHIS(SvTreeListBox,0);
aDoubleClickHdl.Call( this );
return sal_True;
}
@@ -539,7 +506,6 @@ sal_Bool SvTreeListBox::DoubleClickHdl()
sal_Bool SvTreeListBox::CheckDragAndDropMode( SvTreeListBox* pSource, sal_Int8 nAction )
{
- DBG_CHKTHIS(SvTreeListBox,0);
if ( pSource == this )
{
if ( !(nDragDropMode & (SV_DRAGDROP_CTRL_MOVE | SV_DRAGDROP_CTRL_COPY) ) )
@@ -578,7 +544,6 @@ sal_Bool SvTreeListBox::CheckDragAndDropMode( SvTreeListBox* pSource, sal_Int8 n
void SvTreeListBox::NotifyRemoving( SvTreeListEntry* )
{
- DBG_CHKTHIS(SvTreeListBox,0);
}
/*
@@ -611,7 +576,6 @@ sal_Bool SvTreeListBox::NotifyMoving(
sal_uLong& rNewChildPos) // position in childlist of target parent
#endif
{
- DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT(pEntry,"NotifyMoving:SoureEntry?");
if( !pTarget )
{
@@ -646,7 +610,6 @@ sal_Bool SvTreeListBox::NotifyCopying(
SvTreeListEntry*& rpNewParent, // new target parent
sal_uLong& rNewChildPos) // position in childlist of target parent
{
- DBG_CHKTHIS(SvTreeListBox,0);
return NotifyMoving(pTarget,pEntry,rpNewParent,rNewChildPos);
}
@@ -668,7 +631,6 @@ SvTreeListEntry* SvTreeListBox::PrevSibling( SvTreeListEntry* pEntry ) const
// return: all entries copied
sal_Bool SvTreeListBox::CopySelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget )
{
- DBG_CHKTHIS(SvTreeListBox,0);
nCurEntrySelPos = 0; // selection counter for NotifyMoving/Copying
sal_Bool bSuccess = sal_True;
std::vector<SvTreeListEntry*> aList;
@@ -726,7 +688,6 @@ sal_Bool SvTreeListBox::MoveSelection( SvTreeListBox* pSource, SvTreeListEntry*
sal_Bool SvTreeListBox::MoveSelectionCopyFallbackPossible( SvTreeListBox* pSource, SvTreeListEntry* pTarget, sal_Bool bAllowCopyFallback )
{
- DBG_CHKTHIS(SvTreeListBox,0);
nCurEntrySelPos = 0; // selection counter for NotifyMoving/Copying
sal_Bool bSuccess = sal_True;
std::vector<SvTreeListEntry*> aList;
@@ -787,7 +748,6 @@ sal_Bool SvTreeListBox::MoveSelectionCopyFallbackPossible( SvTreeListBox* pSourc
void SvTreeListBox::RemoveSelection()
{
- DBG_CHKTHIS(SvTreeListBox,0);
std::vector<const SvTreeListEntry*> aList;
// cache selection, as the implementation deselects everything on the first
// remove
@@ -813,7 +773,6 @@ SvTreeListBox* SvTreeListBox::GetSourceView() const
void SvTreeListBox::RecalcViewData()
{
- DBG_CHKTHIS(SvTreeListBox,0);
SvTreeListEntry* pEntry = First();
while( pEntry )
{
@@ -832,12 +791,10 @@ void SvTreeListBox::RecalcViewData()
void SvTreeListBox::ViewDataInitialized( SvTreeListEntry* )
{
- DBG_CHKTHIS(SvTreeListBox,0);
}
void SvTreeListBox::ImplShowTargetEmphasis( SvTreeListEntry* pEntry, sal_Bool bShow)
{
- DBG_CHKTHIS(SvTreeListBox,0);
if ( bShow && (nImpFlags & SVLBOX_TARGEMPH_VIS) )
return;
if ( !bShow && !(nImpFlags & SVLBOX_TARGEMPH_VIS) )
@@ -867,7 +824,6 @@ SvTreeListEntry* SvTreeListBox::GetEntry( sal_uLong nRootPos ) const
SvTreeListEntry* SvTreeListBox::GetEntryFromPath( const ::std::deque< sal_Int32 >& _rPath ) const
{
- DBG_CHKTHIS(SvTreeListBox,0);
SvTreeListEntry* pEntry = NULL;
SvTreeListEntry* pParent = NULL;
@@ -884,7 +840,6 @@ SvTreeListEntry* SvTreeListBox::GetEntryFromPath( const ::std::deque< sal_Int32
void SvTreeListBox::FillEntryPath( SvTreeListEntry* pEntry, ::std::deque< sal_Int32 >& _rPath ) const
{
- DBG_CHKTHIS(SvTreeListBox,0);
if ( pEntry )
{
@@ -936,7 +891,6 @@ sal_uLong SvTreeListBox::GetChildCount( SvTreeListEntry* pParent ) const
sal_uLong SvTreeListBox::GetLevelChildCount( SvTreeListEntry* _pParent ) const
{
- DBG_CHKTHIS(SvTreeListBox,0);
//if _pParent is 0, then pEntry is the first child of the root.
SvTreeListEntry* pEntry = FirstChild( _pParent );
@@ -970,14 +924,12 @@ const SvViewDataItem* SvTreeListBox::GetViewDataItem(const SvTreeListEntry* pEnt
SvViewDataEntry* SvTreeListBox::CreateViewData( SvTreeListEntry* )
{
- DBG_CHKTHIS(SvTreeListBox,0);
SvViewDataEntry* pEntryData = new SvViewDataEntry;
return (SvViewDataEntry*)pEntryData;
}
void SvTreeListBox::InitViewData( SvViewDataEntry* pData, SvTreeListEntry* pEntry )
{
- DBG_CHKTHIS(SvTreeListBox,0);
SvTreeListEntry* pInhEntry = (SvTreeListEntry*)pEntry;
SvViewDataEntry* pEntryData = (SvViewDataEntry*)pData;
@@ -998,7 +950,6 @@ void SvTreeListBox::InitViewData( SvViewDataEntry* pData, SvTreeListEntry* pEntr
void SvTreeListBox::EnableSelectionAsDropTarget( sal_Bool bEnable, sal_Bool bWithChildren )
{
- DBG_CHKTHIS(SvTreeListBox,0);
sal_uInt16 nRefDepth;
SvTreeListEntry* pTemp;
@@ -1050,7 +1001,6 @@ void SvTreeListBox::EditText( const OUString& rStr, const Rectangle& rRect,
void SvTreeListBox::EditText( const OUString& rStr, const Rectangle& rRect,
const Selection& rSel, sal_Bool bMulti )
{
- DBG_CHKTHIS(SvTreeListBox,0);
if( pEdCtrl )
delete pEdCtrl;
nImpFlags |= SVLBOX_IN_EDT;
@@ -1064,7 +1014,6 @@ void SvTreeListBox::EditText( const OUString& rStr, const Rectangle& rRect,
IMPL_LINK_NOARG(SvTreeListBox, TextEditEndedHdl_Impl)
{
- DBG_CHKTHIS(SvTreeListBox,0);
if ( nImpFlags & SVLBOX_EDTEND_CALLED ) // avoid nesting
return 0;
nImpFlags |= SVLBOX_EDTEND_CALLED;
@@ -1088,7 +1037,6 @@ IMPL_LINK_NOARG(SvTreeListBox, TextEditEndedHdl_Impl)
void SvTreeListBox::CancelTextEditing()
{
- DBG_CHKTHIS(SvTreeListBox,0);
if ( pEdCtrl )
pEdCtrl->StopEditing( sal_True );
nImpFlags &= (~SVLBOX_IN_EDT);
@@ -1096,7 +1044,6 @@ void SvTreeListBox::CancelTextEditing()
void SvTreeListBox::EndEditing( bool bCancel )
{
- DBG_CHKTHIS(SvTreeListBox,0);
if( pEdCtrl )
pEdCtrl->StopEditing( bCancel );
nImpFlags &= (~SVLBOX_IN_EDT);
@@ -1105,19 +1052,16 @@ void SvTreeListBox::EndEditing( bool bCancel )
bool SvTreeListBox::IsEmptyTextAllowed() const
{
- DBG_CHKTHIS(SvTreeListBox,0);
return mpImpl->m_bIsEmptyTextAllowed;
}
void SvTreeListBox::ForbidEmptyText()
{
- DBG_CHKTHIS(SvTreeListBox,0);
mpImpl->m_bIsEmptyTextAllowed = false;
}
SvTreeListEntry* SvTreeListBox::CreateEntry() const
{
- DBG_CHKTHIS(SvTreeListBox,0);
return new SvTreeListEntry;
}
@@ -1225,12 +1169,10 @@ bool SvTreeListBox::HandleKeyInput( const KeyEvent& _rKEvt )
void SvTreeListBox::WriteDragServerInfo( const Point&, SvLBoxDDInfo* )
{
- DBG_CHKTHIS(SvTreeListBox,0);
}
void SvTreeListBox::ReadDragServerInfo(const Point&, SvLBoxDDInfo* )
{
- DBG_CHKTHIS(SvTreeListBox,0);
}
sal_Bool SvTreeListBox::EditingCanceled() const
@@ -1244,7 +1186,6 @@ sal_Bool SvTreeListBox::EditingCanceled() const
//JP 28.3.2001: new Drag & Drop API
sal_Int8 SvTreeListBox::AcceptDrop( const AcceptDropEvent& rEvt )
{
- DBG_CHKTHIS(SvTreeListBox,0);
sal_Int8 nRet = DND_ACTION_NONE;
if( rEvt.mbLeaving || !CheckDragAndDropMode( pDDSource, rEvt.mnAction ) )
@@ -1289,7 +1230,6 @@ sal_Int8 SvTreeListBox::AcceptDrop( const AcceptDropEvent& rEvt )
sal_Int8 SvTreeListBox::ExecuteDrop( const ExecuteDropEvent& rEvt, SvTreeListBox* pSourceView )
{
- DBG_CHKTHIS(SvTreeListBox,0);
sal_Int8 nRet = DND_ACTION_NONE;
DBG_ASSERT( pSourceView, "SvTreeListBox::ExecuteDrop(): no source view" );
@@ -1341,13 +1281,11 @@ sal_Int8 SvTreeListBox::ExecuteDrop( const ExecuteDropEvent& rEvt, SvTreeListBox
sal_Int8 SvTreeListBox::ExecuteDrop( const ExecuteDropEvent& rEvt )
{
- DBG_CHKTHIS(SvTreeListBox,0);
return ExecuteDrop( rEvt, GetSourceView() );
}
void SvTreeListBox::StartDrag( sal_Int8, const Point& rPosPixel )
{
- DBG_CHKTHIS(SvTreeListBox,0);
Point aEventPos( rPosPixel );
MouseEvent aMouseEvt( aEventPos, 1, MOUSE_SELECT, MOUSE_LEFT );
@@ -1431,13 +1369,11 @@ nAction
DragDropMode SvTreeListBox::NotifyStartDrag( TransferDataContainer&, SvTreeListEntry* )
{
- DBG_CHKTHIS(SvTreeListBox,0);
return (DragDropMode)0xffff;
}
sal_Bool SvTreeListBox::NotifyAcceptDrop( SvTreeListEntry* )
{
- DBG_CHKTHIS(SvTreeListBox,0);
return sal_True;
}
@@ -1497,7 +1433,6 @@ Link SvTreeListBox::GetDragFinishedHdl() const
void SvTreeListBox::InitTreeView()
{
- DBG_CHKTHIS(SvTreeListBox,0);
pCheckButtonData = NULL;
pEdEntry = NULL;
pEdItem = NULL;
@@ -1542,7 +1477,6 @@ OUString SvTreeListBox::GetEntryLongDescription( SvTreeListEntry* ) const
OUString SvTreeListBox::SearchEntryTextWithHeadTitle( SvTreeListEntry* pEntry )
{
- DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT( pEntry, "SvTreeListBox::SearchEntryText(): no entry" );
OUString sRet;
@@ -1606,7 +1540,6 @@ OUString SvTreeListBox::SearchEntryTextWithHeadTitle( SvTreeListEntry* pEntry )
SvTreeListBox::~SvTreeListBox()
{
- DBG_DTOR(SvTreeListBox,0);
pImp->CallEventListeners( VCLEVENT_OBJECT_DYING );
delete pImp;
@@ -1639,7 +1572,6 @@ void SvTreeListBox::SetExtendedWinBits( ExtendedWinBits _nBits )
void SvTreeListBox::SetModel( SvTreeList* pNewModel )
{
- DBG_CHKTHIS(SvTreeListBox,0);
pImp->SetModel( pNewModel );
SetBaseModel(pNewModel);
}
@@ -1659,7 +1591,6 @@ void SvTreeListBox::SetBaseModel( SvTreeList* pNewModel )
void SvTreeListBox::DisconnectFromModel()
{
- DBG_CHKTHIS(SvTreeListBox,0);
SvTreeList* pNewModel = new SvTreeList;
pNewModel->SetRefCount( 0 ); // else this will never be deleted
SvListView::SetModel( pNewModel );
@@ -1679,7 +1610,6 @@ void SvTreeListBox::SetSublistOpenWithLeftRight( sal_Bool b )
void SvTreeListBox::Resize()
{
- DBG_CHKTHIS(SvTreeListBox,0);
if( IsEditingActive() )
EndEditing( true );
@@ -1726,7 +1656,6 @@ void SvTreeListBox::Resize()
// take care of GetTextOffset when doing changes
void SvTreeListBox::SetTabs()
{
- DBG_CHKTHIS(SvTreeListBox,0);
if( IsEditingActive() )
EndEditing( true );
nTreeFlags &= (~TREEFLAG_RECALCTABS);
@@ -1827,7 +1756,6 @@ void SvTreeListBox::InitEntry(SvTreeListEntry* pEntry,
const OUString& aStr, const Image& aCollEntryBmp, const Image& aExpEntryBmp,
SvLBoxButtonKind eButtonKind)
{
- DBG_CHKTHIS(SvTreeListBox,0);
SvLBoxButton* pButton;
SvLBoxString* pString;
SvLBoxContextBmp* pContextBmp;
@@ -1848,7 +1776,6 @@ void SvTreeListBox::InitEntry(SvTreeListEntry* pEntry,
OUString SvTreeListBox::GetEntryText(SvTreeListEntry* pEntry) const
{
- DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT( pEntry, "SvTreeListBox::GetEntryText(): no entry" );
SvLBoxString* pItem = (SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
DBG_ASSERT( pEntry, "SvTreeListBox::GetEntryText(): item not found" );
@@ -1857,7 +1784,6 @@ OUString SvTreeListBox::GetEntryText(SvTreeListEntry* pEntry) const
const Image& SvTreeListBox::GetExpandedEntryBmp(const SvTreeListEntry* pEntry) const
{
- DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT(pEntry,"Entry?");
const SvLBoxContextBmp* pItem = static_cast<const SvLBoxContextBmp*>(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP));
DBG_ASSERT(pItem,"GetContextBmp:Item not found");
@@ -1866,7 +1792,6 @@ const Image& SvTreeListBox::GetExpandedEntryBmp(const SvTreeListEntry* pEntry) c
const Image& SvTreeListBox::GetCollapsedEntryBmp( const SvTreeListEntry* pEntry ) const
{
- DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT(pEntry,"Entry?");
const SvLBoxContextBmp* pItem = static_cast<const SvLBoxContextBmp*>(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP));
DBG_ASSERT(pItem,"GetContextBmp:Item not found");
@@ -1875,7 +1800,6 @@ const Image& SvTreeListBox::GetCollapsedEntryBmp( const SvTreeListEntry* pEntry
IMPL_LINK_INLINE_START( SvTreeListBox, CheckButtonClick, SvLBoxButtonData *, pData )
{
- DBG_CHKTHIS(SvTreeListBox,0);
pHdlEntry = pData->GetActEntry();
CheckButtonHdl();
return 0;
@@ -1890,7 +1814,6 @@ SvTreeListEntry* SvTreeListBox::InsertEntry(
SvLBoxButtonKind eButtonKind
)
{
- DBG_CHKTHIS(SvTreeListBox,0);
nTreeFlags |= TREEFLAG_MANINS;
const Image& rDefExpBmp = pImp->GetDefaultEntryExpBmp( );
@@ -1922,7 +1845,6 @@ SvTreeListEntry* SvTreeListBox::InsertEntry( const OUString& rText,
SvTreeListEntry* pParent, sal_Bool bChildrenOnDemand, sal_uLong nPos, void* pUser,
SvLBoxButtonKind eButtonKind )
{
- DBG_CHKTHIS(SvTreeListBox,0);
nTreeFlags |= TREEFLAG_MANINS;
aCurInsertedExpBmp = aExpEntryBmp;
@@ -1949,7 +1871,6 @@ SvTreeListEntry* SvTreeListBox::InsertEntry( const OUString& rText,
void SvTreeListBox::SetEntryText(SvTreeListEntry* pEntry, const OUString& rStr)
{
- DBG_CHKTHIS(SvTreeListBox,0);
SvLBoxString* pItem = (SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
DBG_ASSERT(pItem,"SetText:Item not found");
pItem->SetText(rStr);
@@ -1959,7 +1880,6 @@ void SvTreeListBox::SetEntryText(SvTreeListEntry* pEntry, const OUString& rStr)
void SvTreeListBox::SetExpandedEntryBmp( SvTreeListEntry* pEntry, const Image& aBmp )
{
- DBG_CHKTHIS(SvTreeListBox,0);
SvLBoxContextBmp* pItem = (SvLBoxContextBmp*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP));
DBG_ASSERT(pItem,"SetExpBmp:Item not found");
@@ -1978,7 +1898,6 @@ void SvTreeListBox::SetExpandedEntryBmp( SvTreeListEntry* pEntry, const Image& a
void SvTreeListBox::SetCollapsedEntryBmp(SvTreeListEntry* pEntry,const Image& aBmp )
{
- DBG_CHKTHIS(SvTreeListBox,0);
SvLBoxContextBmp* pItem = (SvLBoxContextBmp*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP));
DBG_ASSERT(pItem,"SetExpBmp:Item not found");
@@ -1997,7 +1916,6 @@ void SvTreeListBox::SetCollapsedEntryBmp(SvTreeListEntry* pEntry,const Image& aB
void SvTreeListBox::ImpEntryInserted( SvTreeListEntry* pEntry )
{
- DBG_CHKTHIS(SvTreeListBox,0);
SvTreeListEntry* pParent = (SvTreeListEntry*)pModel->GetParent( pEntry );
if( pParent )
@@ -2045,7 +1963,6 @@ void SvTreeListBox::ImpEntryInserted( SvTreeListEntry* pEntry )
void SvTreeListBox::SetCheckButtonState( SvTreeListEntry* pEntry, SvButtonState eState)
{
- DBG_CHKTHIS(SvTreeListBox,0);
if( nTreeFlags & TREEFLAG_CHKBTN )
{
SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXBUTTON));
@@ -2071,7 +1988,6 @@ void SvTreeListBox::SetCheckButtonState( SvTreeListEntry* pEntry, SvButtonState
void SvTreeListBox::SetCheckButtonInvisible( SvTreeListEntry* pEntry)
{
- DBG_CHKTHIS(SvTreeListBox,0);
if( nTreeFlags & TREEFLAG_CHKBTN )
{
SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXBUTTON));
@@ -2082,7 +1998,6 @@ void SvTreeListBox::SetCheckButtonInvisible( SvTreeListEntry* pEntry)
SvButtonState SvTreeListBox::GetCheckButtonState( SvTreeListEntry* pEntry ) const
{
- DBG_CHKTHIS(SvTreeListBox,0);
SvButtonState eState = SV_BUTTON_UNCHECKED;
if( nTreeFlags & TREEFLAG_CHKBTN )
{
@@ -2097,7 +2012,6 @@ SvButtonState SvTreeListBox::GetCheckButtonState( SvTreeListEntry* pEntry ) cons
void SvTreeListBox::CheckButtonHdl()
{
- DBG_CHKTHIS(SvTreeListBox,0);
aCheckButtonHdl.Call( this );
if ( pCheckButtonData )
pImp->CallEventListeners( VCLEVENT_CHECKBOX_TOGGLE, (void*)pCheckButtonData->GetActEntry() );
@@ -2112,7 +2026,6 @@ void SvTreeListBox::CheckButtonHdl()
SvTreeListEntry* SvTreeListBox::CloneEntry( SvTreeListEntry* pSource )
{
- DBG_CHKTHIS(SvTreeListBox,0);
OUString aStr;
Image aCollEntryBmp;
Image aExpEntryBmp;
@@ -2141,7 +2054,6 @@ SvTreeListEntry* SvTreeListBox::CloneEntry( SvTreeListEntry* pSource )
void SvTreeListBox::SetIndent( short nNewIndent )
{
- DBG_CHKTHIS(SvTreeListBox,0);
nIndent = nNewIndent;
SetTabs();
if( IsUpdateMode() )
@@ -2160,7 +2072,6 @@ const Image& SvTreeListBox::GetDefaultCollapsedEntryBmp( ) const
void SvTreeListBox::SetDefaultExpandedEntryBmp( const Image& aBmp )
{
- DBG_CHKTHIS(SvTreeListBox,0);
Size aSize = aBmp.GetSizePixel();
if( aSize.Width() > nContextBmpWidthMax )
nContextBmpWidthMax = (short)aSize.Width();
@@ -2171,7 +2082,6 @@ void SvTreeListBox::SetDefaultExpandedEntryBmp( const Image& aBmp )
void SvTreeListBox::SetDefaultCollapsedEntryBmp( const Image& aBmp )
{
- DBG_CHKTHIS(SvTreeListBox,0);
Size aSize = aBmp.GetSizePixel();
if( aSize.Width() > nContextBmpWidthMax )
nContextBmpWidthMax = (short)aSize.Width();
@@ -2182,7 +2092,6 @@ void SvTreeListBox::SetDefaultCollapsedEntryBmp( const Image& aBmp )
void SvTreeListBox::EnableCheckButton( SvLBoxButtonData* pData )
{
- DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT(!GetEntryCount(),"EnableCheckButton: Entry count != 0");
if( !pData )
nTreeFlags &= (~TREEFLAG_CHKBTN);
@@ -2200,7 +2109,6 @@ void SvTreeListBox::EnableCheckButton( SvLBoxButtonData* pData )
void SvTreeListBox::SetCheckButtonData( SvLBoxButtonData* pData )
{
- DBG_CHKTHIS(SvTreeListBox,0);
if ( pData )
pCheckButtonData = pData;
}
@@ -2217,7 +2125,6 @@ const Image& SvTreeListBox::GetDefaultCollapsedNodeImage( )
void SvTreeListBox::SetNodeBitmaps( const Image& rCollapsedNodeBmp, const Image& rExpandedNodeBmp )
{
- DBG_CHKTHIS(SvTreeListBox,0);
SetExpandedNodeBmp( rExpandedNodeBmp );
SetCollapsedNodeBmp( rCollapsedNodeBmp );
SetTabs();
@@ -2225,19 +2132,16 @@ void SvTreeListBox::SetNodeBitmaps( const Image& rCollapsedNodeBmp, const Image&
sal_Bool SvTreeListBox::EditingEntry( SvTreeListEntry*, Selection& )
{
- DBG_CHKTHIS(SvTreeListBox,0);
return sal_True;
}
sal_Bool SvTreeListBox::EditedEntry( SvTreeListEntry* /*pEntry*/,const OUString& /*rNewText*/)
{
- DBG_CHKTHIS(SvTreeListBox,0);
return sal_True;
}
void SvTreeListBox::EnableInplaceEditing( bool bOn )
{
- DBG_CHKTHIS(SvTreeListBox,0);
if (bOn)
nImpFlags |= SVLBOX_EDT_ENABLED;
else
@@ -2246,7 +2150,6 @@ void SvTreeListBox::EnableInplaceEditing( bool bOn )
void SvTreeListBox::KeyInput( const KeyEvent& rKEvt )
{
- DBG_CHKTHIS(SvTreeListBox,0);
// under OS/2, we get key up/down even while editing
if( IsEditingActive() )
return;
@@ -2279,14 +2182,12 @@ void SvTreeListBox::KeyInput( const KeyEvent& rKEvt )
void SvTreeListBox::RequestingChildren( SvTreeListEntry* pParent )
{
- DBG_CHKTHIS(SvTreeListBox,0);
if( !pParent->HasChildren() )
InsertEntry( OUString("<dummy>"), pParent, sal_False, LIST_APPEND );
}
void SvTreeListBox::GetFocus()
{
- DBG_CHKTHIS(SvTreeListBox,0);
//If there is no item in the tree, draw focus.
if( !First())
{
@@ -2312,7 +2213,6 @@ void SvTreeListBox::GetFocus()
void SvTreeListBox::LoseFocus()
{
- DBG_CHKTHIS(SvTreeListBox,0);
//If there is no item in the tree, delete visual focus.
if( !First())
{
@@ -2324,7 +2224,6 @@ void SvTreeListBox::LoseFocus()
void SvTreeListBox::ModelHasCleared()
{
- DBG_CHKTHIS(SvTreeListBox,0);
pImp->pCursor = 0; // else we crash in GetFocus when editing in-place
delete pEdCtrl;
pEdCtrl = NULL;
@@ -2346,13 +2245,11 @@ void SvTreeListBox::ModelHasCleared()
void SvTreeListBox::ShowTargetEmphasis( SvTreeListEntry* pEntry, sal_Bool /*bShow*/ )
{
- DBG_CHKTHIS(SvTreeListBox,0);
pImp->PaintDDCursor( pEntry );
}
void SvTreeListBox::ScrollOutputArea( short nDeltaEntries )
{
- DBG_CHKTHIS(SvTreeListBox,0);
if( !nDeltaEntries || !pImp->aVerSBar.IsVisible() )
return;
@@ -2387,21 +2284,18 @@ void SvTreeListBox::ScrollToAbsPos( long nPos )
void SvTreeListBox::SetSelectionMode( SelectionMode eSelectMode )
{
- DBG_CHKTHIS(SvTreeListBox,0);
eSelMode = eSelectMode;
pImp->SetSelectionMode( eSelectMode );
}
void SvTreeListBox::SetDragDropMode( DragDropMode nDDMode )
{
- DBG_CHKTHIS(SvTreeListBox,0);
nDragDropMode = nDDMode;
pImp->SetDragDropMode( nDDMode );
}
short SvTreeListBox::GetHeightOffset(const Image& rBmp, Size& aSizeLogic )
{
- DBG_CHKTHIS(SvTreeListBox,0);
short nOffset = 0;
aSizeLogic = rBmp.GetSizePixel();
if( GetEntryHeight() > aSizeLogic.Height() )
@@ -2411,7 +2305,6 @@ short SvTreeListBox::GetHeightOffset(const Image& rBmp, Size& aSizeLogic )
short SvTreeListBox::GetHeightOffset(const Font& /* rFont */, Size& aSizeLogic )
{
- DBG_CHKTHIS(SvTreeListBox,0);
short nOffset = 0;
aSizeLogic = Size(GetTextWidth(OUString('X')), GetTextHeight());
if( GetEntryHeight() > aSizeLogic.Height() )
@@ -2421,7 +2314,6 @@ short SvTreeListBox::GetHeightOffset(const Font& /* rFont */, Size& aSizeLogic )
void SvTreeListBox::SetEntryHeight( SvTreeListEntry* pEntry )
{
- DBG_CHKTHIS(SvTreeListBox,0);
short nHeight, nHeightMax=0;
sal_uInt16 nCount = pEntry->ItemCount();
sal_uInt16 nCur = 0;
@@ -2445,7 +2337,6 @@ void SvTreeListBox::SetEntryHeight( SvTreeListEntry* pEntry )
void SvTreeListBox::SetEntryHeight( short nHeight, sal_Bool bAlways )
{
- DBG_CHKTHIS(SvTreeListBox,0);
if( bAlways || nHeight > nEntryHeight )
{
@@ -2462,7 +2353,6 @@ void SvTreeListBox::SetEntryHeight( short nHeight, sal_Bool bAlways )
void SvTreeListBox::AdjustEntryHeight( const Image& rBmp )
{
- DBG_CHKTHIS(SvTreeListBox,0);
Size aSize;
GetHeightOffset( rBmp, aSize );
if( aSize.Height() > nEntryHeight )
@@ -2474,7 +2364,6 @@ void SvTreeListBox::AdjustEntryHeight( const Image& rBmp )
void SvTreeListBox::AdjustEntryHeight( const Font& rFont )
{
- DBG_CHKTHIS(SvTreeListBox,0);
Size aSize;
GetHeightOffset( rFont, aSize );
if( aSize.Height() > nEntryHeight )
@@ -2486,7 +2375,6 @@ void SvTreeListBox::AdjustEntryHeight( const Font& rFont )
sal_Bool SvTreeListBox::Expand( SvTreeListEntry* pParent )
{
- DBG_CHKTHIS(SvTreeListBox,0);
pHdlEntry = pParent;
sal_Bool bExpanded = sal_False;
sal_uInt16 nFlags;
@@ -2528,7 +2416,6 @@ sal_Bool SvTreeListBox::Expand( SvTreeListEntry* pParent )
sal_Bool SvTreeListBox::Collapse( SvTreeListEntry* pParent )
{
- DBG_CHKTHIS(SvTreeListBox,0);
nImpFlags &= ~SVLBOX_IS_EXPANDING;
pHdlEntry = pParent;
sal_Bool bCollapsed = sal_False;
@@ -2554,7 +2441,6 @@ sal_Bool SvTreeListBox::Collapse( SvTreeListEntry* pParent )
sal_Bool SvTreeListBox::Select( SvTreeListEntry* pEntry, sal_Bool bSelect )
{
- DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT(pEntry,"Select: Null-Ptr");
sal_Bool bRetVal = SelectListEntry( pEntry, bSelect );
DBG_ASSERT(IsSelected(pEntry)==bSelect,"Select failed");
@@ -2575,7 +2461,6 @@ sal_Bool SvTreeListBox::Select( SvTreeListEntry* pEntry, sal_Bool bSelect )
sal_uLong SvTreeListBox::SelectChildren( SvTreeListEntry* pParent, sal_Bool bSelect )
{
- DBG_CHKTHIS(SvTreeListBox,0);
pImp->DestroyAnchor();
sal_uLong nRet = 0;
if( !pParent->HasChildren() )
@@ -2592,7 +2477,6 @@ sal_uLong SvTreeListBox::SelectChildren( SvTreeListEntry* pParent, sal_Bool bSel
void SvTreeListBox::SelectAll( sal_Bool bSelect, sal_Bool )
{
- DBG_CHKTHIS(SvTreeListBox,0);
pImp->SelAllDestrAnch(
bSelect,
true, // delete anchor,
@@ -2601,7 +2485,6 @@ void SvTreeListBox::SelectAll( sal_Bool bSelect, sal_Bool )
void SvTreeListBox::ModelHasInsertedTree( SvTreeListEntry* pEntry )
{
- DBG_CHKTHIS(SvTreeListBox,0);
sal_uInt16 nRefDepth = pModel->GetDepth( (SvTreeListEntry*)pEntry );
SvTreeListEntry* pTmp = (SvTreeListEntry*)pEntry;
do
@@ -2614,7 +2497,6 @@ void SvTreeListBox::ModelHasInsertedTree( SvTreeListEntry* pEntry )
void SvTreeListBox::ModelHasInserted( SvTreeListEntry* pEntry )
{
- DBG_CHKTHIS(SvTreeListBox,0);
ImpEntryInserted( (SvTreeListEntry*)pEntry );
pImp->EntryInserted( (SvTreeListEntry*)pEntry );
}
@@ -2623,19 +2505,16 @@ void SvTreeListBox::ModelIsMoving(SvTreeListEntry* pSource,
SvTreeListEntry* /* pTargetParent */,
sal_uLong /* nChildPos */ )
{
- DBG_CHKTHIS(SvTreeListBox,0);
pImp->MovingEntry( (SvTreeListEntry*)pSource );
}
void SvTreeListBox::ModelHasMoved( SvTreeListEntry* pSource )
{
- DBG_CHKTHIS(SvTreeListBox,0);
pImp->EntryMoved( (SvTreeListEntry*)pSource );
}
void SvTreeListBox::ModelIsRemoving( SvTreeListEntry* pEntry )
{
- DBG_CHKTHIS(SvTreeListBox,0);
if(pEdEntry == pEntry)
pEdEntry = NULL;
@@ -2645,7 +2524,6 @@ void SvTreeListBox::ModelIsRemoving( SvTreeListEntry* pEntry )
void SvTreeListBox::ModelHasRemoved( SvTreeListEntry* pEntry )
{
- DBG_CHKTHIS(SvTreeListBox,0);
if ( pEntry == pHdlEntry)
pHdlEntry = NULL;
pImp->EntryRemoved();
@@ -2653,14 +2531,12 @@ void SvTreeListBox::ModelHasRemoved( SvTreeListEntry* pEntry )
void SvTreeListBox::SetCollapsedNodeBmp( const Image& rBmp)
{
- DBG_CHKTHIS(SvTreeListBox,0);
AdjustEntryHeight( rBmp );
pImp->SetCollapsedNodeBmp( rBmp );
}
void SvTreeListBox::SetExpandedNodeBmp( const Image& rBmp )
{
- DBG_CHKTHIS(SvTreeListBox,0);
AdjustEntryHeight( rBmp );
pImp->SetExpandedNodeBmp( rBmp );
}
@@ -2668,7 +2544,6 @@ void SvTreeListBox::SetExpandedNodeBmp( const Image& rBmp )
void SvTreeListBox::SetFont( const Font& rFont )
{
- DBG_CHKTHIS(SvTreeListBox,0);
Font aTempFont( rFont );
Font aOrigFont( GetFont() );
@@ -2689,7 +2564,6 @@ void SvTreeListBox::SetFont( const Font& rFont )
void SvTreeListBox::AdjustEntryHeightAndRecalc( const Font& rFont )
{
- DBG_CHKTHIS(SvTreeListBox,0);
AdjustEntryHeight( rFont );
// always invalidate, else things go wrong in SetEntryHeight
RecalcViewData();
@@ -2697,7 +2571,6 @@ void SvTreeListBox::AdjustEntryHeightAndRecalc( const Font& rFont )
void SvTreeListBox::Paint( const Rectangle& rRect )
{
- DBG_CHKTHIS(SvTreeListBox,0);
Control::Paint( rRect );
if( nTreeFlags & TREEFLAG_RECALCTABS )
SetTabs();
@@ -2722,32 +2595,27 @@ void SvTreeListBox::Paint( const Rectangle& rRect )
void SvTreeListBox::MouseButtonDown( const MouseEvent& rMEvt )
{
- DBG_CHKTHIS(SvTreeListBox,0);
pImp->MouseButtonDown( rMEvt );
}
void SvTreeListBox::MouseButtonUp( const MouseEvent& rMEvt )
{
- DBG_CHKTHIS(SvTreeListBox,0);
pImp->MouseButtonUp( rMEvt );
}
void SvTreeListBox::MouseMove( const MouseEvent& rMEvt )
{
- DBG_CHKTHIS(SvTreeListBox,0);
pImp->MouseMove( rMEvt );
}
void SvTreeListBox::SetUpdateMode( sal_Bool bUpdate )
{
- DBG_CHKTHIS(SvTreeListBox,0);
pImp->SetUpdateMode( bUpdate );
}
void SvTreeListBox::SetSpaceBetweenEntries( short nOffsLogic )
{
- DBG_CHKTHIS(SvTreeListBox,0);
if( nOffsLogic != nEntryHeightOffs )
{
nEntryHeight = nEntryHeight - nEntryHeightOffs;
@@ -2760,13 +2628,11 @@ void SvTreeListBox::SetSpaceBetweenEntries( short nOffsLogic )
void SvTreeListBox::SetCursor( SvTreeListEntry* pEntry, sal_Bool bForceNoSelect )
{
- DBG_CHKTHIS(SvTreeListBox,0);
pImp->SetCursor(pEntry, bForceNoSelect);
}
void SvTreeListBox::SetCurEntry( SvTreeListEntry* pEntry )
{
- DBG_CHKTHIS(SvTreeListBox,0);
pImp->SetCurEntry( pEntry );
}
@@ -2797,7 +2663,6 @@ void SvTreeListBox::MakeVisible( SvTreeListEntry* pEntry, sal_Bool bMoveToTop )
void SvTreeListBox::ModelHasEntryInvalidated( SvTreeListEntry* pEntry )
{
- DBG_CHKTHIS(SvTreeListBox,0);
// reinitialize the separate items of the entries
sal_uInt16 nCount = ((SvTreeListEntry*)pEntry)->ItemCount();
@@ -2814,7 +2679,6 @@ void SvTreeListBox::ModelHasEntryInvalidated( SvTreeListEntry* pEntry )
void SvTreeListBox::EditItemText( SvTreeListEntry* pEntry, SvLBoxString* pItem,
const Selection& rSelection )
{
- DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT(pEntry&&pItem,"EditItemText: Bad params");
if( IsSelected( pEntry ))
{
@@ -2858,7 +2722,6 @@ void SvTreeListBox::EditEntry( SvTreeListEntry* pEntry )
void SvTreeListBox::ImplEditEntry( SvTreeListEntry* pEntry )
{
- DBG_CHKTHIS(SvTreeListBox,0);
if( IsEditingActive() )
EndEditing();
if( !pEntry )
@@ -2920,7 +2783,6 @@ void SvTreeListBox::SetChildrenNotTransient()
void SvTreeListBox::EditedText( const OUString& rStr )
{
- DBG_CHKTHIS(SvTreeListBox,0);
if(pEdEntry) // we have to check if this entry is null that means that it is removed while editing
{
if( EditedEntry( pEdEntry, rStr ) )
@@ -2937,7 +2799,6 @@ void SvTreeListBox::EditedText( const OUString& rStr )
SvTreeListEntry* SvTreeListBox::GetDropTarget( const Point& rPos )
{
- DBG_CHKTHIS(SvTreeListBox,0);
// scroll
if( rPos.Y() < 12 )
{
@@ -2968,7 +2829,6 @@ SvTreeListEntry* SvTreeListBox::GetDropTarget( const Point& rPos )
SvTreeListEntry* SvTreeListBox::GetEntry( const Point& rPos, sal_Bool bHit ) const
{
- DBG_CHKTHIS(SvTreeListBox,0);
SvTreeListEntry* pEntry = pImp->GetEntry( rPos );
if( pEntry && bHit )
{
@@ -2981,13 +2841,11 @@ SvTreeListEntry* SvTreeListBox::GetEntry( const Point& rPos, sal_Bool bHit ) con
SvTreeListEntry* SvTreeListBox::GetCurEntry() const
{
- DBG_CHKTHIS(SvTreeListBox,0);
return pImp->GetCurEntry();
}
void SvTreeListBox::ImplInitStyle()
{
- DBG_CHKTHIS(SvTreeListBox,0);
const WinBits nWindowStyle = GetStyle();
@@ -3009,7 +2867,6 @@ void SvTreeListBox::ImplInitStyle()
void SvTreeListBox::PaintEntry( SvTreeListEntry* pEntry )
{
- DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT(pEntry,"PaintEntry:No Entry");
if( pEntry )
pImp->PaintEntry( pEntry );
@@ -3017,7 +2874,6 @@ void SvTreeListBox::PaintEntry( SvTreeListEntry* pEntry )
void SvTreeListBox::InvalidateEntry( SvTreeListEntry* pEntry )
{
- DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT(pEntry,"InvalidateEntry:No Entry");
if( pEntry )
{
@@ -3033,7 +2889,6 @@ long SvTreeListBox::PaintEntry(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nTa
long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nTabFlags,
sal_Bool bHasClipRegion )
{
- DBG_CHKTHIS(SvTreeListBox,0);
Rectangle aRect; // multi purpose
@@ -3338,7 +3193,6 @@ void SvTreeListBox::PreparePaint( SvTreeListEntry* )
Rectangle SvTreeListBox::GetFocusRect( SvTreeListEntry* pEntry, long nLine )
{
- DBG_CHKTHIS(SvTreeListBox,0);
Size aSize;
Rectangle aRect;
aRect.Top() = nLine;
@@ -3434,7 +3288,6 @@ Rectangle SvTreeListBox::GetFocusRect( SvTreeListEntry* pEntry, long nLine )
sal_IntPtr SvTreeListBox::GetTabPos( SvTreeListEntry* pEntry, SvLBoxTab* pTab)
{
- DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT(pTab,"No Tab");
sal_IntPtr nPos = pTab->GetPos();
if( pTab->IsDynamic() )
@@ -3449,7 +3302,6 @@ sal_IntPtr SvTreeListBox::GetTabPos( SvTreeListEntry* pEntry, SvLBoxTab* pTab)
SvLBoxItem* SvTreeListBox::GetItem_Impl( SvTreeListEntry* pEntry, long nX,
SvLBoxTab** ppTab, sal_uInt16 nEmptyWidth )
{
- DBG_CHKTHIS(SvTreeListBox,0);
SvLBoxItem* pItemClicked = 0;
sal_uInt16 nTabCount = aTabs.size();
sal_uInt16 nItemCount = pEntry->ItemCount();
@@ -3559,14 +3411,12 @@ SvLBoxItem* SvTreeListBox::GetItem(SvTreeListEntry* pEntry,long nX,SvLBoxTab** p
SvLBoxItem* SvTreeListBox::GetItem(SvTreeListEntry* pEntry,long nX )
{
- DBG_CHKTHIS(SvTreeListBox,0);
SvLBoxTab* pDummyTab;
return GetItem_Impl( pEntry, nX, &pDummyTab, 0 );
}
void SvTreeListBox::AddTab(long nTabPos,sal_uInt16 nFlags,void* pUserData )
{
- DBG_CHKTHIS(SvTreeListBox,0);
nFocusWidth = -1;
SvLBoxTab* pTab = new SvLBoxTab( nTabPos, nFlags );
pTab->SetUserData( pUserData );
@@ -3587,7 +3437,6 @@ void SvTreeListBox::AddTab(long nTabPos,sal_uInt16 nFlags,void* pUserData )
SvLBoxTab* SvTreeListBox::GetFirstDynamicTab( sal_uInt16& rPos ) const
{
- DBG_CHKTHIS(SvTreeListBox,0);
sal_uInt16 nCurTab = 0;
sal_uInt16 nTabCount = aTabs.size();
while( nCurTab < nTabCount )
@@ -3611,14 +3460,12 @@ SvLBoxTab* SvTreeListBox::GetFirstDynamicTab() const
SvLBoxTab* SvTreeListBox::GetTab( SvTreeListEntry* pEntry, SvLBoxItem* pItem) const
{
- DBG_CHKTHIS(SvTreeListBox,0);
sal_uInt16 nPos = pEntry->GetPos( pItem );
return aTabs[ nPos ];
}
void SvTreeListBox::ClearTabList()
{
- DBG_CHKTHIS(SvTreeListBox,0);
sal_uInt16 nTabCount = aTabs.size();
while( nTabCount )
{
@@ -3632,40 +3479,33 @@ void SvTreeListBox::ClearTabList()
Size SvTreeListBox::GetOutputSizePixel() const
{
- DBG_CHKTHIS(SvTreeListBox,0);
Size aSize = pImp->GetOutputSize();
return aSize;
}
void SvTreeListBox::NotifyBeginScroll()
{
- DBG_CHKTHIS(SvTreeListBox,0);
}
void SvTreeListBox::NotifyEndScroll()
{
- DBG_CHKTHIS(SvTreeListBox,0);
}
void SvTreeListBox::NotifyScrolling( long )
{
- DBG_CHKTHIS(SvTreeListBox,0);
}
void SvTreeListBox::NotifyScrolled()
{
- DBG_CHKTHIS(SvTreeListBox,0);
aScrolledHdl.Call( this );
}
void SvTreeListBox::NotifyInvalidating()
{
- DBG_CHKTHIS(SvTreeListBox,0);
}
void SvTreeListBox::Invalidate( sal_uInt16 nInvalidateFlags )
{
- DBG_CHKTHIS(SvTreeListBox,0);
if( nFocusWidth == -1 )
// to make sure that the control doesn't show the wrong focus rectangle
// after painting
@@ -3677,7 +3517,6 @@ void SvTreeListBox::Invalidate( sal_uInt16 nInvalidateFlags )
void SvTreeListBox::Invalidate( const Rectangle& rRect, sal_uInt16 nInvalidateFlags )
{
- DBG_CHKTHIS(SvTreeListBox,0);
if( nFocusWidth == -1 )
// to make sure that the control doesn't show the wrong focus rectangle
// after painting
@@ -3689,7 +3528,6 @@ void SvTreeListBox::Invalidate( const Rectangle& rRect, sal_uInt16 nInvalidateFl
void SvTreeListBox::SetHighlightRange( sal_uInt16 nStart, sal_uInt16 nEnd)
{
- DBG_CHKTHIS(SvTreeListBox,0);
sal_uInt16 nTemp;
nTreeFlags |= TREEFLAG_USESEL;
@@ -3708,7 +3546,6 @@ void SvTreeListBox::SetHighlightRange( sal_uInt16 nStart, sal_uInt16 nEnd)
void SvTreeListBox::Command( const CommandEvent& rCEvt )
{
- DBG_CHKTHIS(SvTreeListBox,0);
// FIXME gnumake2 resync to DEV300_m84
pImp->Command( rCEvt );
}
@@ -3716,7 +3553,6 @@ void SvTreeListBox::Command( const CommandEvent& rCEvt )
void SvTreeListBox::RemoveParentKeepChildren( SvTreeListEntry* pParent )
{
- DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT(pParent,"RemoveParentKeepChildren:No Parent");
SvTreeListEntry* pNewParent = GetParent( pParent );
if( pParent->HasChildren())
diff --git a/svtools/source/contnr/viewdataentry.cxx b/svtools/source/contnr/viewdataentry.cxx
index 06ba46349cf2..93ea793fb7a2 100644
--- a/svtools/source/contnr/viewdataentry.cxx
+++ b/svtools/source/contnr/viewdataentry.cxx
@@ -21,7 +21,6 @@
#include "tools/debug.hxx"
-DBG_NAME(SvViewDataEntry);
SvViewDataEntry::SvViewDataEntry() :
nVisPos(0),
@@ -32,7 +31,6 @@ SvViewDataEntry::SvViewDataEntry() :
mbCursored(false),
mbSelectable(true)
{
- DBG_CTOR(SvViewDataEntry,0);
}
SvViewDataEntry::SvViewDataEntry( const SvViewDataEntry& rData ) :
@@ -44,12 +42,10 @@ SvViewDataEntry::SvViewDataEntry( const SvViewDataEntry& rData ) :
mbCursored(rData.mbCursored),
mbSelectable(rData.mbSelectable)
{
- DBG_CTOR(SvViewDataEntry,0);
}
SvViewDataEntry::~SvViewDataEntry()
{
- DBG_DTOR(SvViewDataEntry,0);
#ifdef DBG_UTIL
nVisPos = 0x12345678;
#endif
diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx
index c86e7e3ccf46..99e1dd5f39dc 100644
--- a/svtools/source/control/accessibleruler.cxx
+++ b/svtools/source/control/accessibleruler.cxx
@@ -42,7 +42,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::accessibility;
-DBG_NAME( SvtRulerAccessible )
//===== internal ============================================================
@@ -56,12 +55,10 @@ SvtRulerAccessible::SvtRulerAccessible(
mpRepr( &rRepr ),
mnClientId( 0 )
{
- DBG_CTOR( SvtRulerAccessible, NULL );
}
SvtRulerAccessible::~SvtRulerAccessible()
{
- DBG_DTOR( SvtRulerAccessible, NULL );
if( IsAlive() )
{
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 67049c804bd5..2d2d125b7e7a 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -296,7 +296,6 @@ FormattedField::StaticFormatter::~StaticFormatter()
}
}
-DBG_NAME(FormattedField);
#define INIT_MEMBERS() \
m_aLastSelection(0,0) \
@@ -324,7 +323,6 @@ FormattedField::FormattedField(Window* pParent, WinBits nStyle, SvNumberFormatte
:SpinField(pParent, nStyle)
,INIT_MEMBERS()
{
- DBG_CTOR(FormattedField, NULL);
if (pInitialFormatter)
{
@@ -341,12 +339,10 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFormattedField(Window *pPar
FormattedField::~FormattedField()
{
- DBG_DTOR(FormattedField, NULL);
}
void FormattedField::SetText(const OUString& rStr)
{
- DBG_CHKTHIS(FormattedField, NULL);
SpinField::SetText(rStr);
m_bValueDirty = sal_True;
@@ -354,7 +350,6 @@ void FormattedField::SetText(const OUString& rStr)
void FormattedField::SetText( const OUString& rStr, const Selection& rNewSelection )
{
- DBG_CHKTHIS(FormattedField, NULL);
SpinField::SetText( rStr, rNewSelection );
m_bValueDirty = sal_True;
@@ -362,7 +357,6 @@ void FormattedField::SetText( const OUString& rStr, const Selection& rNewSelecti
void FormattedField::SetTextFormatted(const OUString& rStr)
{
- DBG_CHKTHIS(FormattedField, NULL);
#if defined DBG_UTIL
if (ImplGetFormatter()->IsTextFormat(m_nFormatKey))
@@ -458,7 +452,6 @@ void FormattedField::SetAutoColor(sal_Bool _bAutomatic)
void FormattedField::impl_Modify(bool makeValueDirty)
{
- DBG_CHKTHIS(FormattedField, NULL);
if (!IsStrictFormat())
{
@@ -486,14 +479,12 @@ void FormattedField::impl_Modify(bool makeValueDirty)
void FormattedField::Modify()
{
- DBG_CHKTHIS(FormattedField, NULL);
impl_Modify();
}
void FormattedField::ImplSetTextImpl(const OUString& rNew, Selection* pNewSel)
{
- DBG_CHKTHIS(FormattedField, NULL);
if (m_bAutoColor)
{
@@ -544,7 +535,6 @@ void FormattedField::ImplSetTextImpl(const OUString& rNew, Selection* pNewSel)
bool FormattedField::PreNotify(NotifyEvent& rNEvt)
{
- DBG_CHKTHIS(FormattedField, NULL);
if (rNEvt.GetType() == EVENT_KEYINPUT)
m_aLastSelection = GetSelection();
return SpinField::PreNotify(rNEvt);
@@ -552,7 +542,6 @@ bool FormattedField::PreNotify(NotifyEvent& rNEvt)
void FormattedField::ImplSetFormatKey(sal_uLong nFormatKey)
{
- DBG_CHKTHIS(FormattedField, NULL);
m_nFormatKey = nFormatKey;
sal_Bool bNeedFormatter = (m_pFormatter == NULL) && (nFormatKey != 0);
@@ -572,7 +561,6 @@ void FormattedField::ImplSetFormatKey(sal_uLong nFormatKey)
void FormattedField::SetFormatKey(sal_uLong nFormatKey)
{
- DBG_CHKTHIS(FormattedField, NULL);
sal_Bool bNoFormatter = (m_pFormatter == NULL);
ImplSetFormatKey(nFormatKey);
FormatChanged((bNoFormatter && (m_pFormatter != NULL)) ? FCT_FORMATTER : FCT_KEYONLY);
@@ -580,7 +568,6 @@ void FormattedField::SetFormatKey(sal_uLong nFormatKey)
void FormattedField::SetFormatter(SvNumberFormatter* pFormatter, sal_Bool bResetFormat)
{
- DBG_CHKTHIS(FormattedField, NULL);
if (bResetFormat)
{
@@ -623,7 +610,6 @@ void FormattedField::SetFormatter(SvNumberFormatter* pFormatter, sal_Bool bReset
OUString FormattedField::GetFormat(LanguageType& eLang) const
{
- DBG_CHKTHIS(FormattedField, NULL);
const SvNumberformat* pFormatEntry = ImplGetFormatter()->GetEntry(m_nFormatKey);
DBG_ASSERT(pFormatEntry != NULL, "FormattedField::GetFormat: no number format for the given format key.");
OUString sFormatString = pFormatEntry ? pFormatEntry->GetFormatstring() : OUString();
@@ -634,7 +620,6 @@ OUString FormattedField::GetFormat(LanguageType& eLang) const
sal_Bool FormattedField::SetFormat(const OUString& rFormatString, LanguageType eLang)
{
- DBG_CHKTHIS(FormattedField, NULL);
sal_uInt32 nNewKey = ImplGetFormatter()->TestNewString(rFormatString, eLang);
if (nNewKey == NUMBERFORMAT_ENTRY_NOT_FOUND)
{
@@ -735,7 +720,6 @@ void FormattedField::SetDecimalDigits(sal_uInt16 _nPrecision)
void FormattedField::FormatChanged( FORMAT_CHANGE_TYPE _nWhat )
{
- DBG_CHKTHIS(FormattedField, NULL);
m_pLastOutputColor = NULL;
if ( ( 0 != ( _nWhat & FCT_FORMATTER ) ) && m_pFormatter )
@@ -781,7 +765,6 @@ void FormattedField::ReFormat()
bool FormattedField::Notify(NotifyEvent& rNEvt)
{
- DBG_CHKTHIS(FormattedField, NULL);
if ((rNEvt.GetType() == EVENT_KEYINPUT) && !IsReadOnly())
{
@@ -852,7 +835,6 @@ bool FormattedField::Notify(NotifyEvent& rNEvt)
void FormattedField::SetMinValue(double dMin)
{
- DBG_CHKTHIS(FormattedField, NULL);
DBG_ASSERT(m_bTreatAsNumber, "FormattedField::SetMinValue : only to be used in numeric mode !");
m_dMinValue = dMin;
@@ -863,7 +845,6 @@ void FormattedField::SetMinValue(double dMin)
void FormattedField::SetMaxValue(double dMax)
{
- DBG_CHKTHIS(FormattedField, NULL);
DBG_ASSERT(m_bTreatAsNumber, "FormattedField::SetMaxValue : only to be used in numeric mode !");
m_dMaxValue = dMax;
@@ -874,14 +855,12 @@ void FormattedField::SetMaxValue(double dMax)
void FormattedField::SetTextValue(const OUString& rText)
{
- DBG_CHKTHIS(FormattedField, NULL);
SetText(rText);
ReFormat();
}
void FormattedField::EnableEmptyField(sal_Bool bEnable)
{
- DBG_CHKTHIS(FormattedField, NULL);
if (bEnable == m_bEnableEmptyField)
return;
@@ -892,7 +871,6 @@ void FormattedField::EnableEmptyField(sal_Bool bEnable)
void FormattedField::ImplSetValue(double dVal, sal_Bool bForce)
{
- DBG_CHKTHIS(FormattedField, NULL);
if (m_bHasMin && (dVal<m_dMinValue))
dVal = m_dMinValue;
@@ -934,7 +912,6 @@ void FormattedField::ImplSetValue(double dVal, sal_Bool bForce)
sal_Bool FormattedField::ImplGetValue(double& dNewVal)
{
- DBG_CHKTHIS(FormattedField, NULL);
dNewVal = m_dCurrentValue;
if (!m_bValueDirty)
@@ -983,13 +960,11 @@ sal_Bool FormattedField::ImplGetValue(double& dNewVal)
void FormattedField::SetValue(double dVal)
{
- DBG_CHKTHIS(FormattedField, NULL);
ImplSetValue(dVal, m_bValueDirty);
}
double FormattedField::GetValue()
{
- DBG_CHKTHIS(FormattedField, NULL);
if ( !ImplGetValue( m_dCurrentValue ) )
{
@@ -1005,7 +980,6 @@ double FormattedField::GetValue()
void FormattedField::Up()
{
- DBG_CHKTHIS(FormattedField, NULL);
// setValue handles under- and overflows (min/max) automatically
SetValue(GetValue() + m_dSpinSize);
SetModifyFlag();
@@ -1016,7 +990,6 @@ void FormattedField::Up()
void FormattedField::Down()
{
- DBG_CHKTHIS(FormattedField, NULL);
SetValue(GetValue() - m_dSpinSize);
SetModifyFlag();
Modify();
@@ -1026,7 +999,6 @@ void FormattedField::Down()
void FormattedField::First()
{
- DBG_CHKTHIS(FormattedField, NULL);
if (m_bHasMin)
{
SetValue(m_dMinValue);
@@ -1039,7 +1011,6 @@ void FormattedField::First()
void FormattedField::Last()
{
- DBG_CHKTHIS(FormattedField, NULL);
if (m_bHasMax)
{
SetValue(m_dMaxValue);
diff --git a/svtools/source/control/vclxaccessibleheaderbaritem.cxx b/svtools/source/control/vclxaccessibleheaderbaritem.cxx
index 327c6ce25701..dfc145504288 100644
--- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx
+++ b/svtools/source/control/vclxaccessibleheaderbaritem.cxx
@@ -40,7 +40,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::accessibility;
using namespace ::comphelper;
-DBG_NAME( VCLXAccessibleHeaderBarItem )
// class AccessibleTabBar
@@ -52,7 +51,6 @@ VCLXAccessibleHeaderBarItem::VCLXAccessibleHeaderBarItem( HeaderBar* pHeadBar
,m_nIndexInParent(_nIndexInParent + 1)
{
- DBG_CTOR( VCLXAccessibleHeaderBarItem, NULL );
m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock() );
}
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index 5f9ab6f193ba..8c28d064071c 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -123,7 +123,6 @@ namespace svt
//= RoadmapWizard
- DBG_NAME( RoadmapWizard )
#ifdef DBG_UTIL
const char* CheckInvariants( const void* pVoid )
@@ -171,7 +170,6 @@ namespace svt
:OWizardMachine( _pParent, _rRes, _nButtonFlags )
,m_pImpl( new RoadmapWizardImpl )
{
- DBG_CTOR( RoadmapWizard, CheckInvariants );
impl_construct();
}
@@ -180,7 +178,6 @@ namespace svt
:OWizardMachine( _pParent, i_nStyle, _nButtonFlags )
,m_pImpl( new RoadmapWizardImpl )
{
- DBG_CTOR( RoadmapWizard, CheckInvariants );
impl_construct();
}
@@ -213,7 +210,6 @@ namespace svt
RoadmapWizard::~RoadmapWizard()
{
delete m_pImpl;
- DBG_DTOR( RoadmapWizard, CheckInvariants );
}
@@ -231,7 +227,6 @@ namespace svt
void RoadmapWizard::declarePath( PathId _nPathId, const WizardPath& _lWizardStates)
{
- DBG_CHKTHIS( RoadmapWizard, CheckInvariants );
m_pImpl->aPaths.insert( Paths::value_type( _nPathId, _lWizardStates ) );
@@ -245,7 +240,6 @@ namespace svt
void RoadmapWizard::declarePath( PathId _nPathId, WizardState _nFirstState, ... )
{
- DBG_CHKTHIS( RoadmapWizard, CheckInvariants );
DBG_ASSERT( _nFirstState != WZS_INVALID_STATE, "RoadmapWizard::declarePath: there should be at least one state in the path!" );
if ( _nFirstState == WZS_INVALID_STATE )
@@ -283,7 +277,6 @@ namespace svt
void RoadmapWizard::activatePath( PathId _nPathId, bool _bDecideForIt )
{
- DBG_CHKTHIS( RoadmapWizard, CheckInvariants );
if ( ( _nPathId == m_pImpl->nActivePath ) && ( _bDecideForIt == m_pImpl->bActivePathIsDefinite ) )
// nothing to do
@@ -328,7 +321,6 @@ namespace svt
void RoadmapWizard::implUpdateRoadmap( )
{
- DBG_CHKTHIS( RoadmapWizard, CheckInvariants );
DBG_ASSERT( m_pImpl->aPaths.find( m_pImpl->nActivePath ) != m_pImpl->aPaths.end(),
"RoadmapWizard::implUpdateRoadmap: there is no such path!" );
@@ -435,7 +427,6 @@ namespace svt
WizardTypes::WizardState RoadmapWizard::determineNextState( WizardState _nCurrentState ) const
{
- DBG_CHKTHIS( RoadmapWizard, CheckInvariants );
sal_Int32 nCurrentStatePathIndex = -1;
@@ -526,7 +517,6 @@ namespace svt
IMPL_LINK_NOARG(RoadmapWizard, OnRoadmapItemSelected)
{
- DBG_CHKTHIS( RoadmapWizard, CheckInvariants );
RoadmapTypes::ItemId nCurItemId = m_pImpl->pRoadmap->GetCurrentRoadmapItemID();
if ( nCurItemId == getCurrentState() )
@@ -571,7 +561,6 @@ namespace svt
void RoadmapWizard::enterState( WizardState _nState )
{
- DBG_CHKTHIS( RoadmapWizard, CheckInvariants );
OWizardMachine::enterState( _nState );
@@ -614,7 +603,6 @@ namespace svt
void RoadmapWizard::enableState( WizardState _nState, bool _bEnable )
{
- DBG_CHKTHIS( RoadmapWizard, CheckInvariants );
// remember this (in case the state appears in the roadmap later on)
if ( _bEnable )
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 9cf2a4f493de..4ec9146c24a6 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -33,7 +33,6 @@
#include <string.h>
#include <math.h>
-DBG_NAME( ImageMap )
#define SCALEPOINT(aPT,aFracX,aFracY) (aPT).X()=((aPT).X()*(aFracX).GetNumerator())/(aFracX).GetDenominator(); \
@@ -581,7 +580,6 @@ ImageMap::ImageMap( const OUString& rName )
ImageMap::ImageMap( const ImageMap& rImageMap )
{
- DBG_CTOR( ImageMap, NULL );
size_t nCount = rImageMap.GetIMapObjectCount();
@@ -620,7 +618,6 @@ ImageMap::ImageMap( const ImageMap& rImageMap )
ImageMap::~ImageMap()
{
- DBG_DTOR( ImageMap, NULL );
ClearImageMap();
}
diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx
index bc1260b7e310..1d42a1dfe63b 100644
--- a/svtools/source/misc/itemdel.cxx
+++ b/svtools/source/misc/itemdel.cxx
@@ -28,7 +28,6 @@
// STATIC DATA -----------------------------------------------------------
-DBG_NAME(SfxItemDesruptor_Impl);
@@ -52,7 +51,6 @@ SfxItemDesruptor_Impl::SfxItemDesruptor_Impl( SfxPoolItem *pItemToDesrupt ):
pItem(pItemToDesrupt),
aLink( LINK(this, SfxItemDesruptor_Impl, Delete) )
{
- DBG_CTOR(SfxItemDesruptor_Impl, 0);
DBG_ASSERT( 0 == pItem->GetRefCount(), "disrupting pooled item" );
pItem->SetKind( SFX_ITEMS_DELETEONIDLE );
@@ -67,7 +65,6 @@ void SfxItemDesruptor_Impl::LaunchDeleteOnIdle()
SfxItemDesruptor_Impl::~SfxItemDesruptor_Impl()
{
- DBG_DTOR(SfxItemDesruptor_Impl, 0);
// remove from Idle-Handler
GetpApp()->RemoveIdleHdl( aLink );
@@ -81,7 +78,6 @@ SfxItemDesruptor_Impl::~SfxItemDesruptor_Impl()
IMPL_LINK_NOARG(SfxItemDesruptor_Impl, Delete)
{
- {DBG_CHKTHIS(SfxItemDesruptor_Impl, 0);}
delete this;
return 0;
}
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index bc9c498a1f61..548cab19c42b 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -159,13 +159,11 @@ namespace svt
};
- DBG_NAME( TemplateContent )
TemplateContent::TemplateContent( const INetURLObject& _rURL )
:m_aURL( _rURL )
{
- DBG_CTOR( TemplateContent, NULL );
DBG_ASSERT( INET_PROT_NOT_VALID != m_aURL.GetProtocol(), "TemplateContent::TemplateContent: invalid URL!" );
m_sLocalName = m_aURL.getName();
implResetDate();
@@ -174,7 +172,6 @@ namespace svt
TemplateContent::~TemplateContent()
{
- DBG_DTOR( TemplateContent, NULL );
}
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 3b6af6348816..4565a1eafe61 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -235,7 +235,6 @@ namespace svt { namespace table
//= TableControl_Impl
- DBG_NAME( TableControl_Impl )
#ifdef DBG_UTIL
@@ -424,7 +423,6 @@ namespace svt { namespace table
#endif
#define DBG_CHECK_ME() \
- DBG_CHKTHIS( TableControl_Impl, TableControl_Impl_checkInvariants )
TableControl_Impl::TableControl_Impl( TableControl& _rAntiImpl )
@@ -455,7 +453,6 @@ namespace svt { namespace table
,m_nRequiredInvariants ( INV_SCROLL_POSITION )
#endif
{
- DBG_CTOR( TableControl_Impl, TableControl_Impl_checkInvariants );
m_pSelEngine = new SelectionEngine( m_pDataWindow.get(), m_pTableFunctionSet );
m_pSelEngine->SetSelectionMode(SINGLE_SELECTION);
m_pDataWindow->SetPosPixel( Point( 0, 0 ) );
@@ -465,7 +462,6 @@ namespace svt { namespace table
TableControl_Impl::~TableControl_Impl()
{
- DBG_DTOR( TableControl_Impl, TableControl_Impl_checkInvariants );
DELETEZ( m_pVScroll );
DELETEZ( m_pHScroll );
diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx
index 28ed032f6f58..54b266621d43 100644
--- a/svtools/source/uno/unocontroltablemodel.cxx
+++ b/svtools/source/uno/unocontroltablemodel.cxx
@@ -147,14 +147,11 @@ namespace svt { namespace table
#define DBG_CHECK_ME() \
DBG_TESTSOLARMUTEX(); \
- DBG_CHKTHIS( UnoControlTableModel, UnoControlTableModel_checkInvariants )
- DBG_NAME( UnoControlTableModel )
UnoControlTableModel::UnoControlTableModel()
:m_pImpl( new UnoControlTableModel_Impl )
{
- DBG_CTOR( UnoControlTableModel, UnoControlTableModel_checkInvariants );
m_pImpl->bHasColumnHeaders = true;
m_pImpl->bHasRowHeaders = false;
m_pImpl->bEnabled = true;
@@ -165,7 +162,6 @@ namespace svt { namespace table
UnoControlTableModel::~UnoControlTableModel()
{
- DBG_DTOR( UnoControlTableModel, UnoControlTableModel_checkInvariants );
DELETEZ( m_pImpl );
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 23:45:53 +0000