diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-04-24 17:10:12 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-04-24 17:16:42 +0100 |
| commit | f756fb84a1629d455ccbd7af1f3975ac307fb957 (patch) | |
| tree | 978f068a902a9aab5d25054ba6e68d53e0e3ea25 /sd/source/core | |
| parent | 2e67b2c1c38d3afa56e070241f529fa003c6f8b7 (diff) | |
Resolves: fdo#60040 crash after undoing master page application
regression since 839cb94a2bd9dfadb6a7e11a97f0540a78f79b6b
Change-Id: Ie7068ecd1655ecae169948dc1e08330dc4200bf9
Diffstat (limited to 'sd/source/core')
| -rw-r--r-- | sd/source/core/drawdoc3.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index d423352d4c06..5621826c5c63 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -1414,7 +1414,6 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, SdPage& rOldNotesMaster = (SdPage&)pNotes->TRG_GetMasterPage(); SdPage* pMaster = NULL; SdPage* pNotesMaster = NULL; - SdPage* pPage = NULL; OUString aOldPageLayoutName(pSelectedPage->GetLayoutName()); OUString aOldLayoutName(aOldPageLayoutName); sal_Int32 nIndex = aOldLayoutName.indexOf( SD_LT_SEPARATOR ); @@ -1714,7 +1713,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, { for (sal_uInt16 nPage = 1; nPage < GetPageCount(); nPage++) { - pPage = (SdPage*) GetPage(nPage); + SdPage* pPage = (SdPage*) GetPage(nPage); OUString aTest = pPage->GetLayoutName(); if (aTest == aOldPageLayoutName) { @@ -1731,20 +1730,21 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, for (std::vector<SdPage*>::iterator pIter = aPageList.begin(); pIter != aPageList.end(); ++pIter) { - AutoLayout eAutoLayout = (*pIter)->GetAutoLayout(); + SdPage* pPage = *pIter; + AutoLayout eAutoLayout = pPage->GetAutoLayout(); if( bUndo ) { SdPresentationLayoutUndoAction * pPLUndoAction = new SdPresentationLayoutUndoAction (this, - ( pPage && pPage->IsMasterPage() ) ? aLayoutName : aOldLayoutName, + pPage->IsMasterPage() ? aLayoutName : aOldLayoutName, aLayoutName, eAutoLayout, eAutoLayout, false, *pIter); pUndoMgr->AddUndoAction(pPLUndoAction); } - (*pIter)->SetPresentationLayout(aLayoutName); - (*pIter)->SetAutoLayout(eAutoLayout); + pPage->SetPresentationLayout(aLayoutName); + pPage->SetAutoLayout(eAutoLayout); } // Adapt new master pages @@ -1847,7 +1847,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, { for (sal_uInt16 nPage = 1; nPage < GetPageCount(); nPage++) { - pPage = (SdPage*) GetPage(nPage); + SdPage* pPage = (SdPage*) GetPage(nPage); if (pPage->GetLayoutName() == aOldPageLayoutName) { aPageList.push_back(pPage); |