Removal of commented code.

25 files changed, 27 insertions, 181 deletions

diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index b592306eaccf..2952ee89d6a9 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -67,25 +67,11 @@ using namespace ::com::sun::star;
             // #100394# xC->setVisible triggers window->Show() and this has
             // problems when the view is not completely constructed which may
             // happen when loading. This leads to accessibility broadcasts which
-            // throw asserts due to the not finished view. All this chan be avoided
+            // throw asserts due to the not finished view. All this chain can be avoided
             // since xC->setVisible is here called only for the side effect in
             // UnoControlContainer::setVisible(...) which calls createPeer(...).
             // This will now be called directly from here.
 
-            // UnoContainerModel erzeugen
-            // uno::Reference< awt::XWindow > xC(mxControlContainer, uno::UNO_QUERY);
-            // CreateControlContainer() is only used from
-            // , thus it seems not necessary to make
-            // it visible her at all.
-            // #58917# Das Show darf nicht am VCL-Fenster landen, weil dann Assertion vom SFX
-            // sal_Bool bVis = pWindow->IsVisible();
-            // xC->setVisible(sal_True);
-            // if ( !bVis )
-            //  pWindow->Hide();
-            //  if( !mxContext.is() && bVisible )
-            //      // Es ist ein TopWindow, also automatisch anzeigen
-            //      createPeer( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > (), ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > () );
-
             uno::Reference< awt::XControl > xControl(mxControlContainer, uno::UNO_QUERY);
             if(xControl.is())
             {
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 18cf582ca115..16dbfbfb6fd5 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -303,7 +303,6 @@ SdrItemPool::SdrItemPool(
     pBoxInfoItem->SetValid( VALID_DISABLE, sal_True ); // some lines may have DontCare state only in tables
 
     mppLocalPoolDefaults[ SDRATTR_TABLE_BORDER_INNER - SDRATTR_START ] =  pBoxInfoItem;
-//  mppLocalPoolDefaults[ SDRATTR_TABLE_BORDER_SHADOW - SDRATTR_START ] = new SvxShadowItem( SDRATTR_TABLE_BORDER_SHADOW );
     mppLocalPoolDefaults[ SDRATTR_TABLE_BORDER_TLBR - SDRATTR_START ] = new SvxLineItem( SDRATTR_TABLE_BORDER_TLBR );
     mppLocalPoolDefaults[ SDRATTR_TABLE_BORDER_BLTR - SDRATTR_START ] = new SvxLineItem( SDRATTR_TABLE_BORDER_BLTR );
 
@@ -314,7 +313,6 @@ SdrItemPool::SdrItemPool(
 
     mpLocalItemInfos[SDRATTR_TABLE_BORDER - SDRATTR_START ]._nSID = SID_ATTR_BORDER_OUTER;
     mpLocalItemInfos[SDRATTR_TABLE_BORDER_INNER - SDRATTR_START ]._nSID = SID_ATTR_BORDER_INNER;
-//  mpLocalItemInfos[SDRATTR_TABLE_BORDER_SHADOW - SDRATTR_START ]._nSID = SID_ATTR_BORDER_SHADOW;
     mpLocalItemInfos[SDRATTR_TABLE_BORDER_TLBR - SDRATTR_START ]._nSID = SID_ATTR_BORDER_DIAG_TLBR;
     mpLocalItemInfos[SDRATTR_TABLE_BORDER_BLTR - SDRATTR_START ]._nSID = SID_ATTR_BORDER_DIAG_BLTR;
 
@@ -877,7 +875,6 @@ SfxItemPresentation SdrAngleItem::GetPresentation(
         xub_StrLen nAnz(2);
 
         const IntlWrapper* pMyIntlWrapper = NULL;
-//        DBG_ASSERT( pIntlWrapper, "SdrAngleItem::GetPresentation: using default App-IntlWrapper" );
         if(!pIntlWrapper)
             pIntlWrapper = pMyIntlWrapper = new IntlWrapper(
                 ::comphelper::getProcessServiceFactory(),
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index ffb3185ef5ea..593d7e744b81 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -912,16 +912,15 @@ sal_Bool SdrCreateView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceA
     }
 }
 
-SfxStyleSheet* SdrCreateView::GetStyleSheet() const // SfxStyleSheet* SdrCreateView::GetStyleSheet(sal_Bool& rOk) const
+SfxStyleSheet* SdrCreateView::GetStyleSheet() const
 {
     if (pAktCreate!=NULL)
     {
-        //rOk=sal_True;
         return pAktCreate->GetStyleSheet();
     }
     else
     {
-        return SdrDragView::GetStyleSheet(); // SdrDragView::GetStyleSheet(rOk);
+        return SdrDragView::GetStyleSheet();
     }
 }
 
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 85e87411723b..29b21f129d11 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -162,12 +162,6 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragEntrySdrObject::createPrim
     // out when clone and original have the same class, so that i can use operator=
     // in those cases
 
-    //        // copy all other needed stuff
-    //        basegfx::B2DHomMatrix aMatrix;
-    //        basegfx::B2DPolyPolygon aPolyPolygon;
-    //      pOleObject->TRGetBaseGeometry(aMatrix, aPolyPolygon);
-    //        pClone->TRSetBaseGeometry(aMatrix, aPolyPolygon);
-
     const SdrObject* pSource = &maOriginal;
 
     if(mpClone)
@@ -607,10 +601,6 @@ void SdrDragMethod::applyCurrentTransformationToSdrObject(SdrObject& rTarget)
             -aPolyRange.getMinX(), -aPolyRange.getMinY()));
         aPolyTransform.scale(fScaleX, fScaleY);
 
-        // normally the polygon should be moved back, but the translation is in the object
-        // transformation and thus does not need to be done
-        // aPolyTransform.translate(-aPolyRange.getMinX(), -aPolyRange.getMinY());
-
         // transform the polygon
         aObjectPolyPolygon.transform(aPolyTransform);
     }
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index a028d58afcf6..212650181bb8 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -225,7 +225,6 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
     bool bRet=false;
     {
         SetDragWithCopy(sal_False);
-        //ForceEdgesOfMarkedNodes();
         //TODO: aAni.Reset();
         mpCurrentSdrDragMethod=NULL;
         bDragSpecial=sal_False;
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index cc958a6673ba..41cef00d9526 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -727,7 +727,6 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool /*
     {
         const SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
-        //const SdrPageView* pPV=pM->GetPageView();
         if( bUndo )
             AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
 
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 98a89f06b79e..66e18cd29dbc 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -2027,7 +2027,6 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo)
         }
         if ( pOle2!=NULL && pOle2->GetGraphic() )
         {
-            //const GDIMetaFile* pMtf=pOle2->GetGDIMetaFile();
             ImpSdrGDIMetaFileImport aFilter(*pMod);
             aFilter.SetScaleRect(pOle2->GetLogicRect());
             aFilter.SetLayer(pObj->GetLayer());
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 9c9fcf085ee6..408ca0eba3e1 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -665,7 +665,6 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
 
             aHdl.SetMoveOutside(sal_False);
             aHdl.SetMoveOutside(sal_True);
-            //OLMRefreshAllIAOManagers();
 
             // register all windows as OutlinerViews with the Outliner
             if(!bOnlyOneView)
@@ -758,11 +757,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
     mxTextEditObj.reset(0);
     pTextEditPV=NULL;
     pTextEditWin=NULL;
-    //HMHif (bMarkHdlWhenTextEdit) {
-    //HMH    HideMarkHdl();
-    //HMH}
     aHdl.SetMoveOutside(sal_False);
-    //HMHShowMarkHdl();
 
     return sal_False;
 }
@@ -931,10 +926,6 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally)
             aRect.Bottom()+=nMorePix;
             aRect=pWin->PixelToLogic(aRect);
             InvalidateOneWin(*pWin,aRect);
-//          pWin->Invalidate(INVALIDATE_UPDATE);
-
-//          pWin->Update();
-//          pWin->Flush();
             pWin->SetFillColor();
             pWin->SetLineColor(COL_BLACK);
             pWin->DrawPixel(aRect.TopLeft());
@@ -949,15 +940,8 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally)
         if (pTEWin!=NULL) {
             pTEWin->SetCursor(pTECursorMerker);
         }
-//HMH        if (bMarkHdlWhenTextEdit) {
-//HMH            HideMarkHdl();
-//HMH        }
         aHdl.SetMoveOutside(sal_False);
         if (eRet!=SDRENDTEXTEDIT_UNCHANGED)
-//HMH       {
-//HMH            ShowMarkHdl(); // Otherwise handles come via broadcast
-//HMH        }
-//HMH       else
         {
             GetMarkedObjectListWriteAccess().SetNameDirty();
         }
@@ -1104,7 +1088,7 @@ sal_Bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
     {
         if (pTextEditOutlinerView->PostKeyEvent(rKEvt, pWin))
         {
-            if( pMod /* && !pMod->IsChanged() */ )
+            if( pMod )
             {
                 if( pTextEditOutliner && pTextEditOutliner->IsModified() )
                     pMod->SetChanged( sal_True );
@@ -1249,7 +1233,7 @@ sal_Bool SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin)
                 return sal_True;
             }
         }
