Kaydet (Commit) 75084f6c authored tarafından Michael Stahl's avatar Michael Stahl

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 4dc78aee)

Change-Id: I1708f01c18b155ae75c14fc407e52ccd2bd798d7
(cherry picked from commit 4df438c9)
Reviewed-on: https://gerrit.libreoffice.org/5530Reviewed-by: 's avatarPetr Mladek <pmladek@suse.cz>
Tested-by: 's avatarPetr Mladek <pmladek@suse.cz>
Reviewed-by: 's avatarThorsten Behrens <tbehrens@suse.com>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@suse.cz>
üst b8a3e787
...@@ -348,14 +348,14 @@ sal_Bool SwPageDesc::IsFollowNextPageOfNode( const SwNode& rNd ) const ...@@ -348,14 +348,14 @@ sal_Bool SwPageDesc::IsFollowNextPageOfNode( const SwNode& rNd ) const
SwFrmFmt *SwPageDesc::GetLeftFmt(bool const bFirst) SwFrmFmt *SwPageDesc::GetLeftFmt(bool const bFirst)
{ {
return (nsUseOnPage::PD_LEFT & eUse) return (nsUseOnPage::PD_LEFT & eUse)
? (bFirst && !IsFirstShared()) ? &aFirst : &aLeft ? ((bFirst) ? &aFirst : &aLeft)
: 0; : 0;
} }
SwFrmFmt *SwPageDesc::GetRightFmt(bool const bFirst) SwFrmFmt *SwPageDesc::GetRightFmt(bool const bFirst)
{ {
return (nsUseOnPage::PD_RIGHT & eUse) return (nsUseOnPage::PD_RIGHT & eUse)
? (bFirst && !IsFirstShared()) ? &aFirst : &aMaster ? ((bFirst) ? &aFirst : &aMaster)
: 0; : 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment