Removed dead code and comments from sd

8 files changed, 30 insertions, 150 deletions

diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx
index 85540be56..8522a5cd7 100644
--- a/sd/source/ui/func/bulmaper.cxx
+++ b/sd/source/ui/func/bulmaper.cxx
@@ -131,7 +131,6 @@ void SdBulletMapper::MapFontsInNumRule( SvxNumRule& aNumRule, const SfxItemSet&
             aMyFont.SetShadow(rSItem.GetValue());
 
             aNewLevel.SetBulletFont(&aMyFont);
-//			aNewLevel.SetBulletRelSize( 75 );
             aNumRule.SetLevel(nLevel, aNewLevel );
         }
         else if( rSrcLevel.GetNumberingType() == com::sun::star::style::NumberingType::CHAR_SPECIAL )
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx
index cba11d2ba..0855cc0fc 100644
--- a/sd/source/ui/func/fucon3d.cxx
+++ b/sd/source/ui/func/fucon3d.cxx
@@ -57,7 +57,6 @@
 #include "ToolBarManager.hxx"
 #include <svx/svx3ditems.hxx>
 
-// #97016#
 #include <svx/polysc3d.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 
@@ -104,7 +103,6 @@ void FuConstruct3dObject::DoExecute( SfxRequest& rReq )
 |*
 \************************************************************************/
 
-// #97016#
 E3dCompoundObject* FuConstruct3dObject::ImpCreateBasic3DShape()
 {
     E3dCompoundObject* p3DObj = NULL;
@@ -261,7 +259,6 @@ E3dCompoundObject* FuConstruct3dObject::ImpCreateBasic3DShape()
     return p3DObj;
 }
 
-// #97016#
 void FuConstruct3dObject::ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dScene *pScene)
 {
     Camera3D &aCamera  = (Camera3D&) pScene->GetCamera ();
@@ -289,7 +286,6 @@ void FuConstruct3dObject::ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dS
 
         case SID_3D_SPHERE:
         {
-//				pScene->RotateX(DEG2RAD(60));
         }
         break;
 
@@ -304,13 +300,11 @@ void FuConstruct3dObject::ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dS
         case SID_3D_CONE:
         case SID_3D_PYRAMID:
         {
-//				pScene->RotateX(DEG2RAD(25));
         }
         break;
 
         case SID_3D_TORUS:
         {
-//				pScene->RotateX(DEG2RAD(15));
             aTransformation.rotate(DEG2RAD(90), 0.0, 0.0);
         }
         break;
@@ -342,11 +336,9 @@ BOOL FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt)
 
         WaitObject aWait( (Window*)mpViewShell->GetActiveWindow() );
 
-        // #97016#
         p3DObj = ImpCreateBasic3DShape();
         E3dScene* pScene = mpView->SetCurrent3DObj(p3DObj);
 
-        // #97016#
         ImpPrepareBasic3DShape(p3DObj, pScene);
         bReturn = mpView->BegCreatePreparedObject(aPnt, nDrgLog, pScene);
 
@@ -441,17 +433,8 @@ void FuConstruct3dObject::Deactivate()
     FuConstruct::Deactivate();
 }
 
-// #97016#
 SdrObject* FuConstruct3dObject::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle)
 {
-    // case SID_3D_CUBE:
-    // case SID_3D_SHELL:
-    // case SID_3D_SPHERE:
-    // case SID_3D_TORUS:
-    // case SID_3D_HALF_SPHERE:
-    // case SID_3D_CYLINDER:
-    // case SID_3D_CONE:
-    // case SID_3D_PYRAMID:
 
     E3dCompoundObject* p3DObj = ImpCreateBasic3DShape();
 
@@ -465,7 +448,6 @@ SdrObject* FuConstruct3dObject::CreateDefaultObject(const sal_uInt16 nID, const
     Rectangle a3DRect(0, 0, (long)fW, (long)fH);
     E3dScene* pScene = new E3dPolyScene(mpView->Get3DDefaultAttributes());
 
-    // mpView->InitScene(pScene, fW, fH, aVolume.MaxVec().Z() + ((fW + fH) / 4.0));
     // copied code from E3dView::InitScene
     double fCamZ(aVolume.getMaxZ() + ((fW + fH) / 4.0));
     Camera3D aCam(pScene->GetCamera());
@@ -523,7 +505,7 @@ SdrObject* FuConstruct3dObject::CreateDefaultObject(const sal_uInt16 nID, const
         }
     }
 
-    // #97016#, #98245# use changed rectangle, not original one
+    // use changed rectangle, not original one
     pScene->SetLogicRect(aRect);
 
     return pScene;
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx
index 8bb887f73..afa0a2956 100644
--- a/sd/source/ui/func/fuconarc.cxx
+++ b/sd/source/ui/func/fuconarc.cxx
@@ -144,7 +144,6 @@ BOOL FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt )
             SfxItemSet aAttr(mpDoc->GetPool());
             SetStyleSheet(aAttr, pObj);
 