-        else // if (rCEvt.GetCommand() == COMMAND_VOICE )
+        else
         {
             pTextEditOutlinerView->Command(rCEvt);
             return sal_True;
@@ -1389,7 +1373,6 @@ sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplace
     sal_Bool bAllTextSelected=ImpIsTextEditAllSelected();
     SfxItemSet* pModifiedSet=NULL;
     const SfxItemSet* pSet=&rSet;
-    //const SvxAdjustItem* pParaJust=NULL;
 
     if (!bTextEdit)
     {
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 3b3fb8296460..0cc8aade8bd1 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -84,8 +84,6 @@ SdrGlobalData::SdrGlobalData() :
     pResMgr(NULL),
     nExchangeFormat(0)
 {
-    //pSysLocale = new SvtSysLocale;
-    //pLocaleData = pSysLocale->GetLocaleDataPtr();
 
     svx::ExtrusionBar::RegisterInterface();
     svx::FontworkBar::RegisterInterface();
@@ -463,8 +461,6 @@ SdrEngineDefaults& SdrEngineDefaults::GetDefaults()
 
 SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pModel )
 {
-    //SdrEngineDefaults& rDefaults = SdrEngineDefaults::GetDefaults();
-
     SfxItemPool* pPool = &pModel->GetItemPool();
     SdrOutliner* pOutl = new SdrOutliner( pPool, nOutlinerMode );
     pOutl->SetEditTextObjectPool( pPool );
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 0de996f72448..4aaa35b48274 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -753,8 +753,6 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const XubString& rS
 
     sal_Int32 nTextWidth = (sal_Int32)( aVD.GetTextWidth( rStr ) * fScaleX );
     sal_Int32 nTextHeight = (sal_Int32)( aVD.GetTextHeight() * fScaleY );
-    //sal_Int32 nDxWidth = 0;
-    //sal_Int32 nLen = rStr.Len();
 
     Point aPos( FRound(rPos.X() * fScaleX + aOfs.X()), FRound(rPos.Y() * fScaleY + aOfs.Y()) );
     Size aSize( nTextWidth, nTextHeight );
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 5d58e1f85e81..910d91b6b739 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -397,7 +397,6 @@ void SdrHdl::Touch()
 
 void SdrHdl::GetRidOfIAObject()
 {
-    //OLMaIAOGroup.Delete();
 
     // OVERLAYMANAGER
     maOverlayGroup.clear();
@@ -864,18 +863,8 @@ sal_Bool SdrHdl::IsFocusHdl() const
         case HDL_CIRC:      // angle of circle segments, corner radius of rectangles
         case HDL_REF1:      // reference point 1, e. g. center of rotation
         case HDL_REF2:      // reference point 2, e. g. endpoint of reflection axis
-        //case HDL_MIRX:        // reflection axis itself
         case HDL_GLUE:      // glue point
         case HDL_GLUE_DESELECTED:      // deselected glue point, used to be a little blue cross
-        // do NOT activate here, let SW implement their own SdrHdl and
-        // overload IsFocusHdl() there to make the anchor accessible
-        //case HDL_ANCHOR:      // anchor symbol (SD, SW)
-        // same for AnchorTR
-        //case HDL_ANCHOR_TR:   // anchor symbol (SD, SW)
-
-        //case HDL_TRNS:        // interactive transparence
-        //case HDL_GRAD:        // interactive gradient
-        //case HDL_COLR:        // interactive color
 
         // for SJ and the CustomShapeHandles:
         case HDL_CUSTOMSHAPE1:
@@ -936,7 +925,6 @@ void SdrHdlColor::CreateB2dIAObject()
             {
                 for(sal_uInt32 b(0L); b < pPageView->PageWindowCount(); b++)
                 {
-                    // const SdrPageViewWinRec& rPageViewWinRec = rPageViewWinList[b];
                     const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(b);
 
                     if(rPageWindow.GetPaintWindow().OutputToWindow())
@@ -1500,7 +1488,7 @@ Pointer ImpEdgeHdl::GetPointer() const
     if (pEdge==NULL)
         return SdrHdl::GetPointer();
     if (nObjHdlNum<=1)
-        return Pointer(POINTER_MOVEPOINT); //Pointer(POINTER_DRAW_CONNECT);
+        return Pointer(POINTER_MOVEPOINT);
     if (IsHorzDrag())
         return Pointer(POINTER_ESIZE);
     else
@@ -1948,7 +1936,6 @@ void SdrHdlList::TravelFocusHdl(sal_Bool bForward)
             if(pNew)
             {
                 pNew->Touch();
-                //SDObRefresh = sal_True;
             }
         }
 
@@ -1977,26 +1964,18 @@ void SdrHdlList::SetFocusHdl(SdrHdl* pNew)
 
             if(nNewHdlNum != CONTAINER_ENTRY_NOTFOUND)
             {
-                //SDOsal_Bool bRefresh(sal_False);
                 mnFocusIndex = nNewHdlNum;
 
                 if(pActual)
                 {
                     pActual->Touch();
-                    //SDObRefresh = sal_True;
                 }
 
                 if(pNew)
                 {
                     pNew->Touch();
-                    //SDObRefresh = sal_True;
                 }
 
-                //OLMif(bRefresh)
-                //OLM{
-                //OLM   if(pView)
-                //OLM       pView->RefreshAllIAOManagers();
-                //OLM}
             }
         }
     }
@@ -2127,18 +2106,15 @@ void SdrHdlList::Sort()
 
     if(pPrev != pNow)
     {
-        //SDOsal_Bool bRefresh(sal_False);
 
         if(pPrev)
         {
             pPrev->Touch();
-            //SDObRefresh = sal_True;
         }
 
         if(pNow)
         {
             pNow->Touch();
-            //SDObRefresh = sal_True;
         }
     }
 }
@@ -2286,7 +2262,6 @@ void SdrCropHdl::CreateB2dIAObject()
 
         for(sal_uInt32 b(0L); b < pPageView->PageWindowCount(); b++)
         {
-            // const SdrPageViewWinRec& rPageViewWinRec = rPageViewWinList[b];
             const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(b);
 
             if(rPageWindow.GetPaintWindow().OutputToWindow())
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 7557d6c73686..4d36c7e4ca91 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -510,7 +510,7 @@ bool _SdrItemBrowserControl::BegChangeEntry(sal_uIntPtr nPos)
     ImpItemListRow* pEntry=ImpGetEntry(nPos);
     if (pEntry!=NULL && !pEntry->bComment) {
         SetMode(MYBROWSEMODE & ~BROWSER_KEEPHIGHLIGHT);
-        pEditControl=new ImpItemEdit(&GetDataWindow(),this,0/*|WB_BORDER|WB_3DLOOK*/);
+        pEditControl=new ImpItemEdit(&GetDataWindow(),this,0);
         Rectangle aRect(GetFieldRectPixel(nPos,ITEMBROWSER_VALUECOL_ID,sal_False));
         aRect.Left()+=2; // little offset for the Edit, so it's exact to the pixel
         aRect.Right()--;
@@ -1140,13 +1140,11 @@ void SdrItemBrowser::Undirty()
     aIdleTimer.Stop();
     bDirty = sal_False;
 
-//  SfxItemSet aSet(pView->GetAttributes());
     SfxItemSet aSet(pView->GetModel()->GetItemPool());
     pView->GetAttributes(aSet);
 
     if(pView->AreObjectsMarked())
     {
-        // SfxItemSet a2ndSet(pView->GetAttributes(sal_True));
         SfxItemSet a2ndSet(pView->GetModel()->GetItemPool());
         pView->GetAttributes(a2ndSet, sal_True);
 
@@ -1169,7 +1167,6 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
     const ImpItemListRow* pEntry=pBrowse->GetAktChangeEntry();
     if (pEntry!=NULL)
     {
-//      SfxItemSet aSet(pView->GetAttributes());
         SfxItemSet aSet(pView->GetModel()->GetItemPool());
         pView->GetAttributes(aSet);
 
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 152fdf5d2061..6eda9683d8a7 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -370,12 +370,12 @@ bool SdrModel::IsInDestruction() const
 }
 
 // not yet implemented
-void SdrModel::operator=(const SdrModel& /*rSrcModel*/)
+void SdrModel::operator=(const SdrModel&)
 {
     OSL_FAIL("SdrModel::operator=() is not yet implemented.");
 }
 
-bool SdrModel::operator==(const SdrModel& /*rCmpModel*/) const
+bool SdrModel::operator==(const SdrModel&) const
 {
     OSL_FAIL("SdrModel::operator==() is not yet implemented");
     return sal_False;
@@ -1817,8 +1817,6 @@ void SdrModel::setLock( bool bLock )
     {
         if( sal_False == bLock )
         {
-            // ReformatAllTextObjects(); due to a typo in the above if, this code was never
-            //                           executed, so I remove it until we discover that we need it here
             ImpReformatAllEdgeObjects();
         }
         mbModelLocked = bLock;
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index d7c8959b59d2..1aaa66b22ae1 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -196,12 +196,6 @@ void SdrMarkView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
             bMarkedObjRectDirty=sal_True;
             bMarkedPointsRectsDirty=sal_True;
         }
-/* removed for now since this breaks existing code who iterates over the mark list and sequentially replaces objects
-        if( eKind==HINT_OBJREMOVED && IsObjMarked( const_cast<SdrObject*>(pSdrHint->GetObject()) ) )
-        {
-            MarkObj( const_cast<SdrObject*>(pSdrHint->GetObject()), GetSdrPageView(), sal_True );
-        }
-*/
     }
     SdrSnapView::Notify(rBC,rHint);
 }
@@ -723,7 +717,6 @@ void SdrMarkView::SetMarkHandles()
                     {
                         sal_Bool bSelected=pMrkPnts!=NULL && pMrkPnts->Exist(sal_uInt16(i-nSiz0));
                         pHdl->SetSelected(bSelected);
-                        //sal_Bool bPlus=bPlusHdlAlways;
                         if (bPlusHdlAlways || bSelected)
                         {
                             sal_uInt32 nPlusAnz=pObj->GetPlusHdlCount(*pHdl);
@@ -756,7 +749,6 @@ void SdrMarkView::SetMarkHandles()
                 const SdrGluePointList* pGPL=pObj->GetGluePointList();
                 if (pGPL!=NULL)
                 {
-                    //sal_uInt16 nGlueAnz=pGPL->GetCount();
                     sal_uInt16 nAnz=(sal_uInt16)pMrkGlue->GetCount();
                     for (sal_uInt16 nNum=0; nNum<nAnz; nNum++)
                     {
@@ -819,11 +811,8 @@ void SdrMarkView::SetDragMode(SdrDragMode eMode)
     eDragMode=eMode;
     if (eDragMode==SDRDRAG_RESIZE) eDragMode=SDRDRAG_MOVE;
     if (eDragMode!=eMode0) {
-        //HMHBOOL bVis=IsMarkHdlShown();
-        //HMHif (bVis) HideMarkHdl();
         ForceRefToMarked();
         SetMarkHandles();
-        //HMHif (bVis) ShowMarkHdl();
         {
             if (AreObjectsMarked()) MarkListHasChanged();
         }
@@ -890,7 +879,6 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
                         pModel->EndUndo();
                     }
 
-                    //pObj->SetItemAndBroadcast(aNewItem);
                     SfxItemSet aNewSet(pModel->GetItemPool());
                     aNewSet.Put(aNewItem);
                     pObj->SetMergedItemSetAndBroadcast(aNewSet);
@@ -1007,7 +995,7 @@ sal_Bool SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
         }
 
         // notify current mouse over handle
-        if( pMouseOverHdl /* && !pMouseOverHdl->mbMouseOver */ )
+        if( pMouseOverHdl )
         {
             pMouseOverHdl->mbMouseOver = true;
             pMouseOverHdl->onMouseEnter(rMEvt);
@@ -1037,7 +1025,6 @@ void SdrMarkView::ForceRefToMarked()
             long nObjDst=0;
             long nOutHgt=0;
             OutputDevice* pOut=GetFirstOutputDevice();
-            //OutputDevice* pOut=GetWin(0);
             if (pOut!=NULL) {
                 // minimum length: 50 pixels
                 nMinLen=pOut->PixelToLogic(Size(0,50)).Height();
@@ -1114,7 +1101,6 @@ void SdrMarkView::SetRef1(const Point& rPt)
         SdrHdl* pH = aHdl.GetHdl(HDL_REF1);
         if(pH)
             pH->SetPos(rPt);
-        //HMHShowMarkHdl();
     }
 }
 
@@ -1126,7 +1112,6 @@ void SdrMarkView::SetRef2(const Point& rPt)
         SdrHdl* pH = aHdl.GetHdl(HDL_REF2);
         if(pH)
             pH->SetPos(rPt);
-        //HMHShowMarkHdl();
     }
 }
 
@@ -1198,7 +1183,7 @@ void SdrMarkView::SetFrameHandles(sal_Bool bOn)
         bForceFrameHandles=bOn;
         sal_Bool bNew=ImpIsFrameHandles();
         if (bNew!=bOld) {
-            AdjustMarkHdl(); //HMHTRUE);
+            AdjustMarkHdl();
             MarkListHasChanged();
         }
     }
@@ -1373,7 +1358,6 @@ sal_Bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, sal_Bool bPrev)
     SdrObject* pBtmObjHit=pBtmMarkHit->GetMarkedSdrObj();
     sal_uIntPtr nObjAnz=pObjList->GetObjCount();
 
-    //sal_uIntPtr nSearchBeg=bPrev ? pBtmObjHit->GetOrdNum()+1 : pTopObjHit->GetOrdNum();
     sal_uInt32 nSearchBeg;
     E3dScene* pScene = NULL;
     SdrObject* pObjHit = (bPrev) ? pBtmObjHit : pTopObjHit;
@@ -1406,7 +1390,6 @@ sal_Bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, sal_Bool bPrev)
 
     sal_uIntPtr no=nSearchBeg;
     SdrObject* pFndObj=NULL;
-    //SdrObject* pAktObj=NULL;
     while (pFndObj==NULL && ((!bPrev && no>0) || (bPrev && no<nObjAnz))) {
         if (!bPrev) no--;
         SdrObject* pObj;
@@ -1435,7 +1418,7 @@ sal_Bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, sal_Bool bPrev)
         GetMarkedObjectListWriteAccess().DeleteMark(bPrev?nBtmMarkHit:nTopMarkHit);
         GetMarkedObjectListWriteAccess().InsertEntry(SdrMark(pFndObj,pPV));
         MarkListHasChanged();
-        AdjustMarkHdl(); //HMHTRUE);
+        AdjustMarkHdl();
     }
     return pFndObj!=NULL;
 }
