When converting to a picture, prioritize cell textDecoration over column-defined ones. ACI0105482

Author: e-marchand

Project/Sources/Methods/svg_drawCellValue.4dm

@@ -910,7 +910,7 @@ End for each
 
 		//// TEXT DECORATION ////
 
-		If ($valObj.textDecoration#"")
+		If (($valObj.textDecoration#"") && ($valObj.textDecoration#"$4D_tdnull"))
 
 			// Double underline not implemented so it is replaced by a simple underline
 			$valObj.textDecoration:=Replace string:C233($valObj.textDecoration; "double"; "")

Project/Sources/Methods/svg_parseStyle.4dm

@@ -195,31 +195,35 @@ If ($parsed.font="")
 End if 
 
 If ($parsed.textDecoration="")
-	If (Value type:C1509($style.textDecoration)=Is real:K8:4)
-		
-		If ($style.textDecoration=0)
-			$parsed.textDecoration:="none"
-			
-		Else 
-			
-			Case of 
-				: (($style.textDecoration & 1)>0)
-					$parsed.textDecoration:="underline"
-				: (($style.textDecoration & 8)>0)
-					$parsed.textDecoration:="double underline"
-			End case 
+	Case of 
+		: (Value type:C1509($style.textDecoration)=Is real:K8:4)
 
-			If (($style.textDecoration & 2)>0)
-				$parsed.textDecoration:=$parsed.textDecoration+" line-through"
+			If ($style.textDecoration=0)
+				$parsed.textDecoration:="none"
+				
+			Else 
+				
+				Case of 
+					: (($style.textDecoration & 1)>0)
+						$parsed.textDecoration:="underline"
+					: (($style.textDecoration & 8)>0)
+						$parsed.textDecoration:="double underline"
+				End case 
+				
+				If (($style.textDecoration & 2)>0)
+					$parsed.textDecoration:=$parsed.textDecoration+" line-through"
+				End if 
+				
+				If (($style.textDecoration & 4)>0)
+					$parsed.textDecoration:=$parsed.textDecoration+" overline"
+				End if 
+				
 			End if 
+		: (Value type:C1509($style.textDecoration)=Is null:K8:31)
 
-			If (($style.textDecoration & 4)>0)
-				$parsed.textDecoration:=$parsed.textDecoration+" overline"
-			End if 
+			$parsed.textDecoration:="$4D_tdnull"
 
-		End if 
-		
-	End if 
+	End case 
 End if 
 
 If ($parsed.isVerticalText=2)