-//-/			pObj->NbcSetAttributes(aAttr, FALSE);
             pObj->SetMergedItemSet(aAttr);
         }
 
@@ -262,7 +261,6 @@ void FuConstructArc::Activate()
     mpView->SetCurrentObj((UINT16)aObjKind);
 
     FuConstruct::Activate();
-//	FuDraw::Activate();
 }
 
 /*************************************************************************
@@ -274,22 +272,10 @@ void FuConstructArc::Activate()
 void FuConstructArc::Deactivate()
 {
     FuConstruct::Deactivate();
-//	FuDraw::Deactivate();
 }
 
-// #97016#
 SdrObject* FuConstructArc::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle)
 {
-    // case SID_DRAW_ARC:
-    // case SID_DRAW_CIRCLEARC:
-    // case SID_DRAW_PIE:
-    // case SID_DRAW_PIE_NOFILL:
-    // case SID_DRAW_CIRCLEPIE:
-    // case SID_DRAW_CIRCLEPIE_NOFILL:
-    // case SID_DRAW_ELLIPSECUT:
-    // case SID_DRAW_ELLIPSECUT_NOFILL:
-    // case SID_DRAW_CIRCLECUT:
-    // case SID_DRAW_CIRCLECUT_NOFILL:
 
     SdrObject* pObj = SdrObjFactory::MakeNewObject(
         mpView->GetCurrentObjInventor(), mpView->GetCurrentObjIdentifier(),
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index d4217eee6..c81f3a6e7 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -117,7 +117,7 @@ FuDraw::~FuDraw()
 
 BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
 {
-    // #95491# remember button state for creation of own MouseEvents
+    // remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
 
     BOOL bReturn = FALSE;
@@ -130,8 +130,6 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
     {
         FrameView* pFrameView = mpViewShell->GetFrameView();
 
-//		  BOOL bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho();
-//		  bOrtho = bOrtho != rMEvt.IsShift();
         BOOL bOrtho = FALSE;
 
         BOOL bRestricted = TRUE;
@@ -220,7 +218,7 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
         SdrPageView* pPV = 0;
         USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
 
-        // #76572# look only for HelpLines when they are visible (!)
+        // look only for HelpLines when they are visible (!)
         BOOL bHelpLine(FALSE);
         if(mpView->IsHlplVisible())
             bHelpLine = mpView->PickHelpLine(aMDPos, nHitLog, *mpWindow, nHelpLine, pPV);
@@ -252,8 +250,6 @@ BOOL FuDraw::MouseMove(const MouseEvent& rMEvt)
     FrameView* pFrameView = mpViewShell->GetFrameView();
     Point aPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() );
 
-//	  BOOL bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho();
-//	  bOrtho = bOrtho != rMEvt.IsShift();
     BOOL bOrtho = FALSE;
 
     BOOL bRestricted = TRUE;
@@ -461,7 +457,7 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt)
 
             if ( !aCode.IsMod1() && !aCode.IsMod2() )
             {
-                // #105336# Moved next line which was a bugfix itself into
+                // Moved next line which was a bugfix itself into
                 // the scope which really does the object selection travel
                 // and thus is allowed to call SelectionHasChanged().
 
@@ -473,13 +469,12 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt)
                 // changeover to the next object
                 if(!mpView->MarkNextObj( !aCode.IsShift() ))
                 {
-                    // #97016# No next object: go over open end and
+                    // No next object: go over open end and
                     // get first from the other side
                     mpView->UnmarkAllObj();
                     mpView->MarkNextObj(!aCode.IsShift());
                 }
 
-                // #97016# II
                 if(mpView->AreObjectsMarked())
                     mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow);
 
@@ -494,11 +489,10 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt)
 
             if ( aCode.IsMod1() )
             {
-                // #97016# mark last object
+                // mark last object
                 mpView->UnmarkAllObj();
                 mpView->MarkNextObj(FALSE);
 
-                // #97016# II
                 if(mpView->AreObjectsMarked())
                     mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow);
 
@@ -513,11 +507,10 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt)
 
             if ( aCode.IsMod1() )
             {
-                // #97016# mark first object
+                // mark first object
                 mpView->UnmarkAllObj();
                 mpView->MarkNextObj(TRUE);
 
-                // #97016# II
                 if(mpView->AreObjectsMarked())
                     mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow);
 
@@ -843,9 +836,8 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt)
                 if ( !pDocSh->IsUIActive() )
                 {
                     /**********************************************************
-                    * aktivate OLE-object
+                    * activate OLE-object
                     **********************************************************/
