Removed comments/commented code

33 files changed, 167 insertions, 763 deletions

diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index f164e2f74871..5fbb55f46bc3 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -93,7 +93,6 @@
 #include <vcl/salbtype.hxx>     // FRound
 #include <svl/whiter.hxx>
 
-// #97849#
 #include <svx/fmmodel.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/objface.hxx>
@@ -125,7 +124,7 @@
 
 using namespace ::com::sun::star;
 
-// #104018# replace macros above with type-detecting methods
+// replace macros above with type-detecting methods
 inline double ImplTwipsToMM(double fVal) { return (fVal * (127.0 / 72.0)); }
 inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
 
@@ -290,18 +289,6 @@ SdrObjPlusData* SdrObjPlusData::Clone(SdrObject* pObj1) const
     return pNeuPlusData;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-//   @@@@  @@@@@  @@@@@@ @@@@@  @@@@  @@@@@@
-//  @@  @@ @@  @@     @@ @@    @@  @@   @@
-//  @@  @@ @@  @@     @@ @@    @@       @@
-//  @@  @@ @@@@@      @@ @@@@  @@       @@
-//  @@  @@ @@  @@     @@ @@    @@       @@
-//  @@  @@ @@  @@ @@  @@ @@    @@  @@   @@
-//   @@@@  @@@@@   @@@@  @@@@@  @@@@    @@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 //////////////////////////////////////////////////////////////////////////////
 // BaseProperties section
 
@@ -339,7 +326,7 @@ void SdrObject::RemoveObjectUser(sdr::ObjectUser& rOldUser)
 }
 
 //////////////////////////////////////////////////////////////////////////////
-// #110094# DrawContact section
+// DrawContact section
 
 sdr::contact::ViewContact* SdrObject::CreateObjectSpecificViewContact()
 {
@@ -410,9 +397,6 @@ SdrObject::SdrObject()
     // #i25616#
     mbSupportTextIndentingOnLineWidthChange = sal_False;
 
-    //#110094#-1
-    //bWriterFlyFrame  =sal_False;
-
     bNotMasterCachable=sal_False;
     bIsEdge=sal_False;
     bIs3DObj=sal_False;
@@ -461,7 +445,6 @@ SdrObject::~SdrObject()
         mpProperties = 0L;
     }
 
-    // #110094#
     if(mpViewContact)
     {
         delete mpViewContact;
@@ -879,7 +862,6 @@ void SdrObject::SetNavigationPosition (const sal_uInt32 nNewPosition)
 
 
 
-// #111111#
 // To make clearer that this method may trigger RecalcBoundRect and thus may be
 // expensive and somtimes problematic (inside a bigger object change You will get
 // non-useful BoundRects sometimes) i rename that method from GetBoundRect() to
@@ -894,7 +876,6 @@ const Rectangle& SdrObject::GetCurrentBoundRect() const
     return aOutRect;
 }
 
-// #111111#
 // To have a possibility to get the last calculated BoundRect e.g for producing
 // the first rectangle for repaints (old and new need to be used) without forcing
 // a RecalcBoundRect (which may be problematical and expensive sometimes) i add here
@@ -958,7 +939,6 @@ void SdrObject::BroadcastObjectChange() const
 
 void SdrObject::SetChanged()
 {
-    // #110094#-11
     // For test purposes, use the new ViewContact for change
     // notification now.
     ActionChanged();
@@ -1006,7 +986,6 @@ SdrObject& SdrObject::operator=(const SdrObject& rObj)
         mpProperties = 0L;
     }
 
