diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-30 15:34:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-31 12:42:50 +0200 |
| commit | 714fe0fed88d01bac1a658fbb2de193a7704e24b (patch) | |
| tree | 48d669b9555ff78dba0c87e9206db030e39cb499 /sw/source | |
| parent | cb9ce13d82839a7ce0db3bd113e70bbcc125076a (diff) | |
loplugin:returnconstant in svx
Change-Id: I0cc0c32afa0d735738c6744873f3518a2763821e
Reviewed-on: https://gerrit.libreoffice.org/58334
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/frmedt/feshview.cxx | 5 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/viewdraw.cxx | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index d6c53ed68834..3094133cf81b 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -2133,7 +2133,10 @@ bool SwFEShell::BeginMark( const Point &rPos ) if (pDView->HasMarkablePoints()) return pDView->BegMarkPoints( rPos ); else - return pDView->BegMarkObj( rPos ); + { + pDView->BegMarkObj( rPos ); + return true; + } } else return false; diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index 4e665239616c..d1939e6df0b6 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -730,8 +730,8 @@ bool SwView::IsDrawTextHyphenate() SfxItemSet aNewAttr( pSdrView->GetModel()->GetItemPool(), svl::Items<EE_PARA_HYPHENATE, EE_PARA_HYPHENATE>{} ); - if( pSdrView->GetAttributes( aNewAttr ) && - aNewAttr.GetItemState( EE_PARA_HYPHENATE ) >= SfxItemState::DEFAULT ) + pSdrView->GetAttributes( aNewAttr ); + if( aNewAttr.GetItemState( EE_PARA_HYPHENATE ) >= SfxItemState::DEFAULT ) bHyphenate = aNewAttr.Get( EE_PARA_HYPHENATE ).GetValue(); return bHyphenate; |