r16213 by jghali - fix two problems which prevent .doc importer to work on Windows

scribus-commit scribus-commit at lists.scribus.net
Mon Jan 3 02:44:53 CET 2011


Author: jghali
Date: Mon Jan  3 01:44:53 2011
New Revision: 16213

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16213
Log:
fix two problems which prevent .doc importer to work on Windows

Modified:
    trunk/Scribus/scribus/plugins/gettext/docim/docim.cpp

Modified: trunk/Scribus/scribus/plugins/gettext/docim/docim.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16213&path=/trunk/Scribus/scribus/plugins/gettext/docim/docim.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/docim/docim.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/docim/docim.cpp Mon Jan  3 01:44:53 2011
@@ -33,7 +33,7 @@
 #if defined(_WIN32)
 	exename = ScPaths::instance().libDir() + "tools/antiword/antiword.exe";
 #endif
-	test->start(exename);
+	test->start(exename, QStringList());
 	if (test->waitForStarted())
 	{
 		found = true;
@@ -97,7 +97,7 @@
 	proc->setWorkingDirectory( ScPaths::instance().libDir() + "tools/antiword/" ); 
 #endif
 	QStringList args;
-	args << "-t" << "-w 0" << filename;
+	args << "-t" << "-w 0" << QDir::toNativeSeparators(filename);
 	//connect(proc, SIGNAL(readyReadStdout()), this, SLOT(slotReadOutput()));
 	//connect(proc, SIGNAL(readyReadStderr()), this, SLOT(slotReadErr()));
 #if defined(_WIN32)




More information about the scribus-commit mailing list