[Libreoffice-commits] core.git: sw/source

[Miklos Vajna]

 sw/source/core/layout/pagechg.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5eb7759d445d5ea26f603de03cab3d6bc5b262ee
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date:   Fri Nov 20 08:35:33 2015 +0100

    SwPageFrm::IsOverHeaderFooterArea: check for IsActive() only later
    
    Checking for a bool is certainly cheaper than a chain of member function
    calls.
    
    Change-Id: I9520194e58e75264f3fcbb413a618e3995f59a4e

diff --git a/sw/source/core/layout/pagechg.cxx 
b/sw/source/core/layout/pagechg.cxx
index 80b2846..60ad4dd 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits