[Libreoffice-commits] core.git: forms/source sd/source

[Thomas Arnhold]

 forms/source/richtext/richtextimplcontrol.cxx     |    2 +-
 sd/source/ui/animations/CustomAnimationDialog.cxx |    1 -
 sd/source/ui/view/drviews1.cxx                    |   10 +---------
 sd/source/ui/view/drviews5.cxx                    |    1 -
 4 files changed, 2 insertions(+), 12 deletions(-)

New commits:
commit 633fca5f3caedac6ea59be99809ffa899cd1bfff
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Mon Feb 25 21:15:55 2013 +0100

    remove two more duplicates
    
    Moreover clarify a comment and remove some commented code.
    
    Change-Id: Iba87b9ea6675a9bb50b8af0f094891e59bd93bd8
    Reviewed-on: https://gerrit.libreoffice.org/2406
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index c23ed5c..c4faf3b 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 1dc4e74..e6c03d6 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1855,7 +1855,6 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent,
     FreeResource();
 
     mpRBClickSequence->SetClickHdl( LINK( this, CustomAnimationDurationTabPage, implControlHdl ) );
-    mpRBClickSequence->SetClickHdl( LINK( this, CustomAnimationDurationTabPage, implControlHdl ) );
     mpLBTrigger->SetSelectHdl( LINK( this, CustomAnimationDurationTabPage, implControlHdl ) );
 
     if( pSet->getPropertyState( nHandleStart ) != STLPropertyState_AMBIGUOUS )
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 2a2bfba..10c5c62 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 152dc11..c87d25b 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -571,7 +571,6 @@ void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence
     }
 
     ChangeEditMode (meEditMode, ! IsLayerModeActive());
-    ChangeEditMode (meEditMode, ! IsLayerModeActive());
     ResetActualLayer();
 }