Removed unused codes and fix some typos

16 files changed, 7 insertions, 166 deletions

diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index fbe5b7493bd9..ec151c6bc870 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -243,8 +243,6 @@ public:
     virtual void SAL_CALL setSubtype( sal_Int16 _subtype ) throw (RuntimeException);
     virtual sal_Bool SAL_CALL getMode() throw (RuntimeException);
     virtual void SAL_CALL setMode( sal_Bool _mode ) throw (RuntimeException);
-//    virtual sal_Bool SAL_CALL getDirection() throw (RuntimeException);
-//    virtual void SAL_CALL setDirection( sal_Bool _direction ) throw (RuntimeException);
     virtual sal_Int32 SAL_CALL getFadeColor() throw (RuntimeException);
     virtual void SAL_CALL setFadeColor( sal_Int32 _fadecolor ) throw (RuntimeException);
 
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index cd0d5fc30146..5a8a7af836b0 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -592,7 +592,6 @@ CustomAnimationCreateTabPage* CustomAnimationCreateDialog::getCurrentPage() cons
     case RID_TP_CUSTOMANIMATION_EMPHASIS:   return mpTabPages[EMPHASIS];
     case RID_TP_CUSTOMANIMATION_EXIT:       return mpTabPages[EXIT];
     case RID_TP_CUSTOMANIMATION_MISCEFFECTS:return mpTabPages[MISCEFFECTS];
-    //case RID_TP_CUSTOMANIMATION_MOTIONPATH:
     default:
                                             return mpTabPages[MOTIONPATH];
     }
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 1cbba2e989a0..dd5405b7a5b6 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1205,18 +1205,6 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
     mpCBSmoothStart = new CheckBox( this, SdResId( CB_SMOOTH_START ) );
     mpCBSmoothEnd = new CheckBox( this, SdResId( CB_SMOOTH_END ) );
     mpCBAutoRestart = new CheckBox( this, SdResId( CB_AUTORESTART ) );
-/*
-    mpFLPlay = new FixedLine( this, SdResId( FL_PLAY ) );
-    mpRBFromStart = new RadioButton( this, SdResId( RB_FROM_START ) );
-    mpRBFromLast = new RadioButton( this, SdResId( RB_FROM_LAST ) );
-    mpRBFromTime = new RadioButton( this, SdResId( RB_FROM_TIME ) );
-    mpMFStartTime = new MetricField( this, SdResId( MF_START_TIME ) );
-    mpFLStop = new FixedLine( this, SdResId( FL_STOP ) );
-    mpRBStopOnClick = new RadioButton( this, SdResId( RB_STOP_ON_CLICK ) );
-    mpRBStopOnNextSlide = new RadioButton( this, SdResId( RB_STOP_ON_NEXT_SLIDE ) );
-    mpRBStopAfterSlides = new RadioButton( this, SdResId( RB_STOP_AFTER_N_SLIDES ) );
-    mpMFStopAfterSlides = new MetricField( this, SdResId( MF_STOP_AFTER_SLIDES ) );
-*/
     mpFLEnhancements = new FixedLine( this, SdResId( FL_ENHANCEMENTS ) );
     mpFTSound = new FixedText( this, SdResId( FT_SOUND ) );
     mpLBSound = new ListBox( this, SdResId( LB_SOUND ) );
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 050a21ea1176..477a680dacb2 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -405,12 +405,6 @@ void CustomAnimationTriggerEntryItem::InitViewData( SvLBox* pView, SvLBoxEntry*
     if( aSize.Height() < 19 )
         aSize.Height() = 19;
     pViewData->aSize = aSize;
-
-/*
-        SvViewData* pViewData = pView->GetViewData( pEntry );
-        if( pViewData )
-            pViewData->SetSelectable(false);
-*/
 }
 
 // --------------------------------------------------------------------
@@ -689,31 +683,6 @@ void CustomAnimationList::update()
 
 // --------------------------------------------------------------------
 
