#10393: opening sla from symbolic link breaks relative paths to graphics (+ some refactoring of FileLoader)

git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17325 11d20701-8431-0410-a711-e3c959e3b870

12 files changed, 108 insertions, 289 deletions

diff --git a/scribus/canvasmode_legacy.cpp b/scribus/canvasmode_legacy.cpp
index e052fff..0c097e0 100644
--- a/scribus/canvasmode_legacy.cpp
+++ b/scribus/canvasmode_legacy.cpp
@@ -5031,7 +5031,7 @@ void LegacyMode::importToPage()
 		else
 		{
 			FileLoader *fileLoader = new FileLoader(fileName);
-			int testResult = fileLoader->TestFile();
+			int testResult = fileLoader->testFile();
 			delete fileLoader;
 			if ((testResult != -1) && (testResult >= FORMATID_ODGIMPORT))
 			{
diff --git a/scribus/canvasmode_normal.cpp b/scribus/canvasmode_normal.cpp
index 865525e..e22530d 100644
--- a/scribus/canvasmode_normal.cpp
+++ b/scribus/canvasmode_normal.cpp
@@ -1374,7 +1374,7 @@ void CanvasMode_Normal::importToPage()
 		else
 		{
 			FileLoader *fileLoader = new FileLoader(fileName);
-			int testResult = fileLoader->TestFile();
+			int testResult = fileLoader->testFile();
 			delete fileLoader;
 			if ((testResult != -1) && (testResult >= FORMATID_ODGIMPORT))
 			{
diff --git a/scribus/fileloader.cpp b/scribus/fileloader.cpp
index e946f55..6d82ce9 100644
--- a/scribus/fileloader.cpp
+++ b/scribus/fileloader.cpp
@@ -60,8 +60,6 @@ for which a new license (GPL+exception) is in place.
  */
 FileLoader::FileLoader(const QString & fileName) :
 	QObject(0),
-	FileName(fileName),
-	FileType(-1),
 	formatSLA12x(LoadSavePlugin::getFormatById(FORMATID_SLA12XIMPORT)),
 	formatSLA13x(LoadSavePlugin::getFormatById(FORMATID_SLA13XIMPORT)),
 	formatSLA134(LoadSavePlugin::getFormatById(FORMATID_SLA134IMPORT)),
@@ -69,8 +67,13 @@ FileLoader::FileLoader(const QString & fileName) :
 	formatSVG(LoadSavePlugin::getFormatById(FORMATID_SVGIMPORT)),
 	formatSXD(LoadSavePlugin::getFormatById(FORMATID_SXDIMPORT)),
 	formatODG(LoadSavePlugin::getFormatById(FORMATID_ODGIMPORT)),
-	prefsManager(PrefsManager::instance())
+	prefsManager(PrefsManager::instance()),
+	m_fileName(fileName),
+	m_fileType(-1)
 {
+	QString realPath = QFileInfo(fileName).canonicalFilePath();
+	if (!realPath.isEmpty())
+		m_fileName = realPath;
 }
 
 // FIXME: This static method is here as a temporary transitional
@@ -87,9 +90,9 @@ const QString FileLoader::getLoadFilterString()
  \brief Tests if the file "FileName" exists and determines the type of the file.
  \retval int -1 if the file doesn't exist or any other error has occurred, 0 for the old Format, 1 for the new Format, 2 for EPS and PS files, 3 for SVG files and 4 for PDF files
  */
-int FileLoader::TestFile()
+int FileLoader::testFile()
 {
-	QFileInfo fi = QFileInfo(FileName);
+	QFileInfo fi = QFileInfo(m_fileName);
 	int ret = -1;
 	if (!fi.exists())
 		ret = -1;
@@ -100,143 +103,54 @@ int FileLoader::TestFile()
 	QList<FileFormat>::const_iterator itEnd(fileFormats.constEnd());
 	for ( ; it != itEnd ; ++it )
 	{
-		if ((*it).nameMatch.indexIn("."+ext)!=-1)
+		if (it->nameMatch.indexIn("."+ext)!=-1)
 		{
-//  		qDebug() << QString("Match :%1: :.%2: on %3").arg((*it).nameMatch.pattern()).arg(ext).arg((*it).trName);
-			if ((*it).plug!=0)
+//  		qDebug() << QString("Match :%1: :.%2: on %3").arg(it->nameMatch.pattern()).arg(ext).arg(it->trName);
+			if (it->plug!=0)
 			{
-				if ((*it).plug->fileSupported(0, FileName))
+				if (it->plug->fileSupported(0, m_fileName))
 				{
-// 					qDebug(QString("File Supported With: %1").arg((*it).trName));
-					ret=(*it).formatId;
+// 					qDebug(QString("File Supported With: %1").arg(it->trName));
+					ret = it->formatId;
 					break;
 				}
 			}
 		}
 // 		else
-// 			qDebug() << QString("No Match :%1: :.%2: on %3").arg((*it).nameMatch.pattern()).arg(ext).arg((*it).trName);
+// 			qDebug() << QString("No Match :%1: :.%2: on %3").arg(it->nameMatch.pattern()).arg(ext).arg(it->trName);
 	}
 	
-// 	if (ret==-1)
-// 	{
-// 		if ((ext.endsWith("sla.gz")) || (ext.endsWith("sla")) || (ext.endsWith("scd.gz")) || (ext.endsWith("scd")))
-// 			ret = CheckScribus();
-// 		else 
-// 		if (((ext.endsWith("ps")) || (ext.endsWith("eps"))) && (formatPS))
-// 			ret = FORMATID_PSIMPORT;
-// 		else if (((ext.endsWith("svg")) || (ext.endsWith("svgz"))) && (formatSVG))
-// 			ret = FORMATID_SVGIMPORT;
-// 		else if ((ext.endsWith("sxd")) && (formatSXD))
-// 			ret = FORMATID_SXDIMPORT;
-// 		else if ((ext.endsWith("odg")) && (formatODG))
-// 			ret = FORMATID_ODGIMPORT;
-// 	}
-/*	if (ext == "pdf")
-		ret = 4; */
-	FileType = ret;
+	m_fileType = ret;
 	return ret;
 }
-/*
-static void replaceFonts(ScribusDoc* currDoc, PageItem *it, QMap<QString, int> UsedFonts, QMap<QString, QString> ReplacedFonts)
-{	
-	if ((it->asTextFrame()) || (it->asPathText()))
-	{
-		CharStyle newFontStyle;
-		for (uint e = 0; e < it->itemText.nrOfRuns(); ++e)
-		{
-			int start = it->itemText.startOfRun(e);
-			ScFace oldFont = it->itemText.charStyle(start).font();
-			if (!UsedFonts.contains(oldFont.scName())) {
-				newFontStyle.setFont((*currDoc->AllFonts)[ReplacedFonts[oldFont.scName()]]);
-				it->itemText.applyCharStyle(start, it->itemText.endOfRun(e) - start, newFontStyle );
-			}
-		}
-	}
-}
 
-*/
-bool FileLoader::LoadPage(ScribusDoc* currDoc, int PageToLoad, bool Mpage, QString renamedPageName)
+bool FileLoader::loadPage(ScribusDoc* currDoc, int PageToLoad, bool Mpage, QString renamedPageName)
 {
 	bool ret = false;
 // 	newReplacement = false;
 	ReplacedFonts = currDoc->AllFonts->getSubstitutions();
 // 	dummyScFaces.clear();
 	QList<FileFormat>::const_iterator it;
-	if (findFormat(FileType, it))
+	if (findFormat(m_fileType, it))
 	{
-		if (FileType==FORMATID_SLA12XIMPORT)
+		if (m_fileType == FORMATID_SLA12XIMPORT)
 		{
-			(*it).plug->setupTargets(currDoc, currDoc->view(), currDoc->scMW(), currDoc->scMW()->mainWindowProgressBar, &(prefsManager->appPrefs.AvailFonts));
-			ret=(*it).plug->loadPage(FileName, PageToLoad, Mpage, renamedPageName);
+			it->plug->setupTargets(currDoc, currDoc->view(), currDoc->scMW(), currDoc->scMW()->mainWindowProgressBar, &(prefsManager->appPrefs.AvailFonts));
+			ret = it->plug->loadPage(m_fileName, PageToLoad, Mpage, renamedPageName);
 // 			if (ret)
-// 				(*it).plug->getReplacedFontData(newReplacement, ReplacedFonts, dummyScFaces);
+// 				it->plug->getReplacedFontData(newReplacement, ReplacedFonts, dummyScFaces);
 		}
-		if (FileType==FORMATID_SLA13XIMPORT || FileType==FORMATID_SLA134IMPORT)
+		if (m_fileType == FORMATID_SLA13XIMPORT || m_fileType == FORMATID_SLA134IMPORT)
 		{
-			(*it).plug->setupTargets(currDoc, 0, currDoc->scMW(), currDoc->scMW()->mainWindowProgressBar, &(prefsManager->appPrefs.AvailFonts));
-			ret=(*it).plug->loadPage(FileName, PageToLoad, Mpage, renamedPageName);
+			it->plug->setupTargets(currDoc, 0, currDoc->scMW(), currDoc->scMW()->mainWindowProgressBar, &(prefsManager->appPrefs.AvailFonts));
+			ret = it->plug->loadPage(m_fileName, PageToLoad, Mpage, renamedPageName);
 // 			if (ret)
-// 				(*it).plug->getReplacedFontData(newReplacement, ReplacedFonts, dummyScFaces);
+// 				it->plug->getReplacedFontData(newReplacement, ReplacedFonts, dummyScFaces);
 		}
 	}
 	if (ret)
 		ret = postLoad(currDoc);  // FIXME: return false if user doesnt want to replace fonts??
 	
-	/*
-	//FIXME: this goes into scribusdoc and should work with substitutes
-	if (ReplacedFonts.count() != 0)
-	{
-		if ((prefsManager->appPrefs.askBeforeSubstituite) || (newReplacement))
-		{
-			qApp->setOverrideCursor(QCursor(Qt::arrowCursor), true);
-			FontReplaceDialog dia(0, &ReplacedFonts);
-			if (dia.exec())
-			{
-				QMap<QString,QString>::Iterator itfsu;
-				for (itfsu = ReplacedFonts.begin(); itfsu != ReplacedFonts.end(); ++itfsu)
-				{
-					if (dia.stickyReplacements->isChecked())
-						prefsManager->appPrefs.GFontSub[itfsu.key()] = itfsu.data();
-				}
-			}
-			else
-			{
-				return false;
-			}
-		}
-		for (uint d = 0; d < currDoc->MasterItems.count(); ++d)
-		{
-			replaceFonts(currDoc, currDoc->MasterItems.at(d), currDoc->UsedFonts, ReplacedFonts);
-		}
-		for (uint d = 0; d < currDoc->DocItems.count(); ++d)
-		{
-			replaceFonts(currDoc, currDoc->DocItems.at(d), currDoc->UsedFonts, ReplacedFonts);
-		}
-		for (uint d = 0; d < currDoc->FrameItems.count(); ++d)
-		{
-			replaceFonts(currDoc, currDoc->FrameItems.at(d), currDoc->UsedFonts, ReplacedFonts);
-		}
-		for (uint a = 0; a < currDoc->paragraphStyles().count(); ++a)
-		{
-//			if ( !currDoc->paragraphStyles()[a].charStyle().font().isNone() && !currDoc->UsedFonts.contains(currDoc->paragraphStyles()[a].charStyle().font().scName()))
-//				currDoc->paragraphStyles()[a].charStyle().setFont
-//					((*currDoc->AllFonts)[ReplacedFonts[currDoc->paragraphStyles()[a].charStyle().font().scName()]]);
-		}
-		QMap<QString,QString>::Iterator itfsu;
-		for (itfsu = ReplacedFonts.begin(); itfsu != ReplacedFonts.end(); ++itfsu)
-		{
-			if (!currDoc->UsedFonts.contains(itfsu.data()))
-			{
-//				QFont fo = prefsManager->appPrefs.AvailFonts[itfsu.data()]->Font;
-//				fo.setPointSize(qRound(ScMW->doc->toolSettings.defSize / 10.0));
-				currDoc->AddFont(itfsu.data(), qRound(currDoc->toolSettings.defSize / 10.0));
-			}
-		}
-		if (prefsManager->appPrefs.askBeforeSubstituite)
-			ReplacedFonts.clear();
-// 		dummyScFaces.clear();
-	}
-	*/
 	return ret;
 }
 
@@ -248,7 +162,7 @@ bool FileLoader::LoadPage(ScribusDoc* currDoc, int PageToLoad, bool Mpage, QStri
  \param currDoc the current document
  \retval bool true when loading is succsessful, false otherwise
  */
-bool FileLoader::LoadFile(ScribusDoc* currDoc)
+bool FileLoader::loadFile(ScribusDoc* currDoc)
 {
 	newReplacement = false;
 	currDoc->guidesSettings.marginsShown = prefsManager->appPrefs.guidesSettings.marginsShown;
@@ -271,38 +185,38 @@ bool FileLoader::LoadFile(ScribusDoc* currDoc)
 	//dummyScFaces.clear();
 	bool ret = false;
 	QList<FileFormat>::const_iterator it;
-	if (findFormat(FileType, it))
+	if (findFormat(m_fileType, it))
 	{
-//		qDebug("fileloader: type %d plugin %s"),FileType,(*it).trName);
-		switch (FileType)
+//		qDebug("fileloader: type %d plugin %s"),FileType,it->trName);
+		switch (m_fileType)
 		{
 			case FORMATID_SLA12XIMPORT:
 				{
-					(*it).setupTargets(currDoc, currDoc->view(), currDoc->scMW(), currDoc->scMW()->mainWindowProgressBar, &(prefsManager->appPrefs.AvailFonts));
-					ret=(*it).loadFile(FileName, LoadSavePlugin::lfCreateDoc);
+					it->setupTargets(currDoc, currDoc->view(), currDoc->scMW(), currDoc->scMW()->mainWindowProgressBar, &(prefsManager->appPrefs.AvailFonts));
+					ret = it->loadFile(m_fileName, LoadSavePlugin::lfCreateDoc);
 // 					if (ret)
-// 						(*it).getReplacedFontData(newReplacement, ReplacedFonts, dummyScFaces);
+// 						it->getReplacedFontData(newReplacement, ReplacedFonts, dummyScFaces);
 				}
 				break;
 			case FORMATID_SLA13XIMPORT:
 			case FORMATID_SLA134IMPORT:
 				{
-					(*it).setupTargets(currDoc, 0, currDoc->scMW(), currDoc->scMW()->mainWindowProgressBar, &(prefsManager->appPrefs.AvailFonts));
-					ret=(*it).loadFile(FileName, LoadSavePlugin::lfCreateDoc);
+					it->setupTargets(currDoc, 0, currDoc->scMW(), currDoc->scMW()->mainWindowProgressBar, &(prefsManager->appPrefs.AvailFonts));
+					ret = it->loadFile(m_fileName, LoadSavePlugin::lfCreateDoc);
 // 					if (ret)
-// 						(*it).getReplacedFontData(newReplacement, ReplacedFonts, dummyScFaces);
+// 						it->getReplacedFontData(newReplacement, ReplacedFonts, dummyScFaces);
 				}
 				break;
 			default:
-				(*it).setupTargets(currDoc, currDoc->view(), currDoc->scMW(), currDoc->scMW()->mainWindowProgressBar, &(prefsManager->appPrefs.AvailFonts));
-				ret = (*it).loadFile(FileName, LoadSavePlugin::lfCreateDoc);
+				it->setupTargets(currDoc, currDoc->view(), currDoc->scMW(), currDoc->scMW()->mainWindowProgressBar, &(prefsManager->appPrefs.AvailFonts));
+				ret = it->loadFile(m_fileName, LoadSavePlugin::lfCreateDoc);
 				break;
 		}
 	}
 	return ret;
 }
 
-bool FileLoader::SaveFile(const QString& fileName, ScribusDoc *doc, QString *savedFile)
+bool FileLoader::saveFile(const QString& fileName, ScribusDoc *doc, QString *savedFile)
 {
 	bool ret = false;
 	QList<FileFormat>::const_iterator it;
@@ -316,48 +230,48 @@ bool FileLoader::SaveFile(const QString& fileName, ScribusDoc *doc, QString *sav
 	return ret;
 }
 
-bool FileLoader::ReadStyles(const QString& fileName, ScribusDoc* doc, StyleSet<ParagraphStyle> &docParagraphStyles)
+bool FileLoader::readStyles(ScribusDoc* doc, StyleSet<ParagraphStyle> &docParagraphStyles)
 {
 	QList<FileFormat>::const_iterator it;
-	if (findFormat(FileType, it)) {
-		(*it).plug->setupTargets(doc, 0, doc->scMW(), doc->scMW()->mainWindowProgressBar, &(prefsManager->appPrefs.AvailFonts));
-		return (*it).readStyles(fileName, doc, docParagraphStyles);
+	if (findFormat(m_fileType, it)) {
+		it->plug->setupTargets(doc, 0, doc->scMW(), doc->scMW()->mainWindowProgressBar, &(prefsManager->appPrefs.AvailFonts));
+		return it->readStyles(m_fileName, doc, docParagraphStyles);
 	}
 	return false;
 }
 
-bool FileLoader::ReadCharStyles(const QString& fileName, ScribusDoc* doc, StyleSet<CharStyle> &docCharStyles)
+bool FileLoader::readCharStyles(ScribusDoc* doc, StyleSet<CharStyle> &docCharStyles)
 {
 	QList<FileFormat>::const_iterator it;
-	if (findFormat(FileType, it)) {
-		(*it).plug->setupTargets(doc, 0, doc->scMW(), doc->scMW()->mainWindowProgressBar, &(prefsManager->appPrefs.AvailFonts));
-		return (*it).readCharStyles(fileName, doc, docCharStyles);
+	if (findFormat(m_fileType, it)) {
+		it->plug->setupTargets(doc, 0, doc->scMW(), doc->scMW()->mainWindowProgressBar, &(prefsManager->appPrefs.AvailFonts));
+		return it->readCharStyles(m_fileName, doc, docCharStyles);
 	}
 	return false;
 }
 
-bool FileLoader::ReadColors(const QString& fileName, ColorList & colors)
+bool FileLoader::readColors(ColorList & colors)
 {
 	QList<FileFormat>::const_iterator it;
-	if (findFormat(FileType, it))
-		return (*it).readColors(fileName, colors);
+	if (findFormat(m_fileType, it))
+		return it->readColors(m_fileName, colors);
 	return false;
 }
 
 
-bool FileLoader::ReadPageCount(const QString& fileName, int *num1, int *num2, QStringList & masterPageNames)
+bool FileLoader::readPageCount(int *num1, int *num2, QStringList & masterPageNames)
 {
 	QList<FileFormat>::const_iterator it;
-	if (findFormat(FileType, it))
-		return (*it).readPageCount(fileName, num1, num2, masterPageNames);
+	if (findFormat(m_fileType, it))
+		return it->readPageCount(m_fileName, num1, num2, masterPageNames);
 	return false;
 }
 
-bool FileLoader::ReadLineStyles(const QString& fileName, QMap<QString,multiLine> *Sty)
+bool FileLoader::readLineStyles(QMap<QString,multiLine> *Sty)
 {
 	QList<FileFormat>::const_iterator it;
-	if (findFormat(FileType, it))
-		return (*it).readLineStyles(fileName, Sty);
+	if (findFormat(m_fileType, it))
+		return it->readLineStyles(m_fileName, Sty);
 	return false;
 }
 
@@ -458,48 +372,8 @@ bool FileLoader::postLoad(ScribusDoc* currDoc)
 			currDoc->docHyphenator->MinWordLen=currDoc->MinWordLen;
 			currDoc->docHyphenator->HyCount=currDoc->HyCount;
 	}
-/*	for (uint d = 0; d < ScMW->doc->MasterItems.count(); ++d)
-	{
-		PageItem *it = ScMW->doc->MasterItems.at(d);
-		if ((it->itemType() == PageItem::TextFrame) || (it->itemType() == PageItem::PathText))
-		{
-			for (uint e = 0; e < it->itemText.count(); ++e)
-			{
-				ScText *hl = it->itemText.at(e);
-				if ((hl->ch == QChar(25)) && ((int)hl->cembedded != -1))
-					hl->cembedded = ScMW->doc->FrameItems.at((int)hl->cembedded);
-				else
-					hl->cembedded = 0;
-			}
-		}
-	}
-	for (uint d = 0; d < ScMW->doc->DocItems.count(); ++d)
-	{
-		PageItem *it = ScMW->doc->DocItems.at(d);
-		if ((it->itemType() == PageItem::TextFrame) || (it->itemType() == PageItem::PathText))
-		{
-			for (uint e = 0; e < it->itemText.count(); ++e)
-			{
-				ScText *hl = it->itemText.at(e);
-				if ((hl->ch == QChar(25)) && ((int)hl->cembedded != -1))
-					hl->cembedded = ScMW->doc->FrameItems.at((int)hl->cembedded);
-				else
-					hl->cembedded = 0;
-			}
-		}
-	} */
-	//FIXME: this goes into scribusdoc
-	//ResourceCollection rsc;
-	//currDoc->getNamedResources(rsc);
-	//ReplacedFonts.clear();
-	//QMap<QString,QString>::ConstIterator it;
-	//for (it = rsc.fonts().begin(); it != rsc.fonts().end(); ++it)
-	//{
-	//	const ScFace& font (rsc.availableFonts->findFont(it.key(), currDoc));
-	//	if (font.isReplacement() )
-	//		ReplacedFonts[it.key()] = font.replacementName();
-	//}
-		ReplacedFonts = currDoc->AllFonts->getSubstitutions(ReplacedFonts.keys());
+
+	ReplacedFonts = currDoc->AllFonts->getSubstitutions(ReplacedFonts.keys());
 	if (ReplacedFonts.count() != 0)
 	{
 		if ((prefsManager->appPrefs.askBeforeSubstituite)) 
@@ -526,61 +400,6 @@ bool FileLoader::postLoad(ScribusDoc* currDoc)
 				return false;
 			}
 		}
-		/*
-		for (uint d = 0; d < currDoc->MasterItems.count(); ++d)
-		{
-			replaceFonts(currDoc, currDoc->MasterItems.at(d), currDoc->UsedFonts, ReplacedFonts);
-		}
-		for (uint d = 0; d < currDoc->DocItems.count(); ++d)
-		{
-			replaceFonts(currDoc, currDoc->DocItems.at(d), currDoc->UsedFonts, ReplacedFonts);
-		}
-		for (uint d = 0; d < currDoc->FrameItems.count(); ++d)
-		{
-			replaceFonts(currDoc, currDoc->FrameItems.at(d), currDoc->UsedFonts, ReplacedFonts);
-		}
-		for (uint a = 0; a < currDoc->paragraphStyles().count(); ++a)
-		{
-			if ( !currDoc->paragraphStyles()[a].charStyle().font().isNone() 
-				 && !currDoc->UsedFonts.contains(currDoc->paragraphStyles()[a].charStyle().font().scName()))
-			{
-//				currDoc->paragraphStyles()[a].charStyle().setFont
-//					((*currDoc->AllFonts)[ReplacedFonts[currDoc->paragraphStyles()[a].charStyle().font().scName()]]);
-			}
-		}
-		QList<QString> tmpList;
-		tmpList.clear();
-		for (int fe = 0; fe < currDoc->PDF_Options.EmbedList.count(); ++fe)
-		{
-			if (ReplacedFonts.contains(currDoc->PDF_Options.EmbedList[fe]))
-				tmpList.append(ReplacedFonts[currDoc->PDF_Options.EmbedList[fe]]);
-			else
-				tmpList.append(currDoc->PDF_Options.EmbedList[fe]);
-		}
-		currDoc->PDF_Options.EmbedList = tmpList;
-		tmpList.clear();
-		for (int fe = 0; fe < currDoc->PDF_Options.SubsetList.count(); ++fe)
-		{
-			if (ReplacedFonts.contains(currDoc->PDF_Options.SubsetList[fe]))
-				tmpList.append(ReplacedFonts[currDoc->PDF_Options.SubsetList[fe]]);
-			else
-				tmpList.append(currDoc->PDF_Options.SubsetList[fe]);
-		}
-		currDoc->PDF_Options.SubsetList = tmpList;
-		QMap<QString,QString>::Iterator itfsu;
-		for (itfsu = ReplacedFonts.begin(); itfsu != ReplacedFonts.end(); ++itfsu)
-		{
-			if (!currDoc->UsedFonts.contains(itfsu.data()))
-			{
-//				QFont fo = prefsManager->appPrefs.AvailFonts[itfsu.data()]->Font;
-//				fo.setPointSize(qRound(ScMW->doc->toolSettings.defSize / 10.0));
-				currDoc->AddFont(itfsu.data(), qRound(currDoc->toolSettings.defSize / 10.0));
-			}
-		}
-		if (prefsManager->appPrefs.askBeforeSubstituite)
-			ReplacedFonts.clear();
-		dummyScFaces.clear();
-		*/
 	}
 
 	return true;
@@ -608,7 +427,7 @@ bool FileLoader::findFormat(uint formatId, QList<FileFormat>::const_iterator &it
 	QList<FileFormat>::const_iterator itEnd(fileFormats.constEnd());
 	for ( ; it != itEnd ; ++it )
 	{
-		if (formatId==(*it).formatId)
+		if (formatId == it->formatId)
 			return true;
 	}
 	return false;
diff --git a/scribus/fileloader.h b/scribus/fileloader.h
index 298e552..119a043 100644
--- a/scribus/fileloader.h
+++ b/scribus/fileloader.h
@@ -32,20 +32,21 @@ class SCRIBUS_API FileLoader : public QObject
 public:
 	FileLoader(const QString & fileName);
 	~FileLoader() {};
-	int TestFile();
-// 	int CheckScribus();
-	bool LoadPage(ScribusDoc* currDoc, int PageToLoad, bool Mpage, QString renamedPageName=QString::null);
-	bool LoadFile(ScribusDoc* currDoc);
-	bool SaveFile(const QString& fileName, ScribusDoc *doc, QString *savedFile = NULL);
-	bool ReadStyles(const QString& fileName, ScribusDoc* doc, StyleSet<ParagraphStyle> &docParagraphStyles);
-	bool ReadCharStyles(const QString& fileName, ScribusDoc* doc, StyleSet<CharStyle> &docCharStyles);
-	bool ReadPageCount(const QString& fileName, int *num1, int *num2, QStringList & masterPageNames);
-	bool ReadColors(const QString& fileName, ColorList & colors);
-	bool ReadLineStyles(const QString& fileName, QMap<QString,multiLine> *Sty);
+
+	int  fileType() const { return m_fileType; }
+	int  testFile();
+
+	bool loadPage(ScribusDoc* currDoc, int PageToLoad, bool Mpage, QString renamedPageName=QString::null);
+	bool loadFile(ScribusDoc* currDoc);
+	bool saveFile(const QString& fileName, ScribusDoc *doc, QString *savedFile = NULL);
+	bool readStyles(ScribusDoc* doc, StyleSet<ParagraphStyle> &docParagraphStyles);
+	bool readCharStyles(ScribusDoc* doc, StyleSet<CharStyle> &docCharStyles);
+	bool readPageCount(int *num1, int *num2, QStringList & masterPageNames);
+	bool readColors(ColorList & colors);
+	bool readLineStyles(QMap<QString, multiLine> *Sty);
 	bool postLoad(ScribusDoc* currDoc);
  	void informReplacementFonts();
-	QString FileName;
-	int FileType;
+	
 	const FileFormat * const formatSLA12x;
 	const FileFormat * const formatSLA13x;
 	const FileFormat * const formatSLA134;
@@ -53,9 +54,6 @@ public:
 	const FileFormat * const formatSVG;
 	const FileFormat * const formatSXD;
 	const FileFormat * const formatODG;
- 	QList<int> LFrames;
-	QMap<uint,QString> DoVorl;
-	uint VorlC;
 
 	static const QString getLoadFilterString();
 private:
@@ -63,9 +61,11 @@ private:
 	bool newReplacement;
 	void readParagraphStyle(ParagraphStyle& vg, const QDomElement& pg, SCFonts &avail, ScribusDoc *doc);
 	bool findFormat(uint formatId, QList<FileFormat>::const_iterator &it);
+
 	PrefsManager* prefsManager;
-	double maximumX;
-	double maximumY;
+
+	QString m_fileName;
+	int     m_fileType;
 };
 
 #endif
diff --git a/scribus/mergedoc.cpp b/scribus/mergedoc.cpp
index 794dc86..a1f182d 100644
--- a/scribus/mergedoc.cpp
+++ b/scribus/mergedoc.cpp
@@ -143,15 +143,15 @@ void MergeDoc::changeFile()
 			dirs->set("merge", fn.left(fn.lastIndexOf("/")));
 			qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
 			FileLoader fl(fn);
-			if (fl.TestFile() == -1)
+			if (fl.testFile() == -1)
 			//TODO put in nice user warning
 				return;
 			QStringList masterPageNames;
 			bool ret = false;
 			if (masterPages)
-				ret = fl.ReadPageCount(fn, &dummy, &count, masterPageNames);
+				ret = fl.readPageCount(&dummy, &count, masterPageNames);
 			else
-				ret = fl.ReadPageCount(fn, &count, &dummy, masterPageNames);
+				ret = fl.readPageCount(&count, &dummy, masterPageNames);
 			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 			if ((ret) && (count != 0))
 			{
diff --git a/scribus/patterndialog.cpp b/scribus/patterndialog.cpp
index d4d8ddb..d6d8523 100644
--- a/scribus/patterndialog.cpp
+++ b/scribus/patterndialog.cpp
@@ -368,7 +368,7 @@ void PatternDialog::loadVectors(QString data)
 	else
 	{
 		FileLoader *fileLoader = new FileLoader(data);
-		int testResult = fileLoader->TestFile();
+		int testResult = fileLoader->testFile();
 		delete fileLoader;
 		if ((testResult != -1) && (testResult >= FORMATID_ODGIMPORT))
 		{
diff --git a/scribus/scribus.cpp b/scribus/scribus.cpp
index 13516c1..9875e07 100644
--- a/scribus/scribus.cpp
+++ b/scribus/scribus.cpp
@@ -3646,7 +3646,7 @@ void ScribusMainWindow::importVectorFile()
 		else
 		{
 			FileLoader *fileLoader = new FileLoader(fileName);
-			int testResult = fileLoader->TestFile();
+			int testResult = fileLoader->testFile();
 			delete fileLoader;
 			if ((testResult != -1) && (testResult >= FORMATID_ODGIMPORT))
 			{
@@ -3845,14 +3845,14 @@ bool ScribusMainWindow::loadPage(QString fileName, int Nr, bool Mpa, const QStri
 	if (!fileName.isEmpty())
 	{
 		FileLoader *fl = new FileLoader(fileName);
-		if (fl->TestFile() == -1)
+		if (fl->testFile() == -1)
 		{
 			delete fl;
 			return false;
 		}
 		doc->setLoading(true);
 		uint oldItemsCount = doc->Items->count();
-		if(!fl->LoadPage(doc, Nr, Mpa, renamedPageName))
+		if(!fl->loadPage(doc, Nr, Mpa, renamedPageName))
 		{
 			delete fl;
 			doc->setLoading(false);
@@ -3949,7 +3949,7 @@ bool ScribusMainWindow::loadDoc(QString fileName)
 	{
 		QString FName = fi.absoluteFilePath();
 		FileLoader *fileLoader = new FileLoader(FName);
-		int testResult=fileLoader->TestFile();
+		int testResult = fileLoader->testFile();
 		if (testResult == -1)
 		{
 			delete fileLoader;
@@ -3999,11 +3999,11 @@ bool ScribusMainWindow::loadDoc(QString fileName)
 		doc->SoftProofing = false;
 		doc->Gamut = false;
 		setScriptRunning(true);
-		bool loadSuccess=fileLoader->LoadFile(doc);
+		bool loadSuccess = fileLoader->loadFile(doc);
 		//Do the font replacement check from here, when we have a GUI. TODO do this also somehow without the GUI
 		//This also gives the user the opportunity to cancel the load when finding theres a replacement required.
 		if (loadSuccess && ScCore->usingGUI())
-			loadSuccess=fileLoader->postLoad(doc);
+			loadSuccess = fileLoader->postLoad(doc);
 		if(!loadSuccess)
 		{
 			view->close();
@@ -4158,7 +4158,7 @@ bool ScribusMainWindow::loadDoc(QString fileName)
 		}
 //		propertiesPalette->updateColorList();
 //		propertiesPalette->Cpal->ChooseGrad(0);
-		if (fileLoader->FileType > FORMATID_NATIVEIMPORTEND)
+		if (fileLoader->fileType() > FORMATID_NATIVEIMPORTEND)
 		{
 			doc->setName(FName+ tr("(converted)"));
 			QFileInfo fi(doc->DocName);
@@ -9232,7 +9232,7 @@ void ScribusMainWindow::emergencySave()
 				std::cout << "Saving: " << doc->DocName.toStdString() << ".emergency" << std::endl;
 				doc->autoSaveTimer->stop();
 				FileLoader fl(doc->DocName+".emergency");
-				fl.SaveFile(doc->DocName+".emergency", doc, 0);
+				fl.saveFile(doc->DocName+".emergency", doc, 0);
 			}
 			view->close();
 			uint numPages=doc->Pages->count();
@@ -9553,7 +9553,7 @@ void ScribusMainWindow::dragEnterEvent ( QDragEnterEvent* e)
 			{
 				QUrl url( fileUrls[i] );
 				FileLoader *fileLoader = new FileLoader(url.path());
-				int testResult = fileLoader->TestFile();
+				int testResult = fileLoader->testFile();
 				delete fileLoader;
 				if ((testResult != -1) && (testResult >= FORMATID_ODGIMPORT))
 				{
@@ -9591,7 +9591,7 @@ void ScribusMainWindow::dropEvent ( QDropEvent * e)
 			{
 				QUrl url( fileUrls[i] );
 				FileLoader *fileLoader = new FileLoader(url.path());
-				int testResult = fileLoader->TestFile();
+				int testResult = fileLoader->testFile();
 				delete fileLoader;
 				if ((testResult != -1) && (testResult >= FORMATID_ODGIMPORT))
 				{
diff --git a/scribus/scribusdoc.cpp b/scribus/scribusdoc.cpp
index ed2a538..3d25431 100644
--- a/scribus/scribusdoc.cpp
+++ b/scribus/scribusdoc.cpp
@@ -1182,21 +1182,21 @@ void ScribusDoc::loadStylesFromFile(QString fileName)
 	if (!fileName.isEmpty())
 	{
 		FileLoader fl(fileName);
-		if (fl.TestFile() == -1)
+		if (fl.testFile() == -1)
 		//TODO put in nice user warning
 			return;
 
-		if (!fl.ReadStyles(fileName, this, *wrkStyles))
+		if (!fl.readStyles(this, *wrkStyles))
 		{
 			//TODO put in nice user warning
 		}
 
-		if (!fl.ReadCharStyles(fileName, this, *wrkCharStyles))
+		if (!fl.readCharStyles(this, *wrkCharStyles))
 		{
 			//TODO put in nice user warning
 		}
 
-		if (!fl.ReadLineStyles(fileName, wrkLineStyles))
+		if (!fl.readLineStyles(wrkLineStyles))
 		{
 			//TODO put in nice user warning
 		}
@@ -1219,21 +1219,21 @@ void ScribusDoc::loadStylesFromFile(QString fileName, StyleSet<ParagraphStyle> *
 	if (!fileName.isEmpty())
 	{
 		FileLoader fl(fileName);
-		if (fl.TestFile() == -1)
+		if (fl.testFile() == -1)
 		//TODO put in nice user warning
 			return;
 
-		if (!fl.ReadStyles(fileName, this, *wrkStyles))
+		if (!fl.readStyles(this, *wrkStyles))
 		{
 			//TODO put in nice user warning
 		}
 
-		if (!fl.ReadCharStyles(fileName, this, *wrkCharStyles))
+		if (!fl.readCharStyles(this, *wrkCharStyles))
 		{
 			//TODO put in nice user warning
 		}
 
-		if (!fl.ReadLineStyles(fileName, wrkLineStyles))
+		if (!fl.readLineStyles(wrkLineStyles))
 		{
 			//TODO put in nice user warning
 		}
@@ -3517,7 +3517,7 @@ bool ScribusDoc::save(const QString& fileName, QString* savedFile)
 		mainWindowProgressBar->reset();
 	}
 	FileLoader fl(fileName);
-	bool ret = fl.SaveFile(fileName, this, savedFile);
+	bool ret = fl.saveFile(fileName, this, savedFile);
 	if (ret)
 	{
 		setName(fileName);
diff --git a/scribus/scribusview.cpp b/scribus/scribusview.cpp
index 0f60044..2f7c013 100644
--- a/scribus/scribusview.cpp
+++ b/scribus/scribusview.cpp
@@ -941,7 +941,7 @@ void ScribusView::contentsDropEvent(QDropEvent *e)
 			else
 			{
 				FileLoader *fileLoader = new FileLoader(url.toLocalFile());
-				int testResult = fileLoader->TestFile();
+				int testResult = fileLoader->testFile();
 				delete fileLoader;
 				if ((testResult != -1) && (testResult >= FORMATID_ODGIMPORT))
 					vectorFile = true;
@@ -1041,7 +1041,7 @@ void ScribusView::contentsDropEvent(QDropEvent *e)
 					else
 					{
 						FileLoader *fileLoader = new FileLoader(url.toLocalFile());
-						int testResult = fileLoader->TestFile();
+						int testResult = fileLoader->testFile();
 						delete fileLoader;
 						if ((testResult != -1) && (testResult >= FORMATID_ODGIMPORT))
 						{
diff --git a/scribus/scribuswin.cpp b/scribus/scribuswin.cpp
index d49eec1..cc09b07 100644
--- a/scribus/scribuswin.cpp
+++ b/scribus/scribuswin.cpp
@@ -96,7 +96,7 @@ void ScribusWin::slotAutoSave()
 		//instead of overwriting source document
 		//moveFile(m_Doc->DocName, m_Doc->DocName+".bak");
 		FileLoader fl(m_Doc->DocName);
-		if (fl.SaveFile(m_Doc->DocName+".autosave", m_Doc, 0))
+		if (fl.saveFile(m_Doc->DocName+".autosave", m_Doc, 0))
 		{
 			//#8081 related : do not unset modified flag until user really save file
 			//m_Doc->setModified(false);
diff --git a/scribus/stylemanager.cpp b/scribus/stylemanager.cpp
index 71ac038..5cecf0b 100644
--- a/scribus/stylemanager.cpp
+++ b/scribus/stylemanager.cpp
@@ -409,13 +409,13 @@ void StyleManager::slotImport()
 			if (!neededColors.isEmpty())
 			{
 				FileLoader fl(selectedFile);
-				if (fl.TestFile() == -1)
+				if (fl.testFile() == -1)
 				{ //TODO put in nice user warning
 					delete dia2;
 					return;
 				}
 				ColorList LColors;
-				if (fl.ReadColors(selectedFile, LColors))
+				if (fl.readColors(LColors))
 				{
 					ColorList::Iterator itc;
 					for (itc = LColors.begin(); itc != LColors.end(); ++itc)
diff --git a/scribus/util_color.cpp b/scribus/util_color.cpp
index f4347d4..261e99c 100644
--- a/scribus/util_color.cpp
+++ b/scribus/util_color.cpp
@@ -734,11 +734,11 @@ bool importColorsFromFile(QString fileName, ColorList &EditColors)
 		else
 		{
 			FileLoader fl(fileName);
-			int test = fl.TestFile();
+			int test = fl.testFile();
 			if ((test == FORMATID_SLA134IMPORT) || (test == FORMATID_SLA13XIMPORT) || (test == FORMATID_SLA12XIMPORT))
 			{
 				ColorList LColors;
-				if (fl.ReadColors(fileName, LColors))
+				if (fl.readColors(LColors))
 				{
 					ColorList::Iterator it;
 					for (it = LColors.begin(); it != LColors.end(); ++it)