Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 3674 → Rev 3675

/branches/Version13x/Scribus/scribus/fileloader.cpp
1624,8 → 1624,7
doc->Items = doc->DocItems;
doc->masterPageMode = false;
//ScApp->view->reformPages();
double maxxtemp,maxytemp;
doc->reformPages(maxxtemp,maxytemp);
doc->reformPages(maximumX, maximumY);
if (doc->Layers.count() == 0)
{
la.LNr = 0;
2463,7 → 2462,7
}
}
 
bool FileLoader::postLoad()
bool FileLoader::postLoad(bool is12doc)
{
/* for (uint d = 0; d < ScApp->doc->MasterItems.count(); ++d)
{
2600,8 → 2599,12
//Calculate the canvas size
FPoint mincp, maxcp;
ScApp->doc->canvasMinMax(mincp, maxcp);
ScApp->view->adjustCanvas(mincp, maxcp);
if (!is12doc)
{
ScApp->doc->canvasMinMax(mincp, maxcp);
FPoint maximumCanvas = FPoint(QMAX(maxcp.x(), maximumX), QMAX(maxcp.y(), maximumY));
ScApp->view->adjustCanvas(mincp, maximumCanvas);
}
return true;
}
/branches/Version13x/Scribus/scribus/fileloader.h
29,7 → 29,7
void GetItemText(QDomElement *it, ScribusDoc *doc, PageItem* obj, bool impo=false, bool VorLFound=false);
PageItem* PasteItem(QDomElement *obj, ScribusDoc *doc);
void GetStyle(QDomElement *pg, struct ParagraphStyle *vg, QValueList<ParagraphStyle> &docParagraphStyles, ScribusDoc* doc, bool fl);
bool postLoad();
bool postLoad(bool is12doc = false);
void informReplacementFonts();
QString FileName;
int FileType;
47,6 → 47,8
static QString readSLA(const QString & fileName);
private:
PrefsManager* prefsManager;
double maximumX;
double maximumY;
};
 
#endif
/branches/Version13x/Scribus/scribus/scribus.cpp
3757,7 → 3757,7
//Do the font replacement check from here, when we have a GUI. TODO do this also somehow without the GUI
//This also gives the user the opportunity to cancel the load when finding theres a replacement required.
if (loadSuccess && ScQApp->usingGUI())
loadSuccess=fileLoader->postLoad();
loadSuccess=fileLoader->postLoad(is12doc);
if(!loadSuccess)
{
view->close();