-/*
-void CustomAnimationList::update( CustomAnimationEffectPtr pEffect )
-{
-    SvLBoxEntry* pEntry = First();
-    while( pEntry )
-    {
-        if( static_cast< CustomAnimationEffectPtr * >( pEntry->GetUserData() )->get() == pEffect.get() )
-        {
-            CustomAnimationPresetsPtr pPresets = mpController->getPresets();
-            const CustomAnimationPresetPtr pPreset = pPresets->getEffectDescriptor( pEffect->getPresetId() );
-            if( pPreset.get() )
-                pEffect->setName( pPresets->getUINameForPresetId( pPreset->getPresetId() ) );
-            else
-                pEffect->setName( pEffect->getPresetId() );
-            break;
-        }
-        pEntry = Next( pEntry );
-    }
-
-    Invalidate();
-}
-*/
-
-// --------------------------------------------------------------------
-
 void CustomAnimationList::append( CustomAnimationEffectPtr pEffect )
 {
     // create a ui description
@@ -765,31 +734,6 @@ void CustomAnimationList::append( CustomAnimationEffectPtr pEffect )
 
 // --------------------------------------------------------------------
 
-/*
-void CustomAnimationList::remove( CustomAnimationEffectPtr pEffect )
-{
-    SvLBoxEntry* pEntry = First();
-    while( pEntry )
-    {
-        if( static_cast< CustomAnimationEffectPtr * >( pEntry->GetUserData() )->get() == pEffect.get() )
-        {
-            GetModel()->Remove( pEntry );
-            if( pEntry == mpLastParentEntry )
-            {
-                mpLastParentEntry = 0;
-                mxLastTargetShape = 0;
-            }
-            break;
-        }
-        pEntry = Next( pEntry );
-    }
-
-    Invalidate();
-}
-*/
-
-// --------------------------------------------------------------------
-
 void selectShape( SvTreeListBox* pTreeList, Reference< XShape > xShape )
 {
     CustomAnimationListEntry* pEntry = static_cast< CustomAnimationListEntry* >(pTreeList->First());
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx
index 8920bbb41cee..3d111c3cbc7a 100644
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -67,14 +67,8 @@ public:
     /** populates the list with all effects from the given MainSequence */
     void update( MainSequencePtr pMainSequence );
 
-    /** updates the given effect in the list */
-//  void update( CustomAnimationEffectPtr pEffect );
-
     void update();
 
-    /** removes the given effect to the list*/
-//  void remove( CustomAnimationEffectPtr pEffect );
-
     EffectSequence getSelection() const;
 
     // events
@@ -91,7 +85,6 @@ public:
 
     virtual void KeyInput( const KeyEvent& rKEvt );
 
-//  virtual SvLBoxEntry* CreateEntry() const;
     virtual void    SetTabs();
 
     virtual void notify_change();
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index f09abc7cb09d..dd47bc82d653 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -754,8 +754,6 @@ void CustomAnimationPane::updateControls()
     mpLBStart->Enable(nSelectionCount > 0);
     mpPBPropertyMore->Enable(nSelectionCount > 0);
 
-//  mpPBPlay->Enable(nSelectionCount > 0);
-
     mpFTProperty->SetText( maStrProperty );
 
     mnPropertyType = nPropertyTypeNone;
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index b2aea6005f62..a5f460b21014 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -495,7 +495,6 @@ SlideTransitionPane::SlideTransitionPane(
 
     // update control states before adding handlers
     updateLayout();
-    //    updateSoundList();
     updateControls();
 
     // set handlers
@@ -545,7 +544,6 @@ void SlideTransitionPane::onChangeCurrentPage()
 {
     ::sd::slidesorter::SlideSorterViewShell * pSlideSorterViewShell
         = ::sd::slidesorter::SlideSorterViewShell::GetSlideSorter(mrBase);
-//    DBG_ASSERT( pSlideSorterViewShell, "No Slide-Sorter available" );
     ::boost::shared_ptr<sd::slidesorter::SlideSorterViewShell::PageSelection> pSelection;
 
     if( pSlideSorterViewShell )
@@ -889,7 +887,6 @@ void SlideTransitionPane::updateControlState()
 
     maPB_APPLY_TO_ALL.Enable( mbHasSelection );
     maPB_PLAY.Enable( mbHasSelection );
-//     maPB_SLIDE_SHOW.Enable( TRUE );
     maCB_AUTO_PREVIEW.Enable( mbHasSelection );
 }
 
@@ -1040,9 +1037,7 @@ impl::TransitionEffect SlideTransitionPane::getTransitionEffectFromControls() co
             aResult.mePresChange = PRESCHANGE_AUTO;
             if( maMF_ADVANCE_AUTO_AFTER.IsEnabled())
             {
-//                 sal_uInt16 nDigits = maMF_ADVANCE_AUTO_AFTER.GetDecimalDigits();
                 aResult.mnTime = static_cast<long>(maMF_ADVANCE_AUTO_AFTER.GetValue());
-                // / static_cast< sal_uInt16 >( pow( 10.0, static_cast< double >( nDigits )));
                 aResult.mbTimeAmbiguous = false;
             }
         }
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index dfa17a7df551..8bd045b8bc90 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -1129,9 +1129,6 @@ void MotionPathTag::DeleteMarkedPoints()
     {
         mrView.BrkAction();
 
-        // Description
-//      BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedPoints(),SDRREPFUNC_OBJ_DELETE);
-
         SdrUShortCont* pPts = mpMark->GetMarkedPoints();
 
         if( pPts )
@@ -1141,22 +1138,14 @@ void MotionPathTag::DeleteMarkedPoints()
             {
                 if( aEditor.GetPolyPolygon().count() )
                 {
-//                  AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pPath ));
                     mpPathObj->SetPathPoly( aEditor.GetPolyPolygon() );
                 }
-                else
-                {
-//                  AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoDeleteObject(*pPath ) );
-//                  pM->GetPageView()->GetObjList()->RemoveObject(pObj->GetOrdNum());
-                }
 
                 mrView.UnmarkAllPoints();
                 mrView.MarkListHasChanged();
                 mrView.updateHandles();
             }
         }
-
-//      EndUndo();
     }
 }
 
