diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index c23ed5ce05da..c4faf3b1d230 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -625,7 +625,7 @@ namespace frm
             // don't draw the text over the border
             lcl_inflate( aPlayground, -aOnePixel.Width(), -aOnePixel.Height() );
 
-        // leave a space of one pixel between the "surroundings" of the control
+        // leave a space of two pixels between the "surroundings" of the control
         // and the content
         lcl_inflate( aPlayground, -aOnePixel.Width(), -aOnePixel.Height() );
         lcl_inflate( aPlayground, -aOnePixel.Width(), -aOnePixel.Height() );
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 1dc4e74dcdcb..e6c03d6eb88c 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1854,7 +1854,6 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent,
 
     FreeResource();
 
-    mpRBClickSequence->SetClickHdl( LINK( this, CustomAnimationDurationTabPage, implControlHdl ) );
     mpRBClickSequence->SetClickHdl( LINK( this, CustomAnimationDurationTabPage, implControlHdl ) );
     mpLBTrigger->SetSelectHdl( LINK( this, CustomAnimationDurationTabPage, implControlHdl ) );
 
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 2a2bfbafddeb..10c5c62bb383 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -444,15 +444,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
             if (meEditMode == EM_PAGE)
                 maTabControl.SetCurPageId (nActualPageNum + 1);
         }
-        /*AF: The LayerDialogChildWindow is not used anymore (I hope).
-        if (GetViewFrame()->KnowsChildWindow(
-            LayerDialogChildWindow::GetChildWindowId()))
-        {
-            GetViewFrame()->SetChildWindow(
-                LayerDialogChildWindow::GetChildWindowId(),
-                IsLayerModeActive());
-        }
-        */
+
         ResetActualLayer();
 
         Invalidate( SID_PAGEMODE );
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 152dc114fd10..c87d25b38b18 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -570,7 +570,6 @@ void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence
         SetZoomRect(aVisArea);
     }
 
-    ChangeEditMode (meEditMode, ! IsLayerModeActive());
     ChangeEditMode (meEditMode, ! IsLayerModeActive());
     ResetActualLayer();
 }