diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-08-20 11:51:27 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-20 11:57:00 +0200 |
| commit | 0b7a823bb6df79384939dda4de3b7f28e5e52758 (patch) | |
| tree | ec01d00a582b1b9357c834c50f3df5cd09b21324 | |
| parent | 4df438c9a9d5e698c47c1e85903eb81880a5e6fa (diff) | |
fdo#66145: fix Undo invalidation in SwDoc::ChgPageDesc()
SwDoc::ChgPageDesc(): make the invalidation of the Undo stack on
change of IsFirstShared work by delaying ChgFirstShare() until after
the check.
Change-Id: Ifbefe446df8b6d785ed1bb6394ec5beb803fb1fe
| -rw-r--r-- | sw/source/core/doc/docdesc.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index f5df1d04e64e..6e04bb829443 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -324,7 +324,6 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged ) // Take over orientation pDesc->SetLandscape( rChged.GetLandscape() ); - pDesc->ChgFirstShare( rChged.IsFirstShared() ); // #i46909# no undo if header or footer changed bool bHeaderFooterChanged = false; @@ -345,6 +344,8 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged ) CopyMasterHeader(rChged, rHead, pDesc, true); // Copy left header CopyMasterHeader(rChged, rHead, pDesc, false); // Copy first header pDesc->ChgHeaderShare( rChged.IsHeaderShared() ); + // there is just one first shared flag for both header and footer? + pDesc->ChgFirstShare( rChged.IsFirstShared() ); // Synch Footer. const SwFmtFooter &rFoot = rChged.GetMaster().GetFooter(); @@ -355,8 +356,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged ) const SwFmtFooter &rOldFoot = pDesc->GetMaster().GetFooter(); bHeaderFooterChanged |= ( rFoot.IsActive() != rOldFoot.IsActive() || - rChged.IsFooterShared() != pDesc->IsFooterShared() || - rChged.IsFirstShared() != pDesc->IsFirstShared() ); + rChged.IsFooterShared() != pDesc->IsFooterShared() ); } pDesc->GetMaster().SetFmtAttr( rFoot ); CopyMasterFooter(rChged, rFoot, pDesc, true); // Copy left footer |