From 7a5f564a799b8654b81454005f4887c6dc774ef0 Mon Sep 17 00:00:00 2001 From: Arnaud Versini Date: Sun, 2 Mar 2014 15:12:20 +0100 Subject: SVX : Remove usage of DBG_CTOR and DBG_DTOR. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested-by: Caolán McNamara --- 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 --- 7 files changed, 33 deletions(-) (limited to 'svx/source/svdraw') diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index e47a83e34444..a52880c98996 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 09d473230a0b..60b3ff96b62d 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 fc8b83bcedd2..ccfafc397f74 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 7e46447ff208..970f09b06510 100644 --- a/svx/source/svdraw/svdoutl.cxx +++ b/svx/source/svdraw/svdoutl.cxx @@ -25,20 +25,17 @@ #include #include -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 bdf8b0c668b9..873e9d80daef 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 cad1c672886a..19511a45ed93 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star; #include #include -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 51ce7be3fd6d..8ed86f255c5f 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); -- cgit