Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 25146 → Rev 25147

/branches/Version15x/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
772,7 → 772,7
if (elem.hasAttribute("Version"))
newVersion = true;
QDomNode docNode = elem.firstChild();
if (m_mwProgressBar!=nullptr)
if (m_mwProgressBar != nullptr)
{
m_mwProgressBar->setMaximum(docNode.childNodes().count());
m_mwProgressBar->setValue(0);
906,7 → 906,7
while (!pageNode.isNull())
{
ObCount++;
if (m_mwProgressBar!=nullptr)
if (m_mwProgressBar != nullptr)
m_mwProgressBar->setValue(ObCount);
QDomElement pg = pageNode.toElement();
// 10/25/2004 pv - None is "reserved" color. cannot be defined in any file...
1376,7 → 1376,7
}
setCurrentComboItem(m_ScMW->unitSwitcher, unitGetStrFromIndex(m_Doc->unitIndex()));
if (m_mwProgressBar!=nullptr)
if (m_mwProgressBar != nullptr)
m_mwProgressBar->setValue(docNode.childNodes().count());
 
ScMessageBox::warning(ScCore->primaryMainWindow(),
1386,9 → 1386,6
return true;
//end old ReadDoc
//return false;
}
 
bool Scribus12Format::saveFile(const QString & /* fileName */, const FileFormat & /* fmt */)
/branches/Version15x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
222,7 → 222,7
int firstPage = 0;
int layerToSetActive = 0;
if (m_mwProgressBar!=nullptr)
if (m_mwProgressBar != nullptr)
{
m_mwProgressBar->setMaximum(ioDevice->size());
m_mwProgressBar->setValue(0);
790,11 → 790,10
}
 
// start auto save timer if needed
if (m_Doc->autoSave() && ScCore->usingGUI())
if (m_Doc->autoSave() && ScCore->usingGUI())
m_Doc->restartAutoSaveTimer();
// m_Doc->autoSaveTimer->start(m_Doc->autoSaveTime());
if (m_mwProgressBar!=nullptr)
if (m_mwProgressBar != nullptr)
m_mwProgressBar->setValue(reader.characterOffset());
 
ScMessageBox::warning(ScCore->primaryMainWindow(),
/branches/Version15x/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
225,7 → 225,7
if (elem.tagName() != "SCRIBUSUTF8NEW")
return false;
QDomNode docNode = elem.firstChild();
if (m_mwProgressBar!=nullptr)
if (m_mwProgressBar != nullptr)
{
m_mwProgressBar->setMaximum(docNode.childNodes().count());
m_mwProgressBar->setValue(0);
459,7 → 459,7
while (!pageNode.isNull())
{
ObCount++;
if (m_mwProgressBar!=nullptr)
if (m_mwProgressBar != nullptr)
m_mwProgressBar->setValue(ObCount);
QDomElement pg = pageNode.toElement();
if (pg.tagName() == "PageSets")
1191,9 → 1191,8
// start auto save timer if needed
if (m_Doc->autoSave() && ScCore->usingGUI())
m_Doc->restartAutoSaveTimer();
// m_Doc->autoSaveTimer->start(m_Doc->autoSaveTime());
 
if (m_mwProgressBar!=nullptr)
if (m_mwProgressBar != nullptr)
m_mwProgressBar->setValue(docNode.childNodes().count());
 
ScMessageBox::warning(ScCore->primaryMainWindow(),
1202,7 → 1201,6
"If you save it in this version, it will no longer be readable by older Scribus versions."));
 
return true;
// return false;
}
 
// Low level plugin API