r19900 by jghali - remove unnecessary argument in Scribus150Format SetItemProps()
scribus-commit
scribus-commit at lists.scribus.net
Wed Mar 4 20:36:17 UTC 2015
Author: jghali
Date: Wed Mar 4 20:36:17 2015
New Revision: 19900
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19900
Log:
remove unnecessary argument in Scribus150Format SetItemProps()
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.h
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19900&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.h
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.h (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.h Wed Mar 4 20:36:17 2015
@@ -190,7 +190,7 @@
void WritePages(ScribusDoc *doc, ScXmlStreamWriter& docu, QProgressBar *dia2, uint maxC, bool master);
void WriteObjects(ScribusDoc *doc, ScXmlStreamWriter& docu, const QString& baseDir, QProgressBar *dia2, uint maxC, ItemSelection master, QList<PageItem*> *items = 0);
- void SetItemProps(ScXmlStreamWriter& docu, PageItem* item, const QString& baseDir, bool newFormat);
+ void SetItemProps(ScXmlStreamWriter& docu, PageItem* item, const QString& baseDir);
QMap<QString, QString> parStyleMap;
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19900&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp Wed Mar 4 20:36:17 2015
@@ -1752,7 +1752,7 @@
docu.writeAttribute("XPOS", item->xPos());
docu.writeAttribute("YPOS", item->yPos());
}
- SetItemProps(docu, item, baseDir, true);
+ SetItemProps(docu, item, baseDir);
if (!item->OnMasterPage.isEmpty())
docu.writeAttribute("OnMasterPage", item->OnMasterPage);
if (!item->pixm.imgInfo.usedPath.isEmpty())
@@ -2401,12 +2401,11 @@
}
}
-void Scribus150Format::SetItemProps(ScXmlStreamWriter& docu, PageItem* item, const QString& baseDir, bool newFormat)
+void Scribus150Format::SetItemProps(ScXmlStreamWriter& docu, PageItem* item, const QString& baseDir)
{
// double xf, yf;
QString tmp, tmpy;
- if (newFormat)
- docu.writeAttribute("OwnPage", item->OwnPage);
+ docu.writeAttribute("OwnPage", item->OwnPage);
docu.writeAttribute("ItemID", qHash(item));
docu.writeAttribute("PTYPE",item->realItemType());
docu.writeAttribute("WIDTH",item->width());
More information about the scribus-commit
mailing list