summaryrefslogtreecommitdiffstats
path: root/scribus/scribusdoc.cpp
diff options
context:
space:
mode:
authorjghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>2012-04-03 20:49:23 +0000
committerjghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>2012-04-03 20:49:23 +0000
commit94932badc2afe80f4e0c8c12642e11cfff30f68b (patch)
treeb630630e5db37aeb8b7fde9f37a38bc5404d5400 /scribus/scribusdoc.cpp
parent8c59d60f62e048a2d94c3bea8c43e4ec1382446a (diff)
downloadscribus-94932badc2afe80f4e0c8c12642e11cfff30f68b.tar.gz
scribus-94932badc2afe80f4e0c8c12642e11cfff30f68b.tar.xz
scribus-94932badc2afe80f4e0c8c12642e11cfff30f68b.zip
#10658 : Deleting masterpage triggers crash
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17414 11d20701-8431-0410-a711-e3c959e3b870
Diffstat (limited to 'scribus/scribusdoc.cpp')
-rw-r--r--scribus/scribusdoc.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/scribus/scribusdoc.cpp b/scribus/scribusdoc.cpp
index 0ef3a94..c4e26ce 100644
--- a/scribus/scribusdoc.cpp
+++ b/scribus/scribusdoc.cpp
@@ -1867,6 +1867,13 @@ void ScribusDoc::deleteMasterPage(const int pageNumber)
Page* page = Pages->takeAt(pageNumber);
QString oldPageName(page->pageName());
delete page;
+ for (int i = 0; i < MasterPages.count(); ++i)
+ MasterPages.at(i)->setPageNr(i);
+ for (int i = 0; i < MasterItems.count(); ++i)
+ {
+ if (MasterItems.at(i)->OwnPage > pageNumber)
+ MasterItems.at(i)->OwnPage--;
+ }
// remove the master page from the master page name list
//MasterNames.remove(page->PageNam);
/*CB TODO moved back to muster.cpp for now as this must happen after reformPages