[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source

[Michael Stahl]

 sw/source/core/layout/pagedesc.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a0342b16c6a837f8fcecd3c7983df119e459b67f
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Aug 20 11:41:37 2013 +0200

    fdo#66145: do not check IsFirstShared() in SwPageDesc::GetLeftFmt()
    
    ... and GetRightFmt().  If the first format is requested it must be
    returned; the sharing works by copying the SwFmtHeader/Footer from
    aMaster to the other members.
    
    (regression from 4dc78aee9bcdb6ea5e9dc47ebb4a4b9e590c725a)
    
    Change-Id: I1708f01c18b155ae75c14fc407e52ccd2bd798d7
    (cherry picked from commit 4df438c9a9d5e698c47c1e85903eb81880a5e6fa)
    Reviewed-on: https://gerrit.libreoffice.org/5534
    Reviewed-by: Petr Mladek <pmladek at suse.cz>
    Tested-by: Petr Mladek <pmladek at suse.cz>

diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index 7e8586b..aa966df 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -348,14 +348,14 @@ sal_Bool SwPageDesc::IsFollowNextPageOfNode( const SwNode& rNd ) const
 SwFrmFmt *SwPageDesc::GetLeftFmt(bool const bFirst)
 {
     return (nsUseOnPage::PD_LEFT & eUse)
-            ? (bFirst && !IsFirstShared()) ? &aFirst : &aLeft
+            ? ((bFirst) ? &aFirst : &aLeft)
             : 0;
 }
 
 SwFrmFmt *SwPageDesc::GetRightFmt(bool const bFirst)
 {
     return (nsUseOnPage::PD_RIGHT & eUse)
-            ? (bFirst && !IsFirstShared()) ? &aFirst : &aMaster
+            ? ((bFirst) ? &aFirst : &aMaster)
             : 0;
 }