|
 |
f0633d |
From e839c779a1a6b5a80d5e7368c457ba9620ecd6bb Mon Sep 17 00:00:00 2001
|
|
|
f0633d |
From: Michael Stahl <mstahl@redhat.com>
|
|
|
f0633d |
Date: Fri, 20 Dec 2013 11:24:48 +0100
|
|
|
f0633d |
Subject: [PATCH 077/109] fdo#70232: sw: brown paper-bag fix for header sharing
|
|
|
f0633d |
mangling footers
|
|
|
f0633d |
|
|
|
f0633d |
Stupid copy/paste error in SwDoc::CopyMasterFooter() checks
|
|
|
f0633d |
IsHeaderShared().
|
|
|
f0633d |
|
|
|
f0633d |
(regression from e1a9a348a519a69f898c9c1e6d87a5837b8267f9)
|
|
|
f0633d |
|
|
|
f0633d |
Change-Id: I0c0bc16a8c581cd05ed206a0de79c7983204165b
|
|
|
f0633d |
(cherry picked from commit 94c772adc2e8d8af468f3996527c84bf7704103f)
|
|
|
f0633d |
Reviewed-on: https://gerrit.libreoffice.org/7154
|
|
|
f0633d |
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f0633d |
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f0633d |
---
|
|
|
f0633d |
sw/source/core/doc/docdesc.cxx | 2 +-
|
|
|
f0633d |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
f0633d |
|
|
|
f0633d |
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
|
|
|
f0633d |
index bb1d78f..7bbecfa 100644
|
|
|
f0633d |
--- a/sw/source/core/doc/docdesc.cxx
|
|
|
f0633d |
+++ b/sw/source/core/doc/docdesc.cxx
|
|
|
f0633d |
@@ -259,7 +259,7 @@ void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot,
|
|
|
f0633d |
// The CntntIdx is _always_ different when called from
|
|
|
f0633d |
// SwDocStyleSheet::SetItemSet, because it deep-copies the
|
|
|
f0633d |
// PageDesc. So check if it was previously shared.
|
|
|
f0633d |
- ((bLeft) ? pDesc->IsHeaderShared() : pDesc->IsFirstShared()))
|
|
|
f0633d |
+ ((bLeft) ? pDesc->IsFooterShared() : pDesc->IsFirstShared()))
|
|
|
f0633d |
{
|
|
|
f0633d |
SwFrmFmt *pFmt = new SwFrmFmt( GetAttrPool(), (bLeft ? "Left footer" : "First footer"),
|
|
|
f0633d |
GetDfltFrmFmt() );
|
|
|
f0633d |
--
|
|
|
f0633d |
1.8.4.2
|
|
|
f0633d |
|