r21958 by craig - Coverity 1350556: As m_doc is used above, don't check if its valid here

[scribus-commit]

Author: craig
Date: Fri Apr 21 16:54:47 2017
New Revision: 21958

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21958
Log:
Coverity 1350556: As m_doc is used above, don't check if its valid here

Modified:
    trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
    trunk/Scribus/scribus/plugins/import/pdf/importpdf.h

Modified: trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21958&path=/trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp	Fri Apr 21 16:54:47 2017
@@ -190,7 +190,7 @@
 	baseFile = QDir::cleanPath(QDir::toNativeSeparators(fi.absolutePath()+"/"));
 	if ( showProgress )
 	{
-		ScribusMainWindow* mw=(m_Doc==0) ? ScCore->primaryMainWindow() : m_Doc->scMW();
+		ScribusMainWindow* mw = m_Doc->scMW();
 		progressDialog = new MultiProgressDialog( tr("Importing: %1").arg(fi.fileName()), CommonStrings::tr_Cancel, mw );
 		QStringList barNames, barTexts;
 		barNames << "GI";
@@ -370,7 +370,7 @@
 	delete tmpSele;
 }
 
-bool PdfPlug::convert(QString fn)
+bool PdfPlug::convert(const QString& fn)
 {
 	bool firstPg = true;
 	int currentLayer = m_Doc->activeLayer();

Modified: trunk/Scribus/scribus/plugins/import/pdf/importpdf.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21958&path=/trunk/Scribus/scribus/plugins/import/pdf/importpdf.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/importpdf.h	(original)
+++ trunk/Scribus/scribus/plugins/import/pdf/importpdf.h	Fri Apr 21 16:54:47 2017
@@ -79,7 +79,7 @@
 	};
 
 private:
-	bool convert(QString fn);
+	bool convert(const QString& fn);
 	QRectF getCBox(int box, int pgNum);
 	QString UnicodeParsedString(GooString *s1);