Объединил c_oAscFileType

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

Common/commonDefines.js

@@ -3,6 +3,38 @@
 var g_bDate1904 = false;
 var FONT_THUMBNAIL_HEIGHT = (7 * 96.0 / 25.4) >> 0;
 
+//files type for Saving & DownloadAs
+var c_oAscFileType = {
+	PDF		: 0x0201,
+	HTML	: 0x0803,
+
+	// Word
+	DOCX	: 0x0041,
+	DOC		: 0x0042,
+	ODT		: 0x0043,
+	RTF		: 0x0044,
+	TXT		: 0x0045,
+	HTML_ZIP: 0x0803,	// ToDo Убрать
+	MHT		: 0x0047,
+	EPUB	: 0x0048,
+	FB2		: 0x0049,
+	MOBI	: 0x004a,
+	DOCY	: 0x1001,
+	JSON	: 0x0808,	// Для mail-merge
+
+	// Excel
+	XLSX	: 0x0101,
+	XLS		: 0x0102,
+	ODS		: 0x0103,
+	CSV		: 0x0104,
+	XLSY	: 0x1002,
+
+	// PowerPoint
+	PPTX	: 0x0081,
+	PPT		: 0x0082,
+	ODP		: 0x0083
+};
+
 // Режимы отрисовки
 var c_oAscFontRenderingModeType = {
 	noHinting				: 1,

Excel/api.js

@@ -605,7 +605,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 				return;
 			}
 
-			this.asc_DownloadAs(c_oAscFileType.PDFPRINT);
+			this.asc_DownloadAs(c_oAscFileType.PDF);
 		};
 
 		spreadsheet_api.prototype.asc_Copy = function(){
@@ -1105,7 +1105,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 			if(null != sSaveKey)
 				oAdditionalData["savekey"] = sSaveKey;
 			var data;
-			if(c_oAscFileType.PDFPRINT === sFormat)
+			if(c_oAscFileType.PDF === sFormat)
 			{
 				if (null === this.printPagesData) {
 					// Рассчитываем данные о страницах
@@ -3276,7 +3276,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 						var oAdditionalData = {};
 						oAdditionalData["documentId"] = t.documentId+ "." + t.documentFormat;
 						oAdditionalData["vkey"] = t.documentVKey;
-						oAdditionalData["outputformat"] = c_oAscFileType.PDFPRINT;
+						oAdditionalData["outputformat"] = c_oAscFileType.PDF;
 
 						t.adjustPrint = new asc_CAdjustPrint();
 						t.printPagesData = t.wb.calcPagesPrint(t.adjustPrint);

Excel/apiDefines.js

@@ -60,17 +60,6 @@ var c_oAscError = {
 var c_oAscConfirm = {
 	ConfirmReplaceRange : 0
 };
-var c_oAscFileType = {
-	INNER		: 0x0101,
-	XLSX		: 0x0101,
-	XLS			: 0x0102,
-	ODS			: 0x0103,
-	CSV			: 0x0104,
-	HTML		: 0x0803,
-	PDFPRINT	: 0x0201,
-	ZIP			: 0x0803,
-	XLSY		: 0x1002
-};
 
 var c_oAscAsyncAction = {
 	Open				: 0,  // открытие документа

PowerPoint/apiDefines.js

@@ -60,14 +60,6 @@ var c_oAscVertAlignJc = {
     Center : 0x01, // var vertalignjc_Center = 0x01;
     Bottom : 0x02  // var vertalignjc_Bottom = 0x02
 };
-//files type for Saving & DownloadAs
-var c_oAscFileType = {
-	INNER:	0x0081,
-	PDF:	0x0201,
-	PPTX:	0x0081,
-	PPT:	0x0082,
-	ODP:	0x0083
-};
 
 // Right = 0; Left = 1; Center = 2; Justify = 3;
 var c_oAscAlignType = {

Word/api.js

@@ -974,7 +974,7 @@ asc_docs_api.prototype.LoadDocument = function(c_DocInfo)
 				// case "rtf" : documentFormatSave = c_oAscFileType.RTF;break;
 				// case "txt" : documentFormatSave = c_oAscFileType.TXT;break;
 				// case "htm" :
-				// case "html" : documentFormatSave = c_oAscFileType.HTML_ZIP;break;
+				// case "html" : documentFormatSave = c_oAscFileType.HTML;break;
 				// case "mht" : documentFormatSave = c_oAscFileType.MHT;break;
 				// case "pdf" : documentFormatSave = c_oAscFileType.PDF;break;
 				// case "epub" : documentFormatSave = c_oAscFileType.EPUB;break;

Word/apiDefines.js

@@ -19,24 +19,6 @@ var c_oAscAsyncAction = {
 	ApplyChanges		: 9, // применение изменений от другого пользователя.
 	MailMergeLoadFile	: 10// загрузка файла для mail merge
 };
-//files type for Saving & DownloadAs
-var c_oAscFileType = {
-	INNER: 		0x0041,
-	DOCX: 		0x0041,
-	DOC: 		0x0042,
-	ODT: 		0x0043,
-	RTF: 		0x0044,
-	TXT: 		0x0045,
-	HTML_ZIP: 	0x0803,
-	MHT: 		0x0047,
-	PDF: 		0x0201,
-	EPUB: 		0x0048,
-	FB2: 		0x0049,
-	MOBI: 		0x004a,
-	DOCY: 		0x1001,
-
-	JSON:		0x0808		// Для mail-merge
-};
 
 // Right = 0; Left = 1; Center = 2; Justify = 3;
 var c_oAscAlignType = {