-                    //HMHmpView->HideMarkHdl();
                     mpViewShell->ActivateObject( (SdrOle2Obj*) pObj, 0);
                 }
             }
@@ -1114,7 +1106,6 @@ bool FuDraw::cancel()
     }
     else if ( mpView->AreObjectsMarked() )
     {
-        // #97016# II
         const SdrHdlList& rHdlList = mpView->GetHdlList();
         SdrHdl* pHdl = rHdlList.GetFocusHdl();
 
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index d664b54f8..09e0058a9 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -411,7 +411,7 @@ BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
                                     bLink, bReplace, nPos,
                                     FALSE, NULL, TRUE, TRUE, FALSE );
 
-            // Loeschen der BookmarkList
+            // delete the BookmarkList
             if( pBookmarkList )
             {
                 String* pString = (String*) pBookmarkList->First();
@@ -423,7 +423,7 @@ BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
                 delete pBookmarkList;
                 pBookmarkList = NULL;
             }
-            // Loeschen der ExchangeList
+            // delete the ExchangeList
             if( pExchangeList )
             {
                 String* pString = (String*) pExchangeList->First();
@@ -437,7 +437,6 @@ BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
             }
         }
         // Dann Objekte einfuegen
-        //pBookmarkList = pDlg->GetList( 2 ); // Objekte
         pBookmarkList = pObjectBookmarkList;
 
         // Um zu gewaehrleisten... (s.o.)
@@ -447,7 +446,7 @@ BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
             bOK = mpDoc->InsertBookmarkAsObject( pBookmarkList, pExchangeList,
                                 bLink, NULL, NULL);
 
-        // Loeschen der BookmarkList
+        // delete the BookmarkList
         if( pBookmarkList )
         {
             String* pString = (String*) pBookmarkList->First();
@@ -459,7 +458,7 @@ BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
             delete pBookmarkList;
             pBookmarkList = NULL;
         }
-        // Loeschen der ExchangeList
+        // delete the ExchangeList
         if( pExchangeList )
         {
             String* pString = (String*) pExchangeList->First();
@@ -512,11 +511,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
         // was zeichnen muessen;
         // der globale Outliner koennte in SdPage::CreatePresObj
         // benutzt werden
-//		SfxItemPool* pPool = mpDoc->GetDrawOutliner().GetEmptyItemSet().GetPool();
         SdrOutliner* pOutliner = new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT );
-//		pOutliner->SetStyleSheetPool((SfxStyleSheetPool*)mpDoc->GetStyleSheetPool());
-//		pOutliner->SetEditTextObjectPool(pPool);
-//		pOutliner->SetForbiddenCharsTable( mpDoc->GetForbiddenCharsTable() );
 
         // Referenz-Device setzen
         pOutliner->SetRefDevice( SD_MOD()->GetRefDevice( *mpDocSh ) );
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 3e7d46a4d..615d6701a 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -51,7 +51,7 @@
 #include "ViewShell.hxx"
 #include "anminfo.hxx"
 #include "unoaprms.hxx"                 // Undo-Action
-#include "sdundogr.hxx"                 // Undo Gruppe
+#include "sdundogr.hxx"                 // Undo Group
 #include "View.hxx"
 #include "sdabstdlg.hxx"
 #include "sdresid.hxx"
@@ -117,11 +117,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
     short nSecondSoundOnSet     = ATTR_MISSING;
     short nSecondPlayFullSet    = ATTR_MISSING;
 
