fdo#62475 - remove pointless comments and ASCII art in sw/source/core/draw

Change-Id: I223cdd6d3bfddf0216453406efc32beee2489ae4

4 files changed, 8 insertions, 75 deletions

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 941bf6c87c2d..cc6f1a5252b0 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -126,13 +126,7 @@ sal_Bool HasWrap( const SdrObject* pObj )
     return sal_False;
 }
 
-/*****************************************************************************
- *
- * GetBoundRect returns the BoundRect _inclusive_ distance of the object.
- *
- *****************************************************************************/
-
-// #i68520# - change naming
+/// returns the BoundRect _inclusive_ distance of the object.
 SwRect GetBoundRectOfAnchoredObj( const SdrObject* pObj )
 {
     SwRect aRet( pObj->GetCurrentBoundRect() );
@@ -476,8 +470,6 @@ void SwFlyDrawContact::SetMaster( SdrObject* _pNewMaster )
     mpMasterObj = static_cast<SwFlyDrawObj *>(_pNewMaster);
 }
 
-// SwFlyDrawContact::Modify()
-
 void SwFlyDrawContact::Modify( const SfxPoolItem*, const SfxPoolItem * )
 {
 }
@@ -979,8 +971,6 @@ SdrObject* SwDrawContact::GetDrawObjectByAnchorFrm( const SwFrm& _rAnchorFrm )
     return pRetDrawObj;
 }
 
-// SwDrawContact::Changed
-
 void SwDrawContact::NotifyBackgrdOfAllVirtObjs( const Rectangle* pOldBoundRect )
 {
     for ( std::list<SwDrawVirtObj*>::iterator aDrawVirtObjIter = maDrawVirtObjs.begin();
@@ -1434,8 +1424,6 @@ namespace
     }
 }
 
-// SwDrawContact::Modify()
-
 void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
 {
     OSL_ENSURE( !mbDisconnectInProgress,
@@ -1585,8 +1573,6 @@ void SwDrawContact::_InvalidateObjs( const bool _bUpdateSortedObjsList )
     }
 }
 
-// SwDrawContact::DisconnectFromLayout()
-
 void SwDrawContact::DisconnectFromLayout( bool _bMoveMasterToInvisibleLayer )
 {
     mbDisconnectInProgress = true;
@@ -1697,8 +1683,6 @@ void SwDrawContact::DisconnectObjFromLayout( SdrObject* _pDrawObj )
     }
 }
 
-// SwDrawContact::ConnectToLayout()
-
 static SwTxtFrm* lcl_GetFlyInCntntAnchor( SwTxtFrm* _pProposedAnchorFrm,
                                    const xub_StrLen _nTxtOfs )
 {
@@ -1905,8 +1889,6 @@ void SwDrawContact::InsertMasterIntoDrawPage()
     GetMaster()->SetUserCall( this );
 }
 
-// SwDrawContact::FindPage(), ChkPage()
-
 SwPageFrm* SwDrawContact::FindPage( const SwRect &rRect )
 {
     // --> #i28701# - use method <GetPageFrm()>
@@ -1951,8 +1933,6 @@ void SwDrawContact::ChkPage()
     }
 }
 
-// SwDrawContact::ChangeMasterObject()
-
 // Important note:
 // method is called by method <SwDPage::ReplaceObject(..)>, which called its
 // corresponding superclass method <FmFormPage::ReplaceObject(..)>.
@@ -2161,7 +2141,8 @@ sdr::contact::ViewContact* SwDrawVirtObj::CreateObjectSpecificViewContact()
     return new sdr::contact::VCOfDrawVirtObj(*this);
 }
 
-// implemetation of SwDrawVirtObj
+// SwDrawVirtObj
+
 SwDrawVirtObj::SwDrawVirtObj( SdrObject&        _rNewObj,
                               SwDrawContact&    _rDrawContact )
     : SdrVirtObj( _rNewObj ),
@@ -2199,8 +2180,8 @@ SwDrawVirtObj* SwDrawVirtObj::Clone() const
     return pObj;
 }
 
