Kaydet (Commit) 5c1cc92e authored tarafından Michael Stahl's avatar Michael Stahl

fdo#69282: sw: fix updating of page styles via SwDocShell::_LoadStyles()

SwDoc::CopyPageDesc() only copies master and left SwFrmFmt attributes,
but not first-master and first-left.  They will contain exactly the same
attributes as master and left but they still need to be copied...

(see also: that FIXME in pagedesc.hxx)

(regression from 75084f6c)

Change-Id: I3dcc3627708b5d6a477eb7fef76cf6c42c95c004
üst 223f7613
...@@ -1443,6 +1443,22 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc, ...@@ -1443,6 +1443,22 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
rDstDesc.GetLeft().DelDiffs( aAttrSet ); rDstDesc.GetLeft().DelDiffs( aAttrSet );
rDstDesc.GetLeft().SetFmtAttr( aAttrSet ); rDstDesc.GetLeft().SetFmtAttr( aAttrSet );
aAttrSet.ClearItem();
aAttrSet.Put( rSrcDesc.GetFirstMaster().GetAttrSet() );
aAttrSet.ClearItem( RES_HEADER );
aAttrSet.ClearItem( RES_FOOTER );
rDstDesc.GetFirstMaster().DelDiffs( aAttrSet );
rDstDesc.GetFirstMaster().SetFmtAttr( aAttrSet );
aAttrSet.ClearItem();
aAttrSet.Put( rSrcDesc.GetFirstLeft().GetAttrSet() );
aAttrSet.ClearItem( RES_HEADER );
aAttrSet.ClearItem( RES_FOOTER );
rDstDesc.GetFirstLeft().DelDiffs( aAttrSet );
rDstDesc.GetFirstLeft().SetFmtAttr( aAttrSet );
} }
CopyHeader( rSrcDesc.GetMaster(), rDstDesc.GetMaster() ); CopyHeader( rSrcDesc.GetMaster(), rDstDesc.GetMaster() );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment