INTEGRATION: CWS impress18 (1.29.56); FILE MERGED
2004/11/03 14:02:37 cl 1.29.56.1: #117245# do not rename master pages in undo actions, does not make sense
This commit is contained in:
parent
eaf4f2f2cb
commit
fdff6dc1ef
1 changed files with 5 additions and 3 deletions
|
@ -2,9 +2,9 @@
|
||||||
*
|
*
|
||||||
* $RCSfile: drawdoc3.cxx,v $
|
* $RCSfile: drawdoc3.cxx,v $
|
||||||
*
|
*
|
||||||
* $Revision: 1.30 $
|
* $Revision: 1.31 $
|
||||||
*
|
*
|
||||||
* last change: $Author: pjunck $ $Date: 2004-11-03 08:53:28 $
|
* last change: $Author: obo $ $Date: 2004-11-18 09:12:53 $
|
||||||
*
|
*
|
||||||
* The Contents of this file are made available subject to the terms of
|
* The Contents of this file are made available subject to the terms of
|
||||||
* either of the following licenses
|
* either of the following licenses
|
||||||
|
@ -1902,7 +1902,9 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
|
||||||
|
|
||||||
SdPresentationLayoutUndoAction * pPLUndoAction =
|
SdPresentationLayoutUndoAction * pPLUndoAction =
|
||||||
new SdPresentationLayoutUndoAction
|
new SdPresentationLayoutUndoAction
|
||||||
(this, aOldLayoutName, aLayoutName,
|
(this,
|
||||||
|
pPage->IsMasterPage() ? aLayoutName : aOldLayoutName,
|
||||||
|
aLayoutName,
|
||||||
eAutoLayout, eAutoLayout, FALSE, pPage);
|
eAutoLayout, eAutoLayout, FALSE, pPage);
|
||||||
pUndoMgr->AddUndoAction(pPLUndoAction);
|
pUndoMgr->AddUndoAction(pPLUndoAction);
|
||||||
pPage->SetPresentationLayout(aLayoutName);
|
pPage->SetPresentationLayout(aLayoutName);
|
||||||
|
|
Loading…
Reference in a new issue