r17403 by jghali - #10642 : text frames on master pages flow around frames on other master pages

[scribus-commit]

Author: jghali
Date: Wed Mar 28 23:17:11 2012
New Revision: 17403

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17403
Log:
#10642 : text frames on master pages flow around frames on other master pages

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17403&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Wed Mar 28 23:17:11 2012
@@ -211,6 +211,9 @@
 			for (int a = 0; a < m_Doc->MasterItems.count(); ++a)
 			{
 				docItem = m_Doc->MasterItems.at(a);
+				// #10642 : masterpage items interact only with items placed on same masterpage
+				if (docItem->OnMasterPage != OnMasterPage)
+					continue;
 				int did = m_Doc->MasterItems.indexOf(docItem);
 				LayerLevItem = m_Doc->layerLevelFromID(docItem->LayerID);
 				if (((did > thisid) && (docItem->LayerID == LayerID)) || (LayerLevItem > LayerLev && m_Doc->layerFlow(docItem->LayerID)))