diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-12-20 17:58:12 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-21 16:19:51 +0000 |
| commit | 283b76abeafe28c335de2d7cdc2fde04a55d4192 (patch) | |
| tree | 6e80598b2082238b4818e35d80b6b21b23beb194 /sw/inc/doc.hxx | |
| parent | e839c779a1a6b5a80d5e7368c457ba9620ecd6bb (diff) | |
fdo#69065: sw: fix mirrored page style with first-page
If a mirrored page style is used with first-page on both a right page
and a left page the current design cannot work because the margins in
the SwPageDesc::aFirst cannot be right for both cases.
So split that up so we get a first-master and first-left format and
copy the headers/footers and margins as appropriate... which is really
adding epicycles to a flawed design; probably this would be better with
just a single SwFrmFmt that has different items for master/left/first
headers.
(cherry picked from commit e936ecc92a7e362f57ce72a955697840920636b8)
Conflicts:
sw/source/core/doc/docdesc.cxx
sw/source/core/doc/poolfmt.cxx
Change-Id: I0889a4ab5959b5a71172203bb64d185960a07d73
Reviewed-on: https://gerrit.libreoffice.org/7158
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/inc/doc.hxx')
| -rw-r--r-- | sw/inc/doc.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 12ab4765a469..ff372aa7ac5c 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -2080,9 +2080,9 @@ private: /// method to set new graphics pool defaults, must only be called by SetDrawDefaults! void UpdateDrawDefaults(); /// Copies master header to left / first one, if necessary - used by ChgPageDesc(). - void CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead, SwPageDesc *pDesc, bool bLeft); + void CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead, SwPageDesc *pDesc, bool bLeft, bool bFirst); /// Copies master footer to left / first one, if necessary - used by ChgPageDesc(). - void CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot, SwPageDesc *pDesc, bool bLeft); + void CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot, SwPageDesc *pDesc, bool bLeft, bool bFirst); /** continue computing a chunk of document statistics * \param nChars number of characters to count before exiting |