-// connection to writer layout: <GetAnchoredObj()>, <SetAnchorFrm(..)>,
-// <GetAnchorFrm()>, <SetPageFrm(..)>, <GetPageFrm()> and <RemoveFromWriterLayout()>
+// connection to writer layout
+
 const SwAnchoredObject* SwDrawVirtObj::GetAnchoredObj() const
 {
     return &maAnchoredDrawObj;
@@ -2233,8 +2214,6 @@ void SwDrawVirtObj::RemoveFromWriterLayout()
     }
 }
 
-// connection to writer layout: <AddToDrawingPage()>, <RemoveFromDrawingPage()>
-
 void SwDrawVirtObj::AddToDrawingPage()
 {
     // determine 'master'
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 80d60d4c3976..0733af1ccd8e 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -63,8 +63,6 @@ static bool bInResize = false;
 TYPEINIT1( SwFlyDrawObj, SdrObject )
 TYPEINIT1( SwVirtFlyDrawObj, SdrVirtObj )
 
-// SwFlyDrawObj::Ctor
-
 namespace sdr
 {
     namespace contact
@@ -141,8 +139,6 @@ sal_uInt16 SwFlyDrawObj::GetObjIdentifier() const
     return SwFlyDrawObjIdentifier;
 }
 
-// SwVirtFlyDrawObj::CToren, Dtor
-
 // TODO: Need own primitive to get the FlyFrame paint working
 
 namespace drawinglayer
@@ -169,10 +165,8 @@ namespace drawinglayer
             {
             }
 
-            // compare operator
             virtual bool operator==(const BasePrimitive2D& rPrimitive) const;
 
-            // get range
             virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const;
 
             // overloaded to allow callbacks to wrap_DoPaintObject
@@ -399,22 +393,15 @@ SwVirtFlyDrawObj::~SwVirtFlyDrawObj()
         GetPage()->RemoveObject( GetOrdNum() );
 }
 
-// SwVirtFlyDrawObj::GetFmt()
-
-
 const SwFrmFmt *SwVirtFlyDrawObj::GetFmt() const
 {
     return GetFlyFrm()->GetFmt();
 }
-
-
 SwFrmFmt *SwVirtFlyDrawObj::GetFmt()
 {
     return GetFlyFrm()->GetFmt();
 }
 
-// SwVirtFlyDrawObj::Paint()
-
 // --> OD #i102707#
 namespace
 {
@@ -497,8 +484,6 @@ void SwVirtFlyDrawObj::wrap_DoPaintObject() const
     }
 }
 
-// SwVirtFlyDrawObj::TakeObjInfo()
-
 void SwVirtFlyDrawObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const
 {
     rInfo.bSelectAllowed     = rInfo.bMoveAllowed =
@@ -521,7 +506,6 @@ void SwVirtFlyDrawObj::SetRect() const
         ((SwVirtFlyDrawObj*)this)->aOutRect = Rectangle();
 }
 
-
 const Rectangle& SwVirtFlyDrawObj::GetCurrentBoundRect() const
 {
     SetRect();
@@ -865,6 +849,7 @@ void SwVirtFlyDrawObj::Resize(const Point& rRef,
     GetFmt()->GetDoc()->GetIDocumentUndoRedo().DoDrawUndo(false);
 }
 
+// Macro
 
 Pointer  SwVirtFlyDrawObj::GetMacroPointer(
     const SdrObjMacroHitRec& ) const
@@ -912,6 +897,8 @@ SdrObject* SwVirtFlyDrawObj::CheckMacroHit( const SdrObjMacroHitRec& rRec ) cons
     return SdrObject::CheckMacroHit( rRec );
 }
 
