diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-08-20 14:56:41 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-08-21 12:03:30 +0000 |
| commit | 1514f2c5d00a6f4743f942c93c3a930e13c14263 (patch) | |
| tree | 3f1bf28036875a05d0778ce45d5388fdc5df656d | |
| parent | 4e7a358909b31005054320fa2e57aa421c16bdc3 (diff) | |
fix undetected(?) merge conflict
commits 49e308ce893e461a121ea7d90ec9514f05bf62aa and
f7433971d901f8f66538ef8df3e7729b0047ca2c were pushed out-of-order and as
a result the "pDesc->ChgFirstShare( rChged.IsFirstShared() );"
somehow managed to get duplicated, which makes
f7433971d901f8f66538ef8df3e7729b0047ca2c ineffective for footers;
remove the duplicate.
Change-Id: Ia61690c2f0714f9e381cd86d50e139f0ccb85a88
Reviewed-on: https://gerrit.libreoffice.org/5544
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
| -rw-r--r-- | sw/source/core/doc/docdesc.cxx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index 2e45e604db17..932eb8451782 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -352,8 +352,6 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged ) CopyMasterHeader(rChged, rHead, pDesc, true); // Copy left header CopyMasterHeader(rChged, rHead, pDesc, false); // Copy first header pDesc->ChgHeaderShare( rChged.IsHeaderShared() ); - // there is just one first shared flag for both header and footer? - pDesc->ChgFirstShare( rChged.IsFirstShared() ); // Synch Footer. const SwFmtFooter &rFoot = rChged.GetMaster().GetFooter(); |