r18677 by fschmid - Fixed Bug #11911: Wrong caption for XPS import dialog

[scribus-commit]

Author: fschmid
Date: Mon Jan  6 16:19:22 2014
New Revision: 18677

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18677
Log:
Fixed Bug #11911: Wrong caption for XPS import dialog

Modified:
    trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
    trunk/Scribus/scribus/plugins/import/xps/xpsimportoptions.ui

Modified: trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18677&path=/trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xps/importxps.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/xps/importxps.cpp Mon Jan  6 16:19:22 2014
@@ -89,6 +89,7 @@
 		delete uz;
 		if (progressDialog)
 			progressDialog->close();
+		return QImage();
 	}
 	bool found = false;
 	if (uz->contains("_rels/.rels"))
@@ -412,6 +413,7 @@
 		delete uz;
 		if (progressDialog)
 			progressDialog->close();
+		return false;
 	}
 
 	retVal = false;

Modified: trunk/Scribus/scribus/plugins/import/xps/xpsimportoptions.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18677&path=/trunk/Scribus/scribus/plugins/import/xps/xpsimportoptions.ui
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xps/xpsimportoptions.ui (original)
+++ trunk/Scribus/scribus/plugins/import/xps/xpsimportoptions.ui Mon Jan  6 16:19:22 2014
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>PDF-Import</string>
+   <string>XPS Import</string>
   </property>
   <property name="sizeGripEnabled">
    <bool>true</bool>