diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-24 09:25:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-24 10:27:12 +0200 |
| commit | 2c56d461633ff1a1b364685df79b521f8802c4ec (patch) | |
| tree | b419b70f891398d39decdc17b7e4f5ae82d478fa /sw/source/uibase/docvw | |
| parent | a975225678c00272fc6e2ee2c85e6fe00a2204f1 (diff) | |
clang-tidy readability-simplify-boolean-expr in sw
Change-Id: Ib3ec37b8280c527fa712192db043b348c3427c50
Reviewed-on: https://gerrit.libreoffice.org/36877
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase/docvw')
| -rw-r--r-- | sw/source/uibase/docvw/HeaderFooterWin.cxx | 5 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/PageBreakWin.cxx | 5 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/edtwin.cxx | 14 |
3 files changed, 4 insertions, 20 deletions
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index 635bf6fa0996..897583f5e7dd 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -247,10 +247,7 @@ bool SwHeaderFooterWin::Contains( const Point &rDocPt ) const return true; ::tools::Rectangle aLineRect(m_pLine->GetPosPixel(), m_pLine->GetSizePixel()); - if (aLineRect.IsInside(rDocPt)) - return true; - - return false; + return aLineRect.IsInside(rDocPt); } void SwHeaderFooterWin::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle&) diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index 7aea3c768ac3..103bb496af75 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -404,10 +404,7 @@ bool SwPageBreakWin::Contains( const Point &rDocPt ) const return true; ::tools::Rectangle aLineRect( m_pLine->GetPosPixel(), m_pLine->GetSizePixel() ); - if ( aLineRect.IsInside( rDocPt ) ) - return true; - - return false; + return aLineRect.IsInside( rDocPt ); } void SwPageBreakWin::SetReadonly( bool bReadonly ) diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 355629a7f051..79570a9b5ee0 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -1175,14 +1175,7 @@ void SwEditWin::ChangeFly( sal_uInt8 nDir, bool bWeb ) bool bSetPos = (RndStdIds::FLY_AS_CHAR != eAnchorId); if(bSetPos && bWeb) { - if (RndStdIds::FLY_AT_PAGE != eAnchorId) - { - bSetPos = false; - } - else - { - bSetPos = true; - } + bSetPos = RndStdIds::FLY_AT_PAGE == eAnchorId; } if( bSetPos ) rSh.SetFlyPos( aTmp.Pos() ); @@ -1822,10 +1815,7 @@ KEYINPUT_CHECKTABLE: goto KEYINPUT_CHECKTABLE_INSDEL; KEYINPUT_CHECKTABLE_INSDEL: - if( rSh.IsTableMode() || !rSh.GetTableFormat() || - !m_bTableInsDelMode || - false /* table protected */ - ) + if( rSh.IsTableMode() || !rSh.GetTableFormat() || !m_bTableInsDelMode ) { const SelectionType nSelectionType = rSh.GetSelectionType(); |