@@ -1478,8 +1461,7 @@ sal_Bool SdrMarkView::MarkObj(const Rectangle& rRect, sal_Bool bUnmark)
     if (bFnd) {
         SortMarkedObjects();
         MarkListHasChanged();
-        AdjustMarkHdl(); //HMHTRUE);
-        //HMHShowMarkHdl();
+        AdjustMarkHdl();
     }
     return bFnd;
 }
@@ -1502,11 +1484,7 @@ void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, sal_Bool bUnmark, s
         }
         if (!bImpNoSetMarkHdl) {
             MarkListHasChanged();
-            AdjustMarkHdl(); //HMHTRUE);
-            //HMHif (!bSomeObjChgdFlag) {
-                // ShowMarkHdl otherwise comes via AfterPaintTimer
-                //HMHShowMarkHdl();
-            //HMH}
+            AdjustMarkHdl();
         }
     }
 }
@@ -1529,10 +1507,7 @@ void SdrMarkView::SetMarkHdlSizePixel(sal_uInt16 nSiz)
     if (nSiz<3) nSiz=3;
     nSiz/=2;
     if (nSiz!=aHdl.GetHdlSize()) {
-        //HMHBOOL bMerk=IsMarkHdlShown();
-        //HMHif (bMerk) HideMarkHdl();
         aHdl.SetHdlSize(nSiz);
-        //HMHif (bMerk) ShowMarkHdl();
     }
 }
 
