Author: craig
Date: Mon Mar 26 22:40:22 2018
New Revision: 22453
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22453
Log:
Revert commit 22451
Modified:
trunk/Scribus/scribus/scribus.cpp
Modified: trunk/Scribus/scribus/scribus.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22453&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Mon Mar 26 22:40:22 2018
@@ -5252,12 +5252,9 @@
if (!resourceManager) // in case its allocated???? maybe can remove in
future
{
resourceManager=new ResourceManager(this);
- if (resourceManager)
- {
- resourceManager->exec();
- resourceManager->deleteLater();
- resourceManager=0;
- }
+ resourceManager->exec();
+ resourceManager->deleteLater();
+ resourceManager=0;
}
}
@@ -7703,7 +7700,7 @@
if (!HaveDoc)
return;
m_pagePalVisible = pagePalette->isVisible();
- QString mpName = "";
+ QString mpName;
if (temp.isEmpty())
mpName = doc->currentPage()->MPageNam;
else
@@ -8030,8 +8027,7 @@
}
for (int i = delFrom - 1; i < delTo; ++i)
{
- UndoObject *tmp = m_undoManager->replaceObject(
-
state->getUInt(QString("Page%1").arg(i)), doc->Pages->at(i));
+ UndoObject *tmp =
m_undoManager->replaceObject(state->getUInt(QString("Page%1").arg(i)),
doc->Pages->at(i));
delete tmp;
}
}
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
