diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-07-08 10:09:05 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-07-08 10:09:05 +0000 |
| commit | e97e5bcf9175afb8c3d1373139d9fe3d666b0956 (patch) | |
| tree | eeb41ea09d7fb5eefce7778c11dfea328c4f2bde /sw/source/ui | |
| parent | 02eb57b07d8c4af3079036bcf15ba9e9f1f27be1 (diff) | |
INTEGRATION: CWS swqbf34 (1.18.186); FILE MERGED
2005/06/28 12:03:27 od 1.18.186.1: #i48949# <SwDocStyleSheet::SetItemSet(..)> - no undo actions for the
copy of the page style.
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/app/docstyle.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index 3108a3a2415e..61ea570620db 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docstyle.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: vg $ $Date: 2005-03-08 11:17:07 $ + * last change: $Author: obo $ $Date: 2005-07-08 11:09:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1313,7 +1313,13 @@ void SwDocStyleSheet::SetItemSet(const SfxItemSet& rSet) if( rDoc.FindPageDescByName( pDesc->GetName(), &nPgDscPos )) { pNewDsc = new SwPageDesc( *pDesc ); + // --> OD 2005-05-09 #i48949# - no undo actions for the + // copy of the page style + const sal_Bool bDoesUndo( rDoc.DoesUndo() ); + rDoc.DoUndo( sal_False ); rDoc.CopyPageDesc(*pDesc, *pNewDsc); // #i7983# + rDoc.DoUndo( bDoesUndo ); + // <-- pFmt = &pNewDsc->GetMaster(); } |