diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-12-20 11:24:48 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-12-21 00:33:52 +0100 |
| commit | 81253d316851faa33565b212b1257505f6ce2e4b (patch) | |
| tree | e3c4c341c589f12fba5e629a1347533a70ca6011 | |
| parent | cb49e62d3a518514dd27e10df6fc6bfd7f509e5f (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)
| -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 413a00d5efb7..3f1d63611876 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -258,7 +258,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() ); |