r19334 by jghali - #12506: Page assigned "Empty" master page after changing from Single Page to Double Page layout

[scribus-commit]

Author: jghali
Date: Thu Jul 10 21:38:07 2014
New Revision: 19334

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19334
Log:
#12506: Page assigned "Empty" master page after changing from Single Page to Double Page layout

Modified:
    branches/Version14x/Scribus/scribus/inspage.cpp

Modified: branches/Version14x/Scribus/scribus/inspage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19334&path=/branches/Version14x/Scribus/scribus/inspage.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/inspage.cpp (original)
+++ branches/Version14x/Scribus/scribus/inspage.cpp Thu Jul 10 21:38:07 2014
@@ -97,6 +97,8 @@
 				{
 					if ((it.key() == CommonStrings::masterPageNormal) && (!conNam))
 						pageData->addItem(CommonStrings::trMasterPageNormal);
+					else if ((it.key() == CommonStrings::trMasterPageNormal) && (!conNam))
+						pageData->addItem(CommonStrings::trMasterPageNormal);
 					else
 					{
 						if (currentDoc->MasterPages.at(it.value())->LeftPg == 1)
@@ -115,6 +117,8 @@
 					{
 						if ((it.key() == CommonStrings::masterPageNormal) && (!conNam))
 							pageData->addItem(CommonStrings::trMasterPageNormal);
+						else if ((it.key() == CommonStrings::trMasterPageNormal) && (!conNam))
+							pageData->addItem(CommonStrings::trMasterPageNormal);
 						else
 						{
 							if ((currentDoc->MasterPages.at(it.value())->LeftPg != 0) && (currentDoc->MasterPages.at(it.value())->LeftPg != 1))
@@ -131,6 +135,8 @@
 					{
 						if ((it.key() == CommonStrings::masterPageNormal) && (!conNam))
 							pageData->addItem(CommonStrings::trMasterPageNormal);
+						else if ((it.key() == CommonStrings::trMasterPageNormal) && (!conNam))
+							pageData->addItem(CommonStrings::trMasterPageNormal);
 						else
 						{
 							if (currentDoc->MasterPages.at(it.value())->LeftPg == 0)
@@ -150,6 +156,8 @@
 					{
 						if ((it.key() == CommonStrings::masterPageNormal) && (!conNam))
 							pageData->addItem(CommonStrings::trMasterPageNormal);
+						else if ((it.key() == CommonStrings::trMasterPageNormal) && (!conNam))
+							pageData->addItem(CommonStrings::trMasterPageNormal);
 						else
 						{
 							if ((currentDoc->MasterPages.at(it.value())->LeftPg != 0) && (currentDoc->MasterPages.at(it.value())->LeftPg != 1))
@@ -166,6 +174,8 @@
 					{
 						if ((it.key() == CommonStrings::masterPageNormal) && (!conNam))
 							pageData->addItem(CommonStrings::trMasterPageNormal);
+						else if ((it.key() == CommonStrings::trMasterPageNormal) && (!conNam))
+							pageData->addItem(CommonStrings::trMasterPageNormal);
 						else
 						{
 							if (currentDoc->MasterPages.at(it.value())->LeftPg == 0)
@@ -182,6 +192,8 @@
 				for (QMap<QString,int>::Iterator it = currentDoc->MasterNames.begin(); it != currentDoc->MasterNames.end(); ++it)
 				{
 					if ((it.key() == CommonStrings::masterPageNormal) && (!conNam))
+						pageData->addItem(CommonStrings::trMasterPageNormal);
+					else if ((it.key() == CommonStrings::trMasterPageNormal) && (!conNam))
 						pageData->addItem(CommonStrings::trMasterPageNormal);
 					else
 					{