-
-
-//    BOOL bDontKnow   = FALSE;
-
-                                    // defaulten (fuer Undo-Aktion)
+    // defaults (for Undo-Action)
     presentation::AnimationEffect eEffect         = presentation::AnimationEffect_NONE;
     presentation::AnimationEffect eTextEffect     = presentation::AnimationEffect_NONE;
     presentation::AnimationSpeed  eSpeed          = presentation::AnimationSpeed_MEDIUM;
@@ -727,10 +723,8 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
                 pAction->SetSoundOn(pInfo->mbSoundOn, pInfo->mbSoundOn);
                 pAction->SetSound(pInfo->maSoundFile, pInfo->maSoundFile);
                 pAction->SetPlayFull(pInfo->mbPlayFull, pInfo->mbPlayFull);
-//				pAction->SetPathObj(pInfo->mpPathObj, pInfo->mpPathObj);
                 pAction->SetClickAction(pInfo->meClickAction, pInfo->meClickAction);
                 pAction->SetBookmark(pInfo->GetBookmark(), pInfo->GetBookmark());
-//				pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, TRUE);
                 pAction->SetVerb(pInfo->mnVerb, pInfo->mnVerb);
                 pAction->SetSecondEffect(pInfo->meSecondEffect, pInfo->meSecondEffect);
                 pAction->SetSecondSpeed(pInfo->meSecondSpeed, pInfo->meSecondSpeed);
@@ -738,7 +732,6 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
                 pAction->SetSecondPlayFull(pInfo->mbSecondPlayFull, pInfo->mbSecondPlayFull);
                 pUndoGroup->AddAction(pAction);
 
-//				pInfo->mbInvisibleInPresentation = TRUE;
             }
             else
             {
@@ -759,8 +752,6 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
                 pAction->SetPathObj(pInfo->mpPathObj, pPath);
                 pAction->SetClickAction(pInfo->meClickAction, eClickAction);
                 pAction->SetBookmark(pInfo->GetBookmark(), aBookmark);
-//				pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation,
-//											pInfo->mbInvisibleInPresentation);
                 pAction->SetVerb(pInfo->mnVerb, (USHORT)pInfo->GetBookmark().ToInt32() );
                 pAction->SetSecondEffect(pInfo->meSecondEffect, eSecondEffect);
                 pAction->SetSecondSpeed(pInfo->meSecondSpeed, eSecondSpeed);
@@ -817,19 +808,15 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
                 if (nSecondPlayFullSet == ATTR_SET)
                     pInfo->mbSecondPlayFull = bSecondPlayFull;
 
-                // noch ein paar Spezialitaeten
-//				if (eEffect == presentation::AnimationEffect_PATH && nEffectSet == ATTR_SET)
-//					pInfo->mSetPath(pPath);
-
                 if (eClickAction == presentation::ClickAction_VERB)
                     pInfo->mnVerb = (USHORT)aBookmark.ToInt32();
             }
         }
-        // Undo Gruppe dem Undo Manager uebergeben
+        // Set the Undo Group in of the Undo Manager
         pUndoMgr->AddUndoAction(pUndoGroup);
         pUndoMgr->LeaveListAction();
 
-        // Model geaendert
+        // Model changed
         mpDoc->SetChanged();
     }
     // sieht man nicht, also muss an den Bindings nicht invalidiert werden
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 0b77cab86..4304b1ddd 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -240,7 +240,7 @@ void FuText::DoExecute( SfxRequest& )
 
     if (pArgs
 
-        // #98198# test for type before using
+        // test for type before using
         && SID_TEXTEDIT == nSlotId
         && SFX_ITEM_SET == pArgs->GetItemState(SID_TEXTEDIT)
 
@@ -265,15 +265,6 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt)
 
     BOOL bReturn = FuDraw::MouseButtonDown(rMEvt);
 
-    /* af: (de)Select object before showing the context menu.
-    // Fuer PopupMenu (vorher DrawViewShell)
-    if ((rMEvt.GetButtons() == MOUSE_RIGHT) && rMEvt.GetClicks() == 1 &&
-        mpView->IsTextEdit())
-    {
-        return (TRUE);
-    }
-        */
-
     mpView->SetMarkHdlWhenTextEdit(TRUE);
     SdrViewEvent aVEvt;
     SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
@@ -407,10 +398,6 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt)
                             // this caused SdrEndTextEdit() to be called also when not in text editing and
                             // this does not make sense and caused troubles. (see issue 112855)
 