+// Dragging
+
 bool SwVirtFlyDrawObj::supportsFullDrag() const
 {
     // call parent
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index 4caa4228159f..f97a77f808af 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -55,18 +55,11 @@ SwDPage::SwDPage(SwDrawDocument& rNewModel, sal_Bool bMasterPage) :
 {
 }
 
-
 SwDPage::~SwDPage()
 {
     delete pGridLst;
 }
 
-/*************************************************************************
-|*
-|*  SwDPage::ReplaceObject()
-|*
-*************************************************************************/
-
 SdrObject*  SwDPage::ReplaceObject( SdrObject* pNewObj, sal_uLong nObjNum )
 {
     SdrObject *pOld = GetObj( nObjNum );
@@ -78,12 +71,6 @@ SdrObject*  SwDPage::ReplaceObject( SdrObject* pNewObj, sal_uLong nObjNum )
     return FmFormPage::ReplaceObject( pNewObj, nObjNum );
 }
 
-/*************************************************************************
-|*
-|*  SwDPage::GetGridFrameList()
-|*
-*************************************************************************/
-
 void InsertGridFrame( SdrPageGridFrameList *pLst, const SwFrm *pPg )
 {
     SwRect aPrt( pPg->Prt() );
@@ -93,7 +80,6 @@ void InsertGridFrame( SdrPageGridFrameList *pLst, const SwFrm *pPg )
     pLst->Insert( SdrPageGridFrame( aPaper, aUser ) );
 }
 
-
 const SdrPageGridFrameList*  SwDPage::GetGridFrameList(
                         const SdrPageView* pPV, const Rectangle *pRect ) const
 {
@@ -237,6 +223,4 @@ Reference< XInterface > SwDPage::createUnoPage()
     return xRet;
 }
 
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 7c31b2bc9f03..694f91521117 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "hintids.hxx"
 #include <editeng/protitem.hxx>
 #include <svx/svdpagv.hxx>
@@ -55,10 +54,8 @@
 #include <sortedobjs.hxx>
 #include <flyfrms.hxx>
 
-
 using namespace com::sun::star;
 
-
 class SwSdrHdl : public SdrHdl
 {
 public:
@@ -128,7 +125,6 @@ sal_Bool SwDrawView::IsAntiAliasing() const
     return getOptionsDrawinglayer().IsAntiAliasing();
 }
 
-
 SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, sal_uInt16 nTol, const SdrMarkList &rMrkList)
 {
     if(!nTol)
@@ -247,8 +243,6 @@ void SwDrawView::AddCustomHdl()
                                      pAnch->IsRightToLeft() ) );
 }
 
-// SwDrawView::GetMaxToTopObj(), _GetMaxToTopObj()
-
 SdrObject* SwDrawView::GetMaxToTopObj( SdrObject* pObj ) const
 {
     if ( GetUserCall(pObj) )
@@ -294,8 +288,6 @@ SdrObject* SwDrawView::GetMaxToTopObj( SdrObject* pObj ) const
     return 0;
 }
 
-// SwDrawView::GetMaxToBtmObj()
-
 SdrObject* SwDrawView::GetMaxToBtmObj(SdrObject* pObj) const
 {
     if ( GetUserCall(pObj) )
@@ -657,8 +649,6 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
     _MoveRepeatedObjs( *pMovedAnchoredObj, aMovedChildObjs );
 }
 
-// SwDrawView::TakeDragLimit()
-
 sal_Bool SwDrawView::TakeDragLimit( SdrDragMode eMode,
                                             Rectangle& rRect ) const
 {
@@ -677,8 +667,6 @@ sal_Bool SwDrawView::TakeDragLimit( SdrDragMode eMode,
     return bRet;
 }
 
-// SwDrawView::CalcAnchor()
-
 const SwFrm* SwDrawView::CalcAnchor()
 {
     const SdrMarkList &rMrkList = GetMarkedObjectList();
@@ -759,8 +747,6 @@ const SwFrm* SwDrawView::CalcAnchor()
     return pAnch;
 }
 
-// SwDrawView::ShowDragXor(), HideDragXor()
-
 void SwDrawView::ShowDragAnchor()
 {
     SdrHdl* pHdl = aHdl.GetHdl(HDL_ANCHOR);
@@ -774,8 +760,6 @@ void SwDrawView::ShowDragAnchor()
     }
 }
 
-// SwDrawView::MarkListHasChanged()
-
 void SwDrawView::MarkListHasChanged()
 {
     Imp().GetShell()->DrawSelChanged();
@@ -859,7 +843,6 @@ void SwDrawView::CheckPossibilities()
                             // TODO/LATER: retrieve Aspect - from where?!
                             bSzProtect |= ( embed::EmbedMisc::EMBED_NEVERRESIZE & xObj->getStatus( embed::Aspects::MSOLE_CONTENT ) ) ? sal_True : sal_False;
 
-
                             // #i972: protect position if it is a Math object anchored 'as char' and baseline alignment is activated
                             SwDoc* pDoc = Imp().GetShell()->GetDoc();
                             const bool bProtectMathPos = SotExchange::IsMath( xObj->getClassID() )