[Libreoffice-commits] core.git: 2 commits - sw/source

[Michael Stahl]

 sw/source/core/doc/docfmt.cxx |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

New commits:
commit 2e9840d18c09ce5552eec2f9d489d952da1034ae
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Aug 5 22:56:17 2014 +0200

    SwDoc::CopyPageDesc(): probably sending Modify for first too cannot hurt
    
    Change-Id: I2056bee7555d3f6723ac374863187d82e4ad9edd

diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index d650a02..faf1214 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1510,6 +1510,12 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
         {
             rDstDesc.GetLeft().ModifyBroadcast( &aInfo, 0, TYPE(SwFrm) );
         }
+        {
+            rDstDesc.GetFirstMaster().ModifyBroadcast( &aInfo, 0, TYPE(SwFrm) );
+        }
+        {
+            rDstDesc.GetFirstLeft().ModifyBroadcast( &aInfo, 0, TYPE(SwFrm) );
+        }
     }
 }
 
commit 5c1cc92ee09f9fcc99077cacd3fc55640f03b7b2
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Aug 5 22:50:23 2014 +0200

    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 75084f6c42c27dc95418df9cefed2fddfb26000e)
    
    Change-Id: I3dcc3627708b5d6a477eb7fef76cf6c42c95c004

diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 055bc46..d650a02 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1443,6 +1443,22 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
 
         rDstDesc.GetLeft().DelDiffs( 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() );