summaryrefslogtreecommitdiff
path: root/sw/source/uibase/docvw
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase/docvw')
-rw-r--r--sw/source/uibase/docvw/HeaderFooterWin.cxx5
-rw-r--r--sw/source/uibase/docvw/PageBreakWin.cxx5
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx14
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();