File oooqs-1.0_rc3-10.2_wrappers.patch of Package OpenOffice_org-Quickstarter

Overview Repositories Revisions Requests Users Attributes Meta

File oooqs-1.0_rc3-10.2_wrappers.patch of Package OpenOffice_org-Quickstarter

--- oooqs/oooqs.cpp.old	2006-11-27 14:09:57.000000000 +0100
+++ oooqs/oooqs.cpp	2006-11-27 15:52:49.000000000 +0100
@@ -331,28 +331,49 @@
 	soffice = config->readEntry("exec", "/usr/lib/ooo-*");
 	sofficeFound=false;
 	
-	if (QFile::exists("/usr/bin/ooo-wrapper")) {
-		int i = soffice.findRev( "/usr/lib/ooo-",0);
-		if ((i == 0) ||
-	            (((soffice == QString("/opt/OpenOffice.org")) ||
-	              (soffice == QString("/opt/OpenOffice.org/"))) &&
-	             (!QFile::exists("/opt/OpenOffice.org/program/soffice")))) {
-			soffice="/usr/bin/ooo-wrapper";
+	if ((soffice == QString("/usr/lib/ooo-*")) ||
+	    (soffice == QString("/opt/OpenOffice.org")) ||
+	    (soffice == QString("/opt/OpenOffice.org/"))) {
+	        // default path setting is detected, so we will use the common version and
+		// architecture independent wrapper from the Novell package if available
+	     	if (QFile::exists("/usr/bin/soffice")) {
+			soffice="/usr/bin/soffice";
 			sofficeFound=true;
 		}
+		else if (QFile::exists("/usr/bin/ooo-wrapper")) {
+			soffice="/usr/bin/ooo-wrapper";
+			sofficeFound=true;
+	        }
+		// we cannot not use the wrapper "ooffice" because it finishes after
+		// the wizard disappears; so, we have to use another fallback for SL 10.1
+		// and SLED10 packages
+		else if (QFile::exists("/usr/lib/ooo-2.0/program/soffice")) {
+			soffice="/usr/lib/ooo-2.0/program/soffice";
+			sofficeFound=true;
+	        }
+		else if (QFile::exists("/usr/lib64/ooo-2.0/program/soffice")) {
+			soffice="/usr/lib64/ooo-2.0/program/soffice";
+			sofficeFound=true;
+	        }
 	}
-	else if (QFile::exists(soffice+"/soffice")){
-		soffice+="/soffice";
-		sofficeFound=true;
-	}
-	else if (QFile::exists(soffice+"/program/soffice")){
-		soffice+="/program/soffice";
-		sofficeFound=true;
-	}
-	else if (QFile::exists(soffice+"/program/soffice.bin")){
-		soffice+="/program/soffice.bin";
-		sofficeFound=true;
+
+	if (sofficeFound == false) {
+		// The user selected another path or the Novell wrappers were not found
+		// therefore we find the wrapper from the given path
+		if (QFile::exists(soffice+"/soffice")){
+			soffice+="/soffice";
+			sofficeFound=true;
+		}
+		else if (QFile::exists(soffice+"/program/soffice")){
+			soffice+="/program/soffice";
+			sofficeFound=true;
+		}
+		else if (QFile::exists(soffice+"/program/soffice.bin")){
+			soffice+="/program/soffice.bin";
+			sofficeFound=true;
+		}
 	}
+
 	if (quickstartEnabled != config->readBoolEntry("quickstart", false)){
 		if (quickstartEnabled){
 			quickstartEnabled=false;

Places

File oooqs-1.0_rc3-10.2_wrappers.patch of Package OpenOffice_org-Quickstarter

Places