diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-20 08:35:33 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-20 08:37:49 +0100 |
| commit | 5eb7759d445d5ea26f603de03cab3d6bc5b262ee (patch) | |
| tree | 3f0e452df998e613e7d2319434ebf0ab337e48be /sw | |
| parent | 6f493f9e379af1e005b85606c6aab515726be993 (diff) | |
SwPageFrm::IsOverHeaderFooterArea: check for IsActive() only later
Checking for a bool is certainly cheaper than a chain of member function
calls.
Change-Id: I9520194e58e75264f3fcbb413a618e3995f59a4e
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/pagechg.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 80b28465ef73..60ad4dde4908 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -2262,10 +2262,10 @@ bool SwPageFrm::IsOverHeaderFooterArea( const Point& rPt, FrameControlType &rCon Size( Frm().Width(), nUpperLimit - Frm().Top() ) ); SwViewShell* pViewShell = getRootFrm()->GetCurrShell(); - bool bHideWhitespaceMode = pViewShell->GetViewOptions()->IsHideWhitespaceMode(); + const bool bHideWhitespaceMode = pViewShell->GetViewOptions()->IsHideWhitespaceMode(); if ( aHeaderArea.IsInside( rPt ) ) { - if (static_cast<const SwFrameFormat*>(GetRegisteredIn())->GetHeader().IsActive() || !bHideWhitespaceMode) + if (!bHideWhitespaceMode || static_cast<const SwFrameFormat*>(GetRegisteredIn())->GetHeader().IsActive()) { rControl = Header; return true; @@ -2277,7 +2277,7 @@ bool SwPageFrm::IsOverHeaderFooterArea( const Point& rPt, FrameControlType &rCon Size( Frm().Width(), Frm().Bottom() - nLowerLimit ) ); if ( aFooterArea.IsInside( rPt ) && - (static_cast<const SwFrameFormat*>(GetRegisteredIn())->GetFooter().IsActive() || !bHideWhitespaceMode) ) + (!bHideWhitespaceMode || static_cast<const SwFrameFormat*>(GetRegisteredIn())->GetFooter().IsActive()) ) { rControl = Footer; return true; |