Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 12906 → Rev 12907

/trunk/Scribus/scribus/scribusXml.cpp
1023,6 → 1023,11
 
bool ScriXmlDoc::ReadElem(QString fileName, SCFonts &avail, ScribusDoc *doc, double Xp, double Yp, bool Fi, bool loc, QMap<QString,QString> &FontSub, ScribusView *view)
{
return ReadElemToLayer(fileName,avail,doc,Xp,Yp,Fi,loc,FontSub,view,0);
}
 
bool ScriXmlDoc::ReadElemToLayer(QString fileName, SCFonts &avail, ScribusDoc *doc, double Xp, double Yp, bool Fi, bool loc, QMap<QString,QString> &FontSub, ScribusView *view, int toLayer)
{
QString ff;
struct CopyPasteBuffer OB;
ParagraphStyle vg;
/trunk/Scribus/scribus/scribusdoc.cpp
4805,7 → 4805,7
if (m_Selection->count() != 0)
{
ScriXmlDoc *ss = new ScriXmlDoc();
ss->ReadElem(ss->WriteElem(this, view(), m_Selection), prefsData.AvailFonts, this, destination->xOffset(), destination->yOffset(), false, true, prefsData.GFontSub, view());
ss->ReadElemToLayer(ss->WriteElem(this, view(), m_Selection), prefsData.AvailFonts, this, destination->xOffset(), destination->yOffset(), false, true, prefsData.GFontSub, view(),(*it).LNr);
m_Selection->clear();
delete ss;
}
/trunk/Scribus/scribus/scribusXml.h
52,6 → 52,7
*/
bool ReadElemHeader(QString file, bool isFile, double *x, double *y, double *w, double *h);
bool ReadElem(QString fileName, SCFonts &avail, ScribusDoc *doc, double Xp, double Yp, bool Fi, bool loc, QMap<QString,QString> &FontSub, ScribusView *view);
bool ReadElemToLayer(QString fileName, SCFonts &avail, ScribusDoc *doc, double Xp, double Yp, bool Fi, bool loc, QMap<QString,QString> &FontSub, ScribusView *view, int toLayer);
QString WriteElem(ScribusDoc *doc, ScribusView *view, Selection *selection);
 
ColorList Farben;