@@ -1831,8 +1806,6 @@ void SdrMarkView::UnmarkAllObj(SdrPageView* pPV)
 {
     if (GetMarkedObjectCount()!=0) {
         BrkAction();
-        //HMHBOOL bVis=bHdlShown;
-        //HMHif (bVis) HideMarkHdl();
         if (pPV!=NULL)
         {
             GetMarkedObjectListWriteAccess().DeletePageView(*pPV);
@@ -1844,15 +1817,13 @@ void SdrMarkView::UnmarkAllObj(SdrPageView* pPV)
         pMarkedObj=NULL;
         pMarkedPV=NULL;
         MarkListHasChanged();
-        AdjustMarkHdl(); //HMHTRUE);
-        //HMHif (bVis) ShowMarkHdl(); // ggf. fuer die RefPoints
+        AdjustMarkHdl();
     }
 }
 
 void SdrMarkView::MarkAllObj(SdrPageView* _pPV)
 {
     BrkAction();
-    //HMHHideMarkHdl();
 
     if(!_pPV)
     {
@@ -1873,22 +1844,15 @@ void SdrMarkView::MarkAllObj(SdrPageView* _pPV)
 
     if(GetMarkedObjectCount())
     {
-        AdjustMarkHdl(); //HMHTRUE);
-        //HMHShowMarkHdl();
+        AdjustMarkHdl();
     }
 }
 
-void SdrMarkView::AdjustMarkHdl() //HMHBOOL bRestraintPaint)
+void SdrMarkView::AdjustMarkHdl()
 {
-    //HMHBOOL bVis=bHdlShown;
-    //HMHif (bVis) HideMarkHdl();
     CheckMarked();
     SetMarkRects();
     SetMarkHandles();
-    //HMHif(bRestraintPaint && bVis)
-    //HMH{
-    //HMH   ShowMarkHdl();
-    //HMH}
 }
 
 Rectangle SdrMarkView::GetMarkedObjBoundRect() const
@@ -1991,7 +1955,7 @@ sal_Bool SdrMarkView::EnterMarkedGroup()
 void SdrMarkView::MarkListHasChanged()
 {
     GetMarkedObjectListWriteAccess().SetNameDirty();
-    SetEdgesOfMarkedNodesDirty(); // bEdgesOfMarkedNodesDirty=sal_True;
+    SetEdgesOfMarkedNodesDirty();
 
     bMarkedObjRectDirty=sal_True;
     bMarkedPointsRectsDirty=sal_True;
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index 684d8cdab015..43ea99ff250f 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -258,10 +258,6 @@ sal_Bool SdrMarkView::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark)
             }
             Point aPos(pHdl->GetPos());
             if (pM!=NULL && (pRect==NULL || pRect->IsInside(aPos))) {
-                //HMHif (bHideHdl && IsMarkHdlShown() && pHdl->GetObj()!=NULL) {
-                    //HMHsal_uInt32 nAnz=pHdl->GetObj()->GetPlusHdlCount(*pHdl);
-                    //HMHif (nAnz!=0L) HideMarkHdl(); // #36987#
-                //HMH}
                 if (ImpMarkPoint(pHdl,pM,bUnmark)) bChgd=sal_True;
             }
         }
