From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 29 Apr 2011 11:48:50 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9280c02e0827fd5227437c5fb3b40294e67a65a6;p=cubeextranet.git

---

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 777e21259..55effc796 100644
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -41,7 +41,6 @@ class wsDocument extends cubeMetier {
 
 	const NORMAL = 0;
 	const FLATTEN = 1;
-	const TEXTS_AS_SHAPES = 1.5;
 	const POLY2BITMAP = 2;
 	const BITMAP = 3;
 	const BARBARE_PNM = 4;
@@ -49,7 +48,7 @@ class wsDocument extends cubeMetier {
 
 	const MAX = 5;
 
-	public static $methods = array(NORMAL, FLATTEN, TEXTS_AS_SHAPES, POLYTOBITMAP, BITMAP, BARBARE_PNM, BARBARE_GS);
+	public static $methods = array(NORMAL, FLATTEN, POLYTOBITMAP, BITMAP, BARBARE_PNM, BARBARE_GS);
 
 	const PNM_FILL = 2;
 
@@ -764,7 +763,7 @@ disablelinks                Disable links.
 			unlink($this->out . $prefix . $page . '.swf');
 		}
 
-		if ($method < self::BARBARE_PNM) {
+		if (!in_array($method, array(self::BARBARE_PNM, self::BARBARE_GS))) {
 			$pdf2swf = new cubeCommandLine('pdf2swf', null, true);
 			$pdf2swf->setPath(CONVERTER_PATH);
 
@@ -776,9 +775,6 @@ disablelinks                Disable links.
 			} elseif ($method == self::FLATTEN) {
 				$pdf2swf->setArg('flatten');
 				$multiply = 1;
-			} elseif ($method == self::TEXTS_AS_SHAPES) {
-				$pdf2swf->setArg('--shapes');
-				$multiply = 1;
 			} elseif ($method == self::POLY2BITMAP) {
 				// Raster graphics, keep texts
 				$pdf2swf->setArg('set poly2bitmap');