diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-08-20 11:41:37 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-08-20 11:57:00 +0200 |
commit | 4df438c9a9d5e698c47c1e85903eb81880a5e6fa (patch) | |
tree | dc3765bdb7873f8caff001b8299e36d9075dd35b | |
parent | bf206549228685a68e1504db05119d8fa1d354b3 (diff) |
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
-rw-r--r-- | sw/source/core/layout/pagedesc.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index fadd5274a995..e53b1352d6d5 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -349,14 +349,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; } |