@@ -300,11 +296,8 @@ void SdrMarkView::SetPlusHandlesAlwaysVisible(sal_Bool bOn)
 { // TODO: Optimize HandlePaint!
     ForceUndirtyMrkPnt();
     if (bOn!=bPlusHdlAlways) {
-        //HMHBOOL bVis=IsMarkHdlShown();
-        //HMHif (bVis) HideMarkHdl();
         bPlusHdlAlways=bOn;
         SetMarkHandles();
-        //HMHif (bVis) ShowMarkHdl();
         MarkListHasChanged();
     }
 }
@@ -510,14 +503,13 @@ sal_Bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark)
 sal_Bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, sal_uIntPtr nOptions) const
 {
     SdrObject* pObj0=rpObj;
-    //SdrPageView* pPV0=rpPV;
     sal_uInt16 nId0=rnId;
     rpObj=NULL; rpPV=NULL; rnId=0;
     if (!IsGluePointEditMode()) return sal_False;
     sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
     sal_Bool bNext=(nOptions & SDRSEARCH_NEXT) !=0;
     OutputDevice* pOut=(OutputDevice*)pActualOutDev;
-    if (pOut==NULL) pOut=GetFirstOutputDevice(); //GetWin(0);
+    if (pOut==NULL) pOut=GetFirstOutputDevice();
     if (pOut==NULL) return sal_False;
     SortMarkedObjects();
     sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 97a4caddb78c..f42eab5b8813 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -895,7 +895,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType )
             for ( i = nAdjustmentValues; i < nAdjustmentDefaults; i++ )
             {
                 seqAdjustmentValues[ i ].Value <<= pDefData[ i ];
-                seqAdjustmentValues[ i ].State = com::sun::star::beans::PropertyState_DIRECT_VALUE; // com::sun::star::beans::PropertyState_DEFAULT_VALUE;
+                seqAdjustmentValues[ i ].State = com::sun::star::beans::PropertyState_DIRECT_VALUE;
             }
         }
         // check if there are defaulted adjustment values that should be filled the hard coded defaults (pDefValue)
