diff options
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r-- | svx/source/svdraw/svdattr.cxx | 80 | ||||
-rw-r--r-- | svx/source/svdraw/svddrgm1.hxx | 24 | ||||
-rw-r--r-- | svx/source/svdraw/svdetc.cxx | 5 | ||||
-rw-r--r-- | svx/source/svdraw/svdfmtf.cxx | 7 | ||||
-rw-r--r-- | svx/source/svdraw/svdhdl.cxx | 8 | ||||
-rw-r--r-- | svx/source/svdraw/svdlayer.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdopath.cxx | 8 | ||||
-rw-r--r-- | svx/source/svdraw/svdouno.cxx | 4 |
9 files changed, 4 insertions, 140 deletions
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index a738e25f76a8..7d2e479273ec 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -106,12 +106,6 @@ using namespace ::rtl; using namespace ::com::sun::star; -/************************************************************************* -|* -|* Constructor -|* -\************************************************************************/ - SdrItemPool::SdrItemPool( SfxItemPool* _pMaster, bool bLoadRefCounts) @@ -343,35 +337,18 @@ SdrItemPool::SdrItemPool( SetItemInfos(mpLocalItemInfos); } -/************************************************************************* -|* -|* copy ctor, so that static defaults are cloned -|* (Parameter 2 = sal_True) -|* -\************************************************************************/ - +// copy ctor, so that static defaults are cloned +// (Parameter 2 = sal_True) SdrItemPool::SdrItemPool(const SdrItemPool& rPool) : XOutdevItemPool(rPool) { } -/************************************************************************* -|* -|* Clone() -|* -\************************************************************************/ - SfxItemPool* SdrItemPool::Clone() const { return new SdrItemPool(*this); } -/************************************************************************* -|* -|* Destructor -|* -\************************************************************************/ - SdrItemPool::~SdrItemPool() { // dtor of SfxItemPool @@ -1604,11 +1581,6 @@ bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, sal_uInt8 /*n return true; } - -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// Edge -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - // EdgeKind TYPEINIT1_AUTOFACTORY(SdrEdgeKindItem,SfxEnumItem); @@ -1747,10 +1719,6 @@ bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemb return true; } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// Measure -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1_AUTOFACTORY(SdrMeasureKindItem,SfxEnumItem); SfxPoolItem* SdrMeasureKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureKindItem(*this); } @@ -1944,10 +1912,6 @@ bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ return true; } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// Circ -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1_AUTOFACTORY(SdrCircKindItem,SfxEnumItem); SfxPoolItem* SdrCircKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCircKindItem(*this); } @@ -2031,10 +1995,6 @@ bool SdrSignedPercentItem::GetPresentation( return true; } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// SdrGrafRedItem -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1( SdrGrafRedItem, SdrSignedPercentItem ); SfxPoolItem* SdrGrafRedItem::Clone( SfxItemPool* /*pPool*/) const @@ -2047,10 +2007,6 @@ SfxPoolItem* SdrGrafRedItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const return new SdrGrafRedItem( rIn ); } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// SdrGrafGreenItem -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1( SdrGrafGreenItem, SdrSignedPercentItem ); SfxPoolItem* SdrGrafGreenItem::Clone( SfxItemPool* /*pPool*/) const @@ -2063,10 +2019,6 @@ SfxPoolItem* SdrGrafGreenItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const return new SdrGrafGreenItem( rIn ); } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// SdrGrafBlueItem -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1( SdrGrafBlueItem, SdrSignedPercentItem ); SfxPoolItem* SdrGrafBlueItem::Clone( SfxItemPool* /*pPool*/) const @@ -2079,10 +2031,6 @@ SfxPoolItem* SdrGrafBlueItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const return new SdrGrafBlueItem( rIn ); } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// SdrGrafLuminanceItem -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1( SdrGrafLuminanceItem, SdrSignedPercentItem ); SfxPoolItem* SdrGrafLuminanceItem::Clone( SfxItemPool* /*pPool*/) const @@ -2095,10 +2043,6 @@ SfxPoolItem* SdrGrafLuminanceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) c return new SdrGrafLuminanceItem( rIn ); } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// SdrGrafContrastItem -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1( SdrGrafContrastItem, SdrSignedPercentItem ); SfxPoolItem* SdrGrafContrastItem::Clone( SfxItemPool* /*pPool*/) const @@ -2111,10 +2055,6 @@ SfxPoolItem* SdrGrafContrastItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) co return new SdrGrafContrastItem( rIn ); } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// SdrGrafGamma100Item -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1( SdrGrafGamma100Item, SfxUInt32Item ); SfxPoolItem* SdrGrafGamma100Item::Clone( SfxItemPool* /*pPool */) const @@ -2143,10 +2083,6 @@ bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId* return true; } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// SdrGrafInvertItem -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1( SdrGrafInvertItem, SdrOnOffItem ); SfxPoolItem* SdrGrafInvertItem::Clone( SfxItemPool* /*pPool*/) const @@ -2159,10 +2095,6 @@ SfxPoolItem* SdrGrafInvertItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) cons return new SdrGrafInvertItem( rIn ); } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// SdrGrafTransparenceItem -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1( SdrGrafTransparenceItem, SdrPercentItem ); SfxPoolItem* SdrGrafTransparenceItem::Clone( SfxItemPool* /*pPool*/) const @@ -2175,10 +2107,6 @@ SfxPoolItem* SdrGrafTransparenceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/ return new SdrGrafTransparenceItem( rIn ); } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// SdrGrafModeItem -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1( SdrGrafModeItem, SfxEnumItem ); SfxPoolItem* SdrGrafModeItem::Clone(SfxItemPool* /*pPool*/) const @@ -2244,10 +2172,6 @@ bool SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres, return true; } -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// SdrGrafCropItem -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - TYPEINIT1( SdrGrafCropItem, SvxGrfCrop ); SfxPoolItem* SdrGrafCropItem::Clone( SfxItemPool* /*pPool*/) const diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx index 621589c1f046..972c17de91ac 100644 --- a/svx/source/svdraw/svddrgm1.hxx +++ b/svx/source/svdraw/svddrgm1.hxx @@ -30,9 +30,6 @@ class SdrDragView; - -// SdrDragMovHdl - class SdrDragMovHdl : public SdrDragMethod { protected: @@ -51,9 +48,6 @@ public: virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE; }; - -// SdrDragRotate - class SdrDragRotate : public SdrDragMethod { private: @@ -77,9 +71,6 @@ public: virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) SAL_OVERRIDE; }; - -// SdrDragShear - class SdrDragShear : public SdrDragMethod { private: @@ -106,9 +97,6 @@ public: virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) SAL_OVERRIDE; }; - -// SdrDragMirror - class SdrDragMirror : public SdrDragMethod { private: @@ -133,9 +121,6 @@ public: virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) SAL_OVERRIDE; }; - -// SdrDragGradient - class SdrDragGradient : public SdrDragMethod { private: @@ -159,9 +144,6 @@ public: virtual void CancelSdrDrag() SAL_OVERRIDE; }; - -// SdrDragCrook - class SdrDragCrook : public SdrDragMethod { private: @@ -211,9 +193,6 @@ public: virtual void applyCurrentTransformationToPolyPolygon(basegfx::B2DPolyPolygon& rTarget) SAL_OVERRIDE; }; - -// SdrDragDistort - class SdrDragDistort : public SdrDragMethod { private: @@ -245,9 +224,6 @@ public: virtual void applyCurrentTransformationToPolyPolygon(basegfx::B2DPolyPolygon& rTarget) SAL_OVERRIDE; }; - -// SdrDragCrop - // derive from SdrDragObjOwn to have handles aligned to object when it // is sheared or rotated class SdrDragCrop : public SdrDragObjOwn diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 569d59923a56..e5e373ea3d1e 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -65,10 +65,7 @@ using namespace ::com::sun::star; -/****************************************************************************** -* Global data of the DrawingEngine -******************************************************************************/ - +// Global data of the DrawingEngine SdrGlobalData::SdrGlobalData() : pSysLocale(NULL), pLocaleData(NULL), diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index e907b2377a62..adb85752bb07 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -670,7 +670,6 @@ void ImpSdrGDIMetaFileImport::InsertObj(SdrObject* pObj, bool bScale) } } -/**************************************************************************************************/ void ImpSdrGDIMetaFileImport::DoAction(MetaPixelAction& /*rAct*/) const { } @@ -742,8 +741,6 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaRoundRectAction& rAct) InsertObj(pRect); } -/**************************************************************************************************/ - void ImpSdrGDIMetaFileImport::DoAction(MetaEllipseAction& rAct) { SdrCircObj* pCirc=new SdrCircObj(OBJ_CIRC,rAct.GetRect()); @@ -781,8 +778,6 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaChordAction& rAct) InsertObj(pCirc); } -/**************************************************************************************************/ - bool ImpSdrGDIMetaFileImport::CheckLastLineMerge(const basegfx::B2DPolygon& rSrcPoly) { // #i102706# Do not merge closed polygons @@ -993,8 +988,6 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaPolyPolygonAction& rAct) } } -/**************************************************************************************************/ - void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const OUString& rStr, const MetaAction& rAct ) { // calc text box size, add 5% to make it fit safely diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 9a0234e67dcc..74f2ec05bf43 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -917,9 +917,6 @@ void SdrHdl::onMouseLeave() { } - -// class SdrHdlColor - SdrHdlColor::SdrHdlColor(const Point& rRef, Color aCol, const Size& rSize, bool bLum) : SdrHdl(rRef, HDL_COLR), aMarkerSize(rSize), @@ -1073,7 +1070,6 @@ void SdrHdlColor::SetSize(const Size& rNew) } } -// class SdrHdlGradient SdrHdlGradient::SdrHdlGradient(const Point& rRef1, const Point& rRef2, bool bGrad) : SdrHdl(rRef1, bGrad ? HDL_GRAD : HDL_TRNS) , pColHdl1(NULL) @@ -2199,10 +2195,6 @@ SdrHdl* SdrHdlList::GetHdl(SdrHdlKind eKind1) const return pRet; } - -// SdrCropHdl - - SdrCropHdl::SdrCropHdl( const Point& rPnt, SdrHdlKind eNewKind, diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx index 73b566a0339b..11a193ef9585 100644 --- a/svx/source/svdraw/svdlayer.cxx +++ b/svx/source/svdraw/svdlayer.cxx @@ -141,10 +141,6 @@ bool SdrLayer::operator==(const SdrLayer& rCmpLayer) const && maName == rCmpLayer.maName); } - -// SdrLayerAdmin - - SdrLayerAdmin::SdrLayerAdmin(SdrLayerAdmin* pNewParent): aLayer(), pParent(pNewParent), diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 71a579475365..bb2b68a97b00 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -778,9 +778,7 @@ const SdrTextObj* SdrModel::GetFormattingTextObj() const void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, bool bInit ) { - /************************************************************************** - * Initialization of the Outliners for drawing text and HitTest - **************************************************************************/ + // Initialization of the Outliners for drawing text and HitTest if( bInit ) { pOutliner->EraseVirtualDevice(); diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 4a1e9502f8e7..702493ea69c9 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -228,8 +228,6 @@ void ImpSdrPathDragData::ResetPoly(const SdrPathObj& rPO) aXP[4]=aTmpXP[nNextNextPnt0]; aXP.SetFlags(4,aTmpXP.GetFlags(nNextNextPnt0)); } -/*************************************************************************/ - struct ImpPathCreateUser : public SdrDragStatUserData { Point aBezControl0; @@ -503,8 +501,6 @@ XPolygon ImpPathCreateUser::GetRectPoly() const return aXP; } -/*************************************************************************/ - class ImpPathForDragAndCreate { SdrPathObj& mrSdrPathObject; @@ -1650,8 +1646,6 @@ Pointer ImpPathForDragAndCreate::GetCreatePointer() const return Pointer(POINTER_CROSS); } -/*************************************************************************/ - SdrPathObjGeoData::SdrPathObjGeoData() : meKind(OBJ_NONE) { @@ -1668,8 +1662,6 @@ sdr::contact::ViewContact* SdrPathObj::CreateObjectSpecificViewContact() return new sdr::contact::ViewContactOfSdrPathObj(*this); } -/*************************************************************************/ - TYPEINIT1(SdrPathObj,SdrTextObj); SdrPathObj::SdrPathObj(SdrObjKind eNewKind) diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index ed4cedacbc04..edee086f559b 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -147,10 +147,6 @@ namespace } } - -// SdrUnoObj - - TYPEINIT1(SdrUnoObj, SdrRectObj); SdrUnoObj::SdrUnoObj(const OUString& rModelName, bool _bOwnUnoControlModel) |