добавил ошибку c_oAscError.ID.ConvertationMS_OFFCRYPTO для зашифрованных ms файлов.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50386 954022d7-b5bf-4e40-9824-e11837661b57

Excel/api.js

@@ -3109,7 +3109,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 				case c_oAscServerError.TaskResult : nRes = c_oAscError.ID.Database;break;
 				case c_oAscServerError.ConvertDownload : nRes = c_oAscError.ID.DownloadError;break;
 				case c_oAscServerError.ConvertTimeout : nRes = c_oAscError.ID.ConvertationTimeout;break;
-				case c_oAscServerError.ConvertMS_OFFCRYPTO :
+				case c_oAscServerError.ConvertMS_OFFCRYPTO : nRes = c_oAscError.ID.ConvertationMS_OFFCRYPTO;break;
 				case c_oAscServerError.ConvertUnknownFormat :
 				case c_oAscServerError.ConvertReadFile :
 				case c_oAscServerError.Convert : nRes = c_oAscError.ID.ConvertationError;break;

Excel/apiDefines.js

@@ -26,6 +26,7 @@
 		CannotMoveRange:        -16,
 		UplImageUrl: 			-17,
 		CoAuthoringDisconnect:	-18,
+		ConvertationMS_OFFCRYPTO:-19,
 		
 		
 		VKeyEncrypt:			-20,

PowerPoint/api.js

@@ -4854,7 +4854,7 @@ function _mapAscServerErrorToAscError(nServerError)
 		case c_oAscServerError.TaskResult : nRes = c_oAscError.ID.Database;break;
 		case c_oAscServerError.ConvertDownload : nRes = c_oAscError.ID.DownloadError;break;
 		case c_oAscServerError.ConvertTimeout : nRes = c_oAscError.ID.ConvertationTimeout;break;
-		case c_oAscServerError.ConvertMS_OFFCRYPTO :
+		case c_oAscServerError.ConvertMS_OFFCRYPTO : nRes = c_oAscError.ID.ConvertationMS_OFFCRYPTO;break;
 		case c_oAscServerError.ConvertUnknownFormat :
 		case c_oAscServerError.ConvertReadFile :
 		case c_oAscServerError.Convert : nRes = c_oAscError.ID.ConvertationError;break;

PowerPoint/apiDefines.js

@@ -114,7 +114,7 @@ var c_oAscError = {
 		UplImageFileCount: 		-11,
 		NoSupportClipdoard:		-12,
 		CoAuthoringDisconnect:	-18,
-
+		ConvertationMS_OFFCRYPTO:-19,
 		VKeyEncrypt: 			-20,
 		KeyExpire: 				-21,
 		UserCountExceed: 		-22

Word/api.js

@@ -6898,7 +6898,7 @@ function _mapAscServerErrorToAscError(nServerError)
 		case c_oAscServerError.TaskResult : nRes = c_oAscError.ID.Database;break;
 		case c_oAscServerError.ConvertDownload : nRes = c_oAscError.ID.DownloadError;break;
 		case c_oAscServerError.ConvertTimeout : nRes = c_oAscError.ID.ConvertationTimeout;break;
-		case c_oAscServerError.ConvertMS_OFFCRYPTO :
+		case c_oAscServerError.ConvertMS_OFFCRYPTO : nRes = c_oAscError.ID.ConvertationMS_OFFCRYPTO;break;
 		case c_oAscServerError.ConvertUnknownFormat :
 		case c_oAscServerError.ConvertReadFile :
 		case c_oAscServerError.Convert : nRes = c_oAscError.ID.ConvertationError;break;

Word/apiDefines.js

@@ -94,6 +94,7 @@ var c_oAscError = {
         SplitCellRowsDivider:   -15,
 
 		CoAuthoringDisconnect:	-18,
+		ConvertationMS_OFFCRYPTO:-19,
 
 		VKeyEncrypt:			-20,
 		KeyExpire:				-21,