@@ -1717,7 +1717,7 @@ void SdrObjCustomShape::NbcShear( const Point& rRef, long nWink, double tn, bool
 
 SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(sal_uInt16 nPosNum) const
 {
-    sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
+    sal_Int32 nWdt = ImpGetLineWdt(); // #i25616#
 
     // #i25616#
     if(!LineIsOutsideGeometry())
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index d96080bcd99d..0ece8906367d 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1314,14 +1314,6 @@ bool SdrObject::MovCreate(SdrDragStat& rStat)
     rStat.SetActionRect(aOutRect);
     aOutRect.Justify();
 
-    // #i101648# for naked (non-derived) SdrObjects, do not invalidate aOutRect
-    // by calling SetBoundRectDirty(); aOutRect IS the geometry for such objects.
-    // No derivation implementation calls the parent implementation, so this will
-    // cause no further prolems
-    //
-    // SetBoundRectDirty();
-    // bSnapRectDirty=sal_True;
-
     return sal_True;
 }
 
@@ -1330,10 +1322,6 @@ bool SdrObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
     rStat.TakeCreateRect(aOutRect);
     aOutRect.Justify();
 
-    // #i101648# see description at MovCreate
-    //
-    // SetRectsDirty();
-
     return (eCmd==SDRCREATE_FORCEEND || rStat.GetPointAnz()>=2);
 }
 
