[Libreoffice-commits] core.git: svx/source
Arnaud Versini
arnaud.versini at gmail.com
Mon Mar 3 07:33:26 PST 2014
svx/source/accessibility/AccessibleTextHelper.cxx | 36 --------------
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 11 ----
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 6 --
svx/source/dialog/ctredlin.cxx | 5 -
svx/source/dialog/fontlb.cxx | 7 --
svx/source/fmcomp/fmgridif.cxx | 3 -
svx/source/fmcomp/gridcell.cxx | 24 ---------
svx/source/fmcomp/gridctrl.cxx | 15 -----
svx/source/form/ParseContext.cxx | 3 -
svx/source/form/datanavi.cxx | 3 -
svx/source/form/fmPropBrw.cxx | 3 -
svx/source/form/fmdpage.cxx | 3 -
svx/source/form/fmexpl.cxx | 32 ------------
svx/source/form/fmobj.cxx | 4 -
svx/source/form/fmpgeimp.cxx | 3 -
svx/source/form/fmshimp.cxx | 3 -
svx/source/form/fmsrcimp.cxx | 7 --
svx/source/form/fmtextcontrolshell.cxx | 6 --
svx/source/form/fmtools.cxx | 3 -
svx/source/form/fmundo.cxx | 6 --
svx/source/form/fmvwimp.cxx | 3 -
svx/source/form/formcontroller.cxx | 3 -
svx/source/form/formdispatchinterceptor.cxx | 3 -
svx/source/form/tabwin.cxx | 9 ---
svx/source/form/tbxform.cxx | 12 ----
svx/source/gallery2/GallerySplitter.cxx | 3 -
svx/source/gallery2/codec.cxx | 3 -
svx/source/gallery2/galbrws.cxx | 6 --
svx/source/gallery2/galbrws2.cxx | 9 ---
svx/source/gallery2/galctrl.cxx | 10 ---
svx/source/gallery2/galmisc.cxx | 6 --
svx/source/gallery2/galobj.cxx | 7 --
svx/source/gallery2/galtheme.cxx | 3 -
svx/source/items/e3ditem.cxx | 10 ---
svx/source/items/galleryitem.cxx | 5 -
svx/source/sdr/contact/viewcontactofunocontrol.cxx | 3 -
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 9 ---
svx/source/svdraw/svdmodel.cxx | 6 --
svx/source/svdraw/svdobj.cxx | 6 --
svx/source/svdraw/svdoole2.cxx | 4 -
svx/source/svdraw/svdoutl.cxx | 3 -
svx/source/svdraw/svdpage.cxx | 8 ---
svx/source/svdraw/svdpagv.cxx | 3 -
svx/source/svdraw/svdpntv.cxx | 3 -
svx/source/unodraw/unopage.cxx | 3 -
svx/source/unodraw/unoshap2.cxx | 3 -
svx/source/unodraw/unoshape.cxx | 8 ---
svx/source/xml/xmleohlp.cxx | 4 -
svx/source/xoutdev/_xpoly.cxx | 13 -----
49 files changed, 351 deletions(-)
New commits:
commit 7a5f564a799b8654b81454005f4887c6dc774ef0
Author: Arnaud Versini <arnaud.versini at gmail.com>
Date: Sun Mar 2 15:12:20 2014 +0100
SVX : Remove usage of DBG_CTOR and DBG_DTOR.
Valgrind is capable of detecting such bugs. No need for extra macros.
Change-Id: I9f2ab3703feb5c49a831da124e161f98cb1bb3ab
Reviewed-on: https://gerrit.libreoffice.org/8419
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index bb021cc..e1daab6 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -83,7 +83,6 @@ namespace accessibility
- DBG_NAME( AccessibleTextHelper_Impl )
template < typename first_type, typename second_type >
::std::pair< first_type, second_type > makeSortedPair( first_type first,
@@ -123,19 +122,16 @@ namespace accessibility
void SetEventSource( const uno::Reference< XAccessible >& rInterface )
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
mxFrontEnd = rInterface;
}
uno::Reference< XAccessible > GetEventSource() const
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
return mxFrontEnd;
}
void SetOffset( const Point& );
Point GetOffset() const
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
::osl::MutexGuard aGuard( maMutex ); Point aPoint( maOffset );
return aPoint;
}
@@ -143,7 +139,6 @@ namespace accessibility
void SetStartIndex( sal_Int32 nOffset );
sal_Int32 GetStartIndex() const
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
// Strictly correct only with locked solar mutex, // but
// here we rely on the fact that sal_Int32 access is
// atomic
@@ -278,7 +273,6 @@ namespace accessibility
// normally should employ RAII here...
mnNotifierClientId(::comphelper::AccessibleEventNotifier::registerClient())
{
- DBG_CTOR( AccessibleTextHelper_Impl, NULL );
#ifdef DBG_UTIL
OSL_TRACE( "AccessibleTextHelper_Impl received ID: %d", mnNotifierClientId );
@@ -287,7 +281,6 @@ namespace accessibility
AccessibleTextHelper_Impl::~AccessibleTextHelper_Impl()
{
- DBG_DTOR( AccessibleTextHelper_Impl, NULL );
SolarMutexGuard aGuard;
@@ -302,7 +295,6 @@ namespace accessibility
SvxTextForwarder& AccessibleTextHelper_Impl::GetTextForwarder() const SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
if( !maEditSource.IsValid() )
throw uno::RuntimeException("Unknown edit source", mxFrontEnd);
@@ -320,7 +312,6 @@ namespace accessibility
SvxViewForwarder& AccessibleTextHelper_Impl::GetViewForwarder() const SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
if( !maEditSource.IsValid() )
throw uno::RuntimeException("Unknown edit source", mxFrontEnd);
@@ -338,7 +329,6 @@ namespace accessibility
SvxEditViewForwarder& AccessibleTextHelper_Impl::GetEditViewForwarder( sal_Bool bCreate ) const SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
if( !maEditSource.IsValid() )
throw uno::RuntimeException("Unknown edit source", mxFrontEnd);
@@ -366,7 +356,6 @@ namespace accessibility
SvxEditSourceAdapter& AccessibleTextHelper_Impl::GetEditSource() const SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
if( maEditSource.IsValid() )
return maEditSource;
@@ -376,7 +365,6 @@ namespace accessibility
sal_Bool AccessibleTextHelper_Impl::IsSelected() const
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
sal_Bool bRet = sal_False;
@@ -406,7 +394,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::SetStartIndex( sal_Int32 nOffset )
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
sal_Int32 nOldOffset( mnStartIndex );
@@ -429,7 +416,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::SetChildFocus( sal_Int32 nChild, sal_Bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
if( bHaveFocus )
{
@@ -456,7 +442,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::ChangeChildFocus( sal_Int32 nNewChild ) SAL_THROW((::com::sun::star::uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
if( mbThisHasFocus )
SetShapeFocus( sal_False );
@@ -469,7 +454,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::SetShapeFocus( sal_Bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
sal_Bool bOldFocus( mbThisHasFocus );
@@ -516,7 +500,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::SetFocus( sal_Bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
sal_Bool bOldFocus( mbGroupHasFocus );
@@ -543,7 +526,6 @@ namespace accessibility
sal_Bool AccessibleTextHelper_Impl::HaveFocus() SAL_THROW((::com::sun::star::uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
// No locking of solar mutex here, since we rely on the fact
// that sal_Bool access is atomic
@@ -552,7 +534,6 @@ namespace accessibility
sal_Bool AccessibleTextHelper_Impl::IsActive() const SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
try
{
@@ -585,7 +566,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::UpdateSelection()
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
try
{
@@ -770,7 +750,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::ShutdownEditSource() SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
// This should only be called with solar mutex locked, i.e. from the main office thread
@@ -800,7 +779,6 @@ namespace accessibility
SAL_WNODEPRECATED_DECLARATIONS_PUSH
void AccessibleTextHelper_Impl::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
// This should only be called with solar mutex locked, i.e. from the main office thread
@@ -825,7 +803,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::SetOffset( const Point& rPoint )
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
// guard against non-atomic access to maOffset data structure
{
@@ -842,7 +819,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::UpdateVisibleChildren( bool bBroadcastEvents )
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
try
{
@@ -954,7 +930,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::UpdateBoundRect()
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
// send BOUNDRECT_CHANGED to affected children
AccessibleTextHelper_UpdateChildBounds aFunctor( *this );
@@ -992,7 +967,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::ParagraphsMoved( sal_Int32 nFirst, sal_Int32 nMiddle, sal_Int32 nLast )
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
const sal_Int32 nParas = GetTextForwarder().GetParagraphCount();
@@ -1150,7 +1124,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::ProcessQueue()
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
// inspect queue for paragraph insert/remove events. If there
// is exactly _one_ of those in the queue, and the number of
@@ -1439,7 +1412,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
// precondition: solar mutex locked
DBG_TESTSOLARMUTEX();
@@ -1569,7 +1541,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::Dispose()
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
if( getNotifierClientId() != -1 )
{
@@ -1606,7 +1577,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::FireEvent( const sal_Int16 nEventId, const uno::Any& rNewValue, const uno::Any& rOldValue ) const
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
// -- object locked --
::osl::ClearableMutexGuard aGuard( maMutex );
@@ -1632,7 +1602,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::FireEvent( const AccessibleEventObject& rEvent ) const
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
// #102261# Call global queue for focus events
if( rEvent.EventId == AccessibleStateType::FOCUSED )
@@ -1646,14 +1615,12 @@ namespace accessibility
// XAccessibleContext
sal_Int32 SAL_CALL AccessibleTextHelper_Impl::getAccessibleChildCount() SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
return mnLastVisibleChild - mnFirstVisibleChild + 1;
}
uno::Reference< XAccessible > SAL_CALL AccessibleTextHelper_Impl::getAccessibleChild( sal_Int32 i ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
i -= GetStartIndex();
@@ -1673,7 +1640,6 @@ namespace accessibility
void SAL_CALL AccessibleTextHelper_Impl::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
if( getNotifierClientId() != -1 )
::comphelper::AccessibleEventNotifier::addEventListener( getNotifierClientId(), xListener );
@@ -1681,7 +1647,6 @@ namespace accessibility
void SAL_CALL AccessibleTextHelper_Impl::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
if( getNotifierClientId() != -1 )
::comphelper::AccessibleEventNotifier::removeEventListener( getNotifierClientId(), xListener );
@@ -1689,7 +1654,6 @@ namespace accessibility
uno::Reference< XAccessible > SAL_CALL AccessibleTextHelper_Impl::getAccessibleAtPoint( const awt::Point& _aPoint ) SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
// make given position relative
if( !mxFrontEnd.is() )
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index 190fef5..b624283 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -561,11 +561,6 @@ void SvxPixelCtlAccessibleChild::FireAccessibleEvent (
CommitChange( AccessibleEventObject( xSource, nEventId, rNew,rOld ) );
}
-
-
-DBG_NAME( SvxPixelCtlAccessibleChild )
-
-
SvxPixelCtlAccessibleChild::SvxPixelCtlAccessibleChild(
SvxPixelCtl& rWindow,
sal_Bool bPixelColorOrBG,
@@ -582,14 +577,11 @@ SvxPixelCtlAccessibleChild::SvxPixelCtlAccessibleChild(
mnIndexInParent( nIndexInParent ),
mnClientId( 0 )
{
- DBG_CTOR( SvxPixelCtlAccessibleChild, NULL );
}
SvxPixelCtlAccessibleChild::~SvxPixelCtlAccessibleChild()
{
- DBG_DTOR( SvxPixelCtlAccessibleChild, NULL );
-
if( IsAlive() )
{
osl_atomic_increment( &m_refCount );
@@ -777,9 +769,6 @@ void SAL_CALL SvxPixelCtlAccessibleChild::addAccessibleEventListener( const uno:
}
}
-
-
-
void SAL_CALL SvxPixelCtlAccessibleChild::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
throw( RuntimeException, std::exception )
{
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 62ebf70..225dc1c 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -53,7 +53,6 @@ using namespace ::com::sun::star::lang;
#define NOCHILDSELECTED -1
-DBG_NAME( SvxRectCtlAccessibleContext )
//===== internal ============================================================
@@ -150,7 +149,6 @@ SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext(
mnSelectedChild( NOCHILDSELECTED ),
mbAngleMode( rRepr.GetNumOfChildren() == 8 )
{
- DBG_CTOR( SvxRectCtlAccessibleContext, NULL );
if( pName )
msName = *pName;
@@ -178,7 +176,6 @@ SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext(
SvxRectCtlAccessibleContext::~SvxRectCtlAccessibleContext()
{
- DBG_DTOR( SvxRectCtlAccessibleContext, NULL );
if( IsAlive() )
{
@@ -795,7 +792,6 @@ void SvxRectCtlAccessibleContext::ThrowExceptionIfNotAlive( void ) throw( lang::
-DBG_NAME( SvxRectCtlChildAccessibleContext )
SvxRectCtlChildAccessibleContext::SvxRectCtlChildAccessibleContext(
@@ -816,13 +812,11 @@ SvxRectCtlChildAccessibleContext::SvxRectCtlChildAccessibleContext(
mnIndexInParent( nIndexInParent ),
mbIsChecked( false )
{
- DBG_CTOR( SvxRectCtlChildAccessibleContext, NULL );
}
SvxRectCtlChildAccessibleContext::~SvxRectCtlChildAccessibleContext()
{
- DBG_DTOR( SvxRectCtlChildAccessibleContext, NULL );
if( IsAlive() )
{
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 99a7f80..2e3e734 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -75,13 +75,11 @@ SvxRedlinEntry::~SvxRedlinEntry()
// Functions in the inserts Items of SvxRedlinTable
-DBG_NAME(SvLBoxColorString);
SvLBoxColorString::SvLBoxColorString(SvTreeListEntry*pEntry, sal_uInt16 nFlags, const OUString& rStr,
const Color& rCol)
: SvLBoxString(pEntry, nFlags, rStr)
{
- DBG_CTOR(SvLBoxColorString,0);
aPrivColor=rCol;
SetText( rStr );
}
@@ -89,17 +87,14 @@ SvLBoxColorString::SvLBoxColorString(SvTreeListEntry*pEntry, sal_uInt16 nFlags,
SvLBoxColorString::SvLBoxColorString()
: SvLBoxString()
{
- DBG_CTOR(SvLBoxColorString,0);
}
SvLBoxColorString::~SvLBoxColorString()
{
- DBG_DTOR(SvLBoxColorString,0);
}
SvLBoxItem* SvLBoxColorString::Create() const
{
- DBG_CHKTHIS(SvLBoxColorString,0);
return new SvLBoxColorString;
}
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index add7dfb..7449551 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -26,12 +26,10 @@
-DBG_NAME( SvLBoxFontString );
SvLBoxFontString::SvLBoxFontString() :
SvLBoxString()
{
- DBG_CTOR( SvLBoxFontString, 0 );
}
SvLBoxFontString::SvLBoxFontString(
@@ -41,7 +39,6 @@ SvLBoxFontString::SvLBoxFontString(
maFont( rFont ),
mbUseColor( pColor != NULL )
{
- DBG_CTOR( SvLBoxFontString, 0 );
SetText( rString );
if( pColor )
maFont.SetColor( *pColor );
@@ -49,20 +46,17 @@ SvLBoxFontString::SvLBoxFontString(
SvLBoxFontString::~SvLBoxFontString()
{
- DBG_DTOR( SvLBoxFontString, 0 );
}
SvLBoxItem* SvLBoxFontString::Create() const
{
- DBG_CHKTHIS( SvLBoxFontString, 0 );
return new SvLBoxFontString;
}
void SvLBoxFontString::Paint(
const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry)
{
- DBG_CHKTHIS( SvLBoxFontString, 0 );
Font aOldFont( rDev.GetFont() );
Font aNewFont( maFont );
bool bSel = pView->IsSelected();
@@ -79,7 +73,6 @@ void SvLBoxFontString::Paint(
void SvLBoxFontString::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData )
{
- DBG_CHKTHIS( SvLBoxFontString, 0 );
Font aOldFont( pView->GetFont() );
pView->Control::SetFont( maFont );
SvLBoxString::InitViewData( pView, pEntry, pViewData);
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index a908105..90ab712 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -353,7 +353,6 @@ Reference< XInterface > SAL_CALL FmXGridControl_NewInstance_Impl(const Reference
{
return *(new FmXGridControl( comphelper::getComponentContext(_rxFactory) ));
}
-DBG_NAME(FmXGridControl )
FmXGridControl::FmXGridControl(const Reference< XComponentContext >& _rxContext)
:UnoControl()
@@ -366,13 +365,11 @@ FmXGridControl::FmXGridControl(const Reference< XComponentContext >& _rxContext)
,m_bInDraw(sal_False)
,m_xContext(_rxContext)
{
- DBG_CTOR(FmXGridControl ,NULL);
}
FmXGridControl::~FmXGridControl()
{
- DBG_DTOR(FmXGridControl ,NULL);
}
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 402e203..326f182 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -1255,13 +1255,11 @@ void DbTextField::implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen )
//= DbFormattedField
-DBG_NAME(DbFormattedField);
DbFormattedField::DbFormattedField(DbGridColumn& _rColumn)
:DbLimitedLengthField(_rColumn)
,m_nKeyType(::com::sun::star::util::NumberFormat::UNDEFINED)
{
- DBG_CTOR(DbFormattedField,NULL);
// if our model's format key changes we want to propagate the new value to our windows
doPropertyListening( FM_PROP_FORMATKEY );
@@ -1270,7 +1268,6 @@ DbFormattedField::DbFormattedField(DbGridColumn& _rColumn)
DbFormattedField::~DbFormattedField()
{
- DBG_DTOR(DbFormattedField,NULL);
}
@@ -2742,7 +2739,6 @@ sal_Bool DbListBox::commitControl()
}
-DBG_NAME(DbFilterField);
/*************************************************************************/
DbFilterField::DbFilterField(const Reference< XComponentContext >& rxContext,DbGridColumn& _rColumn)
:DbCellControl(_rColumn)
@@ -2752,7 +2748,6 @@ DbFilterField::DbFilterField(const Reference< XComponentContext >& rxContext,DbG
,m_bFilterListFilled(sal_False)
,m_bBound(sal_False)
{
- DBG_CTOR(DbFilterField,NULL);
setAlignedController( sal_False );
}
@@ -2763,7 +2758,6 @@ DbFilterField::~DbFilterField()
if (m_nControlClass == ::com::sun::star::form::FormComponentType::CHECKBOX)
((CheckBoxControl*)m_pWindow)->SetClickHdl( Link() );
- DBG_DTOR(DbFilterField,NULL);
}
@@ -3213,7 +3207,6 @@ IMPL_LINK_NOARG(DbFilterField, OnClick)
TYPEINIT0(FmXGridCell);
-DBG_NAME(FmXGridCell);
FmXGridCell::FmXGridCell( DbGridColumn* pColumn, DbCellControl* _pControl )
:OComponentHelper(m_aMutex)
@@ -3225,7 +3218,6 @@ FmXGridCell::FmXGridCell( DbGridColumn* pColumn, DbCellControl* _pControl )
,m_aMouseListeners( m_aMutex )
,m_aMouseMotionListeners( m_aMutex )
{
- DBG_CTOR(FmXGridCell,NULL);
}
@@ -3253,7 +3245,6 @@ FmXGridCell::~FmXGridCell()
dispose();
}
- DBG_DTOR(FmXGridCell,NULL);
}
@@ -3647,7 +3638,6 @@ void FmXTextCell::PaintFieldToCell(OutputDevice& rDev,
/*************************************************************************/
-DBG_NAME(FmXEditCell);
FmXEditCell::FmXEditCell( DbGridColumn* pColumn, DbCellControl& _rControl )
:FmXTextCell( pColumn, _rControl )
@@ -3656,7 +3646,6 @@ FmXEditCell::FmXEditCell( DbGridColumn* pColumn, DbCellControl& _rControl )
,m_pEditImplementation( NULL )
,m_bOwnEditImplementation( false )
{
- DBG_CTOR(FmXEditCell,NULL);
DbTextField* pTextField = PTR_CAST( DbTextField, &_rControl );
if ( pTextField )
@@ -3683,7 +3672,6 @@ FmXEditCell::~FmXEditCell()
}
- DBG_DTOR(FmXEditCell,NULL);
}
// OComponentHelper
@@ -3914,7 +3902,6 @@ void FmXEditCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWi
}
/*************************************************************************/
-DBG_NAME(FmXCheckBoxCell);
FmXCheckBoxCell::FmXCheckBoxCell( DbGridColumn* pColumn, DbCellControl& _rControl )
:FmXDataCell( pColumn, _rControl )
@@ -3922,7 +3909,6 @@ FmXCheckBoxCell::FmXCheckBoxCell( DbGridColumn* pColumn, DbCellControl& _rContro
,m_aActionListeners( m_aMutex )
,m_pBox( & static_cast< CheckBoxControl& >( _rControl.GetWindow() ).GetBox() )
{
- DBG_CTOR(FmXCheckBoxCell,NULL);
}
@@ -3934,7 +3920,6 @@ FmXCheckBoxCell::~FmXCheckBoxCell()
dispose();
}
- DBG_DTOR(FmXCheckBoxCell,NULL);
}
// OComponentHelper
@@ -4094,7 +4079,6 @@ void FmXCheckBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window&
/*************************************************************************/
-DBG_NAME(FmXListBoxCell);
FmXListBoxCell::FmXListBoxCell(DbGridColumn* pColumn, DbCellControl& _rControl)
:FmXTextCell( pColumn, _rControl )
@@ -4102,7 +4086,6 @@ FmXListBoxCell::FmXListBoxCell(DbGridColumn* pColumn, DbCellControl& _rControl)
,m_aActionListeners(m_aMutex)
,m_pBox( &static_cast< ListBox& >( _rControl.GetWindow() ) )
{
- DBG_CTOR(FmXListBoxCell,NULL);
m_pBox->SetDoubleClickHdl( LINK( this, FmXListBoxCell, OnDoubleClick ) );
}
@@ -4116,7 +4099,6 @@ FmXListBoxCell::~FmXListBoxCell()
dispose();
}
- DBG_DTOR(FmXListBoxCell,NULL);
}
// OComponentHelper
@@ -4435,7 +4417,6 @@ IMPL_LINK_NOARG(FmXListBoxCell, OnDoubleClick)
/*************************************************************************/
-DBG_NAME( FmXComboBoxCell );
FmXComboBoxCell::FmXComboBoxCell( DbGridColumn* pColumn, DbCellControl& _rControl )
@@ -4444,7 +4425,6 @@ FmXComboBoxCell::FmXComboBoxCell( DbGridColumn* pColumn, DbCellControl& _rContro
,m_aActionListeners( m_aMutex )
,m_pComboBox( &static_cast< ComboBox& >( _rControl.GetWindow() ) )
{
- DBG_CTOR( FmXComboBoxCell, NULL );
}
@@ -4456,7 +4436,6 @@ FmXComboBoxCell::~FmXComboBoxCell()
dispose();
}
- DBG_DTOR( FmXComboBoxCell, NULL );
}
@@ -4636,13 +4615,11 @@ Reference< XInterface > FmXFilterCell_CreateInstance(const Reference< ::com::su
return *new FmXFilterCell();
}
-DBG_NAME(FmXFilterCell);
FmXFilterCell::FmXFilterCell(DbGridColumn* pColumn, DbCellControl* pControl )
:FmXGridCell( pColumn, pControl )
,m_aTextListeners(m_aMutex)
{
- DBG_CTOR(FmXFilterCell,NULL);
DBG_ASSERT( m_pCellControl->ISA( DbFilterField ), "FmXFilterCell::FmXFilterCell: invalid cell control!" );
static_cast< DbFilterField* >( m_pCellControl )->SetCommitHdl( LINK( this, FmXFilterCell, OnCommit ) );
@@ -4657,7 +4634,6 @@ FmXFilterCell::~FmXFilterCell()
dispose();
}
- DBG_DTOR(FmXFilterCell,NULL);
}
// XUnoTunnel
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index e0758d0..cf23512 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -119,7 +119,6 @@ private:
class GridFieldValueListener;
typedef std::map<sal_uInt16, GridFieldValueListener*> ColumnFieldValueListeners;
-DBG_NAME(GridFieldValueListener)
class GridFieldValueListener : protected ::comphelper::OPropertyChangeListener
{
osl::Mutex m_aMutex;
@@ -149,7 +148,6 @@ GridFieldValueListener::GridFieldValueListener(DbGridControl& _rParent, const Re
,m_nSuspended(0)
,m_bDisposed(false)
{
- DBG_CTOR(GridFieldValueListener, NULL);
if (_rField.is())
{
m_pRealListener = new ::comphelper::OPropertyChangeMultiplexer(this, _rField);
@@ -160,7 +158,6 @@ GridFieldValueListener::GridFieldValueListener(DbGridControl& _rParent, const Re
GridFieldValueListener::~GridFieldValueListener()
{
- DBG_DTOR(GridFieldValueListener, NULL);
dispose();
}
@@ -203,13 +200,11 @@ public:
virtual void disposing(const EventObject& _rEvent, sal_Int16 _nId) throw( RuntimeException ) { m_rParent.disposing(_nId, _rEvent); }
};
-DBG_NAME(DisposeListenerGridBridge)
DisposeListenerGridBridge::DisposeListenerGridBridge(DbGridControl& _rParent, const Reference< XComponent >& _rxObject, sal_Int16 _rId)
:FmXDisposeListener(m_aMutex)
,m_rParent(_rParent)
,m_pRealListener(NULL)
{
- DBG_CTOR(DisposeListenerGridBridge,NULL);
if (_rxObject.is())
{
@@ -227,7 +222,6 @@ DisposeListenerGridBridge::~DisposeListenerGridBridge()
m_pRealListener = NULL;
}
- DBG_DTOR(DisposeListenerGridBridge,NULL);
}
static const sal_uInt16 ControlMap[] =
@@ -863,7 +857,6 @@ void DbGridRow::SetState(CursorWrapper* pCur, sal_Bool bPaintCursor)
}
}
-DBG_NAME(DbGridControl);
DbGridControl::DbGridControl(
Reference< XComponentContext > _rxContext,
Window* pParent,
@@ -903,7 +896,6 @@ DbGridControl::DbGridControl(
,m_bHideScrollbars( sal_False )
,m_bUpdating(sal_False)
{
- DBG_CTOR(DbGridControl,NULL);
OUString sName(SVX_RESSTR(RID_STR_NAVIGATIONBAR));
m_aBar.SetAccessibleName(sName);
@@ -964,7 +956,6 @@ DbGridControl::~DbGridControl()
delete m_pDataCursor;
delete m_pSeekCursor;
- DBG_DTOR(DbGridControl,NULL);
}
void DbGridControl::StateChanged( StateChangedType nType )
@@ -1780,7 +1771,6 @@ void DbGridControl::VisibleRowsChanged( long nNewTopRow, sal_uInt16 nLinesOnScre
void DbGridControl::RecalcRows(long nNewTopRow, sal_uInt16 nLinesOnScreen, sal_Bool bUpdateCursor)
{
- DBG_CHKTHIS( DbGridControl, NULL );
// Wenn kein Cursor -> keine Rows im Browser.
if (!m_pSeekCursor)
{
@@ -1987,7 +1977,6 @@ void DbGridControl::PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uI
sal_Bool DbGridControl::CursorMoving(long nNewRow, sal_uInt16 nNewCol)
{
- DBG_CHKTHIS( DbGridControl, NULL );
DeactivateCell( sal_False );
@@ -2093,7 +2082,6 @@ sal_Bool DbGridControl::SetCurrent(long nNewRow)
void DbGridControl::CursorMoved()
{
- DBG_CHKTHIS( DbGridControl, NULL );
// cursor movement due to deletion or insertion of rows
if (m_pDataCursor && m_nCurrentPos != GetCurRow())
@@ -2215,7 +2203,6 @@ void DbGridControl::AdjustDataSource(sal_Bool bFull)
sal_Int32 DbGridControl::AlignSeekCursor()
{
- DBG_CHKTHIS( DbGridControl, NULL );
// position SeekCursor onto the data cursor, no data transmission
if (!m_pSeekCursor)
@@ -2267,7 +2254,6 @@ sal_Int32 DbGridControl::AlignSeekCursor()
sal_Bool DbGridControl::SeekCursor(long nRow, sal_Bool bAbsolute)
{
- DBG_CHKTHIS( DbGridControl, NULL );
// position SeekCursor onto the data cursor, no data transmission
// additions for the filtermode
@@ -2826,7 +2812,6 @@ void DbGridControl::Command(const CommandEvent& rEvt)
IMPL_LINK(DbGridControl, OnDelete, void*, /*EMPTYTAG*/ )
{
- DBG_CHKTHIS(DbGridControl, NULL );
m_nDeleteEvent = 0;
DeleteSelectedRows();
return 0;
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index 632b743..5b3619a 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -35,11 +35,9 @@ using namespace ::connectivity;
//= OSystemParseContext
-DBG_NAME(OSystemParseContext)
OSystemParseContext::OSystemParseContext() : IParseContext()
{
- DBG_CTOR(OSystemParseContext,NULL);
SolarMutexGuard aGuard;
::svx::StringListResource aKeywords( SVX_RES( RID_RSC_SQL_INTERNATIONAL ) );
@@ -49,7 +47,6 @@ OSystemParseContext::OSystemParseContext() : IParseContext()
OSystemParseContext::~OSystemParseContext()
{
- DBG_DTOR(OSystemParseContext,NULL);
}
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 8666be3..7e15117 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2154,7 +2154,6 @@ namespace svxform
// class DataNavigator
- DBG_NAME(DataNavigator)
DataNavigator::DataNavigator( SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent ) :
@@ -2165,7 +2164,6 @@ namespace svxform
m_aDataWin( this, _pBindings )
{
- DBG_CTOR(DataNavigator,NULL);
SetHelpId( HID_DATA_NAVIGATOR_WIN );
SetText( SVX_RES( RID_STR_DATANAVIGATOR ) );
@@ -2180,7 +2178,6 @@ namespace svxform
DataNavigator::~DataNavigator()
{
- DBG_DTOR(DataNavigator,NULL);
}
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index e8bd3ab..45357f9 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -189,7 +189,6 @@ OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj)
// class FmPropBrw
-DBG_NAME(FmPropBrw);
FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings* _pBindings,
SfxChildWindow* _pMgr, Window* _pParent, const SfxChildWinInfo* _pInfo )
@@ -199,7 +198,6 @@ FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings*
,m_bInStateChange( false )
,m_xORB(_xORB)
{
- DBG_CTOR(FmPropBrw,NULL);
::Size aPropWinSize(STD_WIN_SIZE_X,STD_WIN_SIZE_Y);
SetMinOutputSizePixel(::Size(STD_MIN_SIZE_X,STD_MIN_SIZE_Y));
@@ -284,7 +282,6 @@ FmPropBrw::~FmPropBrw()
{
DBG_UNHANDLED_EXCEPTION();
}
- DBG_DTOR(FmPropBrw,NULL);
}
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index d3f8463..aa3fb08 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -29,16 +29,13 @@ using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::RuntimeException;
using ::com::sun::star::form::XFormsSupplier2;
-DBG_NAME(SvxFmDrawPage)
SvxFmDrawPage::SvxFmDrawPage( SdrPage* pInPage ) :
SvxDrawPage( pInPage )
{
- DBG_CTOR(SvxFmDrawPage,NULL);
}
SvxFmDrawPage::~SvxFmDrawPage() throw ()
{
- DBG_DTOR(SvxFmDrawPage,NULL);
}
::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SvxFmDrawPage::getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception)
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 1c4b418..99fd2e5 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -75,20 +75,17 @@ using namespace ::com::sun::star::container;
// class FmNavInsertedHint
TYPEINIT1( FmNavInsertedHint, SfxHint );
-DBG_NAME(FmNavInsertedHint);
FmNavInsertedHint::FmNavInsertedHint( FmEntryData* pInsertedEntryData, sal_uInt32 nRelPos )
:pEntryData( pInsertedEntryData )
,nPos( nRelPos )
{
- DBG_CTOR(FmNavInsertedHint,NULL);
}
FmNavInsertedHint::~FmNavInsertedHint()
{
- DBG_DTOR(FmNavInsertedHint,NULL);
}
@@ -96,36 +93,30 @@ FmNavInsertedHint::~FmNavInsertedHint()
// class FmNavInsertedHint
TYPEINIT1( FmNavModelReplacedHint, SfxHint );
-DBG_NAME(FmNavModelReplacedHint);
FmNavModelReplacedHint::FmNavModelReplacedHint( FmEntryData* pAffectedEntryData )
:pEntryData( pAffectedEntryData )
{
- DBG_CTOR(FmNavModelReplacedHint,NULL);
}
FmNavModelReplacedHint::~FmNavModelReplacedHint()
{
- DBG_DTOR(FmNavModelReplacedHint,NULL);
}
// class FmNavRemovedHint
TYPEINIT1( FmNavRemovedHint, SfxHint );
-DBG_NAME(FmNavRemovedHint);
FmNavRemovedHint::FmNavRemovedHint( FmEntryData* pRemovedEntryData )
:pEntryData( pRemovedEntryData )
{
- DBG_CTOR(FmNavRemovedHint,NULL);
}
FmNavRemovedHint::~FmNavRemovedHint()
{
- DBG_DTOR(FmNavRemovedHint,NULL);
}
@@ -133,36 +124,30 @@ FmNavRemovedHint::~FmNavRemovedHint()
// class FmNavNameChangedHint
TYPEINIT1( FmNavNameChangedHint, SfxHint );
-DBG_NAME(FmNavNameChangedHint);
FmNavNameChangedHint::FmNavNameChangedHint( FmEntryData* pData, const OUString& rNewName )
:pEntryData( pData )
,aNewName( rNewName )
{
- DBG_CTOR(FmNavNameChangedHint,NULL);
}
FmNavNameChangedHint::~FmNavNameChangedHint()
{
- DBG_DTOR(FmNavNameChangedHint,NULL);
}
// class FmNavClearedHint
TYPEINIT1( FmNavClearedHint, SfxHint );
-DBG_NAME(FmNavClearedHint);
FmNavClearedHint::FmNavClearedHint()
{
- DBG_CTOR(FmNavClearedHint,NULL);
}
FmNavClearedHint::~FmNavClearedHint()
{
- DBG_DTOR(FmNavClearedHint,NULL);
}
@@ -178,17 +163,14 @@ TYPEINIT1(FmNavViewMarksChanged, SfxHint);
// class FmEntryDataList
-DBG_NAME(FmEntryDataList);
FmEntryDataList::FmEntryDataList()
{
- DBG_CTOR(FmEntryDataList,NULL);
}
FmEntryDataList::~FmEntryDataList()
{
- DBG_DTOR(FmEntryDataList,NULL);
}
@@ -233,12 +215,10 @@ void FmEntryDataList::clear()
// class FmEntryData
TYPEINIT0( FmEntryData );
-DBG_NAME(FmEntryData);
FmEntryData::FmEntryData( FmEntryData* pParentData, const Reference< XInterface >& _rxIFace )
:pParent( pParentData )
{
- DBG_CTOR(FmEntryData,NULL);
pChildList = new FmEntryDataList();
newObject( _rxIFace );
@@ -249,7 +229,6 @@ FmEntryData::~FmEntryData()
{
Clear();
delete pChildList;
- DBG_DTOR(FmEntryData,NULL);
}
@@ -321,7 +300,6 @@ sal_Bool FmEntryData::IsEqualWithoutChildren( FmEntryData* pEntryData )
// class FmFormData
TYPEINIT1( FmFormData, FmEntryData );
-DBG_NAME(FmFormData);
FmFormData::FmFormData(
const Reference< XForm >& _rxForm,
@@ -331,7 +309,6 @@ FmFormData::FmFormData(
: FmEntryData( _pParent, _rxForm ),
m_xForm( _rxForm )
{
- DBG_CTOR(FmEntryData,NULL);
// Images setzen
@@ -355,14 +332,12 @@ FmFormData::FmFormData(
FmFormData::~FmFormData()
{
- DBG_DTOR(FmEntryData,NULL);
}
FmFormData::FmFormData( const FmFormData& rFormData )
:FmEntryData( rFormData )
{
- DBG_CTOR(FmEntryData,NULL);
m_xForm = rFormData.GetFormIface();
}
@@ -391,7 +366,6 @@ sal_Bool FmFormData::IsEqualWithoutChildren( FmEntryData* pEntryData )
// class FmControlData
TYPEINIT1( FmControlData, FmEntryData );
-DBG_NAME(FmControlData);
FmControlData::FmControlData(
const Reference< XFormComponent >& _rxComponent,
@@ -401,7 +375,6 @@ FmControlData::FmControlData(
: FmEntryData( _pParent, _rxComponent ),
m_xFormComponent( _rxComponent )
{
- DBG_CTOR(FmControlData,NULL);
// Images setzen
m_aNormalImage = GetImage( _rNormalImages );
@@ -418,14 +391,12 @@ FmControlData::FmControlData(
FmControlData::~FmControlData()
{
- DBG_DTOR(FmControlData,NULL);
}
FmControlData::FmControlData( const FmControlData& rControlData )
:FmEntryData( rControlData )
{
- DBG_CTOR(FmControlData,NULL);
m_xFormComponent = rControlData.GetFormComponent();
}
@@ -580,14 +551,12 @@ namespace svxform
// class NavigatorFrame
- DBG_NAME(NavigatorFrame)
NavigatorFrame::NavigatorFrame( SfxBindings* _pBindings, SfxChildWindow* _pMgr,
Window* _pParent )
:SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_ROLLABLE|WB_3DLOOK|WB_DOCKABLE) )
,SfxControllerItem( SID_FM_FMEXPLORER_CONTROL, *_pBindings )
{
- DBG_CTOR(NavigatorFrame,NULL);
SetHelpId( HID_FORM_NAVIGATOR_WIN );
m_pNavigatorTree = new NavigatorTree( this );
@@ -600,7 +569,6 @@ namespace svxform
NavigatorFrame::~NavigatorFrame()
{
delete m_pNavigatorTree;
- DBG_DTOR(NavigatorFrame,NULL);
}
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index da83d85..c9bd6b0 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -57,14 +57,12 @@ using namespace ::com::sun::star::container;
using namespace ::svxform;
TYPEINIT1(FmFormObj, SdrUnoObj);
-DBG_NAME(FmFormObj);
FmFormObj::FmFormObj(const OUString& rModelName)
:SdrUnoObj ( rModelName )
,m_nPos ( -1 )
,m_pLastKnownRefDevice ( NULL )
{
- DBG_CTOR(FmFormObj, NULL);
// normally, this is done in SetUnoControlModel, but if the call happened in the base class ctor,
// then our incarnation of it was not called (since we were not constructed at this time).
@@ -77,13 +75,11 @@ FmFormObj::FmFormObj()
,m_nPos ( -1 )
,m_pLastKnownRefDevice ( NULL )
{
- DBG_CTOR(FmFormObj, NULL);
}
FmFormObj::~FmFormObj()
{
- DBG_DTOR(FmFormObj, NULL);
if (m_xEnvironmentHistory.is())
m_xEnvironmentHistory->dispose();
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index e46f288..8ea69d3 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -65,7 +65,6 @@ using ::com::sun::star::container::EnumerableMap;
using ::com::sun::star::drawing::XControlShape;
using namespace ::svxform;
-DBG_NAME(FmFormPageImpl)
FmFormPageImpl::FmFormPageImpl( FmFormPage& _rPage )
:m_rPage( _rPage )
@@ -73,7 +72,6 @@ FmFormPageImpl::FmFormPageImpl( FmFormPage& _rPage )
,m_bAttemptedFormCreation( false )
,m_bInFind( false )
{
- DBG_CTOR(FmFormPageImpl,NULL);
}
@@ -352,7 +350,6 @@ FmFormPageImpl::~FmFormPageImpl()
xCurrentForm = NULL;
::comphelper::disposeComponent( m_xForms );
- DBG_DTOR(FmFormPageImpl,NULL);
}
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 797fbf3..4fda8fa 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -635,7 +635,6 @@ void SAL_CALL FmXFormShell_Base_Disambiguation::disposing()
// class FmXFormShell
-DBG_NAME(FmXFormShell);
FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame )
:FmXFormShell_BASE(m_aMutex)
@@ -660,7 +659,6 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame )
,m_bPreparedClose( sal_False )
,m_bFirstActivation( sal_True )
{
- DBG_CTOR(FmXFormShell,NULL);
m_aMarkTimer.SetTimeout(100);
m_aMarkTimer.SetTimeoutHdl(LINK(this,FmXFormShell,OnTimeOut));
@@ -684,7 +682,6 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame )
FmXFormShell::~FmXFormShell()
{
delete m_pTextShell;
- DBG_DTOR(FmXFormShell,NULL);
}
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 3b94249..0d15c2b 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -87,11 +87,9 @@ void FmSearchThread::onTerminated()
// SMART_UNO_IMPLEMENTATION(FmRecordCountListener, UsrObject);
-DBG_NAME(FmRecordCountListener);
FmRecordCountListener::FmRecordCountListener(const Reference< ::com::sun::star::sdbc::XResultSet > & dbcCursor)
{
- DBG_CTOR(FmRecordCountListener,NULL);
m_xListening = Reference< ::com::sun::star::beans::XPropertySet > (dbcCursor, UNO_QUERY);
if (!m_xListening.is())
@@ -123,7 +121,6 @@ Link FmRecordCountListener::SetPropChangeHandler(const Link& lnk)
FmRecordCountListener::~FmRecordCountListener()
{
- DBG_DTOR(FmRecordCountListener,NULL);
}
@@ -666,7 +663,6 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString
}
-DBG_NAME(FmSearchEngine);
FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext,
const Reference< XResultSet > & xCursor, const OUString& sVisibleFields,
@@ -696,7 +692,6 @@ FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext,
,m_nPosition(MATCHING_ANYWHERE)
,m_nTransliterationFlags(0)
{
- DBG_CTOR(FmSearchEngine,NULL);
m_xFormatter = Reference< ::com::sun::star::util::XNumberFormatter >(
::com::sun::star::util::NumberFormatter::create( ::comphelper::getProcessComponentContext() ),
@@ -735,7 +730,6 @@ FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext,
,m_nPosition(MATCHING_ANYWHERE)
,m_nTransliterationFlags(0)
{
- DBG_CTOR(FmSearchEngine,NULL);
fillControlTexts(arrFields);
Init(sVisibleFields);
@@ -746,7 +740,6 @@ FmSearchEngine::~FmSearchEngine()
{
clearControlTexts();
- DBG_DTOR(FmSearchEngine,NULL);
}
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 4978e75..83be05f 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -185,13 +185,11 @@ namespace svx
};
- DBG_NAME( FmFocusListenerAdapter )
FmFocusListenerAdapter::FmFocusListenerAdapter( const Reference< XControl >& _rxControl, IFocusObserver* _pObserver )
:m_pObserver( _pObserver )
,m_xWindow( _rxControl, UNO_QUERY )
{
- DBG_CTOR( FmFocusListenerAdapter, NULL );
DBG_ASSERT( m_xWindow.is(), "FmFocusListenerAdapter::FmFocusListenerAdapter: invalid control!" );
osl_atomic_increment( &m_refCount );
@@ -215,7 +213,6 @@ namespace svx
acquire();
dispose();
- DBG_DTOR( FmFocusListenerAdapter, NULL );
}
@@ -282,13 +279,11 @@ namespace svx
//= FmMouseListenerAdapter
- DBG_NAME( FmMouseListenerAdapter )
FmMouseListenerAdapter::FmMouseListenerAdapter( const Reference< XControl >& _rxControl, IContextRequestObserver* _pObserver )
:m_pObserver( _pObserver )
,m_xWindow( _rxControl, UNO_QUERY )
{
- DBG_CTOR( FmMouseListenerAdapter, NULL );
DBG_ASSERT( m_xWindow.is(), "FmMouseListenerAdapter::FmMouseListenerAdapter: invalid control!" );
osl_atomic_increment( &m_refCount );
@@ -312,7 +307,6 @@ namespace svx
acquire();
dispose();
- DBG_DTOR( FmMouseListenerAdapter, NULL );
}
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index e50cb87..a1d4af6 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -307,14 +307,12 @@ void FmXDisposeListener::setAdapter(FmXDisposeMultiplexer* pAdapter)
}
-DBG_NAME(FmXDisposeMultiplexer);
FmXDisposeMultiplexer::FmXDisposeMultiplexer(FmXDisposeListener* _pListener, const Reference< ::com::sun::star::lang::XComponent>& _rxObject, sal_Int16 _nId)
:m_xObject(_rxObject)
,m_pListener(_pListener)
,m_nId(_nId)
{
- DBG_CTOR(FmXDisposeMultiplexer, NULL);
m_pListener->setAdapter(this);
if (m_xObject.is())
@@ -324,7 +322,6 @@ FmXDisposeMultiplexer::FmXDisposeMultiplexer(FmXDisposeListener* _pListener, con
FmXDisposeMultiplexer::~FmXDisposeMultiplexer()
{
- DBG_DTOR(FmXDisposeMultiplexer, NULL);
}
// ::com::sun::star::lang::XEventListener
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 4112378..0e08e3d 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -172,7 +172,6 @@ typedef std::map<Reference< XPropertySet >, PropertySetInfo> PropertySetInfoCach
OUString static_STR_UNDO_PROPERTY;
-DBG_NAME(FmXUndoEnvironment)
FmXUndoEnvironment::FmXUndoEnvironment(FmFormModel& _rModel)
:rModel( _rModel )
@@ -182,7 +181,6 @@ FmXUndoEnvironment::FmXUndoEnvironment(FmFormModel& _rModel)
,bReadOnly( false )
,m_bDisposed( false )
{
- DBG_CTOR(FmXUndoEnvironment,NULL);
try
{
m_vbaListener = new ScriptEventListenerWrapper( _rModel );
@@ -195,7 +193,6 @@ FmXUndoEnvironment::FmXUndoEnvironment(FmFormModel& _rModel)
FmXUndoEnvironment::~FmXUndoEnvironment()
{
- DBG_DTOR(FmXUndoEnvironment,NULL);
if ( !m_bDisposed ) // i120746, call FormScriptingEnvironment::dispose to avoid memory leak
m_pScriptingEnv->dispose();
@@ -1033,7 +1030,6 @@ OUString FmUndoPropertyAction::GetComment() const
}
-DBG_NAME(FmUndoContainerAction);
FmUndoContainerAction::FmUndoContainerAction(FmFormModel& _rMod,
Action _eAction,
@@ -1049,7 +1045,6 @@ FmUndoContainerAction::FmUndoContainerAction(FmFormModel& _rMod,
// some old code suggested this could be a valid argument. However, this code was
// buggy, and it *seemed* that nobody used it - so it was removed.
- DBG_CTOR(FmUndoContainerAction,NULL);
if ( xCont.is() && xElem.is() )
{
// normalize
@@ -1076,7 +1071,6 @@ FmUndoContainerAction::~FmUndoContainerAction()
{
// if we own the object ....
DisposeElement( m_xOwnElement );
- DBG_DTOR(FmUndoContainerAction,NULL);
}
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 708a747..91aefdb 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -162,7 +162,6 @@ public:
};
-DBG_NAME(FormViewPageWindowAdapter)
FormViewPageWindowAdapter::FormViewPageWindowAdapter( const css::uno::Reference<css::uno::XComponentContext>& _rContext, const SdrPageWindow& _rWindow, FmXFormView* _pViewImpl )
: m_xControlContainer( _rWindow.GetControlContainer() ),
@@ -170,7 +169,6 @@ FormViewPageWindowAdapter::FormViewPageWindowAdapter( const css::uno::Reference<
m_pViewImpl( _pViewImpl ),
m_pWindow( dynamic_cast< Window* >( &_rWindow.GetPaintWindow().GetOutputDevice() ) )
{
- DBG_CTOR(FormViewPageWindowAdapter,NULL);
// create an XFormController for every form
FmFormPage* pFormPage = dynamic_cast< FmFormPage* >( _rWindow.GetPageView().GetPage() );
@@ -197,7 +195,6 @@ FormViewPageWindowAdapter::FormViewPageWindowAdapter( const css::uno::Reference<
FormViewPageWindowAdapter::~FormViewPageWindowAdapter()
{
- DBG_DTOR(FormViewPageWindowAdapter,NULL);
}
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 07fbc8c..21dc44d 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -545,7 +545,6 @@ IMPL_LINK( FormController, OnInvalidateFeatures, void*, /*_pNotInterestedInThisP
/*************************************************************************/
-DBG_NAME( FormController )
FormController::FormController(const Reference< css::uno::XComponentContext > & _rxORB )
:FormController_BASE( m_aMutex )
@@ -583,7 +582,6 @@ FormController::FormController(const Reference< css::uno::XComponentContext > &
,m_bAttemptedHandlerCreation( false )
,m_bSuspendFilterTextListening( false )
{
- DBG_CTOR( FormController, NULL );
::comphelper::increment(m_refCount);
{
@@ -633,7 +631,6 @@ FormController::~FormController()
DELETEZ( m_pControlBorderManager );
- DBG_DTOR( FormController, NULL );
}
diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx
index 344866d..28d4cd7 100644
--- a/svx/source/form/formdispatchinterceptor.cxx
+++ b/svx/source/form/formdispatchinterceptor.cxx
@@ -50,7 +50,6 @@ namespace svxform
//= DispatchInterceptionMultiplexer
- DBG_NAME(DispatchInterceptionMultiplexer)
DispatchInterceptionMultiplexer::DispatchInterceptionMultiplexer(
const Reference< XDispatchProviderInterception >& _rxToIntercept, DispatchInterceptor* _pMaster )
@@ -61,7 +60,6 @@ namespace svxform
,m_bListening(sal_False)
,m_pMaster(_pMaster)
{
- DBG_CTOR(DispatchInterceptionMultiplexer,NULL);
::osl::MutexGuard aGuard( *m_pMutex );
::comphelper::increment(m_refCount);
@@ -86,7 +84,6 @@ namespace svxform
if (!rBHelper.bDisposed)
dispose();
- DBG_DTOR(DispatchInterceptionMultiplexer,NULL);
}
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 93cbfbd..fa891f6 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -111,13 +111,11 @@ static void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< conta
// class FmFieldWinListBox
-DBG_NAME(FmFieldWinListBox)
FmFieldWinListBox::FmFieldWinListBox( FmFieldWin* pParent )
:SvTreeListBox( pParent, WB_HASBUTTONS|WB_BORDER )
,pTabWin( pParent )
{
- DBG_CTOR(FmFieldWinListBox,NULL);
SetHelpId( HID_FIELD_SEL );
SetHighlightRange( );
@@ -126,7 +124,6 @@ FmFieldWinListBox::FmFieldWinListBox( FmFieldWin* pParent )
FmFieldWinListBox::~FmFieldWinListBox()
{
- DBG_DTOR(FmFieldWinListBox,NULL);
}
@@ -180,23 +177,19 @@ void FmFieldWinListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPi
// class FmFieldWinData
-DBG_NAME(FmFieldWinData);
FmFieldWinData::FmFieldWinData()
{
- DBG_CTOR(FmFieldWinData,NULL);
}
FmFieldWinData::~FmFieldWinData()
{
- DBG_DTOR(FmFieldWinData,NULL);
}
// class FmFieldWin
-DBG_NAME(FmFieldWin);
FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent)
:SfxFloatingWindow(_pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE))
@@ -206,7 +199,6 @@ FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _
,m_nObjectType(0)
,m_pChangeListener(NULL)
{
- DBG_CTOR(FmFieldWin,NULL);
SetHelpId( HID_FIELD_SEL_WIN );
SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor()) );
@@ -227,7 +219,6 @@ FmFieldWin::~FmFieldWin()
}
delete pListBox;
delete pData;
- DBG_DTOR(FmFieldWin,NULL);
}
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 9dbbada..9573de5 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -250,18 +250,15 @@ void SvxFmTbxCtlConfig::Select( sal_uInt16 /*nModifier*/ )
SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlAbsRec, SfxInt32Item );
-DBG_NAME(SvxFmTbxCtlAbsRec);
SvxFmTbxCtlAbsRec::SvxFmTbxCtlAbsRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
:SfxToolBoxControl( nSlotId, nId, rTbx )
{
- DBG_CTOR(SvxFmTbxCtlAbsRec,NULL);
}
SvxFmTbxCtlAbsRec::~SvxFmTbxCtlAbsRec()
{
- DBG_DTOR(SvxFmTbxCtlAbsRec,NULL);
}
@@ -304,18 +301,15 @@ Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent )
SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecText, SfxBoolItem );
-DBG_NAME(SvxFmTbxCtlRecText);
SvxFmTbxCtlRecText::SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
:SfxToolBoxControl( nSlotId, nId, rTbx )
{
- DBG_CTOR(SvxFmTbxCtlRecText,NULL);
}
SvxFmTbxCtlRecText::~SvxFmTbxCtlRecText()
{
- DBG_DTOR(SvxFmTbxCtlRecText,NULL);
}
@@ -338,18 +332,15 @@ Window* SvxFmTbxCtlRecText::CreateItemWindow( Window* pParent )
SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecFromText, SfxBoolItem );
-DBG_NAME(SvxFmTbxCtlRecFromText);
SvxFmTbxCtlRecFromText::SvxFmTbxCtlRecFromText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
:SfxToolBoxControl( nSlotId, nId, rTbx )
{
- DBG_CTOR(SvxFmTbxCtlRecFromText,NULL);
}
SvxFmTbxCtlRecFromText::~SvxFmTbxCtlRecFromText()
{
- DBG_DTOR(SvxFmTbxCtlRecFromText,NULL);
}
@@ -369,7 +360,6 @@ Window* SvxFmTbxCtlRecFromText::CreateItemWindow( Window* pParent )
// SvxFmTbxCtlRecTotal
-DBG_NAME(SvxFmTbxCtlRecTotal);
SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecTotal, SfxStringItem );
@@ -377,13 +367,11 @@ SvxFmTbxCtlRecTotal::SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, To
:SfxToolBoxControl( nSlotId, nId, rTbx )
,pFixedText( NULL )
{
- DBG_CTOR(SvxFmTbxCtlRecTotal,NULL);
}
SvxFmTbxCtlRecTotal::~SvxFmTbxCtlRecTotal()
{
- DBG_DTOR(SvxFmTbxCtlRecTotal,NULL);
}
diff --git a/svx/source/gallery2/GallerySplitter.cxx b/svx/source/gallery2/GallerySplitter.cxx
index a620f87..5baac2d 100644
--- a/svx/source/gallery2/GallerySplitter.cxx
+++ b/svx/source/gallery2/GallerySplitter.cxx
@@ -19,7 +19,6 @@
#include "GallerySplitter.hxx"
-DBG_NAME(GallerySplitter)
GallerySplitter::GallerySplitter(
Window* pParent,
@@ -28,12 +27,10 @@ GallerySplitter::GallerySplitter(
: Splitter( pParent, rResId ),
maDataChangeFunctor(rDataChangeFunctor)
{
- DBG_CTOR(GallerySplitter,NULL);
}
GallerySplitter::~GallerySplitter()
{
- DBG_DTOR(GallerySplitter,NULL);
}
void GallerySplitter::DataChanged( const DataChangedEvent& rDCEvt )
diff --git a/svx/source/gallery2/codec.cxx b/svx/source/gallery2/codec.cxx
index 7d58d18..241c20a 100644
--- a/svx/source/gallery2/codec.cxx
+++ b/svx/source/gallery2/codec.cxx
@@ -25,17 +25,14 @@
// - GalleryCodec -
-DBG_NAME(GalleryCodec)
GalleryCodec::GalleryCodec( SvStream& rIOStm ) :
rStm( rIOStm )
{
- DBG_CTOR(GalleryCodec,NULL);
}
GalleryCodec::~GalleryCodec()
{
- DBG_DTOR(GalleryCodec,NULL);
}
sal_Bool GalleryCodec::IsCoded( SvStream& rStm, sal_uInt32& rVersion )
diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx
index cefb644..f939ad3 100644
--- a/svx/source/gallery2/galbrws.cxx
+++ b/svx/source/gallery2/galbrws.cxx
@@ -33,12 +33,10 @@
#include <boost/bind.hpp>
-DBG_NAME(GalleryChildWindow)
GalleryChildWindow::GalleryChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) :
SfxChildWindow( _pParent, nId )
{
- DBG_CTOR(GalleryChildWindow,NULL);
pWindow = new GalleryBrowser( pBindings, this, _pParent, GAL_RES( RID_SVXDLG_GALLERYBROWSER ) );
eChildAlignment = SFX_ALIGN_TOP;
@@ -47,14 +45,12 @@ GalleryChildWindow::GalleryChildWindow( Window* _pParent, sal_uInt16 nId, SfxBin
GalleryChildWindow::~GalleryChildWindow()
{
- DBG_DTOR(GalleryChildWindow,NULL);
}
SFX_IMPL_DOCKINGWINDOW_WITHID( GalleryChildWindow, SID_GALLERY )
// - GalleryBrowser -
-DBG_NAME(GalleryBrowser)
GalleryBrowser::GalleryBrowser(
SfxBindings* _pBindings,
@@ -68,7 +64,6 @@ GalleryBrowser::GalleryBrowser(
mpBrowser2(0),
mpGallery(0)
{
- DBG_CTOR(GalleryBrowser,NULL);
mpGallery = Gallery::GetGalleryInstance();
mpBrowser1 = new GalleryBrowser1(
@@ -102,7 +97,6 @@ GalleryBrowser::~GalleryBrowser()
delete mpSplitter;
delete mpBrowser1;
- DBG_DTOR(GalleryBrowser,NULL);
}
void GalleryBrowser::InitSettings()
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index e98e2ec..90e735c 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -135,7 +135,6 @@ public:
virtual void SAL_CALL disposing( const css::lang::EventObject &rSource) throw ( css::uno::RuntimeException, std::exception );
};
-DBG_NAME(GalleryThemePopup)
GalleryThemePopup::GalleryThemePopup(
const GalleryTheme* pTheme,
@@ -149,7 +148,6 @@ GalleryThemePopup::GalleryThemePopup(
, maBackgroundPopup()
, mpBrowser( pBrowser )
{
- DBG_CTOR(GalleryThemePopup,NULL);
// SID_GALLERY_ENABLE_ADDCOPY
m_aCommandInfo.insert(
@@ -171,7 +169,6 @@ GalleryThemePopup::GalleryThemePopup(
GalleryThemePopup::~GalleryThemePopup()
{
- DBG_DTOR(GalleryThemePopup,NULL);
}
void SAL_CALL GalleryThemePopup::statusChanged(
@@ -399,17 +396,14 @@ IMPL_LINK( GalleryThemePopup, BackgroundMenuSelectHdl, Menu*, pMenu )
} // end anonymous namespace
-DBG_NAME(GalleryToolBox)
GalleryToolBox::GalleryToolBox( GalleryBrowser2* pParent ) :
ToolBox( pParent, WB_TABSTOP )
{
- DBG_CTOR(GalleryToolBox,NULL);
}
GalleryToolBox::~GalleryToolBox()
{
- DBG_DTOR(GalleryToolBox,NULL);
}
void GalleryToolBox::KeyInput( const KeyEvent& rKEvt )
@@ -418,7 +412,6 @@ void GalleryToolBox::KeyInput( const KeyEvent& rKEvt )
ToolBox::KeyInput( rKEvt );
}
-DBG_NAME(GalleryBrowser2)
GalleryBrowser2::GalleryBrowser2( Window* pParent, const ResId& rResId, Gallery* pGallery ) :
Control ( pParent, rResId ),
@@ -434,7 +427,6 @@ GalleryBrowser2::GalleryBrowser2( Window* pParent, const ResId& rResId, Gallery*
meMode ( GALLERYBROWSERMODE_NONE ),
meLastMode ( GALLERYBROWSERMODE_NONE )
{
- DBG_CTOR(GalleryBrowser2,NULL);
m_xContext.set( ::comphelper::getProcessComponentContext() );
@@ -494,7 +486,6 @@ GalleryBrowser2::~GalleryBrowser2()
if( mpCurTheme )
mpGallery->ReleaseTheme( mpCurTheme, *this );
- DBG_DTOR(GalleryBrowser2,NULL);
}
void GalleryBrowser2::InitSettings()
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 3209caa..9259f0f 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -38,7 +38,6 @@
#define GALLERY_BRWBOX_TITLE 1
#define GALLERY_BRWBOX_PATH 2
-DBG_NAME(GalleryPreview)
GalleryPreview::GalleryPreview( GalleryBrowser2* pParent, GalleryTheme* pTheme ) :
Window( pParent, WB_TABSTOP | WB_BORDER ),
@@ -46,7 +45,6 @@ GalleryPreview::GalleryPreview( GalleryBrowser2* pParent, GalleryTheme* pTheme )
DragSourceHelper( this ),
mpTheme( pTheme )
{
- DBG_CTOR(GalleryPreview,NULL);
SetHelpId( HID_GALLERY_WINDOW );
InitSettings();
@@ -58,7 +56,6 @@ GalleryPreview::GalleryPreview( Window* pParent, const ResId & rResId ) :
DragSourceHelper( this ),
mpTheme( NULL )
{
- DBG_CTOR(GalleryPreview,NULL);
SetHelpId( HID_GALLERY_PREVIEW );
InitSettings();
@@ -66,7 +63,6 @@ GalleryPreview::GalleryPreview( Window* pParent, const ResId & rResId ) :
GalleryPreview::~GalleryPreview()
{
- DBG_DTOR(GalleryPreview,NULL);
}
@@ -280,7 +276,6 @@ void drawTransparenceBackground(OutputDevice& rOut, const Point& rPos, const Siz
}
}
-DBG_NAME(GalleryIconView)
GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme ) :
ValueSet( pParent, WB_TABSTOP | WB_3DLOOK | WB_BORDER | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_VSCROLL | WB_FLATVALUESET ),
@@ -288,7 +283,6 @@ GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme
DragSourceHelper( this ),
mpTheme ( pTheme )
{
- DBG_CTOR(GalleryIconView,NULL);
EnableFullItemMode( false );
@@ -301,7 +295,6 @@ GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme
GalleryIconView::~GalleryIconView()
{
- DBG_DTOR(GalleryIconView,NULL);
}
void GalleryIconView::InitSettings()
@@ -526,14 +519,12 @@ void GalleryIconView::StartDrag( sal_Int8, const Point& )
static_cast< GalleryBrowser2* >( GetParent() )->StartDrag( this );
}
-DBG_NAME(GalleryListView)
GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme ) :
BrowseBox( pParent, WB_TABSTOP | WB_3DLOOK | WB_BORDER ),
mpTheme( pTheme ),
mnCurRow( 0 )
{
- DBG_CTOR(GalleryListView,NULL);
SetHelpId( HID_GALLERY_WINDOW );
@@ -547,7 +538,6 @@ GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme
GalleryListView::~GalleryListView()
{
- DBG_DTOR(GalleryListView,NULL);
}
void GalleryListView::InitSettings()
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index eaae215..13fa614 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -354,12 +354,10 @@ sal_Bool KillFile( const INetURLObject& rURL )
return bRet;
}
-DBG_NAME(GalleryProgress)
GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) :
mpFilter( pFilter )
{
- DBG_CTOR(GalleryProgress,NULL);
uno::Reference< lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
@@ -393,7 +391,6 @@ GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) :
GalleryProgress::~GalleryProgress()
{
- DBG_DTOR(GalleryProgress,NULL);
}
void GalleryProgress::Update( sal_uIntPtr nVal, sal_uIntPtr nMaxVal )
@@ -402,7 +399,6 @@ void GalleryProgress::Update( sal_uIntPtr nVal, sal_uIntPtr nMaxVal )
mxProgressBar->setValue( std::min( (sal_uIntPtr)( (double) nVal / nMaxVal * GALLERY_PROGRESS_RANGE ), (sal_uIntPtr) GALLERY_PROGRESS_RANGE ) );
}
-DBG_NAME(GalleryTransferable)
GalleryTransferable::GalleryTransferable( GalleryTheme* pTheme, sal_uIntPtr nObjectPos, bool bLazy ) :
mpTheme( pTheme ),
@@ -412,14 +408,12 @@ GalleryTransferable::GalleryTransferable( GalleryTheme* pTheme, sal_uIntPtr nObj
mpImageMap( NULL ),
mpURL( NULL )
{
- DBG_CTOR(GalleryTransferable,NULL);
InitData( bLazy );
}
GalleryTransferable::~GalleryTransferable()
{
- DBG_DTOR(GalleryTransferable,NULL);
}
void GalleryTransferable::InitData( bool bLazy )
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 81b1336..2c20921 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -315,18 +315,15 @@ void SgaObjectBmp::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
aTitle = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8);
}
-DBG_NAME(SgaObjectSound)
SgaObjectSound::SgaObjectSound() :
eSoundType( SOUND_STANDARD )
{
- DBG_CTOR(SgaObjectSound,NULL);
}
SgaObjectSound::SgaObjectSound( const INetURLObject& rURL ) :
eSoundType( SOUND_STANDARD )
{
- DBG_CTOR(SgaObjectSound,NULL);
if( FileExists( rURL ) )
{
@@ -340,7 +337,6 @@ SgaObjectSound::SgaObjectSound( const INetURLObject& rURL ) :
SgaObjectSound::~SgaObjectSound()
{
- DBG_DTOR(SgaObjectSound,NULL);
}
BitmapEx SgaObjectSound::GetThumbBmp() const
@@ -421,12 +417,10 @@ SgaObjectSvDraw::SgaObjectSvDraw( const FmFormModel& rModel, const INetURLObject
bIsValid = CreateThumb( rModel );
}
-DBG_NAME(SvxGalleryDrawModel)
SvxGalleryDrawModel::SvxGalleryDrawModel()
: mpFormModel( 0 )
{
- DBG_CTOR(SvxGalleryDrawModel,NULL);
const OUString sFactoryURL("sdraw");
@@ -454,7 +448,6 @@ SvxGalleryDrawModel::~SvxGalleryDrawModel()
if( mxDoc.Is() )
mxDoc->DoClose();
- DBG_DTOR(SvxGalleryDrawModel,NULL);
}
SgaObjectSvDraw::SgaObjectSvDraw( SvStream& rIStm, const INetURLObject& rURL )
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index da63859..68f6dec 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -59,7 +59,6 @@ using namespace ::com::sun::star;
// - SgaTheme -
-DBG_NAME(GalleryTheme)
GalleryTheme::GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry ) :
pParent ( pGallery ),
@@ -69,7 +68,6 @@ GalleryTheme::GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry )
nDragPos ( 0 ),
bDragging ( sal_False )
{
- DBG_CTOR(GalleryTheme,NULL);
ImplCreateSvDrawStorage();
}
@@ -87,7 +85,6 @@ GalleryTheme::~GalleryTheme()
}
aObjectList.clear();
- DBG_DTOR(GalleryTheme,NULL);
}
void GalleryTheme::ImplCreateSvDrawStorage()
diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx
index b57e5a8..caf73ff 100644
--- a/svx/source/items/e3ditem.cxx
+++ b/svx/source/items/e3ditem.cxx
@@ -27,8 +27,6 @@ using namespace ::com::sun::star;
// STATIC DATA -----------------------------------------------------------
-DBG_NAMEEX(SvxB3DVectorItem)
-DBG_NAME(SvxB3DVectorItem)
@@ -38,12 +36,10 @@ TYPEINIT1_FACTORY(SvxB3DVectorItem, SfxPoolItem, new SvxB3DVectorItem);
SvxB3DVectorItem::SvxB3DVectorItem()
{
- DBG_CTOR(SvxB3DVectorItem, 0);
}
SvxB3DVectorItem::~SvxB3DVectorItem()
{
- DBG_DTOR(SvxB3DVectorItem, 0);
}
@@ -52,7 +48,6 @@ SvxB3DVectorItem::SvxB3DVectorItem( sal_uInt16 _nWhich, const basegfx::B3DVector
SfxPoolItem( _nWhich ),
aVal( rVal )
{
- DBG_CTOR(SvxB3DVectorItem, 0);
}
@@ -61,14 +56,12 @@ SvxB3DVectorItem::SvxB3DVectorItem( const SvxB3DVectorItem& rItem ) :
SfxPoolItem( rItem ),
aVal( rItem.aVal )
{
- DBG_CTOR(SvxB3DVectorItem, 0);
}
bool SvxB3DVectorItem::operator==( const SfxPoolItem &rItem ) const
{
- DBG_CHKTHIS(SvxB3DVectorItem, 0);
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
return ((SvxB3DVectorItem&)rItem).aVal == aVal;
}
@@ -77,7 +70,6 @@ bool SvxB3DVectorItem::operator==( const SfxPoolItem &rItem ) const
SfxPoolItem* SvxB3DVectorItem::Clone( SfxItemPool* /*pPool*/ ) const
{
- DBG_CHKTHIS(SvxB3DVectorItem, 0);
return new SvxB3DVectorItem( *this );
}
@@ -85,7 +77,6 @@ SfxPoolItem* SvxB3DVectorItem::Clone( SfxItemPool* /*pPool*/ ) const
SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, sal_uInt16 /*nVersion*/) const
{
- DBG_CHKTHIS(SvxB3DVectorItem, 0);
basegfx::B3DVector aStr;
double fValue;
rStream.ReadDouble( fValue ); aStr.setX(fValue);
@@ -98,7 +89,6 @@ SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, sal_uInt16 /*nVersion*/
SvStream& SvxB3DVectorItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/) const
{
- DBG_CHKTHIS(SvxB3DVectorItem, 0);
// ## if (nItemVersion)
double fValue;
diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx
index 0ecd7a0..f7a0f8f 100644
--- a/svx/source/items/galleryitem.cxx
+++ b/svx/source/items/galleryitem.cxx
@@ -21,15 +21,12 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/uno/Sequence.hxx>
-DBG_NAMEEX( SvxGalleryItem )
-DBG_NAME( SvxGalleryItem )
TYPEINIT1_AUTOFACTORY( SvxGalleryItem, SfxPoolItem );
SvxGalleryItem::SvxGalleryItem()
: m_nType( css::gallery::GalleryItemType::EMPTY )
{
- DBG_CTOR(SvxGalleryItem, 0);
}
SvxGalleryItem::SvxGalleryItem( const SvxGalleryItem &rItem )
@@ -39,12 +36,10 @@ SvxGalleryItem::SvxGalleryItem( const SvxGalleryItem &rItem )
, m_xDrawing( rItem.m_xDrawing )
, m_xGraphic( rItem.m_xGraphic )
{
- DBG_CTOR(SvxGalleryItem, 0);
}
SvxGalleryItem::~SvxGalleryItem()
{
- DBG_DTOR(SvxGalleryItem, 0);
}
bool SvxGalleryItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /* nMemberId */ ) const
diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
index 840b97a..8a33b29 100644
--- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
@@ -75,19 +75,16 @@ namespace sdr { namespace contact {
//= ViewContactOfUnoControl
- DBG_NAME( ViewContactOfUnoControl )
ViewContactOfUnoControl::ViewContactOfUnoControl( SdrUnoObj& _rUnoObject )
:ViewContactOfSdrObj( _rUnoObject )
,m_pImpl( new ViewContactOfUnoControl_Impl )
{
- DBG_CTOR( ViewContactOfUnoControl, NULL );
}
ViewContactOfUnoControl::~ViewContactOfUnoControl()
{
- DBG_DTOR( ViewContactOfUnoControl, NULL );
}
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 06790f8..726a8c7 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -922,7 +922,6 @@ namespace sdr { namespace contact {
//= ViewObjectContactOfUnoControl_Impl
- DBG_NAME( ViewObjectContactOfUnoControl_Impl )
ViewObjectContactOfUnoControl_Impl::ViewObjectContactOfUnoControl_Impl( ViewObjectContactOfUnoControl* _pAntiImpl )
:m_pAntiImpl( _pAntiImpl )
@@ -933,7 +932,6 @@ namespace sdr { namespace contact {
,m_eControlDesignMode( eUnknown )
,m_aZoomLevelNormalization()
{
- DBG_CTOR( ViewObjectContactOfUnoControl_Impl, NULL );
DBG_ASSERT( m_pAntiImpl, "ViewObjectContactOfUnoControl_Impl::ViewObjectContactOfUnoControl_Impl: invalid AntiImpl!" );
const OutputDevice& rPageViewDevice( impl_getOutputDevice_throw() );
@@ -965,7 +963,6 @@ namespace sdr { namespace contact {
dispose();
}
- DBG_DTOR( ViewObjectContactOfUnoControl_Impl, NULL );
}
@@ -1703,13 +1700,11 @@ namespace sdr { namespace contact {
//= ViewObjectContactOfUnoControl
- DBG_NAME( ViewObjectContactOfUnoControl )
ViewObjectContactOfUnoControl::ViewObjectContactOfUnoControl( ObjectContact& _rObjectContact, ViewContactOfUnoControl& _rViewContact )
:ViewObjectContactOfSdrObj( _rObjectContact, _rViewContact )
,m_pImpl( new ViewObjectContactOfUnoControl_Impl( this ) )
{
- DBG_CTOR( ViewObjectContactOfUnoControl, NULL );
}
@@ -1718,7 +1713,6 @@ namespace sdr { namespace contact {
m_pImpl->dispose();
m_pImpl = NULL;
- DBG_DTOR( ViewObjectContactOfUnoControl, NULL );
}
@@ -1879,18 +1873,15 @@ namespace sdr { namespace contact {
//= UnoControlPrintOrPreviewContact
- DBG_NAME( UnoControlPrintOrPreviewContact )
UnoControlPrintOrPreviewContact::UnoControlPrintOrPreviewContact( ObjectContactOfPageView& _rObjectContact, ViewContactOfUnoControl& _rViewContact )
:ViewObjectContactOfUnoControl( _rObjectContact, _rViewContact )
{
- DBG_CTOR( UnoControlPrintOrPreviewContact, NULL );
}
UnoControlPrintOrPreviewContact::~UnoControlPrintOrPreviewContact()
{
- DBG_DTOR( UnoControlPrintOrPreviewContact, NULL );
}
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index e47a83e..a52880c 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -100,7 +100,6 @@ struct SdrModelImpl
-DBG_NAME(SdrModel)
TYPEINIT1(SdrModel,SfxBroadcaster);
void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbeddedHelper,
bool bUseExtColorTable, bool bLoadRefCounts)
@@ -218,7 +217,6 @@ SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, sal
maMaPag(),
maPages()
{
- DBG_CTOR(SdrModel,NULL);
ImpCtor(pPool, pPers, false, (bool)bLoadRefCounts);
}
@@ -228,7 +226,6 @@ SdrModel::SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmb
maPages(),
aTablePath(rPath)
{
- DBG_CTOR(SdrModel,NULL);
ImpCtor(pPool, pPers, false, (bool)bLoadRefCounts);
}
@@ -237,7 +234,6 @@ SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, boo
maMaPag(),
maPages()
{
- DBG_CTOR(SdrModel,NULL);
ImpCtor(pPool,pPers,bUseExtColorTable, (bool)bLoadRefCounts);
}
@@ -247,7 +243,6 @@ SdrModel::SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmb
maPages(),
aTablePath(rPath)
{
- DBG_CTOR(SdrModel,NULL);
ImpCtor(pPool,pPers,bUseExtColorTable, (bool)bLoadRefCounts);
}
@@ -264,7 +259,6 @@ SdrModel::SdrModel(const SdrModel& /*rSrcModel*/):
SdrModel::~SdrModel()
{
- DBG_DTOR(SdrModel,NULL);
mbInDestruction = true;
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 09d4732..60b3ff9 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -258,7 +258,6 @@ void SdrObjUserDataList::DeleteUserData(size_t nNum)
-DBG_NAME(SdrObjGeoData);
SdrObjGeoData::SdrObjGeoData():
pGPL(NULL),
@@ -269,12 +268,10 @@ SdrObjGeoData::SdrObjGeoData():
mbVisible(true),
mnLayerID(0)
{
- DBG_CTOR(SdrObjGeoData,NULL);
}
SdrObjGeoData::~SdrObjGeoData()
{
- DBG_DTOR(SdrObjGeoData,NULL);
delete pGPL;
}
@@ -423,7 +420,6 @@ void SdrObject::SetBoundRectDirty()
-DBG_NAME(SdrObject);
TYPEINIT1(SdrObject,SfxListener);
SdrObject::SdrObject()
@@ -444,7 +440,6 @@ SdrObject::SdrObject()
,maWeakUnoShape()
,mbDoNotInsertIntoPageAutomatically(false)
{
- DBG_CTOR(SdrObject,NULL);
bVirtObj =false;
bSnapRectDirty =true;
bNetLock =false;
@@ -502,7 +497,6 @@ SdrObject::~SdrObject()
DBG_UNHANDLED_EXCEPTION();
}
- DBG_DTOR(SdrObject,NULL);
SendUserCall(SDRUSERCALL_DELETE, GetLastBoundRect());
delete pPlusData;
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index fc8b83b..ccfafc3 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -739,11 +739,9 @@ sdr::contact::ViewContact* SdrOle2Obj::CreateObjectSpecificViewContact()
TYPEINIT1(SdrOle2Obj,SdrRectObj);
-DBG_NAME(SdrOle2Obj)
SdrOle2Obj::SdrOle2Obj(bool bFrame_) : m_bTypeAsked(false)
,m_bChart(false)
{
- DBG_CTOR( SdrOle2Obj,NULL);
bInDestruction = false;
mbSuppressSetVisAreaSize = false;
Init();
@@ -758,7 +756,6 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const OUStrin
, m_bTypeAsked(false)
, m_bChart(false)
{
- DBG_CTOR( SdrOle2Obj,NULL);
bInDestruction = false;
mbSuppressSetVisAreaSize = false;
Init();
@@ -802,7 +799,6 @@ OUString SdrOle2Obj::GetStyleString()
SdrOle2Obj::~SdrOle2Obj()
{
- DBG_DTOR( SdrOle2Obj,NULL);
bInDestruction = true;
if ( mpImpl->mbConnected )
diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx
index 7e46447..970f09b 100644
--- a/svx/source/svdraw/svdoutl.cxx
+++ b/svx/source/svdraw/svdoutl.cxx
@@ -25,20 +25,17 @@
#include <editeng/eeitem.hxx>
#include <svl/itempool.hxx>
-DBG_NAME(SdrOutliner)
SdrOutliner::SdrOutliner( SfxItemPool* pItemPool, sal_uInt16 nMode )
: Outliner( pItemPool, nMode ),
//mpPaintInfoRec( NULL )
mpVisualizedPage(0)
{
- DBG_CTOR(SdrOutliner,NULL);
}
SdrOutliner::~SdrOutliner()
{
- DBG_DTOR(SdrOutliner,NULL);
}
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index bdf8b0c..873e9d8 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -69,7 +69,6 @@ public:
static const sal_Int32 InitialObjectContainerCapacity (64);
-DBG_NAME(SdrObjList)
TYPEINIT0(SdrObjList);
@@ -78,7 +77,6 @@ SdrObjList::SdrObjList(SdrModel* pNewModel, SdrPage* pNewPage, SdrObjList* pNewU
mpNavigationOrder(),
mbIsNavigationOrderDirty(false)
{
- DBG_CTOR(SdrObjList,NULL);
maList.reserve(InitialObjectContainerCapacity);
pModel=pNewModel;
pPage=pNewPage;
@@ -94,7 +92,6 @@ SdrObjList::SdrObjList(const SdrObjList& rSrcList):
mpNavigationOrder(),
mbIsNavigationOrderDirty(false)
{
- DBG_CTOR(SdrObjList,NULL);
maList.reserve(InitialObjectContainerCapacity);
pModel=NULL;
pPage=NULL;
@@ -108,7 +105,6 @@ SdrObjList::SdrObjList(const SdrObjList& rSrcList):
SdrObjList::~SdrObjList()
{
- DBG_DTOR(SdrObjList,NULL);
// To avoid that the Clear() method will broadcast changes when in destruction
// which would call virtual methos (not allowed in destructor), the model is set
@@ -1248,7 +1244,6 @@ SfxStyleSheet* SdrPageProperties::GetStyleSheet() const
TYPEINIT1(SdrPage,SdrObjList);
-DBG_NAME(SdrPage)
SdrPage::SdrPage(SdrModel& rNewModel, bool bMasterPage)
: SdrObjList(&rNewModel, this),
mpViewContact(0L),
@@ -1268,7 +1263,6 @@ SdrPage::SdrPage(SdrModel& rNewModel, bool bMasterPage)
mbSwappingLocked(false),
mbPageBorderOnlyLeftRight(false)
{
- DBG_CTOR(SdrPage,NULL);
aPrefVisiLayers.SetAll();
eListKind = (bMasterPage) ? SDROBJLIST_MASTERPAGE : SDROBJLIST_DRAWPAGE;
@@ -1295,7 +1289,6 @@ SdrPage::SdrPage(const SdrPage& rSrcPage)
mbSwappingLocked(rSrcPage.mbSwappingLocked),
mbPageBorderOnlyLeftRight(rSrcPage.mbPageBorderOnlyLeftRight)
{
- DBG_CTOR(SdrPage,NULL);
aPrefVisiLayers.SetAll();
eListKind = (mbMaster) ? SDROBJLIST_MASTERPAGE : SDROBJLIST_DRAWPAGE;
@@ -1368,7 +1361,6 @@ SdrPage::~SdrPage()
mpSdrPageProperties = 0;
}
- DBG_DTOR(SdrPage,NULL);
}
SdrPage& SdrPage::operator=(const SdrPage& rSrcPage)
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index cad1c67..19511a4 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -48,7 +48,6 @@ using namespace ::com::sun::star;
#include <svx/sdrpagewindow.hxx>
#include <svx/sdrpaintwindow.hxx>
-DBG_NAME(SdrPageView);
// interface to SdrPageWindow
@@ -146,7 +145,6 @@ SdrPageView::SdrPageView(SdrPage* pPage1, SdrView& rNewView)
maBackgroundColor(COL_AUTO ), // #i48367# also react on autocolor
mpPreparedPageWindow(0) // #i72752#
{
- DBG_CTOR(SdrPageView,NULL);
mpPage = pPage1;
if(mpPage)
@@ -171,7 +169,6 @@ SdrPageView::SdrPageView(SdrPage* pPage1, SdrView& rNewView)
SdrPageView::~SdrPageView()
{
- DBG_DTOR(SdrPageView,NULL);
// cleanup window vector
ClearPageWindows();
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 51ce7be..8ed86f2 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -163,7 +163,6 @@ BitmapEx convertMetafileToBitmapEx(
TYPEINIT2(SdrPaintView,SfxListener,SfxRepeatTarget);
-DBG_NAME(SdrPaintView);
void SdrPaintView::ImpClearVars()
{
@@ -218,7 +217,6 @@ SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut)
mbHideDraw(false),
mbHideFormControl(false)
{
- DBG_CTOR(SdrPaintView,NULL);
pMod=pModel1;
ImpClearVars();
@@ -236,7 +234,6 @@ SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut)
SdrPaintView::~SdrPaintView()
{
- DBG_DTOR(SdrPaintView,NULL);
if (pDefaultStyleSheet)
EndListening(*pDefaultStyleSheet);
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 3e03541..e2002c9 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -58,13 +58,11 @@ using namespace ::com::sun::star::drawing;
// class SvxDrawPage *
UNO3_GETIMPLEMENTATION_IMPL( SvxDrawPage );
-DBG_NAME(SvxDrawPage)
SvxDrawPage::SvxDrawPage( SdrPage* pInPage ) throw()
: mrBHelper( getMutex() )
, mpPage( pInPage )
, mpModel( 0 )
{
- DBG_CTOR(SvxDrawPage,NULL);
// Am Broadcaster anmelden
if( mpPage )
mpModel = mpPage->GetModel();
@@ -86,7 +84,6 @@ SvxDrawPage::~SvxDrawPage() throw()
acquire();
dispose();
}
- DBG_DTOR(SvxDrawPage,NULL);
}
// XInterface
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 133af08..a59c509 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -543,19 +543,16 @@ uno::Sequence< OUString > SAL_CALL SvxShapeConnector::getSupportedServiceNames()
/***********************************************************************
* class SvxShapeControl *
***********************************************************************/
-DBG_NAME(SvxShapeControl)
SvxShapeControl::SvxShapeControl( SdrObject* pObj ) throw() :
SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_CONTROL), getSvxMapProvider().GetPropertySet(SVXMAP_CONTROL, SdrObject::GetGlobalDrawObjectItemPool()) )
{
- DBG_CTOR(SvxShapeControl,NULL);
setShapeKind( OBJ_UNO );
}
SvxShapeControl::~SvxShapeControl() throw()
{
- DBG_DTOR(SvxShapeControl,NULL);
}
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 276ff9a..3aa5515 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -183,7 +183,6 @@ protected:
* class SvxShape *
***********************************************************************/
-DBG_NAME(SvxShape)
SvxShape::SvxShape( SdrObject* pObject ) throw()
: maSize(100,100)
@@ -195,7 +194,6 @@ SvxShape::SvxShape( SdrObject* pObject ) throw()
, mpModel(NULL)
, mnLockCount(0)
{
- DBG_CTOR(SvxShape,NULL);
impl_construct();
}
@@ -210,7 +208,6 @@ SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries,
, mpModel(NULL)
, mnLockCount(0)
{
- DBG_CTOR(SvxShape,NULL);
impl_construct();
}
@@ -225,7 +222,6 @@ SvxShape::SvxShape() throw()
, mpModel(NULL)
, mnLockCount(0)
{
- DBG_CTOR(SvxShape,NULL);
impl_construct();
}
@@ -254,7 +250,6 @@ SvxShape::~SvxShape() throw()
delete mpImpl, mpImpl = NULL;
- DBG_DTOR(SvxShape,NULL);
}
@@ -4231,16 +4226,13 @@ bool SvxShapeText::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* p
/***********************************************************************
* class SvxShapeRect *
***********************************************************************/
-DBG_NAME(SvxShapeRect)
SvxShapeRect::SvxShapeRect( SdrObject* pObj ) throw()
: SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_SHAPE), getSvxMapProvider().GetPropertySet(SVXMAP_SHAPE, SdrObject::GetGlobalDrawObjectItemPool()))
{
- DBG_CTOR(SvxShapeRect,NULL);
}
SvxShapeRect::~SvxShapeRect() throw()
{
- DBG_DTOR(SvxShapeRect,NULL);
}
uno::Any SAL_CALL SvxShapeRect::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index 2b2891b..cc4c7f7 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -132,7 +132,6 @@ struct OUStringLess
}
};
-DBG_NAME(SvXMLEmbeddedObjectHelper)
SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper() :
WeakComponentImplHelper2< XEmbeddedObjectResolver, XNameAccess >( maMutex ),
maReplacementGraphicsContainerStorageName( XML_CONTAINERSTORAGE_NAME ),
@@ -141,7 +140,6 @@ SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper() :
meCreateMode( EMBEDDEDOBJECTHELPER_MODE_READ ),
mpStreamMap( 0 )
{
- DBG_CTOR(SvXMLEmbeddedObjectHelper,NULL);
}
SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper( ::comphelper::IEmbeddedHelper& rDocPersist, SvXMLEmbeddedObjectHelperMode eCreateMode ) :
@@ -152,13 +150,11 @@ SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper( ::comphelper::IEmbeddedHel
meCreateMode( EMBEDDEDOBJECTHELPER_MODE_READ ),
mpStreamMap( 0 )
{
- DBG_CTOR(SvXMLEmbeddedObjectHelper,NULL);
Init( 0, rDocPersist, eCreateMode );
}
SvXMLEmbeddedObjectHelper::~SvXMLEmbeddedObjectHelper()
{
- DBG_DTOR(SvXMLEmbeddedObjectHelper,NULL);
if( mpStreamMap )
{
SvXMLEmbeddedObjectHelper_Impl::iterator aIter = mpStreamMap->begin();
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index a0f6f93..6a96685 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -33,8 +33,6 @@
#include <basegfx/range/b2drange.hxx>
#include <basegfx/numeric/ftools.hxx>
-DBG_NAME(XPolygon);
-DBG_NAME(XPolyPolygon);
ImpXPolygon::ImpXPolygon( sal_uInt16 nInitSize, sal_uInt16 _nResize )
{
@@ -190,13 +188,11 @@ void ImpXPolygon::Remove( sal_uInt16 nPos, sal_uInt16 nCount )
XPolygon::XPolygon( sal_uInt16 nSize, sal_uInt16 nResize )
{
- DBG_CTOR(XPolygon,NULL);
pImpXPolygon = new ImpXPolygon( nSize, nResize );
}
XPolygon::XPolygon( const XPolygon& rXPoly )
{
- DBG_CTOR(XPolygon,NULL);
pImpXPolygon = rXPoly.pImpXPolygon;
pImpXPolygon->nRefCount++;
}
@@ -204,7 +200,6 @@ XPolygon::XPolygon( const XPolygon& rXPoly )
/// create a XPolygon out of a standard polygon
XPolygon::XPolygon( const Polygon& rPoly )
{
- DBG_CTOR(XPolygon,NULL);
sal_uInt16 nSize = rPoly.GetSize();
pImpXPolygon = new ImpXPolygon( nSize );
@@ -220,7 +215,6 @@ XPolygon::XPolygon( const Polygon& rPoly )
/// create a rectangle (also with rounded corners) as a Bézier polygon
XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy)
{
- DBG_CTOR(XPolygon,NULL);
pImpXPolygon = new ImpXPolygon(17);
long nWh = (rRect.GetWidth() - 1) / 2;
long nHh = (rRect.GetHeight() - 1) / 2;
@@ -282,7 +276,6 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy)
XPolygon::XPolygon(const Point& rCenter, long nRx, long nRy,
sal_uInt16 nStartAngle, sal_uInt16 nEndAngle, sal_Bool bClose)
{
- DBG_CTOR(XPolygon,NULL);
pImpXPolygon = new ImpXPolygon(17);
nStartAngle %= 3600;
@@ -322,7 +315,6 @@ XPolygon::XPolygon(const Point& rCenter, long nRx, long nRy,
XPolygon::~XPolygon()
{
- DBG_DTOR(XPolygon,NULL);
if( pImpXPolygon->nRefCount > 1 )
pImpXPolygon->nRefCount--;
else
@@ -877,7 +869,6 @@ XPolygon::XPolygon(const basegfx::B2DPolygon& rPolygon)
// #i74631# use tools Polygon class for conversion to not have the code doubled
// here. This needs one more conversion but avoids different convertors in
// the long run
- DBG_CTOR(XPolygon,NULL);
const Polygon aSource(rPolygon);
sal_uInt16 nSize = aSource.GetSize();
@@ -926,20 +917,17 @@ bool ImpXPolyPolygon::operator==(const ImpXPolyPolygon& rImpXPolyPoly) const
XPolyPolygon::XPolyPolygon( sal_uInt16 /*nInitSize*/, sal_uInt16 /*nResize*/ )
{
- DBG_CTOR(XPolyPolygon,NULL);
pImpXPolyPolygon = new ImpXPolyPolygon();
}
XPolyPolygon::XPolyPolygon( const XPolyPolygon& rXPolyPoly )
{
- DBG_CTOR(XPolyPolygon,NULL);
pImpXPolyPolygon = rXPolyPoly.pImpXPolyPolygon;
pImpXPolyPolygon->nRefCount++;
}
XPolyPolygon::~XPolyPolygon()
{
- DBG_DTOR(XPolyPolygon,NULL);
if( pImpXPolyPolygon->nRefCount > 1 )
pImpXPolyPolygon->nRefCount--;
else
@@ -1107,7 +1095,6 @@ basegfx::B2DPolyPolygon XPolyPolygon::getB2DPolyPolygon() const
XPolyPolygon::XPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon)
{
- DBG_CTOR(XPolyPolygon,NULL);
pImpXPolyPolygon = new ImpXPolyPolygon();
for(sal_uInt32 a(0L); a < rPolyPolygon.count(); a++)
More information about the Libreoffice-commits
mailing list