Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 4679 → Rev 4680

/branches/Version13x/Scribus/scribus/scribus.cpp
3050,7 → 3050,7
return ret;
}
 
bool ScribusMainWindow::loadPage(QString fileName, int Nr, bool Mpa)
bool ScribusMainWindow::loadPage(QString fileName, int Nr, bool Mpa, const QString& renamedPageName)
{
bool ret = false;
if (!fileName.isEmpty())
3065,7 → 3065,7
}
doc->setLoading(true);
uint oldItemsCount = doc->Items->count();
if(!fl->LoadPage(Nr, Mpa))
if(!fl->LoadPage(Nr, Mpa, renamedPageName))
{
delete fl;
doc->setLoading(false);
/branches/Version13x/Scribus/scribus/scribus.h
295,7 → 295,7
/** \brief generate a new document in the current view */
bool slotFileNew();
bool slotPageImport();
bool loadPage(QString fileName, int Nr, bool Mpa);
bool loadPage(QString fileName, int Nr, bool Mpa, const QString& renamedPageName=QString::null);
 
void slotGetContent();
/*!