@@ -1202,7 +1191,6 @@ void MotionPathTag::SetMarkedSegmentsKind(SdrPathSegmentKind eKind)
             PolyPolygonEditor aEditor( mpPathObj->GetPathPoly(), mpPathObj->IsClosed() );
             if(aEditor.SetSegmentsKind( eKind, pPts->getContainer()) )
             {
-//              AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pPath));
                 mpPathObj->SetPathPoly(aEditor.GetPolyPolygon());
                 mrView.MarkListHasChanged();
                 mrView.updateHandles();
@@ -1256,7 +1244,6 @@ void MotionPathTag::SetMarkedPointsSmooth(SdrPathSmoothKind eKind)
             PolyPolygonEditor aEditor( mpPathObj->GetPathPoly(), mpPathObj->IsClosed() );
             if(aEditor.SetPointsSmooth( eFlags, pPts->getContainer() ) )
             {
-//              AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pPath));
                 mpPathObj->SetPathPoly(aEditor.GetPolyPolygon());
                 mrView.MarkListHasChanged();
                 mrView.updateHandles();
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 6c0402aea096..2cf48bae0c9c 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -351,7 +351,7 @@ SfxPoolItem* SdOptionsLayoutItem::Clone( SfxItemPool* ) const
 int SdOptionsLayoutItem::operator==( const SfxPoolItem& rAttr ) const
 {
     const bool bSameType = SfxPoolItem::operator==( rAttr );
-    DBG_ASSERT( bSameType, "SdOptionsLayoutItem::operator==(), differen pool item type!" );
+    DBG_ASSERT( bSameType, "SdOptionsLayoutItem::operator==(), different pool item type!" );
     return bSameType && ( maOptionsLayout == static_cast< const SdOptionsLayoutItem& >( rAttr ).maOptionsLayout );
 }
 
@@ -454,7 +454,7 @@ SfxPoolItem* SdOptionsContentsItem::Clone( SfxItemPool* ) const
 int SdOptionsContentsItem::operator==( const SfxPoolItem& rAttr ) const
 {
     const bool bSameType = SfxPoolItem::operator==(rAttr);
-    DBG_ASSERT( bSameType, "SdOptionsContentsItem::operator==(), differen pool item type!" );
+    DBG_ASSERT( bSameType, "SdOptionsContentsItem::operator==(), different pool item type!" );
     return bSameType && ( maOptionsContents == static_cast<const SdOptionsContentsItem&>( rAttr ).maOptionsContents );
 }
 
@@ -476,7 +476,6 @@ SdOptionsMisc::SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig ) :
                         B2U( "Office.Draw/Misc" ) :
                         B2U( "Office.Impress/Misc" ) ) :
                       OUString() ),
