From e839c779a1a6b5a80d5e7368c457ba9620ecd6bb Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 20 Dec 2013 11:24:48 +0100 Subject: [PATCH 077/109] 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 Tested-by: Miklos Vajna --- sw/source/core/doc/docdesc.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index bb1d78f..7bbecfa 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() ); -- 1.8.4.2