Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 13569 → Rev 13573

/branches/Version133x/Scribus/scribus/fileloader.cpp
1521,6 → 1521,12
PgNam = pg.attribute("NAM", "");
//Pgc = doc->pageCount;
//AtFl = doc->usesAutomaticTextFrames();
if (pg.tagName()=="MASTERPAGE" && PgNam.isEmpty())
{
qDebug("scribus13format: corrupted masterpage with empty name detected");
PAGE=PAGE.nextSibling();
continue;
}
if (PgNam.isEmpty())
{
//doc->pageCount = Pgc;
/branches/Version133x/Scribus/scribus/scribus.cpp
5067,7 → 5067,7
diaLinksCount=static_cast<int>(dia->Links->count());
}
QString masterPageName = dia->Answer->text();
while (doc->MasterNames.contains(masterPageName) || (masterPageName == "Normal"))
while (doc->MasterNames.contains(masterPageName) || (masterPageName == "Normal") || masterPageName.isEmpty())
{
if (!dia->exec())
{