-    // #97016#
     nDefaultObjectSizeWidth(8000),
     nDefaultObjectSizeHeight(5000),
     bStartWithTemplate( TRUE ),
@@ -494,7 +493,6 @@ SdOptionsMisc::SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig ) :
     bSolidDragging( TRUE ),
     bSolidMarkHdl( TRUE ),
     bSummationOfParagraphs( FALSE ),
-    // #90356#
     bShowUndoDeleteWarning( TRUE ),
     bSlideshowRespectZOrder( TRUE ),
     bShowComments( TRUE ),
@@ -528,11 +526,9 @@ BOOL SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const
             IsSummationOfParagraphs() == rOpt.IsSummationOfParagraphs() &&
             IsSolidDragging() == rOpt.IsSolidDragging() &&
             IsSolidMarkHdl() == rOpt.IsSolidMarkHdl() &&
-            // #90356#
             IsShowUndoDeleteWarning() == rOpt.IsShowUndoDeleteWarning() &&
             IsSlideshowRespectZOrder() == rOpt.IsSlideshowRespectZOrder() &&
             GetPrinterIndependentLayout() == rOpt.GetPrinterIndependentLayout() &&
-            // #97016#
             GetDefaultObjectSizeWidth() == rOpt.GetDefaultObjectSizeWidth() &&
             GetDefaultObjectSizeHeight() == rOpt.GetDefaultObjectSizeHeight() &&
 
@@ -562,7 +558,6 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con
         "Preview",
         "ModifyWithAttributes",
         "SimpleHandles",
-        // #97016#
         "DefaultObjectSize/Width",
         "DefaultObjectSize/Height",
 
@@ -574,7 +569,6 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con
         "NewDoc/AutoPilot",
         "Start/CurrentPage",
         "Compatibility/AddBetween",
-        // #90356#
         "ShowUndoDeleteWarning",
         "SlideshowRespectZOrder",
 
@@ -602,10 +596,8 @@ BOOL SdOptionsMisc::ReadData( const Any* pValues )
     if( pValues[6].hasValue() ) SetBigHandles( *(sal_Bool*) pValues[ 6 ].getValue() );
     if( pValues[7].hasValue() ) SetDoubleClickTextEdit( *(sal_Bool*) pValues[ 7 ].getValue() );
     if( pValues[8].hasValue() ) SetClickChangeRotation( *(sal_Bool*) pValues[ 8 ].getValue() );
-    //  if( pValues[9].hasValue() ) SetPreviewQuality( FRound( *(double*) pValues[ 9 ].getValue() ) );
     if( pValues[10].hasValue() ) SetSolidDragging( *(sal_Bool*) pValues[ 10 ].getValue() );
     if( pValues[11].hasValue() ) SetSolidMarkHdl( *(sal_Bool*) pValues[ 11 ].getValue() );
-    // #97016#
     if( pValues[12].hasValue() ) SetDefaultObjectSizeWidth( *(sal_uInt32*) pValues[ 12 ].getValue() );
     if( pValues[13].hasValue() ) SetDefaultObjectSizeHeight( *(sal_uInt32*) pValues[ 13 ].getValue() );
     if( pValues[14].hasValue() ) SetPrinterIndependentLayout( *(sal_uInt16*) pValues[ 14 ].getValue() );
@@ -622,7 +614,6 @@ BOOL SdOptionsMisc::ReadData( const Any* pValues )
             SetStartWithActualPage( *(sal_Bool*) pValues[ 17 ].getValue() );
         if( pValues[18].hasValue() )
             SetSummationOfParagraphs( *(sal_Bool*) pValues[ 18 ].getValue() );
-        // #90356#
         if( pValues[19].hasValue() )
             SetShowUndoDeleteWarning( *(sal_Bool*) pValues[ 19 ].getValue() );
 
@@ -662,7 +653,6 @@ BOOL SdOptionsMisc::WriteData( Any* pValues ) const
     pValues[ 9 ] <<= (double)0;// GetPreviewQuality();
     pValues[ 10 ] <<= IsSolidDragging();
     pValues[ 11 ] <<= IsSolidMarkHdl();
