|
 |
f085be |
From f23d6a124dc413bcbb98f5145d230de707ca85db Mon Sep 17 00:00:00 2001
|
|
|
f085be |
From: Michael Stahl <mstahl@redhat.com>
|
|
|
f085be |
Date: Tue, 5 Aug 2014 22:50:23 +0200
|
|
|
f085be |
Subject: [PATCH 086/137] fdo#69282: sw: fix updating of page styles via
|
|
|
f085be |
SwDocShell::_LoadStyles()
|
|
|
f085be |
|
|
|
f085be |
SwDoc::CopyPageDesc() only copies master and left SwFrmFmt attributes,
|
|
|
f085be |
but not first-master and first-left. They will contain exactly the same
|
|
|
f085be |
attributes as master and left but they still need to be copied...
|
|
|
f085be |
|
|
|
f085be |
(see also: that FIXME in pagedesc.hxx)
|
|
|
f085be |
|
|
|
f085be |
(regression from 75084f6c42c27dc95418df9cefed2fddfb26000e)
|
|
|
f085be |
|
|
|
f085be |
Change-Id: I3dcc3627708b5d6a477eb7fef76cf6c42c95c004
|
|
|
f085be |
(cherry picked from commit 5c1cc92ee09f9fcc99077cacd3fc55640f03b7b2)
|
|
|
f085be |
Reviewed-on: https://gerrit.libreoffice.org/10774
|
|
|
f085be |
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f085be |
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f085be |
---
|
|
|
f085be |
sw/source/core/doc/docfmt.cxx | 16 ++++++++++++++++
|
|
|
f085be |
1 file changed, 16 insertions(+)
|
|
|
f085be |
|
|
|
f085be |
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
|
|
|
f085be |
index 561cb0f..b987918 100644
|
|
|
f085be |
--- a/sw/source/core/doc/docfmt.cxx
|
|
|
f085be |
+++ b/sw/source/core/doc/docfmt.cxx
|
|
|
f085be |
@@ -2148,6 +2148,22 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
|
|
|
f085be |
|
|
|
f085be |
rDstDesc.GetLeft().DelDiffs( aAttrSet );
|
|
|
f085be |
rDstDesc.GetLeft().SetFmtAttr( aAttrSet );
|
|
|
f085be |
+
|
|
|
f085be |
+ aAttrSet.ClearItem();
|
|
|
f085be |
+ aAttrSet.Put( rSrcDesc.GetFirstMaster().GetAttrSet() );
|
|
|
f085be |
+ aAttrSet.ClearItem( RES_HEADER );
|
|
|
f085be |
+ aAttrSet.ClearItem( RES_FOOTER );
|
|
|
f085be |
+
|
|
|
f085be |
+ rDstDesc.GetFirstMaster().DelDiffs( aAttrSet );
|
|
|
f085be |
+ rDstDesc.GetFirstMaster().SetFmtAttr( aAttrSet );
|
|
|
f085be |
+
|
|
|
f085be |
+ aAttrSet.ClearItem();
|
|
|
f085be |
+ aAttrSet.Put( rSrcDesc.GetFirstLeft().GetAttrSet() );
|
|
|
f085be |
+ aAttrSet.ClearItem( RES_HEADER );
|
|
|
f085be |
+ aAttrSet.ClearItem( RES_FOOTER );
|
|
|
f085be |
+
|
|
|
f085be |
+ rDstDesc.GetFirstLeft().DelDiffs( aAttrSet );
|
|
|
f085be |
+ rDstDesc.GetFirstLeft().SetFmtAttr( aAttrSet );
|
|
|
f085be |
}
|
|
|
f085be |
|
|
|
f085be |
CopyHeader( rSrcDesc.GetMaster(), rDstDesc.GetMaster() );
|
|
|
f085be |
--
|
|
|
f085be |
1.9.3
|
|
|
f085be |
|