/[packages]/cauldron/libreoffice/current/SOURCES/0001-Resolves-fdo-60040-crash-after-undoing-master-page-a.patch
ViewVC logotype

Contents of /cauldron/libreoffice/current/SOURCES/0001-Resolves-fdo-60040-crash-after-undoing-master-page-a.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 618518 - (show annotations) (download)
Sun Apr 27 21:53:48 2014 UTC (9 years, 11 months ago) by tv
File size: 3167 byte(s)
- 4.2.4 rc1
- sync patches with FC
- install man pages
1 From 20934180ab2c5978a613668bf8df49a60ba7a686 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
3 Date: Thu, 24 Apr 2014 17:10:12 +0100
4 Subject: [PATCH] Resolves: fdo#60040 crash after undoing master page
5 application
6
7 regression since 839cb94a2bd9dfadb6a7e11a97f0540a78f79b6b
8
9 Change-Id: Ie7068ecd1655ecae169948dc1e08330dc4200bf9
10 ---
11 sd/source/core/drawdoc3.cxx | 16 ++++++++--------
12 1 file changed, 8 insertions(+), 8 deletions(-)
13
14 diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
15 index 9986219..ea0b6e0 100644
16 --- a/sd/source/core/drawdoc3.cxx
17 +++ b/sd/source/core/drawdoc3.cxx
18 @@ -1367,7 +1367,6 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
19 SdPage& rOldNotesMaster = (SdPage&)pNotes->TRG_GetMasterPage();
20 SdPage* pMaster = NULL;
21 SdPage* pNotesMaster = NULL;
22 - SdPage* pPage = NULL;
23 OUString aOldPageLayoutName(pSelectedPage->GetLayoutName());
24 OUString aOldLayoutName(aOldPageLayoutName);
25 sal_Int32 nIndex = aOldLayoutName.indexOf( SD_LT_SEPARATOR );
26 @@ -1664,7 +1663,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
27 {
28 for (sal_uInt16 nPage = 1; nPage < GetPageCount(); nPage++)
29 {
30 - pPage = (SdPage*) GetPage(nPage);
31 + SdPage* pPage = (SdPage*) GetPage(nPage);
32 OUString aTest = pPage->GetLayoutName();
33 if (aTest == aOldPageLayoutName)
34 {
35 @@ -1681,20 +1680,21 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
36
37 for (std::vector<SdPage*>::iterator pIter = aPageList.begin(); pIter != aPageList.end(); ++pIter)
38 {
39 - AutoLayout eAutoLayout = (*pIter)->GetAutoLayout();
40 + SdPage* pPage = *pIter;
41 + AutoLayout eAutoLayout = pPage->GetAutoLayout();
42
43 if( bUndo )
44 {
45 SdPresentationLayoutUndoAction * pPLUndoAction =
46 new SdPresentationLayoutUndoAction
47 (this,
48 - ( pPage && pPage->IsMasterPage() ) ? aLayoutName : aOldLayoutName,
49 + pPage ? aLayoutName : aOldLayoutName,
50 aLayoutName,
51 - eAutoLayout, eAutoLayout, sal_False, *pIter);
52 + eAutoLayout, eAutoLayout, sal_False, pPage);
53 pUndoMgr->AddUndoAction(pPLUndoAction);
54 }
55 - (*pIter)->SetPresentationLayout(aLayoutName);
56 - (*pIter)->SetAutoLayout(eAutoLayout);
57 + pPage->SetPresentationLayout(aLayoutName);
58 + pPage->SetAutoLayout(eAutoLayout);
59 }
60
61 // Adapt new master pages
62 @@ -1797,7 +1797,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
63 {
64 for (sal_uInt16 nPage = 1; nPage < GetPageCount(); nPage++)
65 {
66 - pPage = (SdPage*) GetPage(nPage);
67 + SdPage* pPage = (SdPage*) GetPage(nPage);
68 if (pPage->GetLayoutName() == aOldPageLayoutName)
69 {
70 aPageList.push_back(pPage);
71 --
72 1.9.0
73

  ViewVC Help
Powered by ViewVC 1.1.30