-//							::Outliner* pOutl = mpView->GetTextEditOutliner();
-//							
-//							if (mxTextObj.is() && (mxTextObj->GetOutlinerParaObject() ||
-//								(pOutl && pOutl->GetText(pOutl->GetParagraph( 0 )).Len() != 0)))
                             if( mpView->IsTextEdit() )
                             {
                                 mpView->SdrEndTextEdit();
@@ -434,7 +421,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt)
                                     mpView->MarkObj(aVEvt.pRootObj, pPV);
                                 }
 
-                                // Objekt draggen
+                                // Drag object
                                 bFirstMouseMove = TRUE;
                                 aDragTimer.Start();
                             }
@@ -531,7 +518,6 @@ BOOL FuText::MouseMove(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-// #97016#
 void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
 {
     if(mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS)
@@ -557,7 +543,7 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
             aSet.Put(SdrTextAutoGrowWidthItem(TRUE));
             aSet.Put(SdrTextAutoGrowHeightItem(FALSE));
 
-            // #91853# Needs to be set since default is SDRTEXTHORZADJUST_BLOCK
+            // Needs to be set since default is SDRTEXTHORZADJUST_BLOCK
             aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT));
             pTxtObj->SetMergedItemSet(aSet);
             pTxtObj->AdjustTextFrameWidthAndHeight();
@@ -572,15 +558,9 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
             // draw text object, needs to be initialized when vertical text is used
             SfxItemSet aSet(mpViewShell->GetPool());
 
-            // #91510#
             aSet.Put(SdrTextAutoGrowWidthItem(TRUE));
             aSet.Put(SdrTextAutoGrowHeightItem(FALSE));
 
-            // #91508#
-            //aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP));
-            //aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT));
-
-            // #107235#
             // Set defaults for vertical klick-n'drag text object, pool defaults are:
             // SdrTextVertAdjustItem: SDRTEXTVERTADJUST_TOP
             // SdrTextHorzAdjustItem: SDRTEXTHORZADJUST_BLOCK
@@ -593,7 +573,6 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
     }
 }
 
-// #97016#
 void FuText::ImpSetAttributesFitToSize(SdrTextObj* pTxtObj)
 {
     // FitToSize (An Rahmen anpassen)
@@ -606,7 +585,6 @@ void FuText::ImpSetAttributesFitToSize(SdrTextObj* pTxtObj)
     pTxtObj->AdjustTextFrameWidthAndHeight();
 }
 
-// #97016#
 void FuText::ImpSetAttributesFitToSizeVertical(SdrTextObj* pTxtObj)
 {
     SfxItemSet aSet(mpViewShell->GetPool(),
@@ -619,15 +597,14 @@ void FuText::ImpSetAttributesFitToSizeVertical(SdrTextObj* pTxtObj)
     pTxtObj->AdjustTextFrameWidthAndHeight();
 }
 
-// #97016#
 void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj)
 {
-    // Normales Textobjekt
+    // Normal Textobject
     if (mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS)
     {
         if( nSlotId == SID_ATTR_CHAR )
         {
-            // Impress-Textobjekt (faellt auf Zeilenhoehe zusammen)
+            // Impress-Textobject (faellt auf Zeilenhoehe zusammen)
             SfxItemSet aSet(mpViewShell->GetPool());
             aSet.Put(SdrTextMinFrameHeightItem(0));
             aSet.Put(SdrTextMaxFrameHeightItem(0));
@@ -742,7 +719,6 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
                 pPara->SetVertical(bVertical);
             }
 
-            // #97016#
             ImpSetAttributesForNewTextObject(GetTextObj());
         }
 
@@ -753,21 +729,18 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
         }
         else if (nSlotId == SID_TEXT_FITTOSIZE)
         {
-            // #97016#
             ImpSetAttributesFitToSize(GetTextObj());
 
             SetInEditMode(rMEvt, FALSE);
         }
         else if ( nSlotId == SID_TEXT_FITTOSIZE_VERTICAL )
         {
-            // #97016#
             ImpSetAttributesFitToSizeVertical(GetTextObj());
 
             SetInEditMode(rMEvt, FALSE);
         }
         else
         {
-            // #97016#
             ImpSetAttributesFitCommon(GetTextObj());
 
             // Damit die Handles und der graue Rahmen stimmen
@@ -843,11 +816,8 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
                 aSet.Put(SdrTextAutoGrowHeightItem(TRUE));
                 aSet.Put(SdrTextAutoGrowWidthItem(TRUE));
 
-                // #91508#
                 if(nSlotId == SID_ATTR_CHAR_VERTICAL)
                 {
-                    // #107235#
-                    //
                     // Here, all items which need to be different from pool default need to be set
                     // again on the newly created text object.
                     // Since this is a simple klick text object, it is first created, then SetVertical()
@@ -873,11 +843,8 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
                         pPara->SetVertical(sal_True);
                     }
 
-                    // #91508#
-                    // aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP));
                     aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT));
 
