r19055 by fschmid - Some minor adjustments.

[scribus-commit]

Author: fschmid
Date: Sun Apr 20 09:42:16 2014
New Revision: 19055

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19055
Log:
Some minor adjustments.

Modified:
    trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
    trunk/Scribus/scribus/plugins/import/pub/importpub.cpp

Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19055&path=/trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodg.cpp Sun Apr 20 09:42:16 2014
@@ -1729,7 +1729,7 @@
 	for(QDomElement para = elem.firstChildElement(); !para.isNull(); para = para.nextSiblingElement())
 	{
 		pStyle = tmpOStyle;
-		if ((para.tagName() != "text:p") && (para.tagName() != "text:list"))
+		if ((para.tagName() != "text:p") && (para.tagName() != "text:list") && (para.tagName() != "text:h"))
 			continue;
 		if (para.hasChildNodes())
 		{

Modified: trunk/Scribus/scribus/plugins/import/pub/importpub.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19055&path=/trunk/Scribus/scribus/plugins/import/pub/importpub.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pub/importpub.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pub/importpub.cpp Sun Apr 20 09:42:16 2014
@@ -615,7 +615,6 @@
 			  {
 				  imgExt = "wmf";
 				  QTemporaryFile *tempFile = new QTemporaryFile(QDir::tempPath() + "/scribus_temp_pub_XXXXXX." + imgExt);
-				  tempFile->setAutoRemove(false);
 				  if (tempFile->open())
 				  {
 					  tempFile->write(imageData);