Kaydet (Commit) 839cb94a authored tarafından Rafael Dominguez's avatar Rafael Dominguez Kaydeden (comit) Caolán McNamara

Replace deprecated List for std::vector<SdPage*>.

üst 2ea6cc6a
...@@ -1664,12 +1664,12 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, ...@@ -1664,12 +1664,12 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
} }
// Liste mit Seiten fuellen // Liste mit Seiten fuellen
List* pPageList = new List; std::vector<SdPage*> aPageList;
// #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)
// #109884# but we need them again to restore the styles of the presentation objects while undo // #109884# but we need them again to restore the styles of the presentation objects while undo
pPageList->Insert(pMaster, LIST_APPEND); aPageList.push_back(pMaster);
pPageList->Insert(pNotesMaster, LIST_APPEND); aPageList.push_back(pNotesMaster);
if (bMaster || bLayoutReloaded) if (bMaster || bLayoutReloaded)
{ {
...@@ -1679,21 +1679,20 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, ...@@ -1679,21 +1679,20 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
String aTest = pPage->GetLayoutName(); String aTest = pPage->GetLayoutName();
if (aTest == aOldPageLayoutName) if (aTest == aOldPageLayoutName)
{ {
pPageList->Insert(pPage, LIST_APPEND); aPageList.push_back(pPage);
} }
} }
} }
else else
{ {
pPageList->Insert(pSelectedPage, LIST_APPEND); aPageList.push_back(pSelectedPage);
pPageList->Insert(pNotes, LIST_APPEND); aPageList.push_back(pNotes);
} }
pPage = (SdPage*)pPageList->First(); for (std::vector<SdPage*>::iterator pIter = aPageList.begin(); pIter != aPageList.end(); ++pIter)
while (pPage)
{ {
AutoLayout eAutoLayout = pPage->GetAutoLayout(); AutoLayout eAutoLayout = (*pIter)->GetAutoLayout();
if( bUndo ) if( bUndo )
{ {
...@@ -1702,15 +1701,12 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, ...@@ -1702,15 +1701,12 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
(this, (this,
pPage->IsMasterPage() ? aLayoutName : aOldLayoutName, pPage->IsMasterPage() ? aLayoutName : aOldLayoutName,
aLayoutName, aLayoutName,
eAutoLayout, eAutoLayout, sal_False, pPage); eAutoLayout, eAutoLayout, sal_False, *pIter);
pUndoMgr->AddUndoAction(pPLUndoAction); pUndoMgr->AddUndoAction(pPLUndoAction);
} }
pPage->SetPresentationLayout(aLayoutName); (*pIter)->SetPresentationLayout(aLayoutName);
pPage->SetAutoLayout(eAutoLayout); (*pIter)->SetAutoLayout(eAutoLayout);
pPage = (SdPage*)pPageList->Next();
} }
delete pPageList;
/********************************************************************* /*********************************************************************
|* Neue Masterpages angleichen |* Neue Masterpages angleichen
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment