From 714fe0fed88d01bac1a658fbb2de193a7704e24b Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 30 Jul 2018 15:34:20 +0200 Subject: loplugin:returnconstant in svx Change-Id: I0cc0c32afa0d735738c6744873f3518a2763821e Reviewed-on: https://gerrit.libreoffice.org/58334 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sw/source/core/frmedt/feshview.cxx | 5 ++++- sw/source/uibase/uiview/viewdraw.cxx | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'sw/source') 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{} ); - 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; -- cgit