From 0c536f18a20f12dfc515b9dceef07964aa883d1f Mon Sep 17 00:00:00 2001 From: jghali Date: Wed, 28 Mar 2012 23:16:48 +0000 Subject: #10642 : text frames on master pages flow around frames on other master pages git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17402 11d20701-8431-0410-a711-e3c959e3b870 --- scribus/pageitem_textframe.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scribus/pageitem_textframe.cpp') diff --git a/scribus/pageitem_textframe.cpp b/scribus/pageitem_textframe.cpp index d00d9b7..79f8056 100644 --- a/scribus/pageitem_textframe.cpp +++ b/scribus/pageitem_textframe.cpp @@ -147,6 +147,9 @@ QRegion PageItem_TextFrame::availableRegion() 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; LayerLevItem = m_Doc->layerLevelFromNumber(docItem->LayerNr); if (((docItem->ItemNr > ItemNr) && (docItem->LayerNr == LayerNr)) || (LayerLevItem > LayerLev && m_Doc->layerFlow(docItem->LayerNr))) { -- cgit