Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 17964 → Rev 17965

/trunk/Scribus/scribus/scribusdoc.cpp
5998,6 → 5998,21
currItem = it.value();
currItem->OwnPage = -1;
}
 
// #11274: Scribus crash when opening .sla document
// OwnPage is not meaningful for pattern items
QHash<QString, ScPattern>::iterator patternIt;
for (patternIt = docPatterns.begin(); patternIt != docPatterns.end(); ++patternIt)
{
QList<PageItem*> patternItems = patternIt->items;
while (patternItems.count() > 0)
{
PageItem* patItem = patternItems.takeAt(0);
if (patItem->isGroup())
patternItems += patItem->groupItemList;
patItem->OwnPage = -1;
}
}
}
 
 
/trunk/Scribus/scribus/scribus.cpp
10411,6 → 10411,16
pat.width = maxx - minx;
pat.height = maxy - miny;
pat.items.append(currItem);
// #11274 : OwnPage is not meaningful for pattern items
// We set consequently pattern item's OwnPage to -1
QList<PageItem*> patternItems = pat.items;
while (patternItems.count() > 0)
{
PageItem* patItem = patternItems.takeAt(0);
if (patItem->isGroup())
patternItems += patItem->groupItemList;
patItem->OwnPage = -1;
}
if (doc->docPatterns.contains(patternName))
doc->docPatterns.remove(patternName);
doc->addPattern(patternName, pat);
/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
3990,11 → 3990,11
ItemInfo itemInfo;
m_Doc->setMasterPageMode(false);
int ownPage = tAtt.valueAsInt("OwnPage");
//int ownPage = tAtt.valueAsInt("OwnPage");
success = readObject(doc, reader, itemInfo, baseDir, false);
if (!success) break;
 
itemInfo.item->OwnPage = ownPage;
itemInfo.item->OwnPage = -1 /*ownPage*/;
itemInfo.item->OnMasterPage = "";
if (isNewFormat)
{
/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
2095,11 → 2095,12
ItemInfo itemInfo;
m_Doc->setMasterPageMode(false);
int ownPage = tAtt.valueAsInt("OwnPage");
//int ownPage = tAtt.valueAsInt("OwnPage");
success = readObject(doc, reader, itemInfo, baseDir, false);
if (!success) break;
 
itemInfo.item->OwnPage = ownPage;
// #11274 : OwnPage is not meaningful for pattern items
itemInfo.item->OwnPage = -1 /*ownPage*/;
itemInfo.item->OnMasterPage = "";
 
if (itemInfo.item->isTableItem)