diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-02-25 21:15:55 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-26 13:03:29 +0000 |
| commit | 633fca5f3caedac6ea59be99809ffa899cd1bfff (patch) | |
| tree | f9daec13d981d200d6638fcfbba48d3f635de3b4 | |
| parent | 07c584ad8ce44cc6fe098a177c8b07e6cfc7881e (diff) | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | forms/source/richtext/richtextimplcontrol.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews1.cxx | 10 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews5.cxx | 1 |
4 files changed, 2 insertions, 12 deletions
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 @@ -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 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 @@ -571,7 +571,6 @@ void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence } ChangeEditMode (meEditMode, ! IsLayerModeActive()); - ChangeEditMode (meEditMode, ! IsLayerModeActive()); ResetActualLayer(); } |