Allow upgrade version when importing to v18

Author: e-marchand

Project/Sources/Methods/COMPILER_private.4dm

@@ -16,12 +16,6 @@ C_OBJECT:C1216(vp_isObjectValid; $1)
 C_OBJECT:C1216(vp_METADATA; $1)
 C_TEXT:C284(vp_METADATA; $2)
 
-//___________________________________
-C_OBJECT:C1216(vp_UPDATE; $1)
-
-//___________________________________
-C_OBJECT:C1216(vp_UPDATE_SJS; $1)
-
 //___________________________________
 C_TEXT:C284(vp_endInit; $1)
 C_TEXT:C284(vp_endInit; $2)

Project/Sources/Methods/vp_UPDATE.4dm

@@ -14,36 +14,7 @@ ________________________________________________________
 // Update according ViewPro version
 // ----------------------------------------------------
 // Declarations
-C_OBJECT:C1216($1)
-
-
-C_OBJECT:C1216($Obj_in)
-
-If (False:C215)
-	C_OBJECT:C1216(vp_UPDATE; $1)
-End if 
-
-// ----------------------------------------------------
-// Initialisations
-var $nbParameters:=Count parameters:C259
-
-If (Asserted:C1132($nbParameters>=1; "Missing parameter"))
-	
-	// Required parameters
-	$Obj_in:=$1  // 4DVP object
-	
-	// Optional parameters
-	If ($nbParameters>=2)
-		
-		// <NONE>
-		
-	End if 
-	
-Else 
-	
-	ABORT:C156
-	
-End if 
+#DECLARE($Obj_in : Object)
 
 // ----------------------------------------------------
 If (Storage:C1525.ViewPro.available)
@@ -69,9 +40,3 @@ If (Storage:C1525.ViewPro.available)
 	vp_UPDATE_SJS($Obj_in.spreadJS)
 
 End if 
-
-// ----------------------------------------------------
-// Return
-// <NONE>
-// ----------------------------------------------------
-// End

Project/Sources/Methods/vp_UPDATE_SJS.4dm

@@ -20,23 +20,18 @@ var $Boo_updated : Boolean
 var $Lon_docMajor; $Lon_sjsMajor : Integer
 var $Txt_buffer; $Txt_property : Text
 
-If (False:C215)
-	C_OBJECT:C1216(vp_UPDATE_SJS; $1)
-End if 
-
-
 // ----------------------------------------------------
 Case of 
 
 		//______________________________________________________
 	: ($Obj_in=Null:C1517)
 
-		err_THROW({code: 1 /*Invalid 4D View Pro object*/})
+		err_THROW({code: 1/*Invalid 4D View Pro object*/})
 
 		//______________________________________________________
 	: ($Obj_in.version=Null:C1517)
 
-		err_THROW({code: 1 /*Invalid 4D View Pro object*/})
+		err_THROW({code: 1/*Invalid 4D View Pro object*/})
 
 		//______________________________________________________
 	: ($Obj_in.version=Storage:C1525.ViewPro.spreadJSVersion)  // Current version
@@ -59,7 +54,7 @@ Case of
 				//……………………………………………………………………………………………………………………………………………………………………
 			: ($Lon_docMajor<9)
 
-				err_THROW({code: 1 /*Invalid 4D View Pro object*/})
+				err_THROW({code: 1/*Invalid 4D View Pro object*/})
 
 				//……………………………………………………………………………………………………………………………………………………………………
 			: ($Lon_docMajor<=10)
@@ -98,7 +93,7 @@ Case of
 			: ($Lon_docMajor>=11)
 
 				// v<$Lon_docMajor> to v17 open v<$Lon_docMajor> doc, adjust minor version
-				$Boo_updated:=($Lon_sjsMajor>=$Lon_docMajor) && ($Lon_sjsMajor<=17)
+				$Boo_updated:=($Lon_sjsMajor>=$Lon_docMajor)
 
 				//……………………………………………………………………………………………………………………………………………………………………
 		End case