r13819 by jghali - #8321 : wrong master page is copied after creating/duplicating new master page

[scribus-commit]

Revision: 13819
Author: jghali
Date: 2009-08-07T20:55:39.209175Z
Commit message: #8321 : wrong master page is copied after creating/duplicating new master page

Changeset: 
M  /branches/Version135/Scribus/scribus/masterpagepalette.cpp

Diffs:
Index: scribus/masterpagepalette.cpp
===================================================================
--- scribus/masterpagepalette.cpp	(revision 13818)
+++ scribus/masterpagepalette.cpp	(revision 13819)
@@ -247,7 +247,9 @@
 				destination->initialMargins.Right = from->initialMargins.Right;
 			}
 		}
-		currentDoc->setCurrentPage(destination);
+		//#8321 : incorrect selection of master page on new mp creation/duplictation
+		//currentDoc->setCurrentPage(destination);
+		selectMasterPage(MasterPageName);
 		uint oldItems = currentDoc->Items->count();
 		uint end2 = currentDoc->MasterItems.count();
 		int GrMax = currentDoc->GroupCounter;
@@ -331,7 +333,9 @@
 			currentDoc->Pages->at(nr)->LeftPg = lp;
 		}
 		updateMasterPageList(MasterPageName);
-		currentView->showMasterPage(currentDoc->MasterNames[MasterPageName]);
+		//#8321 : incorrect selection of master page on new mp creation/duplictation
+		//currentView->showMasterPage(currentDoc->MasterNames[MasterPageName]);
+		selectMasterPage(MasterPageName);
 		currentView->reformPages();
 	}
 	delete dia;