diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-12-20 11:24:48 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-21 16:07:16 +0000 |
| commit | e839c779a1a6b5a80d5e7368c457ba9620ecd6bb (patch) | |
| tree | 3428c6350da3aa2826a528e0ba6f4f83af3594b8 /sw | |
| parent | 23e8d0417c664fcb9b3f281f60629521153d6e55 (diff) | |
fdo#70232: sw: brown paper-bag fix for header sharing mangling footers
Stupid copy/paste error in SwDoc::CopyMasterFooter() checks
IsHeaderShared().
(regression from e1a9a348a519a69f898c9c1e6d87a5837b8267f9)
Change-Id: I0c0bc16a8c581cd05ed206a0de79c7983204165b
(cherry picked from commit 94c772adc2e8d8af468f3996527c84bf7704103f)
Reviewed-on: https://gerrit.libreoffice.org/7154
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/docdesc.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index bb1d78ffd551..7bbecfa1dbb4 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -259,7 +259,7 @@ void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot, // The CntntIdx is _always_ different when called from // SwDocStyleSheet::SetItemSet, because it deep-copies the // PageDesc. So check if it was previously shared. - ((bLeft) ? pDesc->IsHeaderShared() : pDesc->IsFirstShared())) + ((bLeft) ? pDesc->IsFooterShared() : pDesc->IsFirstShared())) { SwFrmFmt *pFmt = new SwFrmFmt( GetAttrPool(), (bLeft ? "Left footer" : "First footer"), GetDfltFrmFmt() ); |