INTEGRATION: CWS draw14 (1.23.36); FILE MERGED
2003/05/27 10:33:13 cl 1.23.36.1: #109884# add SdPresentationLayoutUndoAction also for master pages in SetMasterPage()
This commit is contained in:
parent
11a9510734
commit
18f76a9283
1 changed files with 5 additions and 4 deletions
|
@ -2,9 +2,9 @@
|
||||||
*
|
*
|
||||||
* $RCSfile: drawdoc3.cxx,v $
|
* $RCSfile: drawdoc3.cxx,v $
|
||||||
*
|
*
|
||||||
* $Revision: 1.23 $
|
* $Revision: 1.24 $
|
||||||
*
|
*
|
||||||
* last change: $Author: vg $ $Date: 2003-04-15 17:24:25 $
|
* last change: $Author: vg $ $Date: 2003-06-04 12:26: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
|
||||||
|
@ -1832,8 +1832,9 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
|
||||||
List* pPageList = new List;
|
List* pPageList = new List;
|
||||||
|
|
||||||
// #98456, this has to be removed according to CL (KA 07/08/2002)
|
// #98456, this has to be removed according to CL (KA 07/08/2002)
|
||||||
// pPageList->Insert(pMaster, LIST_APPEND);
|
// #109884# but we need them again to restore the styles of the presentation objects while undo
|
||||||
// pPageList->Insert(pNotesMaster, LIST_APPEND);
|
pPageList->Insert(pMaster, LIST_APPEND);
|
||||||
|
pPageList->Insert(pNotesMaster, LIST_APPEND);
|
||||||
|
|
||||||
if (bMaster || bLayoutReloaded)
|
if (bMaster || bLayoutReloaded)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue