diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-08-20 11:51:27 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-22 13:46:17 +0200 |
| commit | 62809efff8b75b00368ebbc70d697e5613523416 (patch) | |
| tree | 6e7e2c1f2346a244203e77a7c7f785da7a9e7aa0 | |
| parent | 75084f6c42c27dc95418df9cefed2fddfb26000e (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
(cherry picked from commit 0b7a823bb6df79384939dda4de3b7f28e5e52758)
Reviewed-on: https://gerrit.libreoffice.org/5531
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
Reviewed-by: Thorsten Behrens <tbehrens@suse.com>
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
| -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 920853f6b463..56e48ee49b22 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -321,7 +321,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; @@ -342,6 +341,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(); @@ -352,8 +353,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 |