-                    // #107235#
                     // Analog to the else case below, for vertical simple click texts
                     // one of the defaulted setted items from ImpSetAttributesForNewTextObject
                     // needs to be adapted to non-block mode. This could have been done with the
@@ -896,14 +863,11 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
                 }
                 else
                 {
-                    // #104122# This is for Format/Page settings. Since this also leads
+                    // This is for Format/Page settings. Since this also leads
                     // to the object defaults to be changed, i think this code can be
                     // removed. CL. wanted to take a look before adding this.
-                    //const SdrTextHorzAdjust eHA = ( ( pDoc && pDoc->GetDefaultWritingMode() == ::com::sun::star::text::WritingMode_RL_TB ) ?
-                    //                                SDRTEXTHORZADJUST_RIGHT : SDRTEXTHORZADJUST_LEFT );
-                    //aSet.Put( SdrTextHorzAdjustItem( eHA ) );
 
-                    // #104122# Look in the object defaults if left-to-right is wanted. If
+                    // Look in the object defaults if left-to-right is wanted. If
                     // yes, set text anchoring to right to let the box grow to left.
                     const SfxItemSet& rSet = mpView->GetDefaultAttr();
                     SvxFrameDirection eDirection = (SvxFrameDirection)((SvxFrameDirectionItem&)rSet.Get(EE_PARA_WRITINGDIR)).GetValue();
@@ -960,7 +924,6 @@ BOOL FuText::KeyInput(const KeyEvent& rKEvt)
     KeyCode nCode = rKEvt.GetKeyCode();
     BOOL bShift = nCode.IsShift();
 
-    // #97016# IV
     if(mxTextObj.is())
     {
         // maybe object is deleted, test if it's equal to the selected object
@@ -1006,8 +969,6 @@ BOOL FuText::KeyInput(const KeyEvent& rKEvt)
 
         mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
 
-//		if ( pTextObj )
-//			pTextObj->SetEmptyPresObj(FALSE);
     }
     else if (aKeyCode == KEY_ESCAPE)
     {
@@ -1175,7 +1136,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag)
                         }
                         else
                         {
-                            // #98198# Move cursor to end of text
+                            // Move cursor to end of text
                             ESelection aNewSelection(EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND, EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND);
                             pOLV->SetSelection(aNewSelection);
                         }
@@ -1318,7 +1279,7 @@ void FuText::ReceiveRequest(SfxRequest& rReq)
     // Dann Basisklasse rufen (dort wird u.a. nSlotId NICHT gesetzt)
     FuPoor::ReceiveRequest(rReq);
 