@@ -2729,8 +2717,6 @@ void SdrObject::impl_setUnoShape( const uno::Reference< uno::XInterface >& _rxUn
 {
     maWeakUnoShape = _rxUnoShape;
     mpSvxShape = SvxShape::getImplementation( _rxUnoShape );
-//    OSL_ENSURE( mpSvxShape || !_rxUnoShape.is(),
-//        "SdrObject::setUnoShape: not sure it's a good idea to have an XShape which is not implemented by SvxShape ..." );
 }
 
 /** only for internal use! */
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 1e47375d254c..b56b1d56c7fa 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -1501,8 +1501,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
                 aXP1[3].X()-=dx/2;
                 aXP1[3].Y()-=dy/2;
                 aXP1.SetFlags(3,XPOLY_SYMMTR);
-                //aXP1[4].X()+=dx/2;
-                //aXP1[4].Y()+=dy/2;
                 aXP1.Remove(4,1); // because it's identical with aXP1[3]
             }
         }
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 5b31504f6ee4..2fca8bca3a2e 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -519,7 +519,6 @@ public:
     bool beginPathDrag( SdrDragStat& rDrag )  const;
     bool movePathDrag( SdrDragStat& rDrag ) const;
     bool endPathDrag( SdrDragStat& rDrag );
-    //void cancelSpecialDrag( SdrDragStat& rDrag ) const;
     String getSpecialDragComment(const SdrDragStat& rDrag) const;
     basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const;
 
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 1400a08acee3..b92d67f7fa10 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -527,7 +527,7 @@ XubString SdrRectObj::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const
 
 SdrGluePoint SdrRectObj::GetVertexGluePoint(sal_uInt16 nPosNum) const
 {
-    sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
+    sal_Int32 nWdt = ImpGetLineWdt(); // #i25616#
 
     // #i25616#
     if(!LineIsOutsideGeometry())
@@ -553,7 +553,7 @@ SdrGluePoint SdrRectObj::GetVertexGluePoint(sal_uInt16 nPosNum) const
 
 SdrGluePoint SdrRectObj::GetCornerGluePoint(sal_uInt16 nPosNum) const
 {
-    sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
+    sal_Int32 nWdt = ImpGetLineWdt(); // #i25616#
 
     // #i25616#
     if(!LineIsOutsideGeometry())
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index e26cadfa58c6..27f04a322777 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -283,13 +283,11 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
             nNum--;
             XubString* pName=(XubString*)aStyles.GetObject(nNum);
 
-            // UNICODE: String aFam(pName->Cut(pName->Len()-6));
             String aFam = pName->Copy(0, pName->Len() - 6);
 
             aFam.Erase(0,1);
             aFam.EraseTrailingChars();
 
-            // UNICODE: sal_uInt16 nFam=sal_uInt16(aFam);
             sal_uInt16 nFam = (sal_uInt16)aFam.ToInt32();
 
             SfxStyleFamily eFam=(SfxStyleFamily)nFam;
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 19cee36c918b..252ec09ebf3b 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -530,8 +530,8 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C
 
         bool bMap0=rOut.IsMapModeEnabled();
 
-        long nWrX=0;//aWriterPageOffset.X();
-        long nWrY=0;//aWriterPageOffset.Y();
+        long nWrX=0;
+        long nWrY=0;
         Point aOrg(aPgOrg);
         long x1=GetPage()->GetLftBorder()+1+nWrX;
         long x2=GetPage()->GetWdt()-GetPage()->GetRgtBorder()-1+nWrY;
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 6e3bb4d8ba4d..62a3d84bec8e 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -462,7 +462,7 @@ bool SdrPolyEditView::IsRipUpAtMarkedPointsPossible() const
 
                     if(nPointCount >= 3)
                     {
-                        bRetval = pMarkedPathObject->IsClosedObj(); // #i76617# aPathPolygon.isClosed();
+                        bRetval = pMarkedPathObject->IsClosedObj(); // #i76617#
 
                         for(sal_uInt32 b(0); !bRetval && b < pSelectedPoints->GetCount(); b++)
                         {
@@ -547,7 +547,7 @@ SdrObjClosedKind SdrPolyEditView::GetMarkedObjectsClosedState() const
     }
 }
 
-void SdrPolyEditView::CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen) // , long nOpenDistance)
+void SdrPolyEditView::CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen)
 {
     if (AreObjectsMarked())
     {
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index a7d74db1d81d..325bece0506d 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -166,7 +166,6 @@ void ImplHelpLineOverlay::SetPosition(const basegfx::B2DPoint& rNewPosition)
     if(rNewPosition != maPosition)
     {
         // apply to OverlayObjects
-        // apply to OverlayObjects
         for(sal_uInt32 a(0); a < maObjects.count(); a++)
         {
             sdr::overlay::OverlayHelplineStriped* pCandidate =
diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx
index 6f5c0d3b048b..580d38e94fde 100644
--- a/svx/source/svdraw/svdtext.cxx
+++ b/svx/source/svdraw/svdtext.cxx
@@ -168,12 +168,6 @@ void SdrText::SetModel( SdrModel* pNewModel )
         {
             Fraction aMetricFactor=GetMapFactor(aOldUnit,aNewUnit).X();
 
-            // Funktioniert nicht richtig:
-            // Geht am Outliner leider nur in %
-            // double nPercFloat=double(aMetricFactor)*100+0.5;
-            // sal_uInt16 nPerc=(sal_uInt16)nPercFloat;
-            // rOutliner.DoStretchChars(100,nPerc);
-
             if (bSetHgtItem)
             {
                 // Und nun noch das Rahmenattribut korregieren