-    // #97016#
     pValues[ 12 ] <<= GetDefaultObjectSizeWidth();
     pValues[ 13 ] <<= GetDefaultObjectSizeHeight();
     pValues[ 14 ] <<= GetPrinterIndependentLayout();
@@ -674,7 +664,6 @@ BOOL SdOptionsMisc::WriteData( Any* pValues ) const
         pValues[ 16 ] <<= IsStartWithTemplate();
         pValues[ 17 ] <<= IsStartWithActualPage();
         pValues[ 18 ] <<= IsSummationOfParagraphs();
-        // #90356#
         pValues[ 19 ] <<= IsShowUndoDeleteWarning();
         pValues[ 20 ] <<= IsSlideshowRespectZOrder();
 
@@ -711,10 +700,8 @@ SdOptionsMiscItem::SdOptionsMiscItem( USHORT _nWhich, SdOptions* pOpts, ::sd::Fr
         maOptionsMisc.SetStartWithTemplate( pOpts->IsStartWithTemplate() );
         maOptionsMisc.SetStartWithActualPage( pOpts->IsStartWithActualPage() );
         maOptionsMisc.SetSummationOfParagraphs( pOpts->IsSummationOfParagraphs() );
-        // #90356#
         maOptionsMisc.SetShowUndoDeleteWarning( pOpts->IsShowUndoDeleteWarning() );
         maOptionsMisc.SetPrinterIndependentLayout( pOpts->GetPrinterIndependentLayout() );
-        // #97016#
         maOptionsMisc.SetDefaultObjectSizeWidth( pOpts->GetDefaultObjectSizeWidth() );
         maOptionsMisc.SetDefaultObjectSizeHeight( pOpts->GetDefaultObjectSizeHeight() );
 
@@ -774,7 +761,7 @@ SfxPoolItem* SdOptionsMiscItem::Clone( SfxItemPool* ) const
 int SdOptionsMiscItem::operator==( const SfxPoolItem& rAttr ) const
 {
     const bool bSameType = SfxPoolItem::operator==(rAttr);
-    DBG_ASSERT( bSameType, "SdOptionsMiscItem::operator==(), differen pool item type!" );
+    DBG_ASSERT( bSameType, "SdOptionsMiscItem::operator==(), different pool item type!" );
     return bSameType && ( maOptionsMisc == static_cast< const SdOptionsMiscItem& >(rAttr).maOptionsMisc );
 }
 
@@ -799,11 +786,9 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const
         pOpts->SetSummationOfParagraphs( maOptionsMisc.IsSummationOfParagraphs() );
         pOpts->SetSolidDragging( maOptionsMisc.IsSolidDragging() );
         pOpts->SetSolidMarkHdl( maOptionsMisc.IsSolidMarkHdl() );
-        // #90356#
         pOpts->SetShowUndoDeleteWarning( maOptionsMisc.IsShowUndoDeleteWarning() );
         pOpts->SetPrinterIndependentLayout( maOptionsMisc.GetPrinterIndependentLayout() );
         pOpts->SetShowComments( maOptionsMisc.IsShowComments() );
-        // #97016#
         pOpts->SetDefaultObjectSizeWidth( maOptionsMisc.GetDefaultObjectSizeWidth() );
         pOpts->SetDefaultObjectSizeHeight( maOptionsMisc.GetDefaultObjectSizeHeight() );
 
@@ -975,7 +960,7 @@ SfxPoolItem* SdOptionsSnapItem::Clone( SfxItemPool* ) const
 int SdOptionsSnapItem::operator==( const SfxPoolItem& rAttr ) const
 {
     const bool bSameType = SfxPoolItem::operator==(rAttr);
-    DBG_ASSERT( bSameType, "SdOptionsSnapItem::operator==(), differen pool item type!" );
+    DBG_ASSERT( bSameType, "SdOptionsSnapItem::operator==(), different pool item type!" );
     return bSameType && ( maOptionsSnap == static_cast< const SdOptionsSnapItem& >(rAttr).maOptionsSnap );
 }
 
@@ -1505,7 +1490,7 @@ SfxPoolItem* SdOptionsPrintItem::Clone( SfxItemPool* ) const
 int SdOptionsPrintItem::operator==( const SfxPoolItem& rAttr ) const
 {
     const bool bSameType = SfxPoolItem::operator==(rAttr);
-    DBG_ASSERT( bSameType, "SdOptionsPrintItem::operator==(), differen pool item type!" );
+    DBG_ASSERT( bSameType, "SdOptionsPrintItem::operator==(), different pool item type!" );
     return bSameType && ( maOptionsPrint == static_cast< const SdOptionsPrintItem& >( rAttr ).maOptionsPrint );
 }
 
diff --git a/sd/source/ui/app/sddll1.cxx b/sd/source/ui/app/sddll1.cxx
index d43c7a8a7651..ef0155762f2c 100644
--- a/sd/source/ui/app/sddll1.cxx
+++ b/sd/source/ui/app/sddll1.cxx
@@ -96,7 +96,7 @@ void SdDLL::RegisterFactorys()
 
 void SdDLL::RegisterInterfaces()
 {
-    // Modul
+    // Module
     SfxModule* pMod = SD_MOD();
     SdModule::RegisterInterface(pMod);
 
diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx
index 3738bceaac37..7a2f2b494c86 100644
--- a/sd/source/ui/app/sddll2.cxx
+++ b/sd/source/ui/app/sddll2.cxx
@@ -152,7 +152,6 @@ void SdDLL::RegisterControllers()
 
     SvxStyleToolBoxControl::RegisterControl(0, pMod);
     SvxFontNameToolBoxControl::RegisterControl(0, pMod);
-//  SvxFontHeightToolBoxControl::RegisterControl(0, pMod);
     SvxFontColorToolBoxControl::RegisterControl(0, pMod);
 
     SvxGrafFilterToolBoxControl::RegisterControl( SID_GRFFILTER, pMod );
@@ -177,7 +176,6 @@ void SdDLL::RegisterControllers()
     SvxZoomStatusBarControl::RegisterControl( SID_ATTR_ZOOM, pMod );
     SvxPosSizeStatusBarControl::RegisterControl( SID_ATTR_SIZE, pMod );
     SvxModifyControl::RegisterControl( SID_DOC_MODIFIED, pMod );
-    //SvxInsertStatusBarControl::RegisterControl(0, pModd);
     SvxZoomSliderControl::RegisterControl( SID_ATTR_ZOOMSLIDER, pMod );
 
     // MenuControls fuer PopupMenu
@@ -207,9 +205,6 @@ void SdDLL::RegisterControllers()
     SvxFrameLineColorToolBoxControl::RegisterControl(SID_FRAME_LINECOLOR, pMod );
     SvxFrameToolBoxControl::RegisterControl(SID_ATTR_BORDER, pMod );
     SvxSubToolBoxControl::RegisterControl(SID_OPTIMIZE_TABLE, pMod);
-
-//  SdLayoutControl::RegisterControl( SID_ASSIGN_LAYOUT, pMod );
-//  SdLayoutControl::RegisterControl( SID_INSERTPAGE, pMod );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index ca089bd3838a..de1c80b0457e 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -173,19 +173,10 @@ void SdModule::FillStatusBar(StatusBar& rStatusBar)
     // Groesse und Position
     rStatusBar.InsertItem( SID_ATTR_SIZE, SvxPosSizeStatusBarControl::GetDefItemWidth(rStatusBar), // vorher 42
                             SIB_IN | SIB_USERDRAW );
-                            // SIB_AUTOSIZE | SIB_LEFT | SIB_OWNERDRAW );
 
     // Massstab
     rStatusBar.InsertItem( SID_ATTR_ZOOM, SvxZoomStatusBarControl::GetDefItemWidth(rStatusBar), SIB_IN | SIB_CENTER );
-/*
-    // Einfuege- / Uberschreibmodus
-    rStatusBar.InsertItem( SID_ATTR_INSERT, TEXT_WIDTH( "EINFG" ),
-                            SIB_IN | SIB_CENTER );
-
-    // Selektionsmodus
-    rStatusBar.InsertItem( SID_STATUS_SELMODE, TEXT_WIDTH( "ERG" ),
-                            SIB_IN | SIB_CENTER );
-*/
+
     // Dokument geaendert
     rStatusBar.InsertItem( SID_DOC_MODIFIED, SvxModifyControl::GetDefItemWidth(rStatusBar) );
 
@@ -193,8 +184,6 @@ void SdModule::FillStatusBar(StatusBar& rStatusBar)
     rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW );
     rStatusBar.SetHelpId(SID_SIGNATURE, SID_SIGNATURE);
 
-
-
     // Seite
     rStatusBar.InsertItem( SID_STATUS_PAGE, TEXT_WIDTH( String().Fill( 24, 'X' ) ),
                             SIB_IN | SIB_LEFT );
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index bb8a9c2d8763..8b2d64788873 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -1024,14 +1024,6 @@ void OutlineToImpressFinalizer::operator() (bool)
         // have any information about a BaseURL!
         if ( pOutlineShell->Read(*mpStream, String(), EE_FORMAT_RTF) == 0 )
         {
-/*
-            sd::OutlineViewPageChangesGuard aGuard( pView );
-
-            // Remove the first empty pages
-            USHORT nPageCount = mrDocument.GetPageCount();
-            mrDocument.RemovePage( --nPageCount );  // notes page
-            mrDocument.RemovePage( --nPageCount );  // standard page
-*/
         }
 
         // Call UpdatePreview once for every slide to resync the
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 3fd510215cdb..8178d3708169 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -599,10 +599,6 @@ sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor )
 
 // -----------------------------------------------------------------------------
 
