Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 17744 → Rev 17745

/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
2143,8 → 2143,6
//write weld parameter
if (item->isWelded())
{
docu.writeAttribute("isWeldItem", 1);
docu.writeAttribute("WeldSource", qHash(item));
for (int i = 0 ; i < item->weldList.count(); i++)
{
PageItem::weldingInfo wInf = item->weldList.at(i);
2204,6 → 2202,12
if (item->PLineJoin != 0)
docu.writeAttribute("PLINEJOIN", item->PLineJoin);
}
//write weld parameter
if (item->isWelded())
{
docu.writeAttribute("isWeldItem", 1);
docu.writeAttribute("WeldSource", qHash(item));
}
if (item->asRegularPolygon())
{
PageItem_RegularPolygon *regitem = item->asRegularPolygon();
/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
416,10 → 416,12
for (int ttc = 0; ttc < WeldItems.count(); ++ttc)
{
PageItem* ta = WeldItems.at(ttc);
for (int i = 0 ; i < ta->weldList.count(); i++)
for (int i = 0; i < ta->weldList.count(); ++i)
{
PageItem::weldingInfo wInf = ta->weldList.at(i);
ta->weldList[i].weldItem = LinkID[wInf.weldID];
ta->weldList[i].weldItem = LinkID.value(wInf.weldID, 0);
if (ta->weldList[i].weldItem == NULL)
ta->weldList.removeAt(i--);
}
}
}
518,10 → 520,12
for (int ttc = 0; ttc < WeldItems.count(); ++ttc)
{
PageItem* ta = WeldItems.at(ttc);
for (int i = 0 ; i < ta->weldList.count(); i++)
for (int i = 0 ; i < ta->weldList.count(); ++i)
{
PageItem::weldingInfo wInf = ta->weldList.at(i);
ta->weldList[i].weldItem = WeldID[wInf.weldID];
ta->weldList[i].weldItem = WeldID.value(wInf.weldID, 0);
if (ta->weldList[i].weldItem == NULL)
ta->weldList.removeAt(i--);
}
}
}
891,10 → 895,12
for (int ttc = 0; ttc < WeldItems.count(); ++ttc)
{
PageItem* ta = WeldItems.at(ttc);
for (int i = 0 ; i < ta->weldList.count(); i++)
for (int i = 0 ; i < ta->weldList.count(); ++i)
{
PageItem::weldingInfo wInf = ta->weldList.at(i);
ta->weldList[i].weldItem = LinkID[wInf.weldID];
ta->weldList[i].weldItem = LinkID.value(wInf.weldID, 0);
if (ta->weldList[i].weldItem == NULL)
ta->weldList.removeAt(i--);
}
}
}
993,10 → 999,12
for (int ttc = 0; ttc < WeldItems.count(); ++ttc)
{
PageItem* ta = WeldItems.at(ttc);
for (int i = 0 ; i < ta->weldList.count(); i++)
for (int i = 0 ; i < ta->weldList.count(); ++i)
{
PageItem::weldingInfo wInf = ta->weldList.at(i);
ta->weldList[i].weldItem = WeldID[wInf.weldID];
ta->weldList[i].weldItem = WeldID.value(wInf.weldID, 0);
if (ta->weldList[i].weldItem == NULL)
ta->weldList.removeAt(i--);
}
}
}
1535,10 → 1543,12
for (int ttc = 0; ttc < WeldItems.count(); ++ttc)
{
PageItem* ta = WeldItems.at(ttc);
for (int i = 0 ; i < ta->weldList.count(); i++)
for (int i = 0 ; i < ta->weldList.count(); ++i)
{
PageItem::weldingInfo wInf = ta->weldList.at(i);
ta->weldList[i].weldItem = LinkID[wInf.weldID];
ta->weldList[i].weldItem = LinkID.value(wInf.weldID, 0);
if (ta->weldList[i].weldItem == NULL)
ta->weldList.removeAt(i--);
}
}
}
1637,10 → 1647,12
for (int ttc = 0; ttc < WeldItems.count(); ++ttc)
{
PageItem* ta = WeldItems.at(ttc);
for (int i = 0 ; i < ta->weldList.count(); i++)
for (int i = 0 ; i < ta->weldList.count(); ++i)
{
PageItem::weldingInfo wInf = ta->weldList.at(i);
ta->weldList[i].weldItem = WeldID[wInf.weldID];
ta->weldList[i].weldItem = WeldID.value(wInf.weldID, 0);
if (ta->weldList[i].weldItem == NULL)
ta->weldList.removeAt(i--);
}
}
}
3747,10 → 3759,12
for (int ttc = 0; ttc < WeldItems.count(); ++ttc)
{
PageItem* ta = WeldItems.at(ttc);
for (int i = 0 ; i < ta->weldList.count(); i++)
for (int i = 0 ; i < ta->weldList.count(); ++i)
{
PageItem::weldingInfo wInf = ta->weldList.at(i);
ta->weldList[i].weldItem = LinkID[wInf.weldID];
ta->weldList[i].weldItem = LinkID.value(wInf.weldID, 0);
if (ta->weldList[i].weldItem == NULL)
ta->weldList.removeAt(i--);
}
}
}
3785,10 → 3799,12
for (int ttc = 0; ttc < WeldItems.count(); ++ttc)
{
PageItem* ta = WeldItems.at(ttc);
for (int i = 0 ; i < ta->weldList.count(); i++)
for (int i = 0 ; i < ta->weldList.count(); ++i)
{
PageItem::weldingInfo wInf = ta->weldList.at(i);
ta->weldList[i].weldItem = WeldID[wInf.weldID];
ta->weldList[i].weldItem = WeldID.value(wInf.weldID, 0);
if (ta->weldList[i].weldItem == NULL)
ta->weldList.removeAt(i--);
}
}
}
5520,10 → 5536,12
for (int ttc = 0; ttc < WeldItems.count(); ++ttc)
{
PageItem* ta = WeldItems.at(ttc);
for (int i = 0 ; i < ta->weldList.count(); i++)
for (int i = 0 ; i < ta->weldList.count(); ++i)
{
PageItem::weldingInfo wInf = ta->weldList.at(i);
ta->weldList[i].weldItem = LinkID[wInf.weldID];
ta->weldList[i].weldItem = LinkID.value(wInf.weldID, 0);
if (ta->weldList[i].weldItem == NULL)
ta->weldList.removeAt(i--);
}
}
}
5576,10 → 5594,12
for (int ttc = 0; ttc < WeldItems.count(); ++ttc)
{
PageItem* ta = WeldItems.at(ttc);
for (int i = 0 ; i < ta->weldList.count(); i++)
for (int i = 0 ; i < ta->weldList.count(); ++i)
{
PageItem::weldingInfo wInf = ta->weldList.at(i);
ta->weldList[i].weldItem = WeldID[wInf.weldID];
ta->weldList[i].weldItem = WeldID.value(wInf.weldID, 0);
if (ta->weldList[i].weldItem == NULL)
ta->weldList.removeAt(i--);
}
}
}