diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-08-20 11:41:37 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-22 13:46:17 +0200 |
| commit | 75084f6c42c27dc95418df9cefed2fddfb26000e (patch) | |
| tree | ccae7a3a4a6fca4b5d43ffadc982a581a592ac72 | |
| parent | b8a3e787e9c48d8e7af80800456919726ed8dd4b (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
(cherry picked from commit 4df438c9a9d5e698c47c1e85903eb81880a5e6fa)
Reviewed-on: https://gerrit.libreoffice.org/5530
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
Reviewed-by: Thorsten Behrens <tbehrens@suse.com>
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
| -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 33aecbff3536..1b248f1fed51 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; } |