-    if (nSlotId == SID_TEXTEDIT || mpViewShell->GetFrameView()->IsQuickEdit() || /*#95971#*/ SID_ATTR_CHAR == nSlotId)
+    if (nSlotId == SID_TEXTEDIT || mpViewShell->GetFrameView()->IsQuickEdit() || SID_ATTR_CHAR == nSlotId)
     {
         MouseEvent aMEvt(mpWindow->GetPointerPosPixel());
 
@@ -1332,7 +1293,7 @@ void FuText::ReceiveRequest(SfxRequest& rReq)
 
             if (!mxTextObj.is())
             {
-                // Versuchen, ein Obj zu selektieren
+                // Try to select an object
                 SdrPageView* pPV = mpView->GetSdrPageView();
                 SdrViewEvent aVEvt;
                 mpView->PickAnything(aMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
@@ -1365,7 +1326,7 @@ void FuText::ReceiveRequest(SfxRequest& rReq)
 
         if (pArgs
 
-            // #98198# test for type before using
+            // test for type before using
             && SID_TEXTEDIT == nSlotId
             && SFX_ITEM_SET == pArgs->GetItemState(SID_TEXTEDIT)
 
@@ -1396,27 +1357,16 @@ IMPL_LINK( FuText, SpellError, void *, nLang )
 }
 
 
-/*************************************************************************
-|*
-|* Reaktion auf Doppelklick
-|*
-\************************************************************************/
 void FuText::DoubleClick(const MouseEvent& )
 {
-    // Nichts zu tun
+    // Nothing to do
 }
 
-/** #97016#
-    #105815# Removed the insertion of default text and putting a new text
+/** Removed the insertion of default text and putting a new text
     object directly into edit mode.
 */
 SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle)
 {
-    // case SID_TEXTEDIT:	// BASIC ???
-    // case SID_ATTR_CHAR:
-    // case SID_ATTR_CHAR_VERTICAL:
-    // case SID_TEXT_FITTOSIZE:
-    // case SID_TEXT_FITTOSIZE_VERTICAL:
 
     SdrObject* pObj = SdrObjFactory::MakeNewObject(
         mpView->GetCurrentObjInventor(), mpView->GetCurrentObjIdentifier(),
@@ -1432,22 +1382,18 @@ SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rR
             sal_Bool bVertical = (SID_ATTR_CHAR_VERTICAL == nID || SID_TEXT_FITTOSIZE_VERTICAL == nID);
             pText->SetVerticalWriting(bVertical);
 
-            // #97016#
             ImpSetAttributesForNewTextObject(pText);
 
             if (nSlotId == SID_TEXT_FITTOSIZE)
             {
-                // #97016#
                 ImpSetAttributesFitToSize(pText);
             }
             else if ( nSlotId == SID_TEXT_FITTOSIZE_VERTICAL )
             {
-                // #97016#
                 ImpSetAttributesFitToSizeVertical(pText);
             }
             else
             {
-                // #97016#
                 ImpSetAttributesFitCommon(pText);
             }
 
@@ -1501,7 +1447,6 @@ void FuText::ChangeFontSize( bool bGrow, OutlinerView* pOLV, const FontList* pFo
     }
     else
     {
-//		SdDrawDocument* pDoc = pView->GetDoc();
 
         const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
         for( sal_uInt32 nMark = 0; nMark < rMarkList.GetMarkCount(); nMark++ )
diff --git a/sd/source/ui/func/unoaprms.cxx b/sd/source/ui/func/unoaprms.cxx
index a063d84e2..d2a527ab5 100644
--- a/sd/source/ui/func/unoaprms.cxx
+++ b/sd/source/ui/func/unoaprms.cxx
@@ -53,8 +53,7 @@ void SdAnimationPrmsUndoAction::Undo()
         if( pDoc )
         {
             SdAnimationInfo* pInfo = pDoc->GetAnimationInfo( pObject );
-            // So nicht...
-            //SdAnimationInfo* pInfo = (SdAnimationInfo*)pObject->GetUserData(0);
+
             pInfo->mbActive		= bOldActive;
             pInfo->meEffect      = eOldEffect;
             pInfo->meTextEffect  = eOldTextEffect;
@@ -65,10 +64,8 @@ void SdAnimationPrmsUndoAction::Undo()
             pInfo->mbSoundOn     = bOldSoundOn;
             pInfo->maSoundFile   = aOldSoundFile;
             pInfo->mbPlayFull    = bOldPlayFull;
-//			pInfo->mSetPath(pOldPathObj);
             pInfo->meClickAction = eOldClickAction;
             pInfo->SetBookmark( aOldBookmark );
-//			pInfo->mbInvisibleInPresentation = bOldInvisibleInPres;
             pInfo->mnVerb        = nOldVerb;
             pInfo->mnPresOrder   = nOldPresOrder;
 
@@ -111,10 +108,8 @@ void SdAnimationPrmsUndoAction::Redo()
     pInfo->mbSoundOn     = bNewSoundOn;
     pInfo->maSoundFile   = aNewSoundFile;
     pInfo->mbPlayFull    = bNewPlayFull;
-//	pInfo->mSetPath(pNewPathObj);
     pInfo->meClickAction = eNewClickAction;
     pInfo->SetBookmark( aNewBookmark );
-//	pInfo->mbInvisibleInPresentation = bNewInvisibleInPres;
     pInfo->mnVerb        = nNewVerb;
     pInfo->mnPresOrder   = nNewPresOrder;