-    // #110094#
     if(mpViewContact)
     {
         delete mpViewContact;
@@ -1029,11 +1008,11 @@ SdrObject& SdrObject::operator=(const SdrObject& rObj)
     bNoPrint=rObj.bNoPrint;
     mbVisible=rObj.mbVisible;
     bMarkProt=rObj.bMarkProt;
-    //EmptyPresObj wird nicht kopiert: nun doch! (25-07-1995, Joe)
+    //EmptyPresObj wird nicht kopiert: nun doch!
     bEmptyPresObj =rObj.bEmptyPresObj;
-    //NotVisibleAsMaster wird nicht kopiert: nun doch! (25-07-1995, Joe)
+    //NotVisibleAsMaster wird nicht kopiert: nun doch!
     bNotVisibleAsMaster=rObj.bNotVisibleAsMaster;
-    bSnapRectDirty=sal_True; //rObj.bSnapRectDirty;
+    bSnapRectDirty=sal_True;
     bNotMasterCachable=rObj.bNotMasterCachable;
     delete pPlusData;
     pPlusData=NULL;
@@ -1542,7 +1521,6 @@ void SdrObject::Move(const Size& rSiz)
 {
     if (rSiz.Width()!=0 || rSiz.Height()!=0) {
         Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
-        // #110094#-14 SendRepaintBroadcast();
         NbcMove(rSiz);
         SetChanged();
         BroadcastObjectChange();
@@ -1554,7 +1532,6 @@ void SdrObject::Resize(const Point& rRef, const Fraction& xFact, const Fraction&
 {
     if (xFact.GetNumerator()!=xFact.GetDenominator() || yFact.GetNumerator()!=yFact.GetDenominator()) {
         Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
-        // #110094#-14 SendRepaintBroadcast();
         NbcResize(rRef,xFact,yFact);
         SetChanged();
         BroadcastObjectChange();
@@ -1566,7 +1543,6 @@ void SdrObject::Rotate(const Point& rRef, long nWink, double sn, double cs)
 {
     if (nWink!=0) {
         Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
-        // #110094#-14 SendRepaintBroadcast();
         NbcRotate(rRef,nWink,sn,cs);
         SetChanged();
         BroadcastObjectChange();
@@ -1577,7 +1553,6 @@ void SdrObject::Rotate(const Point& rRef, long nWink, double sn, double cs)
 void SdrObject::Mirror(const Point& rRef1, const Point& rRef2)
 {
     Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
-    // #110094#-14 SendRepaintBroadcast();
     NbcMirror(rRef1,rRef2);
     SetChanged();
     BroadcastObjectChange();
@@ -1588,7 +1563,6 @@ void SdrObject::Shear(const Point& rRef, long nWink, double tn, bool bVShear)
 {
     if (nWink!=0) {
         Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
-        // #110094#-14 SendRepaintBroadcast();
         NbcShear(rRef,nWink,tn,bVShear);
         SetChanged();
         BroadcastObjectChange();
@@ -1607,7 +1581,6 @@ void SdrObject::SetRelativePos(const Point& rPnt)
 {
     if (rPnt!=GetRelativePos()) {
         Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
-        // #110094#-14 SendRepaintBroadcast();
         NbcSetRelativePos(rPnt);
         SetChanged();
         BroadcastObjectChange();
@@ -1631,7 +1604,6 @@ void SdrObject::SetAnchorPos(const Point& rPnt)
 {
     if (rPnt!=aAnchor) {
         Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
-        // #110094#-14 SendRepaintBroadcast();
         NbcSetAnchorPos(rPnt);
         SetChanged();
         BroadcastObjectChange();
@@ -1676,7 +1648,6 @@ void SdrObject::AdjustToMaxRect( const Rectangle& rMaxRect, bool /* bShrinkOnly
 void SdrObject::SetSnapRect(const Rectangle& rRect)
 {
     Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
-    // #110094#-14 SendRepaintBroadcast();
     NbcSetSnapRect(rRect);
     SetChanged();
     BroadcastObjectChange();
@@ -1686,7 +1657,6 @@ void SdrObject::SetSnapRect(const Rectangle& rRect)
 void SdrObject::SetLogicRect(const Rectangle& rRect)
 {
     Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
-    // #110094#-14 SendRepaintBroadcast();
     NbcSetLogicRect(rRect);
     SetChanged();
     BroadcastObjectChange();
@@ -1731,7 +1701,6 @@ Point SdrObject::GetPoint(sal_uInt32 /*i*/) const
 void SdrObject::SetPoint(const Point& rPnt, sal_uInt32 i)
 {
     Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
-    // #110094#-14 SendRepaintBroadcast();
     NbcSetPoint(rPnt, i);
     SetChanged();
     BroadcastObjectChange();
@@ -1759,7 +1728,6 @@ void SdrObject::EndTextEdit(SdrOutliner& /*rOutl*/)
 void SdrObject::SetOutlinerParaObject(OutlinerParaObject* pTextObject)
 {
     Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
-    // #110094#-14 SendRepaintBroadcast();
     NbcSetOutlinerParaObject(pTextObject);
     SetChanged();
     BroadcastObjectChange();
@@ -2127,7 +2095,7 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
         SetResizeProtect(b);
     }
 
-    /* #67368# move protect always sets size protect */
+    /* move protect always sets size protect */
     if( IsMoveProtect() )
         SetResizeProtect( true );
 
@@ -2250,7 +2218,6 @@ void SdrObject::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemov
     if(pUserCall)
         aBoundRect0 = GetLastBoundRect();
 
-    // #110094#-14 SendRepaintBroadcast();
     NbcSetStyleSheet(pNewStyleSheet, bDontRemoveHardAttr);
     SetChanged();
     BroadcastObjectChange();
@@ -2317,11 +2284,6 @@ const SdrGluePointList* SdrObject::GetGluePointList() const
     return NULL;
 }
 
-//SdrGluePointList* SdrObject::GetGluePointList()
-//{
-//  if (pPlusData!=NULL) return pPlusData->pGluePoints;
-//  return NULL;
-//}
 
 SdrGluePointList* SdrObject::ForceGluePointList()
 {
@@ -2498,7 +2460,6 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, sal_Bool bForceLin
             {
                 if(eOldFillStyle != XFILL_NONE)
                 {
-                    // #107600# use new boolean here
                     bAddOriginalGeometry = true;
                 }
             }
@@ -2755,7 +2716,6 @@ void SdrObject::SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundR
 
     if ( pUserCall )
     {
-        // UserCall ausfuehren
         pUserCall->Changed( *this, eUserCall, rBoundRect );
     }
 
@@ -3081,7 +3041,6 @@ void SdrObject::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const ba
     SetSnapRect(aBaseRect);
 }
 
-// #116168#
 // Give info if object is in destruction
 sal_Bool SdrObject::IsInDestruction() const
 {
@@ -3123,17 +3082,6 @@ void SdrObject::SetContextWritingMode( const sal_Int16 /*_nContextWritingMode*/
     // this base class does not support different writing modes, so ignore the call
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-//   @@@@  @@@@@  @@@@@@  @@@@@  @@@@   @@@@  @@@@@@  @@@@  @@@@@  @@  @@
-//  @@  @@ @@  @@     @@  @@    @@  @@ @@  @@   @@   @@  @@ @@  @@ @@  @@
-//  @@  @@ @@  @@     @@  @@    @@  @@ @@       @@   @@  @@ @@  @@ @@  @@
-//  @@  @@ @@@@@      @@  @@@@  @@@@@@ @@       @@   @@  @@ @@@@@   @@@@
-//  @@  @@ @@  @@     @@  @@    @@  @@ @@       @@   @@  @@ @@  @@   @@
-//  @@  @@ @@  @@ @@  @@  @@    @@  @@ @@  @@   @@   @@  @@ @@  @@   @@
-//   @@@@  @@@@@   @@@@   @@    @@  @@  @@@@    @@    @@@@  @@  @@   @@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
 
 SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel)
 {
@@ -3285,6 +3233,4 @@ namespace svx
     }
 }
 
-// eof
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index bbba009800e8..3c0b242913a9 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -286,7 +286,6 @@ basegfx::B2DPolyPolygon SdrCaptionObj::TakeXorPoly() const
 sal_uInt32 SdrCaptionObj::GetHdlCount() const
 {
     sal_uInt32 nAnz1(SdrRectObj::GetHdlCount());
-    // sal_uInt32 nAnz2(aTailPoly.GetSize());
     // Derzeit ist nur das Draggen des Schwanzendes implementiert
     return nAnz1 + 1L;
 }
@@ -660,7 +659,6 @@ void SdrCaptionObj::RecalcSnapRect()
 {
     SdrRectObj::RecalcSnapRect();
     // #i32599#
-    // maSnapRect.Union(aTailPoly.GetBoundRect());
     // !!!!! fehlende Impl.
 }
 
@@ -698,7 +696,6 @@ void SdrCaptionObj::SetTailPos(const Point& rPos)
 {
     if (aTailPoly.GetSize()==0 || aTailPoly[0]!=rPos) {
         Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
-        // #110094#-14 SendRepaintBroadcast();
         NbcSetTailPos(rPos);
         SetChanged();
         BroadcastObjectChange();
@@ -756,7 +753,7 @@ void SdrCaptionObj::RestGeoData(const SdrObjGeoData& rGeo)
 }
 
 SdrObject* SdrCaptionObj::DoConvertToPolyObj(sal_Bool bBezier) const
-{ // #42334# - Convert implementiert
+{
     SdrObject* pRect=SdrRectObj::DoConvertToPolyObj(bBezier);
     SdrObject* pTail = ImpConvertMakeObj(basegfx::B2DPolyPolygon(aTailPoly.getB2DPolygon()), sal_False, bBezier);
     SdrObject* pRet=(pTail!=NULL) ? pTail : pRect;
@@ -848,6 +845,4 @@ basegfx::B2DPolygon SdrCaptionObj::getTailPolygon() const
     return aTailPoly.getB2DPolygon();
 }
 
-// eof
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index c951cb11c7e4..98537d10816b 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -77,7 +77,7 @@ Point GetWinkPnt(const Rectangle& rR, long nWink)
     if (nWdt!=nHgt) {
         if (nWdt>nHgt) {
             if (nWdt!=0) {
-                // eventuelle Ueberlaeufe bei sehr grossen Objekten abfangen (Bug 23384)
+                // eventuelle Ueberlaeufe bei sehr grossen Objekten abfangen
                 if (Abs(nHgt)>32767 || Abs(aRetval.Y())>32767) {
                     aRetval.Y()=BigMulDiv(aRetval.Y(),nHgt,nWdt);
                 } else {
@@ -86,7 +86,7 @@ Point GetWinkPnt(const Rectangle& rR, long nWink)
             }
         } else {
             if (nHgt!=0) {
-                // eventuelle Ueberlaeufe bei sehr grossen Objekten abfangen (Bug 23384)
+                // eventuelle Ueberlaeufe bei sehr grossen Objekten abfangen
                 if (Abs(nWdt)>32767 || Abs(aRetval.X())>32767) {
                     aRetval.X()=BigMulDiv(aRetval.X(),nWdt,nHgt);
                 } else {
@@ -880,7 +880,6 @@ void SdrCircObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear
 
 void SdrCircObj::NbcMirror(const Point& rRef1, const Point& rRef2)
 {
-    //long nWink0=aGeo.nDrehWink;
     bool bFreeMirr=meCircleKind!=OBJ_CIRC;
     Point aTmpPt1;
     Point aTmpPt2;
@@ -1132,7 +1131,7 @@ void SdrCircObj::ImpSetCircInfoToAttr()
 
     if(eNewKindA != eOldKindA || nStartWink != nOldStartWink || nEndWink != nOldEndWink)
     {
-        // #81921# since SetItem() implicitly calls ImpSetAttrToCircInfo()
+        // since SetItem() implicitly calls ImpSetAttrToCircInfo()
         // setting the item directly is necessary here.
         if(eNewKindA != eOldKindA)
         {
@@ -1164,7 +1163,4 @@ SdrObject* SdrCircObj::DoConvertToPolyObj(sal_Bool bBezier) const
     return pRet;
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// eof
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index f29b8806d928..b1b9c9064e67 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -135,8 +135,8 @@ bool SdrEdgeInfoRec::ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rX
     sal_uInt16 nIdx=ImpGetPolyIdx(eLineCode,rXP);
     bool bHorz=nAngle1==0 || nAngle1==18000;
     if (eLineCode==OBJ2LINE2 || eLineCode==OBJ2LINE3) {
-        nIdx=rXP.GetPointCount()-nIdx; // #36314#
-        bHorz=nAngle2==0 || nAngle2==18000; // #52000#
+        nIdx=rXP.GetPointCount()-nIdx;
+        bHorz=nAngle2==0 || nAngle2==18000;
     }
     if ((nIdx & 1)==1) bHorz=!bHorz;
     return bHorz;
@@ -181,9 +181,8 @@ SdrEdgeObj::SdrEdgeObj()
     nNotifyingCount(0),
     bEdgeTrackDirty(sal_False),
     bEdgeTrackUserDefined(sal_False),
-    // #109007# Default is to allow default connects
+    // Default is to allow default connects
     mbSuppressDefaultConnect(sal_False),
-    // #110649#
     mbBoundRectCalculationRunning(sal_False)
 {
     bClosedObj=sal_False;
@@ -266,7 +265,6 @@ void SdrEdgeObj::ImpSetAttrToEdgeInfo()
         }
     }
 
-    // #84649#
     ImpDirtyEdgeTrack();
 }
 
@@ -325,7 +323,7 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr()
 
     if(n != nValAnz || nVals[0] != nVal1 || nVals[1] != nVal2 || nVals[2] != nVal3)
     {
-        // #75371# Here no more notifying is necessary, just local changes are OK.
+        // Here no more notifying is necessary, just local changes are OK.
         if(n != nValAnz)
         {
             GetProperties().SetObjectItemDirect(SdrEdgeLineDeltaAnzItem(n));
@@ -455,12 +453,12 @@ SdrGluePoint SdrEdgeObj::GetCornerGluePoint(sal_uInt16 nNum) const
 
 const SdrGluePointList* SdrEdgeObj::GetGluePointList() const
 {
-    return NULL; // Keine benutzerdefinierten Klebepunkte fuer Verbinder #31671#
+    return NULL; // Keine benutzerdefinierten Klebepunkte fuer Verbinder
 }
 
 SdrGluePointList* SdrEdgeObj::ForceGluePointList()
 {
-    return NULL; // Keine benutzerdefinierten Klebepunkte fuer Verbinder #31671#
+    return NULL; // Keine benutzerdefinierten Klebepunkte fuer Verbinder
 }
 
 bool SdrEdgeObj::IsEdge() const
@@ -555,7 +553,6 @@ void SdrEdgeObj::ImpRecalcEdgeTrack()
     if ( bEdgeTrackUserDefined && (GetModel() && GetModel()->isLocked()) )
         return;
 
-    // #110649#
     if(IsBoundRectCalculationRunning())
     {
         // this object is involved into another ImpRecalcEdgeTrack() call
@@ -582,18 +579,15 @@ void SdrEdgeObj::ImpRecalcEdgeTrack()
 
         Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
         SetRectsDirty();
-        // #110094#-14 if (!bEdgeTrackDirty) SendRepaintBroadcast();
         *pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo);
         ImpSetEdgeInfoToAttr(); // Die Werte aus aEdgeInfo in den Pool kopieren
         bEdgeTrackDirty=sal_False;
 
         // Only redraw here, no object change
         ActionChanged();
-        // BroadcastObjectChange();
 
         SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
 
-        // #110649#
         ((SdrEdgeObj*)this)->mbBoundRectCalculationRunning = sal_False;
     }
 }
@@ -729,7 +723,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection&
     if (bCon1) {
         if (rCon1.pObj==(SdrObject*)this)
         {
-            // sicherheitshalber Abfragen #44515#
+            // sicherheitshalber Abfragen
             aBoundRect1=aOutRect;
         }
         else
@@ -752,7 +746,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection&
         aBewareRect1=aBoundRect1;
     }
     if (bCon2) {
-        if (rCon2.pObj==(SdrObject*)this) { // sicherheitshalber Abfragen #44515#
+        if (rCon2.pObj==(SdrObject*)this) { // sicherheitshalber Abfragen
             aBoundRect2=aOutRect;
         }
         else
@@ -1536,7 +1530,7 @@ void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
     bool bObj1=aCon1.pObj!=NULL && aCon1.pObj->GetBroadcaster()==&rBC;
     bool bObj2=aCon2.pObj!=NULL && aCon2.pObj->GetBroadcaster()==&rBC;
     if (bDying && (bObj1 || bObj2)) {
-        // #35605# Dying vorher abfangen, damit AttrObj nicht
+        // Dying vorher abfangen, damit AttrObj nicht
         // wg. vermeintlicher Vorlagenaenderung rumbroadcastet
         if (bObj1) aCon1.pObj=NULL;
         if (bObj2) aCon2.pObj=NULL;
@@ -1560,12 +1554,10 @@ void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
         {
             // Broadcasting nur, wenn auf der selben Page
             Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
-            // #110094#-14 if (!bEdgeTrackDirty) SendRepaintBroadcast();
             ImpDirtyEdgeTrack();
 
             // only redraw here, no objectchange
             ActionChanged();
-            // BroadcastObjectChange();
 
             SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
         }
@@ -1575,7 +1567,6 @@ void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 
 /** updates edges that are connected to the edges of this object
     as if the connected objects send a repaint broadcast
-    #103122#
 */
 void SdrEdgeObj::Reformat()
 {
@@ -1895,8 +1886,6 @@ bool SdrEdgeObj::applySpecialDrag(SdrDragStat& rDragStat)
     // save EdgeInfos and mark object as user modified
     ImpSetEdgeInfoToAttr();
     bEdgeTrackUserDefined = false;
-    //SetRectsDirty();
-    //SetChanged();
 
     if(bOriginalEdgeModified && rDragStat.GetView())
     {
@@ -2065,7 +2054,7 @@ Pointer SdrEdgeObj::GetCreatePointer() const
 bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut)
 {
     rCon.ResetVars();
-    if (pOut==NULL) pOut=rPV.GetView().GetFirstOutputDevice(); // GetWin(0);
+    if (pOut==NULL) pOut=rPV.GetView().GetFirstOutputDevice();
     if (pOut==NULL) return sal_False;
     SdrObjList* pOL=rPV.GetObjList();
     const SetOfByte& rVisLayer=rPV.GetVisibleLayers();
@@ -2136,7 +2125,6 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO
                     }
                     else if (bCenter && !bUserFnd && !bEdge)
                     {
-                        // #109007#
                         // Suppress default connect at object center
                         if(!pThis || !pThis->GetSuppressDefaultConnect())
                         {
@@ -2167,7 +2155,6 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO
                     !bEdge &&
                     SdrObjectPrimitiveHit(*pObj, rPt, nBoundHitTol, rPV, &rVisLayer, false))
                 {
-                    // #109007#
                     // Suppress default connect at object inside bound
                     if(!pThis || !pThis->GetSuppressDefaultConnect())
                     {
@@ -2232,10 +2219,9 @@ void SdrEdgeObj::NbcResize(const Point& rRefPnt, const Fraction& aXFact, const F
     SdrTextObj::NbcResize(rRefPnt,aXFact,aXFact);
     ResizeXPoly(*pEdgeTrack,rRefPnt,aXFact,aYFact);
 
-    // #75371# if resize is not from paste, forget user distances
+    // if resize is not from paste, forget user distances
     if(!GetModel()->IsPasteResize())
     {
-        // #75735#
         aEdgeInfo.aObj1Line2 = Point();
         aEdgeInfo.aObj1Line3 = Point();
         aEdgeInfo.aObj2Line2 = Point();
@@ -2386,7 +2372,6 @@ void SdrEdgeObj::SetTailPoint( sal_Bool bTail, const Point& rPt )
 void SdrEdgeObj::setGluePointIndex( sal_Bool bTail, sal_Int32 nIndex /* = -1 */ )
 {
     Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetCurrentBoundRect();
-    // #110094#-14 BroadcastObjectChange();
 
     SdrObjConnection& rConn1 = GetConnection( bTail );
 
@@ -2396,8 +2381,7 @@ void SdrEdgeObj::setGluePointIndex( sal_Bool bTail, sal_Int32 nIndex /* = -1 */
 
     if( nIndex > 3 )
     {
-//      nIndex -= 4;
-        nIndex -= 3;        // SJ: the start api index is 0, whereas the implementation in svx starts from 1
+        nIndex -= 3;        // the start api index is 0, whereas the implementation in svx starts from 1
 
         // for user defined glue points we have
         // to get the id for this index first
@@ -2415,7 +2399,6 @@ void SdrEdgeObj::setGluePointIndex( sal_Bool bTail, sal_Int32 nIndex /* = -1 */
     SetChanged();
     SetRectsDirty();
     ImpRecalcEdgeTrack();
-    // bEdgeTrackDirty=sal_True;
 }
 
 /** this method is used by the api to return a glue point id for a connection.
@@ -2428,13 +2411,12 @@ sal_Int32 SdrEdgeObj::getGluePointIndex( sal_Bool bTail )
     {
         nId = rConn1.GetConnectorId();
         if( !rConn1.IsAutoVertex() )
-//          nId += 4;
-            nId += 3;       // SJ: the start api index is 0, whereas the implementation in svx starts from 1
+            nId += 3;       // the start api index is 0, whereas the implementation in svx starts from 1
     }
     return nId;
 }
 
-// #102344# Implementation was missing; edge track needs to be invalidated additionally.
+// Implementation was missing; edge track needs to be invalidated additionally.
 void SdrEdgeObj::NbcSetAnchorPos(const Point& rPnt)
 {
     // call parent functionality
@@ -2476,7 +2458,4 @@ void SdrEdgeObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b
     }
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// eof
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index b8fc80a49404..926e011110be 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -333,7 +333,6 @@ SdrGrafObj::SdrGrafObj()
     pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT );
     bNoShear = sal_True;
 
-    // #111096#
     mbGrafAnimationAllowed = sal_True;
 
     // #i25616#
@@ -356,7 +355,6 @@ SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect)
     pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT );
     bNoShear = sal_True;
 
-    // #111096#
     mbGrafAnimationAllowed = sal_True;
 
     // #i25616#
@@ -379,7 +377,6 @@ SdrGrafObj::SdrGrafObj( const Graphic& rGrf )
     pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT );
     bNoShear = sal_True;
 
-    // #111096#
     mbGrafAnimationAllowed = sal_True;
 
     // #i25616#
@@ -451,7 +448,7 @@ const Graphic& SdrGrafObj::GetGraphic() const
 
 Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const
 {
-    // #107947# Refactored most of the code to GraphicObject, where
+    // Refactored most of the code to GraphicObject, where
     // everybody can use e.g. the cropping functionality
 
     GraphicType     eType = GetGraphicType();
@@ -461,7 +458,7 @@ Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const
     const sal_Bool      bRotate = ( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) != 0 ) &&
         ( aGeo.nDrehWink && aGeo.nDrehWink != 18000 ) && ( GRAPHIC_NONE != eType );
 
-    // #104115# Need cropping info earlier
+    // Need cropping info earlier
     ( (SdrGrafObj*) this )->ImpSetAttrToGrafInfo();
     GraphicAttr aActAttr;
 
@@ -485,7 +482,7 @@ Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const
             aActAttr.SetRotation( sal_uInt16(aGeo.nDrehWink / 10) );
     }
 
-    // #107947# Delegate to moved code in GraphicObject
+    // Delegate to moved code in GraphicObject
     return GetGraphicObject().GetTransformedGraphic( aDestSize, aDestMap, aActAttr );
 }
 
@@ -652,7 +649,7 @@ void SdrGrafObj::SetGraphicLink( const String& rFileName, const String& rFilterN
     ImpLinkAnmeldung();
     pGraphic->SetUserData();
 
-    // #92205# A linked graphic is per definition swapped out (has to be loaded)
+    // A linked graphic is per definition swapped out (has to be loaded)
     pGraphic->SetSwapState();
 }
 
@@ -1025,8 +1022,6 @@ void SdrGrafObj::SetModel( SdrModel* pNewModel )
 
 void SdrGrafObj::StartAnimation( OutputDevice* /*pOutDev*/, const Point& /*rPoint*/, const Size& /*rSize*/, long /*nExtraData*/)
 {
-    // #111096#
-    // use new graf animation
     SetGrafAnimationAllowed(sal_True);
 }
 
@@ -1034,8 +1029,6 @@ void SdrGrafObj::StartAnimation( OutputDevice* /*pOutDev*/, const Point& /*rPoin
 
 void SdrGrafObj::StopAnimation(OutputDevice* /*pOutDev*/, long /*nExtraData*/)
 {
-    // #111096#
-    // use new graf animation
     SetGrafAnimationAllowed(sal_False);
 }
 
@@ -1294,9 +1287,6 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
 
                     if(mbInsidePaint && !GetViewContact().HasViewObjectContacts(true))
                     {
-//                          Rectangle aSnapRect(GetSnapRect());
-//                          const Rectangle aSnapRectPixel(pOutDev->LogicToPixel(aSnapRect));
-
                         pFilterData = new com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >( 3 );
 
                         com::sun::star::awt::Size aPreviewSizeHint( 64, 64 );
@@ -1320,7 +1310,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
                         pGraphic->SetGraphic( aGraphic );
                         pGraphic->SetUserData( aUserData );
 
-                        // #142146# Graphic successfully swapped in.
+                        // Graphic successfully swapped in.
                         pRet = GRFMGR_AUTOSWAPSTREAM_LOADED;
                     }
                     delete pFilterData;
@@ -1357,8 +1347,6 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
 
 // -----------------------------------------------------------------------------
 
-// #111096#
-// Access to GrafAnimationAllowed flag
 sal_Bool SdrGrafObj::IsGrafAnimationAllowed() const
 {
     return mbGrafAnimationAllowed;
@@ -1391,9 +1379,6 @@ Reference< XInputStream > SdrGrafObj::getInputStream()
 
     if( pModel )
     {
-//      if( !pGraphic->HasUserData() )
-//          pGraphic->SwapOut();
-
         // kann aus dem original Doc-Stream nachgeladen werden...
         if( pGraphic->HasUserData() )
         {
@@ -1438,6 +1423,4 @@ Reference< XInputStream > SdrGrafObj::getInputStream()
     return xStream;
 }
 
-// eof
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 0a1ec4c47fcb..486a57784e3a 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -51,7 +51,7 @@
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdattrx.hxx>  // NotPersistItems
-#include <svx/svdoedge.hxx>  // #32383# Die Verbinder nach Move nochmal anbroadcasten
+#include <svx/svdoedge.hxx>  // Die Verbinder nach Move nochmal anbroadcasten
 #include "svx/svdglob.hxx"   // StringCache
 #include "svx/svdstr.hrc"    // Objektname
 
@@ -59,23 +59,11 @@
 #include <svl/whiter.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/sdr/properties/groupproperties.hxx>
-
-// #110094#
 #include <svx/sdr/contact/viewcontactofgroup.hxx>
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-//   @@@@  @@@@@  @@@@@@   @@@@  @@@@@   @@@@  @@  @@ @@@@@
-//  @@  @@ @@  @@     @@  @@     @@  @@ @@  @@ @@  @@ @@  @@
-//  @@  @@ @@@@@      @@  @@ @@@ @@@@@  @@  @@ @@  @@ @@@@@
-//  @@  @@ @@  @@ @@  @@  @@  @@ @@  @@ @@  @@ @@  @@ @@
-//   @@@@  @@@@@   @@@@    @@@@@ @@  @@  @@@@   @@@@  @@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 //////////////////////////////////////////////////////////////////////////////
 // BaseProperties section
 
@@ -85,7 +73,7 @@ sdr::properties::BaseProperties* SdrObjGroup::CreateObjectSpecificProperties()
 }
 
 //////////////////////////////////////////////////////////////////////////////
-// #110094# DrawContact section
+// DrawContact section
 
 sdr::contact::ViewContact* SdrObjGroup::CreateObjectSpecificViewContact()
 {
@@ -272,7 +260,7 @@ SdrObjList* SdrObjGroup::GetSubList() const
 
 const Rectangle& SdrObjGroup::GetCurrentBoundRect() const
 {
-    // <aOutRect> has to contain the bounding rectangle (#144962#)
+    // <aOutRect> has to contain the bounding rectangle
     if ( pSub->GetObjCount()!=0 )
     {
         const_cast<SdrObjGroup*>(this)->aOutRect = pSub->GetAllObjBoundRect();
@@ -284,7 +272,7 @@ const Rectangle& SdrObjGroup::GetCurrentBoundRect() const
 
 const Rectangle& SdrObjGroup::GetSnapRect() const
 {
-    // <aOutRect> has to contain the bounding rectangle (#144962#)
+    // <aOutRect> has to contain the bounding rectangle
     if ( pSub->GetObjCount()!=0 )
     {
         return pSub->GetAllObjSnapRect();
@@ -578,7 +566,7 @@ void SdrObjGroup::Move(const Size& rSiz)
         Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
         MovePoint(aRefPoint,rSiz);
         if (pSub->GetObjCount()!=0) {
-            // #32383# Erst die Verbinder verschieben, dann den Rest
+            // Erst die Verbinder verschieben, dann den Rest
             SdrObjList* pOL=pSub;
             sal_uIntPtr nObjAnz=pOL->GetObjCount();
             sal_uIntPtr i;
@@ -591,7 +579,6 @@ void SdrObjGroup::Move(const Size& rSiz)
                 if (!pObj->IsEdgeObj()) pObj->Move(rSiz);
             }
         } else {
-            // #110094#-14 SendRepaintBroadcast();
             MoveRect(aOutRect,rSiz);
             SetRectsDirty();
         }
@@ -624,7 +611,7 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio
         Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
         ResizePoint(aRefPoint,rRef,xFact,yFact);
         if (pSub->GetObjCount()!=0) {
-            // #32383# Erst die Verbinder verschieben, dann den Rest
+            // Erst die Verbinder verschieben, dann den Rest
             SdrObjList* pOL=pSub;
             sal_uIntPtr nObjAnz=pOL->GetObjCount();
             sal_uIntPtr i;
@@ -637,7 +624,6 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio
                 if (!pObj->IsEdgeObj()) pObj->Resize(rRef,xFact,yFact);
             }
         } else {
-            // #110094#-14 SendRepaintBroadcast();
             ResizeRect(aOutRect,rRef,xFact,yFact);
             SetRectsDirty();
         }
@@ -656,7 +642,7 @@ void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs)
         Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
         nDrehWink=NormAngle360(nDrehWink+nWink);
         RotatePoint(aRefPoint,rRef,sn,cs);
-        // #32383# Erst die Verbinder verschieben, dann den Rest
+        // Erst die Verbinder verschieben, dann den Rest
         SdrObjList* pOL=pSub;
         sal_uIntPtr nObjAnz=pOL->GetObjCount();
         sal_uIntPtr i;
@@ -682,7 +668,7 @@ void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2)
     SetGlueReallyAbsolute(sal_True);
     Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
     MirrorPoint(aRefPoint,rRef1,rRef2); // fehlende Implementation in SvdEtc !!!
-    // #32383# Erst die Verbinder verschieben, dann den Rest
+    // Erst die Verbinder verschieben, dann den Rest
     SdrObjList* pOL=pSub;
     sal_uIntPtr nObjAnz=pOL->GetObjCount();
     sal_uIntPtr i;
@@ -709,7 +695,7 @@ void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, bool bVShear)
         Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
         nShearWink+=nWink;
         ShearPoint(aRefPoint,rRef,tn);
-        // #32383# Erst die Verbinder verschieben, dann den Rest
+        // Erst die Verbinder verschieben, dann den Rest
         SdrObjList* pOL=pSub;
         sal_uIntPtr nObjAnz=pOL->GetObjCount();
         sal_uIntPtr i;
@@ -737,7 +723,7 @@ void SdrObjGroup::SetAnchorPos(const Point& rPnt)
     aAnchor=rPnt;
     Size aSiz(rPnt.X()-aAnchor.X(),rPnt.Y()-aAnchor.Y());
     MovePoint(aRefPoint,aSiz);
-    // #32383# Erst die Verbinder verschieben, dann den Rest
+    // Erst die Verbinder verschieben, dann den Rest
     SdrObjList* pOL=pSub;
     sal_uIntPtr nObjAnz=pOL->GetObjCount();
     sal_uIntPtr i;
@@ -800,6 +786,4 @@ SdrObject* SdrObjGroup::DoConvertToPolyObj(sal_Bool bBezier) const
     return pGroup;
 }
 
-// eof
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 7f960c9a0c2f..f53d09e25941 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -92,8 +92,6 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe
     bShowUnit = ((SdrMeasureShowUnitItem&)rSet.Get(SDRATTR_MEASURESHOWUNIT)).GetValue();
     sal_Int16 nNumDigits = ((SdrMeasureDecimalPlacesItem&)rSet.Get(SDRATTR_MEASUREDECIMALPLACES)).GetValue();
 
-    //SdrModel* pModel = rObj.pModel;
-
     switch(eMeasureFieldKind)
     {
         case SDRMEASUREFIELD_VALUE:
@@ -780,7 +778,7 @@ SdrHdl* SdrMeasureObj::GetHdl(sal_uInt32 nHdlNum) const
     aRec.nHelplineDist=0;
     ImpCalcGeometrics(aRec,aMPol);
     Point aPt;
-    //SdrHdlKind eHdl=HDL_POLY;
+
     switch (nHdlNum) {
         case 0: aPt=aMPol.aHelpline1.aP1; break;
         case 1: aPt=aMPol.aHelpline2.aP1; break;
@@ -1087,7 +1085,7 @@ long SdrMeasureObj::GetRotateAngle() const
 
 void SdrMeasureObj::RecalcSnapRect()
 {
-    // #94520# Added correct implementation here.
+    // Added correct implementation here.
     ImpMeasureRec aRec;
     ImpMeasurePoly aMPol;
     XPolyPolygon aXPP;
@@ -1194,7 +1192,6 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(sal_Bool bBezier) const
     {
         // four lines, middle line with gap, so there are two lines used
         // which have one arrow each
-        //sal_Int32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue();
         sal_Int32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue();
         aSet.Put(XLineEndWidthItem(0L));
 
@@ -1225,7 +1222,6 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(sal_Bool bBezier) const
     else if(nCount == 5)
     {
         // five lines, first two are the outer ones
-        //sal_Int32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue();
         sal_Int32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue();
 
         aSet.Put(XLineEndWidthItem(0L));
@@ -1487,7 +1483,4 @@ void SdrMeasureObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, cons
     }
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// eof
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index c406da42f6ca..0757c2824341 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -423,8 +423,6 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI()
             }
         }
     } // for(sal_Int32 i = nCount-1 ; i >= 0;--i)
-
-    //m_pClient->GetViewShell()->UIActivating( m_pClient );
 }
 
 //--------------------------------------------------------------------
@@ -575,9 +573,6 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangl
         }
         else
             mpObj->ActionChanged();
-
-        // let the window size be recalculated
-        //SizeHasChanged(); // TODO: OJ
     }
 }
 // XWindowSupplier
@@ -688,7 +683,6 @@ public:
     String          aPersistName;       // name of object in persist
     SdrLightEmbeddedClient_Impl* pLightClient; // must be registered as client only using AddOwnLightClient() call
 
-    // #107645#
     // New local var to avoid repeated loading if load of OLE2 fails
     sal_Bool        mbLoadingOLEObjectFailed;
     sal_Bool        mbConnected;
@@ -699,7 +693,6 @@ public:
     SdrOle2ObjImpl()
     : pGraphicObject( NULL )
     , pLightClient ( NULL )
-    // #107645#
     // init to start situation, loading did not fail
     , mbLoadingOLEObjectFailed( sal_False )
     , mbConnected( sal_False )
@@ -776,7 +769,7 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, bool bFrame_)
     if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
         SetResizeProtect(sal_True);
 
-    // #108759# For math objects, set closed state to transparent
+    // For math objects, set closed state to transparent
     if( ImplIsMathObj( xObjRef.GetObject() ) )
         SetClosedObj( false );
 }
@@ -798,7 +791,7 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubStrin
     if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
         SetResizeProtect(sal_True);
 
-    // #108759# For math objects, set closed state to transparent
+    // For math objects, set closed state to transparent
     if( ImplIsMathObj( xObjRef.GetObject() ) )
         SetClosedObj( false );
 }
@@ -821,7 +814,7 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef&  rNewObjRef, const XubStri
     if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
         SetResizeProtect(sal_True);
 
-    // #108759# For math objects, set closed state to transparent
+    // For math objects, set closed state to transparent
     if( ImplIsMathObj( xObjRef.GetObject() ) )
         SetClosedObj( false );
 }
@@ -898,9 +891,6 @@ void SdrOle2Obj::SetGraphic_Impl(const Graphic* pGrf)
 
     SetChanged();
     BroadcastObjectChange();
-
-    //if ( ppObjRef->Is() && pGrf )
-    //  BroadcastObjectChange();
 }
 
 void SdrOle2Obj::SetGraphic(const Graphic* pGrf)
@@ -925,7 +915,7 @@ void SdrOle2Obj::Connect()
 
     if( mpImpl->mbConnected )
     {
-        // mba: currently there are situations where it seems to be unavoidable to have multiple connects
+        // currently there are situations where it seems to be unavoidable to have multiple connects
         // changing this would need a larger code rewrite, so for now I remove the assertion
         // OSL_FAIL("Connect() called on connected object!");
         return;
@@ -1439,12 +1429,12 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta
     if( rNewObjRef == xObjRef.GetObject() )
         return;
 
-    // MBA: the caller of the method is responsible to control the old object, it will not be closed here
+    // the caller of the method is responsible to control the old object, it will not be closed here
     // Otherwise WW8 import crashes because it tranfers control to OLENode by this method
     if ( xObjRef.GetObject().is() )
         xObjRef.Lock( sal_False );
 
-    // MBA: avoid removal of object in Disconnect! It is definitely a HACK to call SetObjRef(0)!
+    // avoid removal of object in Disconnect! It is definitely a HACK to call SetObjRef(0)!
     // This call will try to close the objects; so if anybody else wants to keep it, it must be locked by a CloseListener
     xObjRef.Clear();
 
@@ -1461,7 +1451,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta
         if ( (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
             SetResizeProtect(sal_True);
 
-        // #108759# For math objects, set closed state to transparent
+        // For math objects, set closed state to transparent
         if( ImplIsMathObj( rNewObjRef ) )
             SetClosedObj( false );
 
@@ -1477,7 +1467,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta
 void SdrOle2Obj::SetClosedObj( bool bIsClosed )
 {
     // TODO/LATER: do we still need this hack?
-    // #108759# Allow changes to the closed state of OLE objects
+    // Allow changes to the closed state of OLE objects
     bClosedObj = bIsClosed;
 }
 
@@ -1622,7 +1612,7 @@ SdrOle2Obj& SdrOle2Obj::operator=(const SdrOle2Obj& rObj)
 
         SdrRectObj::operator=( rObj );
 
-        // #108867# Manually copying bClosedObj attribute
+        // Manually copying bClosedObj attribute
         SetClosedObj( rObj.IsClosedObj() );
 
         mpImpl->aPersistName = rOle2Obj.mpImpl->aPersistName;
@@ -1660,30 +1650,6 @@ SdrOle2Obj& SdrOle2Obj::operator=(const SdrOle2Obj& rObj)
                 }
 
                 Connect();
-
-                /* only needed for MSOLE-Objects, now handled inside implementation of Object
-                if ( xObjRef.is() && rOle2Obj.xObjRef.is() && rOle2Obj.GetAspect() != embed::Aspects::MSOLE_ICON )
-                {
-                    try
-                    {
-                        awt::Size aVisSize = rOle2Obj.xObjRef->getVisualAreaSize( rOle2Obj.GetAspect() );
-                        if( rOle2Obj.xObjRef->getMapUnit( rOle2Obj.GetAspect() ) == xObjRef->getMapUnit( GetAspect() ) )
-                        xObjRef->setVisualAreaSize( GetAspect(), aVisSize );
-                    }
-                    catch ( embed::WrongStateException& )
-                    {
-                        // setting of VisArea not necessary for objects that don't cache it in loaded state
-                    }
-                    catch( embed::NoVisualAreaSizeException& )
-                    {
-                        // objects my not have visual areas
-                    }
-                    catch( uno::Exception& e )
-                    {
-                        (void)e;
-                        OSL_FAIL( "SdrOle2Obj::operator=(), unexpected exception caught!" );
-                    }
-                }                                                                            */
             }
         }
     }
@@ -1768,7 +1734,7 @@ void SdrOle2Obj::ImpSetVisAreaSize()
 
                 // make the new object area known to the client
                 // compared to the "else" branch aRect might have been changed by the object and no additional scaling was applied
-                // OJ: WHY this -> OSL_ASSERT( pClient );
+                // WHY this -> OSL_ASSERT( pClient );
                 if( pClient )
                     pClient->SetObjArea(aRect);
 
@@ -2013,7 +1979,6 @@ void SdrOle2Obj::GetObjRef_Impl()
 {
     if ( !xObjRef.is() && mpImpl->aPersistName.Len() && pModel && pModel->GetPersist() )
     {
-        // #107645#
         // Only try loading if it did not went wrong up to now
         if(!mpImpl->mbLoadingOLEObjectFailed)
         {
@@ -2021,7 +1986,6 @@ void SdrOle2Obj::GetObjRef_Impl()
             m_bTypeAsked = false;
             CheckFileLink_Impl();
 
-            // #107645#
             // If loading of OLE object failed, remember that to not invoke a endless
             // loop trying to load it again and again.
             if( xObjRef.is() )
@@ -2029,7 +1993,7 @@ void SdrOle2Obj::GetObjRef_Impl()
                 mpImpl->mbLoadingOLEObjectFailed = sal_True;
             }
 
-            // #108759# For math objects, set closed state to transparent
+            // For math objects, set closed state to transparent
             if( ImplIsMathObj( xObjRef.GetObject() ) )
                 SetClosedObj( false );
         }
@@ -2038,14 +2002,14 @@ void SdrOle2Obj::GetObjRef_Impl()
         {
             if( !IsEmptyPresObj() )
             {
-                // #75637# remember modified status of model
+                // remember modified status of model
                 const sal_Bool bWasChanged(pModel ? pModel->IsChanged() : sal_False);
 
                 // perhaps preview not valid anymore
-                // #75637# This line changes the modified state of the model
+                // This line changes the modified state of the model
                 SetGraphic_Impl( NULL );
 
-                // #75637# if status was not set before, force it back
+                // if status was not set before, force it back
                 // to not set, so that SetGraphic(0L) above does not
                 // set the modified state of the model.
                 if(!bWasChanged && pModel && pModel->IsChanged())
@@ -2115,7 +2079,6 @@ uno::Reference< frame::XModel > SdrOle2Obj::getXModel() const
 
 // -----------------------------------------------------------------------------
 
-// #109985#
 sal_Bool SdrOle2Obj::IsChart() const
 {
     if ( !m_bTypeAsked )
@@ -2239,7 +2202,4 @@ void SdrOle2Obj::SetWindow(const com::sun::star::uno::Reference < com::sun::star
     }
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// eof
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index 5aa2e7bb34d4..ddd845e0fe66 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -41,8 +41,6 @@
 #include <svtools/colorcfg.hxx>
 #include <svl/itemset.hxx>
 #include <svx/sdr/properties/pageproperties.hxx>
-
-// #111111#
 #include <svx/sdr/contact/viewcontactofpageobj.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -103,20 +101,17 @@ SdrPageObj::SdrPageObj(const Rectangle& rRect, SdrPage* pNewPage)
 
 SdrPageObj::~SdrPageObj()
 {
-    // #111111#
     if(mpShownPage)
     {
         mpShownPage->RemovePageUser(*this);
     }
 }
 
-// #111111#
 SdrPage* SdrPageObj::GetReferencedPage() const
 {
     return mpShownPage;
 }
 
-// #111111#
 void SdrPageObj::SetReferencedPage(SdrPage* pNewPage)
 {
     if(mpShownPage != pNewPage)
@@ -201,6 +196,4 @@ void SdrPageObj::TakeObjNamePlural(XubString& rName) const
     rName=ImpGetResStr(STR_ObjNamePluralPAGE);
 }
 
-// eof
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index b7fa9ce32248..e907b7103110 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -61,7 +61,7 @@
 #include <svx/sdr/contact/viewcontactofsdrpathobj.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 
-// #104018# replace macros above with type-safe methods
+// replace macros above with type-safe methods
 inline sal_Int32 ImplTwipsToMM(sal_Int32 nVal) { return ((nVal * 127 + 36) / 72); }
 inline sal_Int32 ImplMMToTwips(sal_Int32 nVal) { return ((nVal * 72 + 63) / 127); }
 inline sal_Int64 ImplTwipsToMM(sal_Int64 nVal) { return ((nVal * 127 + 36) / 72); }
@@ -128,7 +128,6 @@ struct ImpSdrPathDragData  : public SdrDragStatUserData
     sal_uInt16                      nNextNextPnt0;
     bool                        bEliminate;     // Punkt loeschen? (wird von MovDrag gesetzt)
 
-    // ##
     sal_Bool                        mbMultiPointDrag;
     const XPolyPolygon          maOrig;
     XPolyPolygon                maMove;
@@ -908,7 +907,7 @@ bool ImpPathForDragAndCreate::endPathDrag(SdrDragStat& rDrag)
 
         // Winkel anpassen fuer Text an einfacher Linie
         if (bLineGlueMirror)
-        { // #40549#
+        {
             Point aLinePt1_(aPathPolygon[0][0]);
             Point aLinePt2_(aPathPolygon[0][1]);
             bool bXMirr=(aLinePt1_.X()>aLinePt2_.X())!=(aLinePt1.X()>aLinePt2.X());
@@ -935,14 +934,6 @@ bool ImpPathForDragAndCreate::endPathDrag(SdrDragStat& rDrag)
     return true;
 }
 
-/*void ImpPathForDragAndCreate::cancelSpecialDrag( SdrDragStat& rDrag ) const
-{
-    ImpSdrPathDragData* pID=(ImpSdrPathDragData*)rDrag.GetUser();
-    if (pID!=NULL) {
-        delete pID;
-        rDrag.SetUser(NULL);
-    }
-}*/
 
 String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) const
 {
@@ -1180,7 +1171,7 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra
     else
     {
         const XPolygon& rXP=aPathPolygon[(sal_uInt16)rDrag.GetHdl()->GetPolyNum()];
-        if (rXP.GetPointCount()<=2) { //|| rXPoly.GetFlags(1)==XPOLY_CONTROL && rXPoly.GetPointCount()<=4
+        if (rXP.GetPointCount()<=2) {
             XPolygon aXPoly(rXP);
             aXPoly[(sal_uInt16)rDrag.GetHdl()->GetPointNum()]=rDrag.GetNow();
             aRetval.Insert(aXPoly);
@@ -1342,7 +1333,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
         rXPoly[0]=rStat.GetPos0();
     } else nActPoint--;
     bool bFreeHand=IsFreeHand(pU->eAktKind);
-    rStat.SetNoSnap(bFreeHand /*|| (pU->bMixed && pU->eAktKind==OBJ_LINE)*/);
+    rStat.SetNoSnap(bFreeHand);
     rStat.SetOrtho8Possible(pU->eAktKind!=OBJ_CARC && pU->eAktKind!=OBJ_RECT && (!pU->bMixedCreate || pU->eAktKind!=OBJ_LINE));
     Point aActMerk(rXPoly[nActPoint]);
     rXPoly[nActPoint]=rStat.Now();
@@ -1354,7 +1345,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
         }
         rXPoly[0]=aPt;
     }
-    OutputDevice* pOut=pView==NULL ? NULL : pView->GetFirstOutputDevice(); // GetWin(0);
+    OutputDevice* pOut=pView==NULL ? NULL : pView->GetFirstOutputDevice();
     if (bFreeHand) {
         if (pU->nBezierStartPoint>nActPoint) pU->nBezierStartPoint=nActPoint;
         if (rStat.IsMouseDown() && nActPoint>0) {
@@ -1732,7 +1723,7 @@ void SdrPathObj::ImpForceLineWink()
         aGeo.RecalcSinCos();
         aGeo.RecalcTan();
 
-        // #101412# for SdrTextObj, keep aRect up to date
+        // for SdrTextObj, keep aRect up to date
         aRect = Rectangle(aPoint0, aPoint1);
         aRect.Justify();
     }
@@ -1776,7 +1767,7 @@ void SdrPathObj::ImpForceKind()
     }
     else
     {
-        // #i10659#, similar to #101412# but for polys with more than 2 points.
+        // #i10659#, for polys with more than 2 points.
         //
         // Here i again need to fix something, because when Path-Polys are Copy-Pasted
         // between Apps with different measurements (e.g. 100TH_MM and TWIPS) there is
@@ -2420,7 +2411,7 @@ void SdrPathObj::NbcMirror(const Point& rRefPnt1, const Point& rRefPnt2)
     aTrans.translate(rRefPnt1.X(), rRefPnt1.Y());
     maPathPolygon.transform(aTrans);
 
-    // #97538# Do Joe's special handling for lines when mirroring, too
+    // Do Joe's special handling for lines when mirroring, too
     ImpForceKind();
 
     // #i19871# first modify locally, then call parent (to get correct SnapRect with GluePoints)
@@ -2457,12 +2448,12 @@ void SdrPathObj::NbcSetSnapRect(const Rectangle& rRect)
 {
     Rectangle aOld(GetSnapRect());
 
-    // #95736# Take RECT_EMPTY into account when calculating scale factors
+    // Take RECT_EMPTY into account when calculating scale factors
     long nMulX = (RECT_EMPTY == rRect.Right()) ? 0 : rRect.Right()  - rRect.Left();
 
     long nDivX = aOld.Right()   - aOld.Left();
 
-    // #95736# Take RECT_EMPTY into account when calculating scale factors
+    // Take RECT_EMPTY into account when calculating scale factors
     long nMulY = (RECT_EMPTY == rRect.Bottom()) ? 0 : rRect.Bottom() - rRect.Top();
 
     long nDivY = aOld.Bottom()  - aOld.Top();
@@ -2827,7 +2818,7 @@ void SdrPathObj::SetPathPoly(const basegfx::B2DPolyPolygon& rPathPoly)
     }
 }
 
-void SdrPathObj::ToggleClosed() // long nOpenDistance)
+void SdrPathObj::ToggleClosed()
 {
     Rectangle aBoundRect0;
     if(pUserCall != NULL)
@@ -3119,7 +3110,4 @@ void SdrPathObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b
     SetPathPoly(aNewPolyPolygon);
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// eof
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index e63518ad0e93..e6ecaee1a2bb 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -587,7 +587,7 @@ SdrGluePoint SdrRectObj::GetCornerGluePoint(sal_uInt16 nPosNum) const
 SdrObject* SdrRectObj::DoConvertToPolyObj(sal_Bool bBezier) const
 {
     XPolygon aXP(ImpCalcXPoly(aRect,GetEckenradius()));
-    { // #40608# Nur Uebergangsweise bis zum neuen TakeContour()
+    { // Nur Uebergangsweise bis zum neuen TakeContour()
         aXP.Remove(0,1);
         aXP[aXP.GetPointCount()-1]=aXP[0];
     }
@@ -618,6 +618,4 @@ void SdrRectObj::RestGeoData(const SdrObjGeoData& rGeo)
     SetXPolyDirty();
 }
 
-// eof
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 96b77a2f13ed..b6d2d1c613c4 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -74,21 +74,10 @@
 using namespace com::sun::star;
 
 //////////////////////////////////////////////////////////////////////////////
-// #104018# replace macros above with type-safe methods
+// replace macros above with type-safe methods
 inline double ImplTwipsToMM(double fVal) { return (fVal * (127.0 / 72.0)); }
 inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-//  @@@@@@ @@@@@ @@   @@ @@@@@@  @@@@  @@@@@  @@@@@@
-//    @@   @@    @@@ @@@   @@   @@  @@ @@  @@     @@
-//    @@   @@     @@@@@    @@   @@  @@ @@  @@     @@
-//    @@   @@@@    @@@     @@   @@  @@ @@@@@      @@
-//    @@   @@     @@@@@    @@   @@  @@ @@  @@     @@
-//    @@   @@    @@@ @@@   @@   @@  @@ @@  @@ @@  @@
-//    @@   @@@@@ @@   @@   @@    @@@@  @@@@@   @@@@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
 
 //////////////////////////////////////////////////////////////////////////////
 // BaseProperties section
@@ -124,16 +113,9 @@ SdrTextObj::SdrTextObj()
     bNoMirror=sal_False;
     bDisableAutoWidthOnDragging=sal_False;
 
-    // #101684#
     mbInEditMode = sal_False;
-
-    // #111096#
     mbTextHidden = sal_False;
-
-    // #111096#
     mbTextAnimationAllowed = sal_True;
-
-    // #108784#
     maTextEditOffset = Point(0, 0);
 
     // #i25616#
@@ -156,17 +138,10 @@ SdrTextObj::SdrTextObj(const Rectangle& rNewRect)
     bDisableAutoWidthOnDragging=sal_False;
     ImpJustifyRect(aRect);
 
-    // #101684#
     mbInEditMode = sal_False;
-
-    // #111096#
     mbTextHidden = sal_False;
-
-    // #111096#
     mbTextAnimationAllowed = sal_True;
     mbInDownScale = sal_False;
-
-    // #108784#
     maTextEditOffset = Point(0, 0);
 
     // #i25616#
@@ -187,17 +162,10 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind)
     bNoMirror=sal_True;
     bDisableAutoWidthOnDragging=sal_False;
 
-    // #101684#
     mbInEditMode = sal_False;
-
-    // #111096#
     mbTextHidden = sal_False;
-
-    // #111096#
     mbTextAnimationAllowed = sal_True;
     mbInDownScale = sal_False;
-
-    // #108784#
     maTextEditOffset = Point(0, 0);
 
     // #i25616#
@@ -220,17 +188,10 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect)
     bDisableAutoWidthOnDragging=sal_False;
     ImpJustifyRect(aRect);
 
-    // #101684#
     mbInEditMode = sal_False;
-
-    // #111096#
     mbTextHidden = sal_False;
-
-    // #111096#
     mbTextAnimationAllowed = sal_True;
     mbInDownScale = sal_False;
-
-    // #108784#
     maTextEditOffset = Point(0, 0);
 
     // #i25616#
@@ -255,17 +216,10 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStr
 
     NbcSetText(rInput, rBaseURL, eFormat);
 
-    // #101684#
     mbInEditMode = sal_False;
-
-    // #111096#
     mbTextHidden = sal_False;
-
-    // #111096#
     mbTextAnimationAllowed = sal_True;
     mbInDownScale = sal_False;
-
-    // #108784#
     maTextEditOffset = Point(0, 0);
 
     // #i25616#
@@ -321,12 +275,10 @@ void SdrTextObj::NbcSetText(const XubString& rStr)
 {
     SdrOutliner& rOutliner=ImpGetDrawOutliner();
     rOutliner.SetStyleSheet( 0, GetStyleSheet());
-    //OutputDevice* pRef1=rOutliner.GetRefDevice();
     rOutliner.SetUpdateMode(sal_True);
     rOutliner.SetText(rStr,rOutliner.GetParagraph( 0 ));
     OutlinerParaObject* pNewText=rOutliner.CreateParaObject();
     Size aSiz(rOutliner.CalcTextSize());
-    //OutputDevice* pRef2=rOutliner.GetRefDevice();
     rOutliner.Clear();
     NbcSetOutlinerParaObject(pNewText);
     aTextSize=aSiz;
@@ -336,14 +288,10 @@ void SdrTextObj::NbcSetText(const XubString& rStr)
 void SdrTextObj::SetText(const XubString& rStr)
 {
     Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
-    // #110094#-14 SendRepaintBroadcast();
     NbcSetText(rStr);
     SetChanged();
     BroadcastObjectChange();
     SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
-    //if (GetBoundRect()!=aBoundRect0) {
-    //  SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
-    //}
 }
 
 void SdrTextObj::NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat)
@@ -363,7 +311,6 @@ void SdrTextObj::NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16
 void SdrTextObj::SetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat)
 {
     Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
-    // #110094#-14 SendRepaintBroadcast();
     NbcSetText(rInput,rBaseURL,eFormat);
     SetChanged();
     BroadcastObjectChange();
@@ -424,7 +371,6 @@ bool SdrTextObj::IsAutoGrowWidth() const
     const SfxItemSet& rSet = GetObjectItemSet();
     sal_Bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue();
 
-    // #101684#
     sal_Bool bInEditMOde = IsInEditMode();
 
     if(!bInEditMOde && bRet)
@@ -456,7 +402,6 @@ SdrTextHorzAdjust SdrTextObj::GetTextHorizontalAdjust(const SfxItemSet& rSet) co
 
     SdrTextHorzAdjust eRet = ((SdrTextHorzAdjustItem&)(rSet.Get(SDRATTR_TEXT_HORZADJUST))).GetValue();
 
-    // #101684#
     sal_Bool bInEditMode = IsInEditMode();
 
     if(!bInEditMode && eRet == SDRTEXTHORZADJUST_BLOCK)
@@ -487,11 +432,11 @@ SdrTextVertAdjust SdrTextObj::GetTextVerticalAdjust(const SfxItemSet& rSet) cons
     if(IsContourTextFrame())
         return SDRTEXTVERTADJUST_TOP;
 
-    // #103516# Take care for vertical text animation here
+    // Take care for vertical text animation here
     SdrTextVertAdjust eRet = ((SdrTextVertAdjustItem&)(rSet.Get(SDRATTR_TEXT_VERTADJUST))).GetValue();
     sal_Bool bInEditMode = IsInEditMode();
 
-    // #103516# Take care for vertical text animation here
+    // Take care for vertical text animation here
     if(!bInEditMode && eRet == SDRTEXTVERTADJUST_BLOCK)
     {
         SdrTextAniKind eAniKind = ((SdrTextAniKindItem&)(rSet.Get(SDRATTR_TEXT_ANIKIND))).GetValue();
@@ -656,11 +601,11 @@ bool SdrTextObj::NbcSetAutoGrowHeight(bool bAuto)
 
 bool SdrTextObj::NbcSetMinTextFrameHeight(long nHgt)
 {
-    if( bTextFrame && ( !pModel || !pModel->isLocked() ) )          // SJ: #i44922#
+    if( bTextFrame && ( !pModel || !pModel->isLocked() ) )          // #i44922#
     {
         SetObjectItem(SdrTextMinFrameHeightItem(nHgt));
 
-        // #84974# use bDisableAutoWidthOnDragging as
+        // use bDisableAutoWidthOnDragging as
         // bDisableAutoHeightOnDragging if vertical.
         if(IsVerticalWriting() && bDisableAutoWidthOnDragging)
         {
@@ -695,11 +640,11 @@ bool SdrTextObj::NbcSetAutoGrowWidth(bool bAuto)
 
 bool SdrTextObj::NbcSetMinTextFrameWidth(long nWdt)
 {
-    if( bTextFrame && ( !pModel || !pModel->isLocked() ) )          // SJ: #i44922#
+    if( bTextFrame && ( !pModel || !pModel->isLocked() ) )          // #i44922#
     {
         SetObjectItem(SdrTextMinFrameWidthItem(nWdt));
 
-        // #84974# use bDisableAutoWidthOnDragging only
+        // use bDisableAutoWidthOnDragging only
         // when not vertical.
         if(!IsVerticalWriting() && bDisableAutoWidthOnDragging)
         {
@@ -753,7 +698,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho
         // Beim Hittest muss das unterbleiben (Performance!)
         pContourPolyPolygon = new basegfx::B2DPolyPolygon();
 
-        // #86258# test if shadow needs to be avoided for TakeContour()
+        // test if shadow needs to be avoided for TakeContour()
         const SfxItemSet& rSet = GetObjectItemSet();
         sal_Bool bShadowOn = ((SdrShadowItem&)(rSet.Get(SDRATTR_SHADOW))).GetValue();
 
@@ -765,7 +710,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho
 
         if(bShadowOn)
         {
-            // #86258# force shadow off
+            // force shadow off
             SdrObject* pCopy = Clone();
             pCopy->SetMergedItem(SdrShadowItem(sal_False));
             *pContourPolyPolygon = pCopy->TakeContour();
@@ -811,7 +756,6 @@ void SdrTextObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const
     aAnkRect.Right()-=nRightDist;
     aAnkRect.Bottom()-=nLowerDist;
 
-    // #108816#
     // Since sizes may be bigger than the object bounds it is necessary to
     // justify the rect now.
     ImpJustifyRect(aAnkRect);
@@ -862,7 +806,6 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
             long nWdt=nAnkWdt;
             long nHgt=nAnkHgt;
 
-            // #101684#
             sal_Bool bInEditMode = IsInEditMode();
 
             if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE))
@@ -874,7 +817,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
             rOutliner.SetMaxAutoPaperSize(Size(nWdt,nHgt));
         }
 
-        // #103516# New try with _BLOCK for hor and ver after completely
+        // New try with _BLOCK for hor and ver after completely
         // supporting full width for vertical text.
         if(SDRTEXTHORZADJUST_BLOCK == eHAdj && !IsVerticalWriting())
         {
@@ -933,7 +876,6 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
     Point aTextPos(aAnkRect.TopLeft());
     Size aTextSiz(rOutliner.GetPaperSize()); // GetPaperSize() hat etwas Toleranz drauf, oder?
 
-    // #106653#
     // For draw objects containing text correct hor/ver alignment if text is bigger
     // than the object itself. Without that correction, the text would always be
     // formatted to the left edge (or top edge when vertical) of the draw object.
@@ -941,7 +883,6 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
     {
         if(aAnkRect.GetWidth() < aTextSiz.Width() && !IsVerticalWriting())
         {
-            // #110129#
             // Horizontal case here. Correct only if eHAdj == SDRTEXTHORZADJUST_BLOCK,
             // else the alignment is wanted.
             if(SDRTEXTHORZADJUST_BLOCK == eHAdj)
@@ -952,7 +893,6 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
 
         if(aAnkRect.GetHeight() < aTextSiz.Height() && IsVerticalWriting())
         {
-            // #110129#
             // Vertical case here. Correct only if eHAdj == SDRTEXTVERTADJUST_BLOCK,
             // else the alignment is wanted.
             if(SDRTEXTVERTADJUST_BLOCK == eVAdj)
@@ -1008,7 +948,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
 
     if(pOut && pOut->GetOutDevType() == OUTDEV_PRINTER)
     {
-        // #35762#: Checken ob CharStretching ueberhaupt moeglich
+        // Checken ob CharStretching ueberhaupt moeglich
         GDIMetaFile* pMtf = pOut->GetConnectMetaFile();
         UniString aTestString(sal_Unicode('J'));
 
@@ -1035,7 +975,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
         bNoStretching = (aSize1 == aSize2);
 
 #ifdef WNT
-        // #35762# Windows vergroessert bei Size(100,500) den Font proportional
+        // Windows vergroessert bei Size(100,500) den Font proportional
         // Und das finden wir nicht so schoen.
         if(aSize2.Height() >= aSize1.Height() * 2)
         {
@@ -1061,7 +1001,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
     long nX=(nWantWdt*100) /nIsWdt; // X-Stretching berechnen
     long nY=(nWantHgt*100) /nIsHgt; // Y-Stretching berechnen
     bool bChkX = true;
-    if (bNoStretching) { // #35762# evtl. nur proportional moeglich
+    if (bNoStretching) { // evtl. nur proportional moeglich
         if (nX>nY) { nX=nY; bChkX=sal_False; }
         else { nY=nX; }
     }
@@ -1082,7 +1022,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
             bNoMoreLoop = true;
         }
 
-        // #87877# exception, there is no text yet (vertical case)
+        // exception, there is no text yet (vertical case)
         if(nIsHgt <= 1)
         {
             nY = nX;
@@ -1094,7 +1034,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
         Size aSiz(rOutliner.CalcTextSize());
         long nXDiff=aSiz.Width()-nWantWdt;
         rFitXKorreg=Fraction(nWantWdt,aSiz.Width());
-        if (((nXDiff>=nXTolMi || !bChkX) && nXDiff<=nXTolPl) || nXDiff==nXDiff0/*&& Abs(nYDiff)<=nYTol*/) {
+        if (((nXDiff>=nXTolMi || !bChkX) && nXDiff<=nXTolPl) || nXDiff==nXDiff0) {
             bNoMoreLoop = true;
         } else {
             // Stretchingfaktoren korregieren
@@ -1113,14 +1053,12 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
 
 void SdrTextObj::StartTextAnimation(OutputDevice* /*pOutDev*/, const Point& /*rOffset*/, long /*nExtraData*/)
 {
-    // #111096#
     // use new text animation
     SetTextAnimationAllowed(sal_True);
 }
 
 void SdrTextObj::StopTextAnimation(OutputDevice* /*pOutDev*/, long /*nExtraData*/)
 {
-    // #111096#
     // use new text animation
     SetTextAnimationAllowed(sal_False);
 }
@@ -1160,11 +1098,11 @@ void SdrTextObj::TakeObjNameSingul(XubString& rName) const
         XubString aStr2(pOutlinerParaObject->GetTextObject().GetText(0));
         aStr2.EraseLeadingChars();
 
-        // #69446# avoid non expanded text portions in object name
+        // avoid non expanded text portions in object name
         // (second condition is new)
         if(aStr2.Len() && aStr2.Search(sal_Unicode(255)) == STRING_NOTFOUND)
         {
-            // #76681# space between ResStr and content text
+            // space between ResStr and content text
             aStr += sal_Unicode(' ');
 
             aStr += sal_Unicode('\'');
@@ -1227,7 +1165,7 @@ SdrTextObj& SdrTextObj::operator=(const SdrTextObj& rObj)
     aTextSize=rObj.aTextSize;
     bTextSizeDirty=rObj.bTextSizeDirty;
 
-    // #101776# Not all of the necessary parameters were copied yet.
+    // Not all of the necessary parameters were copied yet.
     bNoShear = rObj.bNoShear;
     bNoRotate = rObj.bNoRotate;
     bNoMirror = rObj.bNoMirror;
@@ -1273,7 +1211,7 @@ basegfx::B2DPolyPolygon SdrTextObj::TakeContour() const
     // und nun noch ggf. das BoundRect des Textes dazu
     if ( pModel && GetOutlinerParaObject() && !IsFontwork() && !IsContourTextFrame() )
     {
-        // #80328# using Clone()-Paint() strategy inside TakeContour() leaves a destroyed
+        // using Clone()-Paint() strategy inside TakeContour() leaves a destroyed
         // SdrObject as pointer in DrawOutliner. Set *this again in fetching the outliner
         // in every case
         SdrOutliner& rOutliner=ImpGetDrawOutliner();
@@ -1350,7 +1288,7 @@ void SdrTextObj::ImpCheckMasterCachable()
     }
 }
 
-// #101029#: Extracted from ImpGetDrawOutliner()
+// Extracted from ImpGetDrawOutliner()
 void SdrTextObj::ImpInitDrawOutliner( SdrOutliner& rOutl ) const
 {
     rOutl.SetUpdateMode(sal_False);
@@ -1375,7 +1313,7 @@ SdrOutliner& SdrTextObj::ImpGetDrawOutliner() const
 {
     SdrOutliner& rOutl=pModel->GetDrawOutliner(this);
 
-    // #101029#: Code extracted to ImpInitDrawOutliner()
+    // Code extracted to ImpInitDrawOutliner()
     ImpInitDrawOutliner( rOutl );
 
     return rOutl;
@@ -1388,7 +1326,7 @@ boost::shared_ptr< SdrOutliner > SdrTextObj::CreateDrawOutliner()
     return xDrawOutliner;
 }
 
-// #101029#: Extracted from Paint()
+// Extracted from Paint()
 void SdrTextObj::ImpSetupDrawOutlinerForPaint( bool             bContourFrame,
                                                SdrOutliner&     rOutliner,
                                                Rectangle&       rTextRect,
@@ -1582,7 +1520,7 @@ void SdrTextObj::NbcReformatText()
         }
         SetTextSizeDirty();
         ActionChanged();
-        // FME, AW: i22396
+        // i22396
         // Necessary here since we have no compare operator at the outliner
         // para object which may detect changes regarding the combination
         // of outliner para data and configuration (e.g., change of
@@ -1599,7 +1537,6 @@ void SdrTextObj::ReformatText()
         if (pUserCall!=NULL)
             aBoundRect0=GetLastBoundRect();
 
-        // #110094#-14 SendRepaintBroadcast();
         NbcReformatText();
         SetChanged();
         BroadcastObjectChange();
@@ -1654,7 +1591,6 @@ void SdrTextObj::ForceOutlinerParaObject()
 
 sal_Bool SdrTextObj::IsVerticalWriting() const
 {
-    // #89459#
     if(pEdtOutl)
     {
         return pEdtOutl->IsVertical();
@@ -1687,7 +1623,7 @@ void SdrTextObj::SetVerticalWriting(sal_Bool bVertical)
         sal_Bool bAutoGrowWidth = ((SdrTextAutoGrowWidthItem&)rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue();
         sal_Bool bAutoGrowHeight = ((SdrTextAutoGrowHeightItem&)rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT)).GetValue();
 
-        // #103516# Also exchange hor/ver adjust items
+        // Also exchange hor/ver adjust items
         SdrTextHorzAdjust eHorz = ((SdrTextHorzAdjustItem&)(rSet.Get(SDRATTR_TEXT_HORZADJUST))).GetValue();
         SdrTextVertAdjust eVert = ((SdrTextVertAdjustItem&)(rSet.Get(SDRATTR_TEXT_VERTADJUST))).GetValue();
 
@@ -1697,7 +1633,7 @@ void SdrTextObj::SetVerticalWriting(sal_Bool bVertical)
         // prepare ItemSet to set exchanged width and height items
         SfxItemSet aNewSet(*rSet.GetPool(),
             SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT,
-            // #103516# Expanded item ranges to also support hor and ver adjust.
+            // Expanded item ranges to also support hor and ver adjust.
             SDRATTR_TEXT_VERTADJUST, SDRATTR_TEXT_VERTADJUST,
             SDRATTR_TEXT_AUTOGROWWIDTH, SDRATTR_TEXT_HORZADJUST,
             0, 0);
@@ -1706,7 +1642,7 @@ void SdrTextObj::SetVerticalWriting(sal_Bool bVertical)
         aNewSet.Put(SdrTextAutoGrowWidthItem(bAutoGrowHeight));
         aNewSet.Put(SdrTextAutoGrowHeightItem(bAutoGrowWidth));
 
-        // #103516# Exchange horz and vert adjusts
+        // Exchange horz and vert adjusts
         switch(eVert)
         {
             case SDRTEXTVERTADJUST_TOP: aNewSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT)); break;
@@ -1980,7 +1916,6 @@ SdrTextAniDirection SdrTextObj::GetTextAniDirection() const
     return ((SdrTextAniDirectionItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_ANIDIRECTION))).GetValue();
 }
 
-// #111096#
 // Access to thext hidden flag
 sal_Bool SdrTextObj::GetTextHidden() const
 {
@@ -1995,7 +1930,6 @@ void SdrTextObj::NbcSetTextHidden(sal_Bool bNew)
     }
 }
 
-// #111096#
 // Get necessary data for text scroll animation. ATM base it on a Text-Metafile and a
 // painting rectangle. Rotation is excluded from the returned values.
 GDIMetaFile* SdrTextObj::GetTextScrollMetaFileAndRectangle(
@@ -2051,7 +1985,6 @@ GDIMetaFile* SdrTextObj::GetTextScrollMetaFileAndRectangle(
     return pRetval;
 }
 
-// #111096#
 // Access to TextAnimationAllowed flag
 bool SdrTextObj::IsTextAnimationAllowed() const
 {
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 8344db8522aa..7a47c14d254e 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -91,7 +91,7 @@ namespace
         // the visible area for contour text decomposition
         basegfx::B2DVector                                          maScale;
 
-        // #SJ# ClipRange for BlockText decomposition; only text portions completely
+        // ClipRange for BlockText decomposition; only text portions completely
         // inside are to be accepted, so this is different from geometric clipping
         // (which would allow e.g. upper parts of portions to remain). Only used for
         // BlockText (see there)
@@ -576,7 +576,7 @@ namespace
     {
         if(pInfo)
         {
-            // #SJ# Is clipping wanted? This is text clipping; only accept a portion
+            // Is clipping wanted? This is text clipping; only accept a portion
             // if it's completely in the range
             if(!maClipRange.isEmpty())
             {
@@ -1055,7 +1055,7 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
         bMirrorX ? -1.0 : 1.0, bMirrorY ? -1.0 : 1.0,
         fShearX, fRotate, aTranslate.getX(), aTranslate.getY()));
 
-    // #SJ# create ClipRange (if needed)
+    // create ClipRange (if needed)
     basegfx::B2DRange aClipRange;
 
     if(rSdrBlockTextPrimitive.getClipOnBounds())
@@ -1391,7 +1391,5 @@ void SdrTextObj::impGetScrollTextTiming(drawinglayer::animation::AnimationEntryL
     }
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// eof
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 4e4a6b6a54a1..e6f99a2bc65a 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -821,7 +821,5 @@ void SdrTextObj::impDecomposePathTextPrimitive(
     drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(rTarget, aRetvalB);
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// eof
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 64c15c1e6908..94b6727eedbf 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -62,19 +62,6 @@
 #include <editeng/editeng.hxx>
 #include <editeng/postitem.hxx>
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-//  @@@@@@ @@@@@ @@   @@ @@@@@@  @@@@  @@@@@  @@@@@@
-//    @@   @@    @@@ @@@   @@   @@  @@ @@  @@     @@
-//    @@   @@     @@@@@    @@   @@  @@ @@  @@     @@
-//    @@   @@@@    @@@     @@   @@  @@ @@@@@      @@
-//    @@   @@     @@@@@    @@   @@  @@ @@  @@     @@
-//    @@   @@    @@@ @@@   @@   @@  @@ @@  @@ @@  @@
-//    @@   @@@@@ @@   @@   @@    @@@@  @@@@@   @@@@
-//
-//  Attribute, StyleSheets und AutoGrow
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
 
 bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bWdt) const
 {
@@ -121,7 +108,6 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bW
             if (aSiz.Width()<2) aSiz.Width()=2;   // Mindestgroesse 2
             if (aSiz.Height()<2) aSiz.Height()=2; // Mindestgroesse 2
 
-            // #101684#
             sal_Bool bInEditMode = IsInEditMode();
 
             if(!bInEditMode)
@@ -231,7 +217,6 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
     bool bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt,bWdt);
     if (bRet) {
         Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
-        // #110094#-14 SendRepaintBroadcast();
         aRect=aNeuRect;
         SetRectsDirty();
         if (HAS_BASE(SdrRectObj,this)) { // mal wieder 'nen Hack
@@ -397,9 +382,9 @@ void SdrTextObj::NbcResizeTextAttributes(const Fraction& xFact, const Fraction&
     }
 }
 
-/** #103836# iterates over the paragraphs of a given SdrObject and removes all
-             hard set character attributes with the which ids contained in the
-             given vector
+/**  iterates over the paragraphs of a given SdrObject and removes all
+     hard set character attributes with the which ids contained in the
+     given vector
 */
 void SdrTextObj::RemoveOutlinerCharacterAttribs( const std::vector<sal_uInt16>& rCharWhichIds )
 {
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index 97ce80a3309d..eeab6dccc527 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -42,19 +42,6 @@
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-//  @@@@@@ @@@@@ @@   @@ @@@@@@  @@@@  @@@@@  @@@@@@
-//    @@   @@    @@@ @@@   @@   @@  @@ @@  @@     @@
-//    @@   @@     @@@@@    @@   @@  @@ @@  @@     @@
-//    @@   @@@@    @@@     @@   @@  @@ @@@@@      @@
-//    @@   @@     @@@@@    @@   @@  @@ @@  @@     @@
-//    @@   @@    @@@ @@@   @@   @@  @@ @@  @@ @@  @@
-//    @@   @@@@@ @@   @@   @@    @@@@  @@@@@   @@@@
-//
-//  Dragging, Handles, Create
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
 
 sal_uInt32 SdrTextObj::GetHdlCount() const
 {
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index a7ddf9573af7..94f8f473f141 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -39,19 +39,6 @@
 #include <editeng/eeitem.hxx>
 #include <svx/sdtfchim.hxx>
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-//  @@@@@@ @@@@@ @@   @@ @@@@@@  @@@@  @@@@@  @@@@@@
-//    @@   @@    @@@ @@@   @@   @@  @@ @@  @@     @@
-//    @@   @@     @@@@@    @@   @@  @@ @@  @@     @@
-//    @@   @@@@    @@@     @@   @@  @@ @@@@@      @@
-//    @@   @@     @@@@@    @@   @@  @@ @@  @@     @@
-//    @@   @@    @@@ @@@   @@   @@  @@ @@  @@ @@  @@
-//    @@   @@@@@ @@   @@   @@    @@@@  @@@@@   @@@@
-//
-//  TextEdit
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
 
 bool SdrTextObj::HasTextEdit() const
 {
@@ -65,7 +52,6 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
     if (pEdtOutl!=NULL) return sal_False; // Textedit laeuft evtl. schon an einer anderen View!
     pEdtOutl=&rOutl;
 
-    // #101684#
     mbInEditMode = sal_True;
 
     sal_uInt16 nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT;
@@ -109,7 +95,6 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
         // der Parent pOutlAttr (=die Vorlage) temporaer entfernt
         // werden, da sonst bei SetParaAttribs() auch alle in diesem
         // Parent enthaltenen Items hart am Absatz attributiert werden.
-        // -> BugID 22467
         const SfxItemSet& rSet = GetObjectItemSet();
         SfxItemSet aFilteredSet(*rSet.GetPool(), EE_ITEMS_START, EE_ITEMS_END);
         aFilteredSet.Put(rSet);
@@ -120,7 +105,7 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
         Rectangle aAnchorRect;
         Rectangle aTextRect;
         TakeTextRect(rOutl, aTextRect, sal_False,
-            &aAnchorRect/* #97097# give sal_True here, not sal_False */);
+            &aAnchorRect);
         Fraction aFitXKorreg(1,1);
         ImpSetCharStretching(rOutl,aTextRect.GetSize(),aAnchorRect.GetSize(),aFitXKorreg);
     }
@@ -131,16 +116,9 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
 
     if(pOutlinerParaObject)
     {
-        // #78476# also repaint when animated text is put to edit mode
-        // to not make appear the text double
-        // #111096# should now repaint automatically.
-        // sal_Bool bIsAnimated(pPlusData && pPlusData->pAnimator);
-
-        if(aGeo.nDrehWink || IsFontwork() /*|| bIsAnimated*/)
+        if(aGeo.nDrehWink || IsFontwork())
         {
             // only repaint here, no real objectchange
-
-//          ActionChanged();
             BroadcastObjectChange();
         }
     }
@@ -174,7 +152,6 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p
         if (aTmpSiz.Height()!=0) aMaxSiz.Height()=aTmpSiz.Height();
     }
 
-    // #106879#
     // Done earlier since used in else tree below
     SdrTextHorzAdjust eHAdj(GetTextHorizontalAdjust());
     SdrTextVertAdjust eVAdj(GetTextVerticalAdjust());
@@ -195,7 +172,6 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p
             SdrTextAniKind      eAniKind=GetTextAniKind();
             SdrTextAniDirection eAniDirection=GetTextAniDirection();
 
-            // #101684#
             sal_Bool bInEditMode = IsInEditMode();
 
             if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE))
@@ -214,7 +190,6 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p
     }
     else
     {
-        // #106879#
         // aPaperMin needs to be set to object's size if full width is activated
         // for hor or ver writing respectively
         if((SDRTEXTHORZADJUST_BLOCK == eHAdj && !IsVerticalWriting())
@@ -241,17 +216,16 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p
     }
 
     // Die PaperSize soll in den meisten Faellen von selbst wachsen
-    // #89459#
     if(IsVerticalWriting())
         aPaperMin.Width() = 0;
     else
-        aPaperMin.Height() = 0; // #33102#
+        aPaperMin.Height() = 0;
 
     if(eHAdj!=SDRTEXTHORZADJUST_BLOCK || bFitToSize) {
         aPaperMin.Width()=0;
     }
 
-    // #103516# For complete ver adjust support, set paper min height to 0, here.
+    // For complete ver adjust support, set paper min height to 0, here.
     if(SDRTEXTVERTADJUST_BLOCK != eVAdj || bFitToSize)
     {
         aPaperMin.Height() = 0;
@@ -290,7 +264,6 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
     nStat &= ~EE_CNTRL_AUTOPAGESIZE;
     rOutl.SetControlWord(nStat);
 
-    // #101684#
     mbInEditMode = sal_False;
 }
 
@@ -337,11 +310,7 @@ void SdrTextObj::ImpSetTextEditParams() const
         Size aPaperMax;
         Rectangle aEditArea;
         TakeTextEditArea(&aPaperMin,&aPaperMax,&aEditArea,NULL);
-        //SdrFitToSizeType eFit=GetFitToSize();
-        //bool bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
         bool bContourFrame=IsContourTextFrame();
-        //EVAnchorMode eAM=(EVAnchorMode)GetOutlinerViewAnchorMode();
-        //sal_uIntPtr nViewAnz=pEdtOutl->GetViewCount();
         pEdtOutl->SetMinAutoPaperSize(aPaperMin);
         pEdtOutl->SetMaxAutoPaperSize(aPaperMax);
         pEdtOutl->SetPaperSize(Size());
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index 2cb8038e1271..2d2d7256eeee 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -42,26 +42,8 @@
 #include <sfx2/linkmgr.hxx>
 #include <tools/urlobj.hxx>
 #include <svl/urihelper.hxx>
-
-// #90477#
 #include <tools/tenccvt.hxx>
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-//  @@@@  @@@@@  @@@@@@  @@@@@@ @@@@@@ @@  @@ @@@@@@  @@    @@ @@  @@ @@  @@
-// @@  @@ @@  @@     @@    @@   @@      @@@@    @@    @@    @@ @@@ @@ @@ @@
-// @@  @@ @@@@@      @@    @@   @@@@@    @@     @@    @@    @@ @@@@@@ @@@@
-// @@  @@ @@  @@ @@  @@    @@   @@      @@@@    @@    @@    @@ @@ @@@ @@ @@
-//  @@@@  @@@@@   @@@@     @@   @@@@@@ @@  @@   @@    @@@@@ @@ @@  @@ @@  @@
-//
-// ImpSdrObjTextLink zur Verbindung von SdrTextObj und LinkManager
-//
-// Einem solchen Link merke ich mir als SdrObjUserData am Objekt. Im Gegensatz
-// zum Grafik-Link werden die ObjektDaten jedoch kopiert (fuer Paint, etc.).
-// Die Information ob das Objekt ein Link ist besteht genau darin, dass dem
-// Objekt ein entsprechender UserData-Record angehaengt ist oder nicht.
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
 
 class ImpSdrObjTextLink: public ::sfx2::SvBaseLink
 {
@@ -129,15 +111,6 @@ void ImpSdrObjTextLink::Closed()
     return SUCCESS;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@    @@ @@  @@ @@  @@  @@  @@  @@@@@ @@@@@@ @@@@@   @@@@@   @@@@  @@@@@@  @@@@
-// @@    @@ @@@ @@ @@ @@   @@  @@ @@     @@     @@  @@  @@  @@ @@  @@   @@   @@  @@
-// @@    @@ @@@@@@ @@@@    @@  @@  @@@@  @@@@@  @@@@@   @@  @@ @@@@@@   @@   @@@@@@
-// @@    @@ @@ @@@ @@@@@   @@  @@     @@ @@     @@  @@  @@  @@ @@  @@   @@   @@  @@
-// @@@@@ @@ @@  @@ @@  @@   @@@@  @@@@@  @@@@@@ @@  @@  @@@@@  @@  @@   @@   @@  @@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
 
 TYPEINIT1(ImpSdrObjTextLinkUserData,SdrObjUserData);
 
@@ -165,17 +138,6 @@ SdrObjUserData* ImpSdrObjTextLinkUserData::Clone(SdrObject* pObj1) const
     return pData;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-//  @@@@@@ @@@@@ @@   @@ @@@@@@  @@@@  @@@@@  @@@@@@
-//    @@   @@    @@@ @@@   @@   @@  @@ @@  @@     @@
-//    @@   @@     @@@@@    @@   @@  @@ @@  @@     @@
-//    @@   @@@@    @@@     @@   @@  @@ @@@@@      @@
-//    @@   @@     @@@@@    @@   @@  @@ @@  @@     @@
-//    @@   @@    @@@ @@@   @@   @@  @@ @@  @@ @@  @@
-//    @@   @@@@@ @@   @@   @@    @@@@  @@@@@   @@@@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
 
 void SdrTextObj::SetTextLink(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet)
 {
@@ -280,7 +242,6 @@ bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/
 
     if( pIStm )
     {
-        // #90477# pIStm->SetStreamCharSet( eCharSet );
         pIStm->SetStreamCharSet(GetSOLoadTextEncoding(eCharSet, (sal_uInt16)pIStm->GetVersion()));
 
         char cRTF[5];
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index ace2b4cf5814..94f7f1187f8b 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -49,19 +49,6 @@
 #include <svx/xlnclit.hxx>
 #include <svx/xlnwtit.hxx>
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-//  @@@@@@ @@@@@ @@   @@ @@@@@@  @@@@  @@@@@  @@@@@@
-//    @@   @@    @@@ @@@   @@   @@  @@ @@  @@     @@
-//    @@   @@     @@@@@    @@   @@  @@ @@  @@     @@
-//    @@   @@@@    @@@     @@   @@  @@ @@@@@      @@
-//    @@   @@     @@@@@    @@   @@  @@ @@  @@     @@
-//    @@   @@    @@@ @@@   @@   @@  @@ @@  @@ @@  @@
-//    @@   @@@@@ @@   @@   @@    @@@@  @@@@@   @@@@
-//
-//  Transformationen
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
 
 void SdrTextObj::NbcSetSnapRect(const Rectangle& rRect)
 {
@@ -168,15 +155,6 @@ void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
     }
     else
     {
-        // #100663# aRect is NOT initialized for lines (polgon objects with two
-        // exceptionally handled points). Thus, after this call the text rotaion is
-        // gone. This error must be present since day one of this old drawing layer.
-        // It's astonishing that noone discovered it earlier.
-        // Polygon aPol(Rect2Poly(aRect,aGeo));
-        // Polygon aPol(Rect2Poly(GetSnapRect(), aGeo));
-
-        // #101412# go back to old method, side effects are impossible
-        // to calculate.
         Polygon aPol(Rect2Poly(aRect,aGeo));
 
         for(sal_uInt16 a(0); a < aPol.GetSize(); a++)
@@ -257,7 +235,7 @@ void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear
 {
     SetGlueReallyAbsolute(sal_True);
 
-    // #75889# when this is a SdrPathObj aRect maybe not initialized
+    // when this is a SdrPathObj aRect maybe not initialized
     Polygon aPol(Rect2Poly(aRect.IsEmpty() ? GetSnapRect() : aRect, aGeo));
 
     sal_uInt16 nPointCount=aPol.GetSize();
@@ -546,7 +524,4 @@ SdrObject* SdrTextObj::ImpConvertAddText(SdrObject* pObj, bool bBezier) const
     }
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// eof
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 1c0763ad4a50..d6bc6d54f1bc 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -270,12 +270,7 @@ void SdrUnoObj::SetContextWritingMode( const sal_Int16 _nContextWritingMode )
 namespace
 {
     /** helper class to restore graphics at <awt::XView> object after <SdrUnoObj::Paint>
-
-        OD 08.05.2003 #109432#
-        Restoration of graphics necessary to assure that paint on a window
-
-        @author OD
-    */
+        Restoration of graphics necessary to assure that paint on a window  */
     class RestoreXViewGraphics
     {
         private:
@@ -624,7 +619,5 @@ bool SdrUnoObj::impl_getViewContact( ViewContactOfUnoControl*& _out_rpContact )
   return new ::sdr::contact::ViewContactOfUnoControl( *this );
 }
 
-// -----------------------------------------------------------------------------
-// eof
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx
index df99bfecdb9e..32b1ceaf2a32 100644
--- a/svx/source/svdraw/svdoutl.cxx
+++ b/svx/source/svdraw/svdoutl.cxx
@@ -37,11 +37,7 @@
 #include <svl/itempool.hxx>
 
 DBG_NAME(SdrOutliner)
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
+
 SdrOutliner::SdrOutliner( SfxItemPool* pItemPool, sal_uInt16 nMode )
 :   Outliner( pItemPool, nMode ),
     //mpPaintInfoRec( NULL )
@@ -51,22 +47,12 @@ SdrOutliner::SdrOutliner( SfxItemPool* pItemPool, sal_uInt16 nMode )
 }
 
 
-/*************************************************************************
-|*
-|* Dtor
-|*
-\************************************************************************/
 SdrOutliner::~SdrOutliner()
 {
     DBG_DTOR(SdrOutliner,NULL);
 }
 
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
 void SdrOutliner::SetTextObj( const SdrTextObj* pObj )
 {
     if( pObj && pObj != mpTextObj.get() )
@@ -94,21 +80,11 @@ void SdrOutliner::SetTextObj( const SdrTextObj* pObj )
     mpTextObj.reset( const_cast< SdrTextObj* >(pObj) );
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
 void SdrOutliner::SetTextObjNoInit( const SdrTextObj* pObj )
 {
     mpTextObj.reset( const_cast< SdrTextObj* >(pObj) );
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
 XubString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos,
                                      Color*& rpTxtColor, Color*& rpFldColor)
 {
diff --git a/svx/source/svdraw/svdoutlinercache.cxx b/svx/source/svdraw/svdoutlinercache.cxx
index bf41c4f8042d..c14658149071 100644
--- a/svx/source/svdraw/svdoutlinercache.cxx
+++ b/svx/source/svdraw/svdoutlinercache.cxx
@@ -94,7 +94,7 @@ void SdrOutlinerCache::disposeOutliner( SdrOutliner* pOutliner )
             pOutliner->Clear();
             pOutliner->SetVertical( false );
 
-            // #101088# Deregister on outliner, might be reused from outliner cache
+            // Deregister on outliner, might be reused from outliner cache
             pOutliner->SetNotifyHdl( Link() );
         }
         else if( (OUTLINERMODE_TEXTOBJECT == nOutlMode) && (NULL == mpModeText) )
@@ -103,7 +103,7 @@ void SdrOutlinerCache::disposeOutliner( SdrOutliner* pOutliner )
             pOutliner->Clear();
             pOutliner->SetVertical( false );
 
-            // #101088# Deregister on outliner, might be reused from outliner cache
+            // Deregister on outliner, might be reused from outliner cache
             pOutliner->SetNotifyHdl( Link() );
         }
         else
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index bfe7199001de..9e9dd91e8dea 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -48,7 +48,7 @@ sdr::properties::BaseProperties& SdrVirtObj::GetProperties() const
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-// AW, OD 2004-05-03 #i27224#
+// #i27224#
 sdr::contact::ViewContact* SdrVirtObj::CreateObjectSpecificViewContact()
 {
     return new sdr::contact::ViewContactOfVirtObj(*this);
@@ -99,7 +99,6 @@ void SdrVirtObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/)
 
     // Only a repaint here, rRefObj may have changed and broadcasts
     ActionChanged();
-    // BroadcastObjectChange();
 }
 
 void SdrVirtObj::NbcSetAnchorPos(const Point& rAnchorPos)
@@ -417,7 +416,6 @@ void SdrVirtObj::Move(const Size& rSiz)
 {
     if (rSiz.Width()!=0 || rSiz.Height()!=0) {
         Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
-        // #110094#-14 SendRepaintBroadcast();
         NbcMove(rSiz);
         SetChanged();
         BroadcastObjectChange();
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 776d5f8589ca..b264900828ed 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -139,7 +139,6 @@ SdrObjList::~SdrObjList()
 {
     DBG_DTOR(SdrObjList,NULL);
 
-    // #111111#
     // 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
     // to NULL here.
@@ -167,8 +166,6 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
     for (no=0; no<nAnz; no++) {
         SdrObject* pSO=rSrcList.GetObj(no);
 
-        // #116235#
-        //SdrObject* pDO=pSO->Clone(pPage,pModel);
         SdrObject* pDO = pSO->Clone();
         pDO->SetModel(pModel);
         pDO->SetPage(pPage);
@@ -374,7 +371,7 @@ void SdrObjList::NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrIns
         pObj->SetObjList(this);
         pObj->SetPage(pPage);
 
-        // #110094# Inform the parent about change to allow invalidations at
+        // Inform the parent about change to allow invalidations at
         // evtl. existing parent visualisations
         impChildInserted(*pObj);
 
@@ -392,7 +389,7 @@ void SdrObjList::InsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsert
 
     if(pObj)
     {
-        // #69055# if anchor is used, reset it before grouping
+        // if anchor is used, reset it before grouping
         if(GetOwnerObj())
         {
             const Point& rAnchorPos = pObj->GetAnchorPos();
@@ -533,7 +530,7 @@ SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum)
         pNewObj->SetObjList(this);
         pNewObj->SetPage(pPage);
 
-        // #110094#  Inform the parent about change to allow invalidations at
+        // Inform the parent about change to allow invalidations at
         // evtl. existing parent visualisations
         impChildInserted(*pNewObj);
 
@@ -580,7 +577,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum)
         pNewObj->SetObjList(this);
         pNewObj->SetPage(pPage);
 
-        // #110094#  Inform the parent about change to allow invalidations at
+        // Inform the parent about change to allow invalidations at
         // evtl. existing parent visualisations
         impChildInserted(*pNewObj);
 
@@ -617,7 +614,7 @@ SdrObject* SdrObjList::NbcSetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nN
 
         InsertObjectIntoContainer(*pObj,nNewObjNum);
 
-        // #110094# No need to delete visualisation data since same object
+        // No need to delete visualisation data since same object
         // gets inserted again. Also a single ActionChanged is enough
         pObj->ActionChanged();
 
@@ -644,7 +641,7 @@ SdrObject* SdrObjList::SetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewO
         RemoveObjectFromContainer(nOldObjNum);
         InsertObjectIntoContainer(*pObj,nNewObjNum);
 
-        // #110094#No need to delete visualisation data since same object
+        // No need to delete visualisation data since same object
         // gets inserted again. Also a single ActionChanged is enough
         pObj->ActionChanged();
 
@@ -703,16 +700,6 @@ void SdrObjList::NbcReformatAllTextObjects()
     while (nNum<nAnz)
     {
         SdrObject* pObj = GetObj(nNum);
-        if (pPrinter &&
-            pObj->GetObjInventor() == SdrInventor &&
-            pObj->GetObjIdentifier() == OBJ_OLE2  &&
-            !( (SdrOle2Obj*) pObj )->IsEmpty() )
-        {
-            //const SvInPlaceObjectRef& xObjRef = ((SdrOle2Obj*) pObj)->GetObjRef();
-            //TODO/LATER: PrinterChangeNotification needed
-            //if( xObjRef.Is() && ( xObjRef->GetMiscStatus() & SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE ) )
-            //  xObjRef->OnDocumentPrinterChanged(pPrinter);
-        }
 
         pObj->NbcReformatText();
         nAnz=GetObjCount();             // ReformatText may delete an object
@@ -729,7 +716,6 @@ void SdrObjList::ReformatAllTextObjects()
 /** steps over all available objects and reformats all
     edge objects that are connected to other objects so that
     they may reposition itselfs.
-    #103122#
 */
 void SdrObjList::ReformatAllEdgeObjects()
 {
@@ -841,7 +827,6 @@ void SdrObjList::UnGroupObj( sal_uIntPtr nObjNum )
     if( pUngroupObj )
     {
         SdrObjList* pSrcLst = pUngroupObj->GetSubList();
-        //sal_Int32 nCount( 0 );
         if( pUngroupObj->ISA( SdrObjGroup ) && pSrcLst )
         {
             SdrObjGroup* pUngroupGroup = static_cast< SdrObjGroup* > (pUngroupObj);
@@ -1136,7 +1121,7 @@ void SdrPageGridFrameList::Clear()
 }
 
 //////////////////////////////////////////////////////////////////////////////
-// #111111# PageUser section
+// PageUser section
 
 void SdrPage::AddPageUser(sdr::PageUser& rNewUser)
 {
@@ -1153,7 +1138,7 @@ void SdrPage::RemovePageUser(sdr::PageUser& rOldUser)
 }
 
 //////////////////////////////////////////////////////////////////////////////
-// #110094# DrawContact section
+// DrawContact section
 
 sdr::contact::ViewContact* SdrPage::CreateObjectSpecificViewContact()
 {
@@ -1385,7 +1370,6 @@ SdrPage::~SdrPage()
         DBG_UNHANDLED_EXCEPTION();
     }
 
-    // #111111#
     // tell all the registered PageUsers that the page is in destruction
     // This causes some (all?) PageUsers to remove themselves from the list
     // of page users.  Therefore we have to use a copy of the list for the
@@ -1398,7 +1382,6 @@ SdrPage::~SdrPage()
         pPageUser->PageInDestruction(*this);
     }
 
-    // #111111#
     // Clear the vector. This means that user do not need to call RemovePageUser()
     // when they get called from PageInDestruction().
     maPageUsers.clear();
@@ -1407,7 +1390,6 @@ SdrPage::~SdrPage()
 
     TRG_ClearMasterPage();
 
-    // #110094#
     if(mpViewContact)
     {
         delete mpViewContact;
@@ -1461,7 +1443,6 @@ SdrPage& SdrPage::operator=(const SdrPage& rSrcPage)
     {
         TRG_ClearMasterPage();
     }
-    //aMasters = rSrcPage.aMasters;
 
     mbObjectsNotPersistent = rSrcPage.mbObjectsNotPersistent;
 
@@ -1727,7 +1708,6 @@ sal_uInt16 SdrPage::GetPageNum() const
 
 void SdrPage::SetChanged()
 {
-    // #110094#-11
     // For test purposes, use the new ViewContact for change
     // notification now.
     ActionChanged();
@@ -1791,7 +1771,7 @@ sdr::contact::ViewContact& SdrPage::TRG_GetMasterPageDescriptorViewContact() con
     return mpMasterPageDescriptor->GetViewContact();
 }
 
-// #115423# used from SdrModel::RemoveMasterPage
+// used from SdrModel::RemoveMasterPage
 void SdrPage::TRG_ImpMasterPageRemoved(const SdrPage& rRemovedPage)
 {
     if(TRG_HasMasterPage())
@@ -1810,7 +1790,6 @@ const SdrPageGridFrameList* SdrPage::GetGridFrameList(const SdrPageView* /*pPV*/
 
 XubString SdrPage::GetLayoutName() const
 {
-    // Die wollte Dieter haben.
     return String();
 }
 
@@ -1923,7 +1902,7 @@ bool SdrPage::checkVisibility(
     return true;
 }
 
-// #110094# DrawContact support: Methods for handling Page changes
+// DrawContact support: Methods for handling Page changes
 void SdrPage::ActionChanged() const
 {
     // Do necessary ViewContact actions
@@ -1936,7 +1915,7 @@ void SdrPage::ActionChanged() const
     }
 }
 
-// NYI: Dummy implementations for declarations in svdpage.hxx
+// Dummy implementations for declarations in svdpage.hxx
 Bitmap      SdrPage::GetBitmap(const SetOfByte& /*rVisibleLayers*/, bool /*bTrimBorders*/) const
 {
     DBG_ASSERT(0, "SdrPage::GetBitmap(): not yet implemented.");
@@ -2029,7 +2008,5 @@ drawinglayer::primitive2d::Primitive2DSequence StandardCheckVisisbilityRedirecto
     }
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// eof
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index c763468151a4..1392ab9ffe9a 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -55,7 +55,6 @@
 #include <svx/svdotext.hxx> // fuer PaintOutlinerView
 #include <svx/svdoole2.hxx>
 
-// #110094#
 #include <svx/sdr/contact/objectcontactofpageview.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/sdr/contact/viewobjectcontactredirector.hxx>
@@ -121,7 +120,6 @@ SdrPageWindow* SdrPageView::FindPageWindow(const OutputDevice& rOutDev) const
 
 SdrPageWindow* SdrPageView::GetPageWindow(sal_uInt32 nIndex) const
 {
-    // #126416#
     if(nIndex < maPageWindows.size())
     {
         return maPageWindows[nIndex];
@@ -132,7 +130,6 @@ SdrPageWindow* SdrPageView::GetPageWindow(sal_uInt32 nIndex) const
 
 void SdrPageView::ClearPageWindows()
 {
-    // #126416#
     for(SdrPageWindowVector::const_iterator a = maPageWindows.begin(); a != maPageWindows.end(); ++a)
     {
         delete *a;
@@ -151,7 +148,7 @@ SdrPageWindow* SdrPageView::RemovePageWindow(sal_uInt32 nPos)
     if(nPos < maPageWindows.size())
     {
         SdrPageWindowVector::iterator aAccess = maPageWindows.begin() + nPos;
-        // #114376# remember return value
+        // remember return value
         SdrPageWindow* pErasedSdrPageWindow = *aAccess;
         maPageWindows.erase(aAccess);
         return pErasedSdrPageWindow;
@@ -166,7 +163,7 @@ SdrPageWindow* SdrPageView::RemovePageWindow(SdrPageWindow& rOld)
 
     if(aFindResult != maPageWindows.end())
     {
-        // #114376# remember return value
+        // remember return value
         SdrPageWindow* pSdrPageWindow = *aFindResult;
         maPageWindows.erase(aFindResult);
         return pSdrPageWindow;
@@ -179,7 +176,7 @@ SdrPageWindow* SdrPageView::RemovePageWindow(SdrPageWindow& rOld)
 
 SdrPageView::SdrPageView(SdrPage* pPage1, SdrView& rNewView)
 :   mrView(rNewView),
-    // #103911# col_auto color lets the view takes the default SvxColorConfig entry
+    // col_auto color lets the view takes the default SvxColorConfig entry
     maDocumentColor( COL_AUTO ),
     maBackgroundColor(COL_AUTO ), // #i48367# also react on autocolor
     mpPreparedPageWindow(0) // #i72752#
@@ -219,10 +216,6 @@ SdrPageView::~SdrPageView()
 
 SdrPageWindow& SdrPageView::CreateNewPageWindowEntry(SdrPaintWindow& rPaintWindow)
 {
-    // MIB 3.7.08: Das WinRec muss sofort in die Liste eingetragen werden,
-    // weil sich das InsertControlContainer darauf verlaesst
-    //SdrPageViewWinRec* pRec = new SdrPageViewWinRec( *this, pOut );
-    //pWinList->Insert(pRec);
     SdrPageWindow& rWindow = *(new SdrPageWindow(*this, rPaintWindow));
     AppendPageWindow(rWindow);
 
@@ -329,9 +322,6 @@ void SdrPageView::InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix)
 void SdrPageView::PaintOutlinerView(OutputDevice* pOut, const Rectangle& rRect) const
 {
     if (GetView().pTextEditOutliner==NULL) return;
-    //const SdrObject* pTextObjTmp=GetView().GetTextEditObject();
-    //const SdrTextObj* pText=PTR_CAST(SdrTextObj,pTextObjTmp);
-    //bool bTextFrame=pText!=NULL && pText->IsTextFrame();
     sal_uIntPtr nViewAnz=GetView().pTextEditOutliner->GetViewCount();
     for (sal_uIntPtr i=0; i<nViewAnz; i++) {
         OutlinerView* pOLV=GetView().pTextEditOutliner->GetView(i);
@@ -522,10 +512,7 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C
     {
         // no more global output size, use window size instead to decide grid sizes
         long nScreenWdt = rOut.GetOutputSizePixel().Width();
-        // old: long nScreenWdt=System::GetDesktopRectPixel().GetWidth();
 
-        // Grid bei kleinen Zoomstufen etwas erweitern
-        //Size a1PixSiz(rOut.PixelToLogic(Size(1,1)));
         long nMinDotPix=2;
         long nMinLinPix=4;
 
@@ -545,7 +532,6 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C
             nMinLinPix=4;
         }
         Size aMinDotDist(rOut.PixelToLogic(Size(nMinDotPix,nMinDotPix)));
-        //Size a3PixSiz(rOut.PixelToLogic(Size(2,2)));
         Size aMinLinDist(rOut.PixelToLogic(Size(nMinLinPix,nMinLinPix)));
         bool bHoriSolid=nx2<aMinDotDist.Width();
         bool bVertSolid=ny2<aMinDotDist.Height();
@@ -579,9 +565,6 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C
 
             if (nTgl>=3) nTgl=0;
         }
-        // Keine Zwischenpunkte, wenn...
-        //if (nx2<a2PixSiz.Width()) nx2=nx1;
-        //if (ny2<a2PixSiz.Height()) ny2=ny1;
 
         bool bHoriFine=nx2<nx1;
         bool bVertFine=ny2<ny1;
@@ -601,8 +584,7 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C
         long y1=GetPage()->GetUppBorder()+1+nWrX;
         long y2=GetPage()->GetHgt()-GetPage()->GetLwrBorder()-1+nWrY;
         const SdrPageGridFrameList* pFrames=GetPage()->GetGridFrameList(this,NULL);
-        //sal_uInt16 nBufSiz=1024; // 4k Buffer = max. 512 Punkte
-        // #90353# long* pBuf = NULL;
+
         sal_uInt16 nGridPaintAnz=1;
         if (pFrames!=NULL) nGridPaintAnz=pFrames->GetCount();
         for (sal_uInt16 nGridPaintNum=0; nGridPaintNum<nGridPaintAnz; nGridPaintNum++) {
@@ -692,8 +674,6 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C
                             nPointOffset++;
                         }
                     }
-
-                    // rOut.DrawGrid( Rectangle( xo + xBigOrg, yo + yFinOrg, x2, y2 ), Size( nx1, ny2 ), nGridFlags );
                 }
             }
         }
@@ -768,7 +748,6 @@ sal_Bool SdrPageView::IsObjMarkable(SdrObject* pObj) const
             return sal_False;
         }
 
-        // #112440#
         if(pObj->ISA(SdrObjGroup))
         {
             // If object is a Group object, visibility depends evtl. on
@@ -1098,19 +1077,18 @@ void SdrPageView::CheckAktGroup()
     }
 }
 
-// #103834# Set background color for svx at SdrPageViews
+// Set background color for svx at SdrPageViews
 void SdrPageView::SetApplicationBackgroundColor(Color aBackgroundColor)
 {
     maBackgroundColor = aBackgroundColor;
 }
 
-// #109585#
 Color SdrPageView::GetApplicationBackgroundColor() const
 {
     return maBackgroundColor;
 }
 
-// #103911# Set document color for svx at SdrPageViews
+// Set document color for svx at SdrPageViews
 void SdrPageView::SetApplicationDocumentColor(Color aDocumentColor)
 {
     maDocumentColor = aDocumentColor;
@@ -1121,7 +1099,5 @@ Color SdrPageView::GetApplicationDocumentColor() const
     return maDocumentColor;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// eof
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index a04ab26d949d..b452f4ea43c9 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -84,7 +84,6 @@ using namespace ::rtl;
 using namespace ::com::sun::star;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-// #114409#-3 Migrate Encirclement
 class ImplEncirclementOverlay
 {
     // The OverlayObjects
@@ -315,7 +314,6 @@ SdrPaintView::~SdrPaintView()
         maPaintWindows.pop_back();
     }
 
-    // #114409#-3 Migrate HelpLine
     BrkEncirclement();
 }
 
@@ -1180,14 +1178,12 @@ void SdrPaintView::InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix)
 
 void SdrPaintView::InvalidateOneWin(Window& rWin)
 {
-    // #111096#
     // do not erase background, that causes flicker (!)
     rWin.Invalidate(INVALIDATE_NOERASE);
 }
 
 void SdrPaintView::InvalidateOneWin(Window& rWin, const Rectangle& rRect)
 {
-    // #111096#
     // do not erase background, that causes flicker (!)
     rWin.Invalidate(rRect, INVALIDATE_NOERASE);
 }
@@ -1303,7 +1299,6 @@ void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDo
 #endif
 }
 
-/* new interface src537 */
 sal_Bool SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
 {
     if(bOnlyHardAttr || !pDefaultStyleSheet)
@@ -1326,9 +1321,8 @@ sal_Bool SdrPaintView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAl
     return sal_True;
 }
 
-SfxStyleSheet* SdrPaintView::GetStyleSheet() const // SfxStyleSheet* SdrPaintView::GetStyleSheet(sal_Bool& rOk) const
+SfxStyleSheet* SdrPaintView::GetStyleSheet() const
 {
-    //rOk=sal_True;
     return GetDefaultStyleSheet();
 }
 
@@ -1495,7 +1489,7 @@ Color SdrPaintView::GetGridColor() const
     return maGridColor;
 }
 
-// #103834# Set background color for svx at SdrPageViews
+// Set background color for svx at SdrPageViews
 void SdrPaintView::SetApplicationBackgroundColor(Color aBackgroundColor)
 {
     if(mpPageView)
@@ -1504,7 +1498,7 @@ void SdrPaintView::SetApplicationBackgroundColor(Color aBackgroundColor)
     }
 }
 
-// #103911# Set document color for svx at SdrPageViews
+// Set document color for svx at SdrPageViews
 void SdrPaintView::SetApplicationDocumentColor(Color aDocumentColor)
 {
     if(mpPageView)
@@ -1513,13 +1507,11 @@ void SdrPaintView::SetApplicationDocumentColor(Color aDocumentColor)
     }
 }
 
-// #114898#
 bool SdrPaintView::IsBufferedOutputAllowed() const
 {
     return (mbBufferedOutputAllowed && maDrawinglayerOpt.IsPaintBuffer());
 }
 
-// #114898#
 void SdrPaintView::SetBufferedOutputAllowed(bool bNew)
 {
     if(bNew != (bool)mbBufferedOutputAllowed)
@@ -1570,6 +1562,4 @@ void SdrPaintView::SetAnimationTimer(sal_uInt32 nTime)
     }
 }
 
-// eof
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index ae98ae8f8cf3..a5cdd406a46d 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -741,6 +741,4 @@ void SdrPolyEditView::RotateMarkedPoints(const Point& rRef, long nWink, bool bCo
     AdjustMarkHdl();
 }
 
-// eof
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index ef39697b5ff4..40f7c6a9be8a 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -45,7 +45,6 @@
 #include <svx/sdrpaintwindow.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-// #114409#-1 Migrate PageOrigin
 class ImplPageOriginOverlay
 {
     // The OverlayObjects
@@ -108,7 +107,6 @@ void ImplPageOriginOverlay::SetPosition(const basegfx::B2DPoint& rNewPosition)
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-// #114409#-2 Migrate HelpLine
 class ImplHelpLineOverlay
 {
     // The OverlayObjects
@@ -187,19 +185,6 @@ void ImplHelpLineOverlay::SetPosition(const basegfx::B2DPoint& rNewPosition)
     }
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-//  @@@@  @@  @@  @@@@  @@@@@   @@ @@ @@ @@@@@ @@   @@
-// @@  @@ @@@ @@ @@  @@ @@  @@  @@ @@ @@ @@    @@   @@
-// @@     @@@@@@ @@  @@ @@  @@  @@ @@ @@ @@    @@ @ @@
-//  @@@@  @@@@@@ @@@@@@ @@@@@   @@@@@ @@ @@@@  @@@@@@@
-//     @@ @@ @@@ @@  @@ @@       @@@  @@ @@    @@@@@@@
-// @@  @@ @@  @@ @@  @@ @@       @@@  @@ @@    @@@ @@@
-//  @@@@  @@  @@ @@  @@ @@        @   @@ @@@@@ @@   @@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
 
 void SdrSnapView::ClearVars()
 {
@@ -229,30 +214,21 @@ void SdrSnapView::ClearVars()
     bEliminatePolyPoints=sal_False;
     nEliminatePolyPointLimitAngle=0;
 
-    // #114409#-1 Migrate PageOrigin
     BrkSetPageOrg();
-
-    // #114409#-2 Migrate HelpLine
     BrkDragHelpLine();
 }
 
 SdrSnapView::SdrSnapView(SdrModel* pModel1, OutputDevice* pOut):
     SdrPaintView(pModel1,pOut),
-    // #114409#-1 Migrate PageOrigin
     mpPageOriginOverlay(0L),
-    // #114409#-2 Migrate HelpLine
     mpHelpLineOverlay(0L)
 {
     ClearVars();
 }
 
-// #114409#-1 Migrate PageOrigin
 SdrSnapView::~SdrSnapView()
 {
-    // #114409#-1 Migrate PageOrigin
     BrkSetPageOrg();
-
-    // #114409#-2 Migrate HelpLine
     BrkDragHelpLine();
 }
 
@@ -379,12 +355,12 @@ sal_uInt16 SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
         a=y         ; if (Abs(a)<=my) { dy1=-a; if (Abs(dy1)<Abs(dy)) dy=dy1; } // linke Papierkante
         a=y- ys     ; if (Abs(a)<=my) { dy1=-a; if (Abs(dy1)<Abs(dy)) dy=dy1; } // rechte Papierkante
     }
-    if (bOFrmSnap || bOPntSnap /*|| (bConnVisible && bOConSnap)*/) {
+    if (bOFrmSnap || bOPntSnap) {
         sal_uIntPtr nMaxPointSnapCount=200;
         sal_uIntPtr nMaxFrameSnapCount=200;
 
-        // #97981# go back to IM_DEEPNOGROUPS runthrough for snap to object comparisons
-        SdrObjListIter aIter(*pPV->GetPage(),/*IM_FLAT*/IM_DEEPNOGROUPS,sal_True);
+        // go back to IM_DEEPNOGROUPS runthrough for snap to object comparisons
+        SdrObjListIter aIter(*pPV->GetPage(),IM_DEEPNOGROUPS,sal_True);
 
         while (aIter.IsMore() && (nMaxPointSnapCount>0 || nMaxFrameSnapCount>0)) {
             SdrObject* pO=aIter.Next();
@@ -606,7 +582,7 @@ sal_Bool SdrSnapView::BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV)
         {
             const SdrHelpLineList& rHelpLines = pPV->GetHelpLines();
             const SdrHelpLine& rHelpLine = rHelpLines[nHelpLineNum];
-            Point aHelpLinePos = rHelpLine.GetPos(); // + pPV->GetOffset();
+            Point aHelpLinePos = rHelpLine.GetPos();
             basegfx::B2DPoint aStartPos(aHelpLinePos.X(), aHelpLinePos.Y());
 
             DBG_ASSERT(0L == mpHelpLineOverlay, "SdrSnapView::BegDragHelpLine: There exists a ImplHelpLineOverlay (!)");
@@ -726,6 +702,4 @@ void SdrSnapView::BrkDragHelpLine()
     }
 }
 
-// eof
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx
index 369ce4ff3d81..bfc84a75f3d6 100644
--- a/svx/source/svdraw/svdtext.cxx
+++ b/svx/source/svdraw/svdtext.cxx
@@ -155,7 +155,7 @@ void SdrText::SetModel( SdrModel* pNewModel )
         sal_Bool bDefHgtChanged=nNewFontHgt!=nOldFontHgt;
         sal_Bool bSetHgtItem=bDefHgtChanged && !bHgtSet;
         if (bSetHgtItem)
-        { // #32665#
+        {
             // zunaechst das HeightItem festklopfen, damit
             // 1. Es eben bestehen bleibt und
             // 2. DoStretchChars vom richtigen Wert ausgeht
@@ -183,7 +183,7 @@ void SdrText::SetModel( SdrModel* pNewModel )
                 SetObjectItem(SvxFontHeightItem(nOldFontHgt, 100, EE_CHAR_FONTHEIGHT));
             }
         }
-        SetOutlinerParaObject(rOutliner.CreateParaObject()); // #34494#
+        SetOutlinerParaObject(rOutliner.CreateParaObject());
         mpOutlinerParaObject->ClearPortionInfo();
         mbPortionInfoChecked=sal_False;
         rOutliner.Clear();
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 42ca495b3294..180e967571bf 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -612,18 +612,6 @@ void Poly2Rect(const Polygon& rPol, Rectangle& rRect, GeoStat& rGeo)
     if (rGeo.nDrehWink!=0) RotatePoint(aPt3,Point(0,0),-rGeo.nSin,rGeo.nCos); // -Sin fuer Rueckdrehung
     long nHgt=aPt3.Y();
 
-    if(aPt3.X())
-    {
-        // #i74358# the axes are not orthogonal, so for getting the correct height,
-        // calculate the length of aPt3
-
-        // #i74358# this change was wrong, in the field of the old geometry stuff
-        // it is not an error. The new height always is the same as before; shear
-        // does not change object height at all. This is different from the interactions,
-        // but obviously wanted in the old versions.
-        //
-        // nHgt = static_cast< long >(sqrt(static_cast< double >(aPt3.X() * aPt3.X() + aPt3.Y() * aPt3.Y())));
-    }
 
     long nShW=GetAngle(aPt3);
     nShW-=27000; // ShearWink wird zur Senkrechten gemessen
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 460910cea81c..b746813faff5 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -106,7 +106,7 @@ XubString SdrUndoAction::GetSdrRepeatComment(SdrView& /*rView*/) const
 SdrUndoGroup::SdrUndoGroup(SdrModel& rNewMod)
 :   SdrUndoAction(rNewMod),
     aBuf(1024,32,32),
-    eFunction(SDRREPFUNC_OBJ_NONE)      /*#72642#*/
+    eFunction(SDRREPFUNC_OBJ_NONE)
 {}
 
 SdrUndoGroup::SdrUndoGroup(SdrModel& rNewMod,const String& rStr)
@@ -226,20 +226,6 @@ XubString SdrUndoGroup::GetSdrRepeatComment(SdrView& /*rView*/) const
     return aRet;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-//   @@@@   @@@@@   @@@@@@  @@@@@   @@@@   @@@@@@   @@@@
-//  @@  @@  @@  @@      @@  @@     @@  @@    @@    @@  @@
-//  @@  @@  @@  @@      @@  @@     @@        @@    @@
-//  @@  @@  @@@@@       @@  @@@@   @@        @@     @@@@
-//  @@  @@  @@  @@      @@  @@     @@        @@        @@
-//  @@  @@  @@  @@  @@  @@  @@     @@  @@    @@    @@  @@
-//   @@@@   @@@@@    @@@@   @@@@@   @@@@     @@     @@@@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 SdrUndoObj::SdrUndoObj(SdrObject& rNewObj):
     SdrUndoAction(*rNewObj.GetModel()),
     pObj(&rNewObj)
@@ -278,8 +264,7 @@ void SdrUndoObj::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr,
         GetDescriptionStringForObject( *pObj, nStrCacheID, rStr, bRepeat );
 }
 
-// #94278# common call method for evtl. page change when UNDO/REDO
-// is triggered
+// common call method for evtl. page change when UNDO/REDO is triggered
 void SdrUndoObj::ImpShowPageOfThisObject()
 {
     if(pObj && pObj->IsInserted() && pObj->GetPage() && pObj->GetModel())
@@ -382,7 +367,7 @@ void SdrUndoAttrObj::Undo()
     E3DModifySceneSnapRectUpdater aUpdater(pObj);
     sal_Bool bIs3DScene(pObj && pObj->ISA(E3dScene));
 
-    // #94278# Trigger PageChangeCall
+    // Trigger PageChangeCall
     ImpShowPageOfThisObject();
 
     if(!pUndoGroup || bIs3DScene)
@@ -419,7 +404,7 @@ void SdrUndoAttrObj::Undo()
 
         sdr::properties::ItemChangeBroadcaster aItemChange(*pObj);
 
-        // #105122# Since ClearItem sets back everything to normal
+        // Since ClearItem sets back everything to normal
         // it also sets fit-to-size text to non-fit-to-size text and
         // switches on autogrowheight (the default). That may lead to
         // loosing the geometry size info for the object when it is
@@ -429,7 +414,6 @@ void SdrUndoAttrObj::Undo()
 
         if(pUndoSet)
         {
-            // #109587#
             if(pObj->ISA(SdrCaptionObj))
             {
                 // do a more smooth item deletion here, else the text
@@ -458,7 +442,7 @@ void SdrUndoAttrObj::Undo()
             pObj->SetMergedItemSet(*pUndoSet);
         }
 
-        // #105122# Restore prev size here when it was changed.
+        // Restore prev size here when it was changed.
         if(aSnapRect != pObj->GetSnapRect())
         {
             pObj->NbcSetSnapRect(aSnapRect);
@@ -493,12 +477,10 @@ void SdrUndoAttrObj::Redo()
 
         sdr::properties::ItemChangeBroadcaster aItemChange(*pObj);
 
-        // #105122#
         const Rectangle aSnapRect = pObj->GetSnapRect();
 
         if(pRedoSet)
         {
-            // #109587#
             if(pObj->ISA(SdrCaptionObj))
             {
                 // do a more smooth item deletion here, else the text
@@ -527,7 +509,7 @@ void SdrUndoAttrObj::Redo()
             pObj->SetMergedItemSet(*pRedoSet);
         }
 
-        // #105122# Restore prev size here when it was changed.
+        // Restore prev size here when it was changed.
         if(aSnapRect != pObj->GetSnapRect())
         {
             pObj->NbcSetSnapRect(aSnapRect);
@@ -547,7 +529,7 @@ void SdrUndoAttrObj::Redo()
         pUndoGroup->Redo();
     }
 
-    // #94278# Trigger PageChangeCall
+    // Trigger PageChangeCall
     ImpShowPageOfThisObject();
 }
 
@@ -600,7 +582,7 @@ XubString SdrUndoAttrObj::GetSdrRepeatComment(SdrView& /*rView*/) const
 
 void SdrUndoMoveObj::Undo()
 {
-    // #94278# Trigger PageChangeCall
+    // Trigger PageChangeCall
     ImpShowPageOfThisObject();
 
     pObj->Move(Size(-aDistance.Width(),-aDistance.Height()));
@@ -610,7 +592,7 @@ void SdrUndoMoveObj::Redo()
 {
     pObj->Move(Size(aDistance.Width(),aDistance.Height()));
 
-    // #94278# Trigger PageChangeCall
+    // Trigger PageChangeCall
     ImpShowPageOfThisObject();
 }
 
@@ -650,7 +632,7 @@ SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj):
     if (pOL!=NULL && pOL->GetObjCount() && !rNewObj.ISA(E3dScene))
     {
         // Aha, Gruppenobjekt
-        // AW: Aber keine 3D-Szene, dann nur fuer die Szene selbst den Undo anlegen
+        // Aber keine 3D-Szene, dann nur fuer die Szene selbst den Undo anlegen
         pUndoGroup=new SdrUndoGroup(*pObj->GetModel());
         sal_uIntPtr nObjAnz=pOL->GetObjCount();
         for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
@@ -670,14 +652,13 @@ SdrUndoGeoObj::~SdrUndoGeoObj()
 
 void SdrUndoGeoObj::Undo()
 {
-    // #94278# Trigger PageChangeCall
+    // Trigger PageChangeCall
     ImpShowPageOfThisObject();
 
     if(pUndoGroup)
     {
         pUndoGroup->Undo();
 
-        // #97172#
         // only repaint, no objectchange
         pObj->ActionChanged();
     }
@@ -695,7 +676,6 @@ void SdrUndoGeoObj::Redo()
     {
         pUndoGroup->Redo();
 
-        // #97172#
         // only repaint, no objectchange
         pObj->ActionChanged();
     }
@@ -706,7 +686,7 @@ void SdrUndoGeoObj::Redo()
         pObj->SetGeoData(*pRedoGeo);
     }
 
-    // #94278# Trigger PageChangeCall
+    // Trigger PageChangeCall
     ImpShowPageOfThisObject();
 }
 
@@ -754,7 +734,7 @@ void SdrUndoObjList::SetOwner(bool bNew)
 
 void SdrUndoRemoveObj::Undo()
 {
-    // #94278# Trigger PageChangeCall
+    // Trigger PageChangeCall
     ImpShowPageOfThisObject();
 
     DBG_ASSERT(!pObj->IsInserted(),"UndoRemoveObj: pObj ist bereits Inserted");
@@ -794,7 +774,7 @@ void SdrUndoRemoveObj::Redo()
         pObjList->RemoveObject(nOrdNum);
     }
 
-    // #94278# Trigger PageChangeCall
+    // Trigger PageChangeCall
     ImpShowPageOfThisObject();
 }
 
@@ -802,7 +782,7 @@ void SdrUndoRemoveObj::Redo()
 
 void SdrUndoInsertObj::Undo()
 {
-    // #94278# Trigger PageChangeCall
+    // Trigger PageChangeCall
     ImpShowPageOfThisObject();
 
     DBG_ASSERT(pObj->IsInserted(),"UndoInsertObj: pObj ist nicht Inserted");
@@ -844,7 +824,7 @@ void SdrUndoInsertObj::Redo()
         }
     }
 
-    // #94278# Trigger PageChangeCall
+    // Trigger PageChangeCall
     ImpShowPageOfThisObject();
 }
 
@@ -956,7 +936,7 @@ SdrUndoReplaceObj::~SdrUndoReplaceObj()
 
 void SdrUndoReplaceObj::Undo()
 {
-    // #94278# Trigger PageChangeCall
+    // Trigger PageChangeCall
     ImpShowPageOfThisObject();
 
     if (IsOldOwner() && !IsNewOwner())
@@ -993,7 +973,7 @@ void SdrUndoReplaceObj::Redo()
         OSL_FAIL("SdrUndoReplaceObj::Redo(): IsMine-Flags stehen verkehrt. Doppelter Redo-Aufruf?");
     }
 
-    // #94278# Trigger PageChangeCall
+    // Trigger PageChangeCall
     ImpShowPageOfThisObject();
 }
 
@@ -1049,7 +1029,7 @@ SdrUndoObjOrdNum::SdrUndoObjOrdNum(SdrObject& rNewObj, sal_uInt32 nOldOrdNum1, s
 
 void SdrUndoObjOrdNum::Undo()
 {
-    // #94278# Trigger PageChangeCall
+    // Trigger PageChangeCall
     ImpShowPageOfThisObject();
 
     SdrObjList* pOL=pObj->GetObjList();
@@ -1069,7 +1049,7 @@ void SdrUndoObjOrdNum::Redo()
     }
     pOL->SetObjectOrdNum(nOldOrdNum,nNewOrdNum);
 
-    // #94278# Trigger PageChangeCall
+    // Trigger PageChangeCall
     ImpShowPageOfThisObject();
 }
 
@@ -1118,7 +1098,7 @@ void SdrUndoObjSetText::AfterSetText()
 
 void SdrUndoObjSetText::Undo()
 {
-    // #94278# Trigger PageChangeCall
+    // Trigger PageChangeCall
     ImpShowPageOfThisObject();
 
     // alten Text sichern fuer Redo
@@ -1152,7 +1132,7 @@ void SdrUndoObjSetText::Redo()
 
     pObj->ActionChanged();
 
-    // #94278# Trigger PageChangeCall
+    // Trigger PageChangeCall
     ImpShowPageOfThisObject();
 }
 
@@ -1304,19 +1284,6 @@ String SdrUndoObjStrAttr::GetComment() const
     return aStr;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-//  @@      @@@@   @@  @@  @@@@@  @@@@@
-//  @@     @@  @@  @@  @@  @@     @@  @@
-//  @@     @@  @@  @@  @@  @@     @@  @@
-//  @@     @@@@@@   @@@@   @@@@   @@@@@
-//  @@     @@  @@    @@    @@     @@  @@
-//  @@     @@  @@    @@    @@     @@  @@
-//  @@@@@  @@  @@    @@    @@@@@  @@  @@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
 
 SdrUndoLayer::SdrUndoLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel):
     SdrUndoAction(rNewModel),
@@ -1411,19 +1378,6 @@ XubString SdrUndoMoveLayer::GetComment() const
     return ImpGetResStr(STR_UndoMovLayer);
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-//  @@@@@    @@@@    @@@@   @@@@@   @@@@
-//  @@  @@  @@  @@  @@  @@  @@     @@  @@
-//  @@  @@  @@  @@  @@      @@     @@
-//  @@@@@   @@@@@@  @@ @@@  @@@@    @@@@
-//  @@      @@  @@  @@  @@  @@         @@
-//  @@      @@  @@  @@  @@  @@     @@  @@
-//  @@      @@  @@   @@@@@  @@@@@   @@@@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
 
 SdrUndoPage::SdrUndoPage(SdrPage& rNewPg)
 :   SdrUndoAction(*rNewPg.GetModel()),
@@ -1643,18 +1597,6 @@ XubString SdrUndoSetPageNum::GetComment() const
     return aStr;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-//  @@   @@  @@@@   @@@@  @@@@@@ @@@@@ @@@@@   @@@@@   @@@@   @@@@  @@@@@  @@@@
-//  @@@ @@@ @@  @@ @@  @@   @@   @@    @@  @@  @@  @@ @@  @@ @@  @@ @@    @@  @@
-//  @@@@@@@ @@  @@ @@       @@   @@    @@  @@  @@  @@ @@  @@ @@     @@    @@
-//  @@@@@@@ @@@@@@  @@@@    @@   @@@@  @@@@@   @@@@@  @@@@@@ @@ @@@ @@@@   @@@@
-//  @@ @ @@ @@  @@     @@   @@   @@    @@  @@  @@     @@  @@ @@  @@ @@        @@
-//  @@   @@ @@  @@ @@  @@   @@   @@    @@  @@  @@     @@  @@ @@  @@ @@    @@  @@
-//  @@   @@ @@  @@  @@@@    @@   @@@@@ @@  @@  @@     @@  @@  @@@@@ @@@@@  @@@@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 SdrUndoPageMasterPage::SdrUndoPageMasterPage(SdrPage& rChangedPage)
 :   SdrUndoPage(rChangedPage),
     mbOldHadMasterPage(mrPage.TRG_HasMasterPage())
@@ -1868,6 +1810,5 @@ SdrUndoAction* SdrUndoFactory::CreateUndoPageChangeMasterPage(SdrPage& rChangedP
     return new SdrUndoPageChangeMasterPage(rChangedPage);
 }
 
-// eof
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 8ed0b81da33e..13cc43029f37 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -158,19 +158,6 @@ SdrDropMarkerOverlay::~SdrDropMarkerOverlay()
     // OverlayManager and deletes them.
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-//  @@ @@ @@ @@@@@ @@   @@
-//  @@ @@ @@ @@    @@   @@
-//  @@ @@ @@ @@    @@ @ @@
-//  @@@@@ @@ @@@@  @@@@@@@
-//   @@@  @@ @@    @@@@@@@
-//   @@@  @@ @@    @@@ @@@
-//    @   @@ @@@@@ @@   @@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
 
 TYPEINIT1(SdrView,SdrCreateView);
 
@@ -274,9 +261,6 @@ sal_Bool SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
         if (DoMouseEvent(aVEvt)) bRet=sal_True;
     }
 
-    // #87792# Removed code which did let the mouse snap on object
-    // points
-
     return bRet;
 }
 
@@ -287,7 +271,6 @@ sal_Bool SdrView::Command(const CommandEvent& rCEvt, Window* pWin)
     return bRet;
 }
 
-/* new interface src537 */
 sal_Bool SdrView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
 {
     return SdrCreateView::GetAttributes(rTargetSet, bOnlyHardAttr);
@@ -295,8 +278,7 @@ sal_Bool SdrView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr)
 
 SfxStyleSheet* SdrView::GetStyleSheet() const
 {
-    //sal_Bool bOk=sal_False;
-    return SdrCreateView::GetStyleSheet(); //bOk);
+    return SdrCreateView::GetStyleSheet();
 }
 
 SdrHitKind SdrView::PickAnything(const MouseEvent& rMEvt, sal_uInt16 nEventKind, SdrViewEvent& rVEvt) const
@@ -310,7 +292,6 @@ SdrHitKind SdrView::PickAnything(const MouseEvent& rMEvt, sal_uInt16 nEventKind,
     if (pOut==NULL)
     {
         pOut = GetFirstOutputDevice();
-        //pOut=GetWin(0);
     }
     Point aPnt(rMEvt.GetPosPixel());
     if (pOut!=NULL) aPnt=pOut->PixelToLogic(aPnt);
@@ -347,7 +328,6 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
     if (pOut==NULL)
     {
         pOut = GetFirstOutputDevice();
-        //pOut=GetWin(0);
     }
 
     // #i73628# Use a non-changeable copy of he logic pos
@@ -409,7 +389,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
             }
         }
     }
-    else if (PickObj(aLocalLogicPosition,nHitTolLog,pHitObj,pPV,SDRSEARCH_DEEP|/*SDRSEARCH_TESTMARKABLE|*/SDRSEARCH_ALSOONMASTER|SDRSEARCH_WHOLEPAGE,&pObj,NULL,&nHitPassNum))
+    else if (PickObj(aLocalLogicPosition,nHitTolLog,pHitObj,pPV,SDRSEARCH_DEEP|SDRSEARCH_ALSOONMASTER|SDRSEARCH_WHOLEPAGE,&pObj,NULL,&nHitPassNum))
     {
         // MasterPages und WholePage fuer Macro und URL
         eHit=SDRHIT_UNMARKEDOBJECT;
@@ -536,14 +516,12 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
         // Ringsum die TextEditArea ein Rand zum Selektieren ohne Textedit
         Rectangle aBoundRect(pHitObj->GetCurrentBoundRect());
 
-        // #105130# Force to SnapRect when Fontwork
+        // Force to SnapRect when Fontwork
         if(pHitObj->ISA(SdrTextObj) && ((SdrTextObj*)pHitObj)->IsFontwork())
         {
             aBoundRect = pHitObj->GetSnapRect();
         }
 
-        // #105130# Old test for hit on BoundRect is completely wrong
-        // and never worked, doing it new here.
         sal_Int32 nTolerance(nHitTolLog);
         sal_Bool bBoundRectHit(sal_False);
 
@@ -788,7 +766,6 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
     sal_Bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0;
     sal_Bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0;
     sal_Bool bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0;
-    //sal_Bool bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0;
     sal_Bool bMouseDown=rVEvt.bMouseDown;
     sal_Bool bMouseUp=rVEvt.bMouseUp;
     if (bMouseDown) {
@@ -1001,7 +978,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
         aHitRec.bDown=bMacroDown;
         return pMacroObj->GetMacroPointer(aHitRec);
     }
-    //sal_uInt16 nTol=nHitTolLog;
+
     // TextEdit, ObjEdit, Macro
     if (IsTextEdit() && (IsTextEditInSelectionMode() || IsTextEditHit(rMousePos,0/*nTol*/)))
     {
@@ -1597,6 +1574,6 @@ void SdrView::SetMasterPagePaintCaching(sal_Bool bOn)
         }
     }
 }
-// eof
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index d3820eb99181..e815fa9c0e2a 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -59,7 +59,6 @@
 #include <clonelist.hxx>
 #include <vcl/virdev.hxx>
 
-// b4967543
 #include <svl/style.hxx>
 
 // #i72535#
@@ -223,7 +222,7 @@ sal_Bool SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObj
     SdrRectObj* pObj=new SdrRectObj(OBJ_TEXT,aTextRect);
     pObj->SetModel(pMod);
     pObj->SetLayer(nLayer);
-    pObj->NbcSetText(rStr); // #32424# SetText vor SetAttr, weil SetAttr sonst unwirksam!
+    pObj->NbcSetText(rStr); // SetText vor SetAttr, weil SetAttr sonst unwirksam!
     if (pDefaultStyleSheet!=NULL) pObj->NbcSetStyleSheet(pDefaultStyleSheet, sal_False);
 
     pObj->SetMergedItemSet(aDefaultAttr);
@@ -356,14 +355,13 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL
     {
         const SdrPage* pSrcPg=pSrcMod->GetPage(nPg);
 
-        // #104148# Use SnapRect, not BoundRect here
+        // Use SnapRect, not BoundRect here
         Rectangle aR=pSrcPg->GetAllObjSnapRect();
 
         if (bResize)
             ResizeRect(aR,aPt0,xResize,yResize);
         Point aDist(aPos-aR.Center());
         Size  aSiz(aDist.X(),aDist.Y());
-        //sal_uIntPtr nDstObjAnz0=pDstLst->GetObjCount();
         sal_uIntPtr nCloneErrCnt=0;
         sal_uIntPtr nOb,nObAnz=pSrcPg->GetObjCount();
         sal_Bool bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0;
@@ -376,16 +374,15 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL
         {
             const SdrObject* pSrcOb=pSrcPg->GetObj(nOb);
 
-            // #116235#
             SdrObject* pNeuObj = pSrcOb->Clone();
 
             if (pNeuObj!=NULL)
             {
                 if(bResize)
                 {
-                    pNeuObj->GetModel()->SetPasteResize(sal_True); // #51139#
+                    pNeuObj->GetModel()->SetPasteResize(sal_True);
                     pNeuObj->NbcResize(aPt0,xResize,yResize);
-                    pNeuObj->GetModel()->SetPasteResize(sal_False); // #51139#
+                    pNeuObj->GetModel()->SetPasteResize(sal_False);
                 }
 
                 // #i39861#
@@ -670,7 +667,7 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject*
 
         if(pSdrGrafObj)
         {
-            // #110981# Make behaviour coherent with metafile
+            // Make behaviour coherent with metafile
             // recording below (which of course also takes
             // view-transformed objects)
             aRet = pSdrGrafObj->GetTransformedGraphic();
@@ -807,8 +804,6 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
                 }
                 else
                 {
-                    // #116235#
-                    // pNeuObj = pObj->Clone( pNeuPag, pNeuMod );
                     pNeuObj = pObj->Clone();
                     pNeuObj->SetPage( pNeuPag );
                     pNeuObj->SetModel( pNeuMod );