-/* testcode
-#include <sfx2/docfile.hxx>
-*/
-
 sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject, sal_uInt32 nObjectType, const DataFlavor& )
 {
     sal_Bool bRet = sal_False;
@@ -628,17 +624,6 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject
                         rxOStm->Commit();
                 }
 
-    /* testcode
-                {
-                    const rtl::OUString aURL( RTL_CONSTASCII_USTRINGPARAM( "file:///e:/test.xml" ) );
-                    SfxMedium aMedium( aURL, STREAM_WRITE | STREAM_TRUNC, TRUE );
-                    aMedium.IsRemote();
-                    com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> xDocOut( new utl::OOutputStreamWrapper( *aMedium.GetOutStream() ) );
-                    if( SvxDrawingLayerExport( pDoc, xDocOut, xComponent, (pDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS) ? "com.sun.star.comp.Impress.XMLClipboardExporter" : "com.sun.star.comp.DrawingLayer.XMLExporter" ) )
-                        aMedium.Commit();
-                }
-    */
-
                 xComponent->dispose();
                 bRet = ( rxOStm->GetError() == ERRCODE_NONE );
             }
@@ -736,7 +721,6 @@ void SdTransferable::SetPageBookmarks( const List& rPageBookmarks, BOOL bPersist
         if( mpSdViewIntern )
             mpSdViewIntern->HideSdrPage();
 
-        // #116168#
         mpSdDrawDocument->ClearModel(sal_False);
 
         mpPageDocShell = NULL;
diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx
index 87fea0731a9e..0b818d390894 100644
--- a/sd/source/ui/app/tbxww.cxx
+++ b/sd/source/ui/app/tbxww.cxx
@@ -154,7 +154,6 @@ void SdTbxControl::StateChanged( USHORT nSId,
     if( eState == SFX_ITEM_AVAILABLE )
     {
         TbxImageItem* pItem = PTR_CAST( TbxImageItem, pState );
-        //DBG_ASSERT( pItem, "TbxImageItem erwartet!" );
         // Im StarDesktop kann jetzt auch ein anderes Item ankommen,
         // das nicht ausgewertet werden darf (#33802# und #33838#)
         if( pItem )
@@ -325,9 +324,6 @@ BOOL SdTbxControl::IsCheckable( USHORT nSId )
         case SID_CONNECTOR_LINES_CIRCLE_END:
         case SID_CONNECTOR_LINES_CIRCLES:
 
-
-
-        //case SID_ZOOM_OUT:
             return( TRUE );
     }
     return( FALSE );
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 56eee9cd32f8..a51ee7f09273 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -116,8 +116,6 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
     BOOL bHandoutMode = FALSE;
     SdPage* pHandoutMPage = NULL;
     String aNewName;
-
-    // #95981#
     String aOldName;
 
     AutoLayout aNewAutoLayout;