r19804 by craig - Add extra system locations to hyph finders, correct LibreOffice resource locations for their new bundle

[scribus-commit]

Author: craig
Date: Sun Feb  8 10:25:42 2015
New Revision: 19804

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19804
Log:
Add extra system locations to hyph finders, correct LibreOffice resource locations for their new bundle

Modified:
    trunk/Scribus/scribus/scpaths.cpp

Modified: trunk/Scribus/scribus/scpaths.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19804&path=/trunk/Scribus/scribus/scpaths.cpp
==============================================================================
--- trunk/Scribus/scribus/scpaths.cpp (original)
+++ trunk/Scribus/scribus/scpaths.cpp Sun Feb  8 10:25:42 2015
@@ -241,8 +241,8 @@
 	//dictionaryPaths
 	QString macPortsPath("/opt/local/share/hunspell/");
 	QString finkPath("/sw/share/hunspell/");
-	QString osxLibreOfficePath("/Applications/LibreOffice.app/Contents/share/extensions");
-	QString osxUserLibreOfficePath(QDir::homePath()+"/Applications/LibreOffice.app/Contents/share/extensions");
+	QString osxLibreOfficePath("/Applications/LibreOffice.app/Contents/Resources/extensions");
+	QString osxUserLibreOfficePath(QDir::homePath()+"/Applications/LibreOffice.app/Contents/Resources/extensions");
 	QString linuxLocalPath("/usr/local/share/hunspell/");
 	QString linuxHunspellPath("/usr/share/hunspell/");
 	QString linuxMyspellPath("/usr/share/myspell/");
@@ -305,21 +305,18 @@
 QStringList ScPaths::hyphDirs() const
 {
 	//dictionaryPaths
-/*
 	QString macPortsPath("/opt/local/share/hunspell/");
 	QString finkPath("/sw/share/hunspell/");
-	QString osxLibreOfficePath("/Applications/LibreOffice.app/Contents/share/extensions");
-	QString osxUserLibreOfficePath(QDir::homePath()+"/Applications/LibreOffice.app/Contents/share/extensions");
+	QString osxLibreOfficePath("/Applications/LibreOffice.app/Contents/Resources/extensions");
+	QString osxUserLibreOfficePath(QDir::homePath()+"/Applications/LibreOffice.app/Contents/Resources/extensions");
 	QString linuxLocalPath("/usr/local/share/hunspell/");
 	QString linuxHunspellPath("/usr/share/hunspell/");
 	QString linuxMyspellPath("/usr/share/myspell/");
 	QString windowsLOPath("LibreOffice 3.5/share/extensions");
-*/
 	QDir d;
 	QStringList hyphDirs;
 	hyphDirs.append(getUserDictDir(false));
 	hyphDirs.append(m_shareDir + "dicts/hyph/");
-/*
 #ifdef Q_OS_MAC
 	d.setPath(macPortsPath);
 	if (d.exists())
@@ -368,7 +365,6 @@
 	if (d.exists())
 		spellDirs.append(linuxLocalPath);
 #endif
-	*/
 	return hyphDirs;
 }