diff options
| author | jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870> | 2012-03-28 23:16:48 +0000 |
|---|---|---|
| committer | jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870> | 2012-03-28 23:16:48 +0000 |
| commit | 0c536f18a20f12dfc515b9dceef07964aa883d1f (patch) | |
| tree | ee67253dbbb802b93b840fe898151f2b2cf18397 /scribus/pageitem_textframe.cpp | |
| parent | 54c7bee3db96ee8619d4bf4ba1b8d374186f8fb5 (diff) | |
| download | scribus-0c536f18a20f12dfc515b9dceef07964aa883d1f.tar.gz scribus-0c536f18a20f12dfc515b9dceef07964aa883d1f.tar.xz scribus-0c536f18a20f12dfc515b9dceef07964aa883d1f.zip | |
#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
Diffstat (limited to 'scribus/pageitem_textframe.cpp')
| -rw-r--r-- | scribus/pageitem_textframe.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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))) { |