Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 13573 → Rev 13574

/branches/Version135/Scribus/scribus/scribus.cpp
5683,11 → 5683,25
QString masterPageName;
int pageLocation=0;
copyDialog.values(masterPageName, copyFromMaster, pageLocation);
while (doc->MasterNames.contains(masterPageName) || (masterPageName == CommonStrings::masterPageNormal))
bool badMasterPageName = doc->MasterNames.contains(masterPageName);
badMasterPageName |= (masterPageName == CommonStrings::masterPageNormal);
badMasterPageName |= (masterPageName == CommonStrings::trMasterPageNormal);
badMasterPageName |= (masterPageName == CommonStrings::trMasterPageNormalLeft);
badMasterPageName |= (masterPageName == CommonStrings::trMasterPageNormalMiddle);
badMasterPageName |= (masterPageName == CommonStrings::trMasterPageNormalRight);
badMasterPageName |= masterPageName.isEmpty();
while (badMasterPageName)
{
if (!copyDialog.exec())
return;
copyDialog.values(masterPageName, copyFromMaster, pageLocation);
badMasterPageName = doc->MasterNames.contains(masterPageName);
badMasterPageName |= (masterPageName == CommonStrings::masterPageNormal);
badMasterPageName |= (masterPageName == CommonStrings::trMasterPageNormal);
badMasterPageName |= (masterPageName == CommonStrings::trMasterPageNormalLeft);
badMasterPageName |= (masterPageName == CommonStrings::trMasterPageNormalMiddle);
badMasterPageName |= (masterPageName == CommonStrings::trMasterPageNormalRight);
badMasterPageName |= masterPageName.isEmpty();
}
int currentPageNumber=doc->currentPage()->pageNr();
bool ok=doc->copyPageToMasterPage(currentPageNumber, pageLocation, pageLocationCount, masterPageName, copyFromMaster);
/branches/Version135/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
772,6 → 772,12
a = pg.attribute("NUM").toInt();
PgNam = "";
PgNam = pg.attribute("NAM", "");
if (pg.tagName()=="MASTERPAGE" && PgNam.isEmpty())
{
qDebug() << "scribus13format: corrupted masterpage with empty name detected";
PAGE=PAGE.nextSibling();
continue;
}
//Pgc = m_Doc->pageCount;
//AtFl = m_Doc->usesAutomaticTextFrames();
if (PgNam.isEmpty())
/branches/Version135/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
865,6 → 865,12
a = pg.attribute("NUM").toInt();
PgNam = "";
PgNam = pg.attribute("NAM", "");
if (pg.tagName()=="MASTERPAGE" && PgNam.isEmpty())
{
qDebug() << "scribus134format: corrupted masterpage with empty name detected";
PAGE=PAGE.nextSibling();
continue;
}
//Pgc = m_Doc->pageCount;
//AtFl = m_Doc->usesAutomaticTextFrames();
if (PgNam.isEmpty())