diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-03-16 22:33:14 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-03-16 22:40:42 +0200 |
commit | 2976b53ff8c815f5f6a5deba1763fba153bd528f (patch) | |
tree | 178b9b8384f71f27c39922f3a30b432034375c49 /svx/source/svdraw/svdograf.cxx | |
parent | 7956ff62ee9a4b82f64d19d51cccddd73bc49d1e (diff) |
Bin more pointless comments and ASCII graphics
Suggested Easy Hack: Replace all instances of // -------- comments
including surrounding newlines with a single newline.
Another Easy Hack, slightly harder to automate: Remove all the
pointless comments that just tell the class name right before the
declaration of that class.
Change-Id: Ia890ed613b53c5d719988697e20a983d62334123
Diffstat (limited to 'svx/source/svdraw/svdograf.cxx')
-rw-r--r-- | svx/source/svdraw/svdograf.cxx | 126 |
1 files changed, 0 insertions, 126 deletions
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index c9622d1ca5e2..a32cad756868 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -65,18 +65,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; -// ----------- -// - Defines - -// ----------- - #define SWAPGRAPHIC_TIMEOUT 5000 - -// ------------------ -// - SdrGraphicLink - -// ------------------ - - const Graphic ImpLoadLinkedGraphic( const String aFileName, const String aFilterName ) { Graphic aGraphic; @@ -194,8 +184,6 @@ void SAL_CALL SdrGraphicUpdater::run(void) } } -// ----------------------------------------------------------------------------- - SdrGraphicLink::SdrGraphicLink(SdrGrafObj* pObj) : ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ) , pGrafObj( pObj ) @@ -204,30 +192,22 @@ SdrGraphicLink::SdrGraphicLink(SdrGrafObj* pObj) SetSynchron( false ); } -// ----------------------------------------------------------------------------- - SdrGraphicLink::~SdrGraphicLink() { if ( pGraphicUpdater ) pGraphicUpdater->Terminate(); } -// ----------------------------------------------------------------------------- - void SdrGraphicLink::DataChanged( const Graphic& rGraphic ) { pGrafObj->ImpSetLinkedGraphic( rGraphic ); } -// ----------------------------------------------------------------------------- - void SdrGraphicLink::RemoveGraphicUpdater() { pGraphicUpdater = NULL; } -// ----------------------------------------------------------------------------- - ::sfx2::SvBaseLink::UpdateResult SdrGraphicLink::DataChanged( const String& rMimeType, const ::com::sun::star::uno::Any & rValue ) { @@ -253,8 +233,6 @@ void SdrGraphicLink::RemoveGraphicUpdater() return SUCCESS; } -// ----------------------------------------------------------------------------- - void SdrGraphicLink::Closed() { // close connection; set pLink of the object to NULL, as link instance is just about getting destructed. @@ -264,8 +242,6 @@ void SdrGraphicLink::Closed() SvBaseLink::Closed(); } -// ----------------------------------------------------------------------------- - void SdrGraphicLink::UpdateAsynchron() { if( GetObj() ) @@ -283,13 +259,6 @@ void SdrGraphicLink::UpdateAsynchron() } } -// -------------- -// - SdrGrafObj - -// -------------- - -////////////////////////////////////////////////////////////////////////////// -// BaseProperties section - sdr::properties::BaseProperties* SdrGrafObj::CreateObjectSpecificProperties() { return new sdr::properties::GraphicProperties(*this); @@ -355,12 +324,8 @@ void SdrGrafObj::onGraphicChanged() } } -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1(SdrGrafObj,SdrRectObj); -// ----------------------------------------------------------------------------- - SdrGrafObj::SdrGrafObj() : SdrRectObj(), pGraphicLink ( NULL ), @@ -385,8 +350,6 @@ SdrGrafObj::SdrGrafObj() mbSupportTextIndentingOnLineWidthChange = false; } -// ----------------------------------------------------------------------------- - SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect) : SdrRectObj ( rRect ), pGraphicLink ( NULL ), @@ -411,8 +374,6 @@ SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect) mbSupportTextIndentingOnLineWidthChange = false; } -// ----------------------------------------------------------------------------- - SdrGrafObj::SdrGrafObj( const Graphic& rGrf ) : SdrRectObj(), pGraphicLink ( NULL ), @@ -437,8 +398,6 @@ SdrGrafObj::SdrGrafObj( const Graphic& rGrf ) mbSupportTextIndentingOnLineWidthChange = false; } -// ----------------------------------------------------------------------------- - SdrGrafObj::~SdrGrafObj() { delete pGraphic; @@ -446,8 +405,6 @@ SdrGrafObj::~SdrGrafObj() ImpLinkAbmeldung(); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::SetGraphicObject( const GraphicObject& rGrfObj ) { *pGraphic = rGrfObj; @@ -461,8 +418,6 @@ void SdrGrafObj::SetGraphicObject( const GraphicObject& rGrfObj ) onGraphicChanged(); } -// ----------------------------------------------------------------------------- - const GraphicObject& SdrGrafObj::GetGraphicObject(bool bForceSwapIn) const { if(bForceSwapIn) @@ -488,8 +443,6 @@ const GraphicObject* SdrGrafObj::GetReplacementGraphicObject() const return mpReplacementGraphic; } -// ----------------------------------------------------------------------------- - void SdrGrafObj::NbcSetGraphic( const Graphic& rGrf ) { pGraphic->SetGraphic( rGrf ); @@ -507,16 +460,12 @@ void SdrGrafObj::SetGraphic( const Graphic& rGrf ) BroadcastObjectChange(); } -// ----------------------------------------------------------------------------- - const Graphic& SdrGrafObj::GetGraphic() const { ForceSwapIn(); return pGraphic->GetGraphic(); } -// ----------------------------------------------------------------------------- - Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const { // Refactored most of the code to GraphicObject, where @@ -557,8 +506,6 @@ Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const return GetGraphicObject().GetTransformedGraphic( aDestSize, aDestMap, aActAttr ); } -// ----------------------------------------------------------------------------- - GraphicType SdrGrafObj::GetGraphicType() const { return pGraphic->GetType(); @@ -589,8 +536,6 @@ const Size& SdrGrafObj::GetGrafPrefSize() const return pGraphic->GetPrefSize(); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::SetGrafStreamURL( const String& rGraphicStreamURL ) { mbIsPreview = false; @@ -608,15 +553,11 @@ void SdrGrafObj::SetGrafStreamURL( const String& rGraphicStreamURL ) } } -// ----------------------------------------------------------------------------- - String SdrGrafObj::GetGrafStreamURL() const { return pGraphic->GetUserData(); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::ForceSwapIn() const { if( mbIsPreview ) @@ -646,15 +587,11 @@ void SdrGrafObj::ForceSwapIn() const } } -// ----------------------------------------------------------------------------- - void SdrGrafObj::ForceSwapOut() const { pGraphic->FireSwapOutRequest(); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::ImpLinkAnmeldung() { sfx2::LinkManager* pLinkManager = pModel != NULL ? pModel->GetLinkManager() : NULL; @@ -671,8 +608,6 @@ void SdrGrafObj::ImpLinkAnmeldung() } } -// ----------------------------------------------------------------------------- - void SdrGrafObj::ImpLinkAbmeldung() { sfx2::LinkManager* pLinkManager = pModel != NULL ? pModel->GetLinkManager() : NULL; @@ -685,8 +620,6 @@ void SdrGrafObj::ImpLinkAbmeldung() } } -// ----------------------------------------------------------------------------- - void SdrGrafObj::SetGraphicLink(const rtl::OUString& rFileName, const String& rFilterName) { ImpLinkAbmeldung(); @@ -699,8 +632,6 @@ void SdrGrafObj::SetGraphicLink(const rtl::OUString& rFileName, const String& rF pGraphic->SetSwapState(); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::ReleaseGraphicLink() { ImpLinkAbmeldung(); @@ -723,8 +654,6 @@ const rtl::OUString& SdrGrafObj::GetFilterName() const return aFilterName; } -// ----------------------------------------------------------------------------- - void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { bool bAnim = pGraphic->IsAnimated(); @@ -754,15 +683,11 @@ void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary()); } -// ----------------------------------------------------------------------------- - sal_uInt16 SdrGrafObj::GetObjIdentifier() const { return sal_uInt16( OBJ_GRAF ); } -// ----------------------------------------------------------------------------- - /* The graphic of the GraphicLink will be loaded. If it is called with bAsynchron = true then the graphic will be set later via DataChanged */ @@ -780,8 +705,6 @@ bool SdrGrafObj::ImpUpdateGraphicLink( bool bAsynchron ) const return bRet; } -// ----------------------------------------------------------------------------- - void SdrGrafObj::ImpSetLinkedGraphic( const Graphic& rGraphic ) { const sal_Bool bIsChanged = GetModel()->IsChanged(); @@ -791,8 +714,6 @@ void SdrGrafObj::ImpSetLinkedGraphic( const Graphic& rGraphic ) GetModel()->SetChanged( bIsChanged ); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::TakeObjNameSingul(XubString& rName) const { if(pGraphic) @@ -842,8 +763,6 @@ void SdrGrafObj::TakeObjNameSingul(XubString& rName) const } } -// ----------------------------------------------------------------------------- - void SdrGrafObj::TakeObjNamePlural( XubString& rName ) const { if(pGraphic) @@ -893,8 +812,6 @@ void SdrGrafObj::TakeObjNamePlural( XubString& rName ) const } } -// ----------------------------------------------------------------------------- - SdrObject* SdrGrafObj::getFullDragClone() const { // call parent @@ -937,9 +854,6 @@ SdrGrafObj& SdrGrafObj::operator=( const SdrGrafObj& rObj ) return *this; } -// ----------------------------------------------------------------------------- -// #i25616# - basegfx::B2DPolyPolygon SdrGrafObj::TakeXorPoly() const { if(mbInsidePaint) @@ -966,22 +880,16 @@ basegfx::B2DPolyPolygon SdrGrafObj::TakeXorPoly() const } } -// ----------------------------------------------------------------------------- - sal_uInt32 SdrGrafObj::GetHdlCount() const { return 8L; } -// ----------------------------------------------------------------------------- - SdrHdl* SdrGrafObj::GetHdl(sal_uInt32 nHdlNum) const { return SdrRectObj::GetHdl( nHdlNum + 1L ); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { SdrRectObj::NbcResize( rRef, xFact, yFact ); @@ -993,52 +901,38 @@ void SdrGrafObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract bMirrored = !bMirrored; } -// ----------------------------------------------------------------------------- - void SdrGrafObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs) { SdrRectObj::NbcRotate(rRef,nWink,sn,cs); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::NbcMirror(const Point& rRef1, const Point& rRef2) { SdrRectObj::NbcMirror(rRef1,rRef2); bMirrored = !bMirrored; } -// ----------------------------------------------------------------------------- - void SdrGrafObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) { // #i118485# Call Shear now, old version redirected to rotate SdrRectObj::NbcShear(rRef, nWink, tn, bVShear); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::NbcSetSnapRect(const Rectangle& rRect) { SdrRectObj::NbcSetSnapRect(rRect); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::NbcSetLogicRect( const Rectangle& rRect) { SdrRectObj::NbcSetLogicRect(rRect); } -// ----------------------------------------------------------------------------- - SdrObjGeoData* SdrGrafObj::NewGeoData() const { return new SdrGrafObjGeoData; } -// ----------------------------------------------------------------------------- - void SdrGrafObj::SaveGeoData(SdrObjGeoData& rGeo) const { SdrRectObj::SaveGeoData(rGeo); @@ -1046,8 +940,6 @@ void SdrGrafObj::SaveGeoData(SdrObjGeoData& rGeo) const rGGeo.bMirrored=bMirrored; } -// ----------------------------------------------------------------------------- - void SdrGrafObj::RestGeoData(const SdrObjGeoData& rGeo) { SdrRectObj::RestGeoData(rGeo); @@ -1055,8 +947,6 @@ void SdrGrafObj::RestGeoData(const SdrObjGeoData& rGeo) bMirrored=rGGeo.bMirrored; } -// ----------------------------------------------------------------------------- - void SdrGrafObj::SetPage( SdrPage* pNewPage ) { bool bRemove = pNewPage == NULL && pPage != NULL; @@ -1078,8 +968,6 @@ void SdrGrafObj::SetPage( SdrPage* pNewPage ) ImpLinkAnmeldung(); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::SetModel( SdrModel* pNewModel ) { bool bChg = pNewModel != pModel; @@ -1103,22 +991,16 @@ void SdrGrafObj::SetModel( SdrModel* pNewModel ) ImpLinkAnmeldung(); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::StartAnimation( OutputDevice* /*pOutDev*/, const Point& /*rPoint*/, const Size& /*rSize*/, long /*nExtraData*/) { SetGrafAnimationAllowed(true); } -// ----------------------------------------------------------------------------- - bool SdrGrafObj::HasGDIMetaFile() const { return( pGraphic->GetType() == GRAPHIC_GDIMETAFILE ); } -// ----------------------------------------------------------------------------- - bool SdrGrafObj::isEmbeddedSvg() const { return GRAPHIC_BITMAP == GetGraphicType() && GetGraphic().getSvgData().get(); @@ -1289,8 +1171,6 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText ) cons return pRetval; } -// ----------------------------------------------------------------------------- - void SdrGrafObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { SetXPolyDirty(); @@ -1329,8 +1209,6 @@ void SdrGrafObj::ImpSetAttrToGrafInfo() SetRectsDirty(); } -// ----------------------------------------------------------------------------- - void SdrGrafObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly ) { Size aSize; @@ -1381,8 +1259,6 @@ void SdrGrafObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly ) } } -// ----------------------------------------------------------------------------- - IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) { SvStream* pRet = GRFMGR_AUTOSWAPSTREAM_NONE; @@ -1490,8 +1366,6 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) return (long)(void*) pRet; } -// ----------------------------------------------------------------------------- - void SdrGrafObj::SetGrafAnimationAllowed(bool bNew) { if(mbGrafAnimationAllowed != bNew) |