r18298 by jghali - fix build issue when poppler is not available

scribus-commit scribus-commit at lists.scribus.net
Sat Jun 1 23:33:21 UTC 2013


Author: jghali
Date: Sat Jun  1 23:33:21 2013
New Revision: 18298

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18298
Log:
fix build issue when poppler is not available

Modified:
    trunk/Scribus/scribus/plugins/import/ps/importpsplugin.cpp

Modified: trunk/Scribus/scribus/plugins/import/ps/importpsplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18298&path=/trunk/Scribus/scribus/plugins/import/ps/importpsplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ps/importpsplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/ps/importpsplugin.cpp Sat Jun  1 23:33:21 2013
@@ -96,9 +96,8 @@
 {
 	FileFormat fmt(this);
 	fmt.trName = FormatsManager::instance()->nameOfFormat(FormatsManager::EPS); // Human readable name
-	fmt.formatId = FORMATID_EPSIMPORT;
+	fmt.formatId = 0;
 	fmt.filter = FormatsManager::instance()->extensionsForFormat(FormatsManager::EPS);// QFileDialog filter
- 	fmt.nameMatch = QRegExp("\\.("+FormatsManager::instance()->extensionListForFormat(FormatsManager::EPS, 1)+")$", Qt::CaseInsensitive);
 	fmt.fileExtensions = QStringList() << "eps" << "epsf" << "epsi" << "eps2" << "eps3" << "epi" << "ept";
 	fmt.load = true;
 	fmt.save = false;
@@ -108,9 +107,8 @@
 	
 	FileFormat fmt2(this);
 	fmt2.trName = FormatsManager::instance()->nameOfFormat(FormatsManager::PS); // Human readable name
-	fmt2.formatId = FORMATID_PSIMPORT;
+	fmt2.formatId = 0;
 	fmt2.filter = FormatsManager::instance()->extensionsForFormat(FormatsManager::PS);// QFileDialog filter
- 	fmt2.nameMatch = QRegExp("\\.("+FormatsManager::instance()->extensionListForFormat(FormatsManager::PS, 1)+")$", Qt::CaseInsensitive);
 	fmt2.fileExtensions = QStringList() << "ps";
 	fmt2.load = true;
 	fmt2.save = false;
@@ -120,9 +118,8 @@
 
 	FileFormat fmt3(this);
 	fmt3.trName = FormatsManager::instance()->nameOfFormat(FormatsManager::PDF); // Human readable name
-	fmt3.formatId = FORMATID_PDFIMPORT;
+	fmt3.formatId = 0;
 	fmt3.filter = FormatsManager::instance()->extensionsForFormat(FormatsManager::PDF);// QFileDialog filter
-	fmt3.nameMatch = QRegExp("\\."+FormatsManager::instance()->extensionListForFormat(FormatsManager::PDF, 1)+"$", Qt::CaseInsensitive);
 	fmt3.fileExtensions = QStringList() << "pdf";
 	fmt3.load = true;
 	fmt3.save = false;




More information about the scribus-commit mailing list