правки для локальной версии

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

Build/local/webexcel.json

 {
     "info": {
-        "version": "3.5.0",
+        "version": "3.6.0",
         "build": 148
     },
     "update_src": {
@@ -18,7 +18,6 @@
                 "../../Common/apiCommon.js",
                 "../../Common/commonDefines.js",
                 "../../Common/editorscommon.js",
-				"../../Common/Private/editorscommon.js",
                 "../../Common/NumFormat.js",
                 "../../Common/Charts/charts.js",
                 "../../Common/Charts/DrawingArea.js",
@@ -32,7 +31,7 @@
                 "../../Word/Drawing/WorkEvents.js",
                 "../../Word/Drawing/Externals.js",
                 "../../Word/Drawing/Metafile.js",
-                "../../Excel/model/DrawingObjects/GlobalLoaders.js",
+                "../../Common/GlobalLoaders.js",
                 "../../Excel/apiDefines.js",
                 "../../Excel/document/empty-workbook.js",
                 "../../Excel/utils/utils.js",
@@ -43,6 +42,7 @@
                 "../../Excel/model/CollaborativeEditing.js",
                 "../../Excel/model/ConditionalFormatting.js",
                 "../../Excel/model/FormulaObjects/parserFormula.js",
+                "../../Excel/model/FormulaObjects/_xlfnFunctions.js",
 				"../../Excel/model/FormulaObjects/dateandtimeFunctions.js",
                 "../../Excel/model/FormulaObjects/engineeringFunctions.js",
                 "../../Excel/model/FormulaObjects/cubeFunctions.js",
@@ -155,8 +155,12 @@
                 "../../Excel/model/DrawingObjects/GlobalCounters.js",
                 "../../Word/apiCommon.js",
                 "../../Excel/apiCommonExport.js",
+                "../../Common/apiBase.js",
                 "../../Excel/api.js",
-                "../../Excel/Private/api.js",
+				"../../Common/Private/license.js",
+                "../../Excel/Private/license.js",
+				"../../Excel/Private/comments.js",
+				"../../Common/Local/common.js",
 				"../../Excel/Local/api.js"
             ],
             "dst": "../../Excel/sdk-all.js",
@@ -164,7 +168,7 @@
                 "../../Common/Build/Externs.js",
                 "../../Common/3rdparty/jquery/jquery.min.js",
                 "../../Common/3rdparty/Underscore/underscore-min.js",
-                "../../Common/3rdparty/Sockjs/sockjs-0.3.min.js",
+                "../../Common/3rdparty/Sockjs/sockjs.min.js",
                 "../../Common/3rdparty/XRegExp/xregexp-all-min.js",
                 "../../Common/3rdparty/jszip/jszip.min.js",
                 "../../Common/3rdparty/jszip-utils/jszip-utils.min.js",
@@ -175,7 +179,6 @@
             "map": "sdk-all.js.map",
             "log": "../../Excel/Build/Log",
             "define": [
-                "ASC_DOCS_API_LOAD_COAUTHORING_SETTINGS=false",
                 "ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT=true"
             ]
         },
@@ -203,8 +206,8 @@
                 "expand": true,
                 "cwd": "../../Excel/",
                 "src": [
+                    "../Common/apiBase.js",
                     "api.js",
-                    "Private/api.js",
                     "apiDefines.js",
                     "view/EventsController.js",
                     "view/HandlerList.js",

Build/local/webpowerpoint.json

 {
     "info": {
-        "version": "3.5.0",
+        "version": "3.6.0",
         "build": 158
     },
     "update_src": {
@@ -17,7 +17,7 @@
                 "../../Common/FontsFreeType/FontManager.js",
                 "../../Common/FontsFreeType/font_map.js",
                 "../../Word/Drawing/Externals.js",
-                "../../Word/Drawing/GlobalLoaders.js",
+                "../../Common/GlobalLoaders.js",
                 "../../Common/commonDefines.js",
                 "../../Common/apiCommon.js",
                 "../../Common/downloaderfiles.js",
@@ -25,7 +25,6 @@
                 "../../Common/docscoapi.js",
                 "../../Common/wordcopypaste.js",
                 "../../Common/editorscommon.js",
-				"../../Common/Private/editorscommon.js",
                 "../../PowerPoint/Drawing/ThemeLoader.js",
                 "../../Common/Charts/DrawingObjects.js",
                 "../../Common/SerializeCommonWordExcel.js",
@@ -129,8 +128,11 @@
                 "../../PowerPoint/Editor/Format/GroupPrototype.js",
                 "../../PowerPoint/Editor/Format/ChartSpacePrototype.js",
                 "../../PowerPoint/Editor/Format/GraphicFrame.js",
+                "../../Common/apiBase.js",
                 "../../PowerPoint/api.js",
-                "../../PowerPoint/Private/api.js",
+				"../../Common/Private/license.js",
+                "../../PowerPoint/Private/license.js",
+				"../../PowerPoint/Private/comments.js",
                 "../../PowerPoint/apiCommon.js",
                 "../../Word/apiCommon.js",
                 "../../PowerPoint/apiExport.js",
@@ -140,7 +142,8 @@
                 "../../Excel/model/Workbook.js",
                 "../../Excel/model/CellInfo.js",
                 "../../Common/AdvancedOptions.js",
-                "../../Common/Locks.js",
+                "../../Common/Private/Locks.js",
+				"../../Common/Local/common.js",
 				"../../PowerPoint/Local/api.js"
             ],
             "dst": "../../PowerPoint/sdk-all.js",
@@ -148,7 +151,7 @@
                 "../../Common/Build/Externs.js",
                 "../../Common/3rdparty/jquery/jquery.min.js",
                 "../../Common/3rdparty/Underscore/underscore-min.js",
-                "../../Common/3rdparty/Sockjs/sockjs-0.3.min.js",
+                "../../Common/3rdparty/Sockjs/sockjs.min.js",
                 "../../Common/3rdparty/XRegExp/xregexp-all-min.js",
                 "../../Common/3rdparty/jszip/jszip.min.js",
                 "../../Common/3rdparty/jszip-utils/jszip-utils.min.js",
@@ -157,7 +160,6 @@
             "map": "sdk-all.js.map",
             "log": "../../PowerPoint/Build/Log",
             "define": [
-                "ASC_DOCS_API_LOAD_COAUTHORING_SETTINGS=false",
                 "ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT=true"
             ]
         },
@@ -180,8 +182,8 @@
                 "expand": true,
                 "cwd": "../../PowerPoint/",
                 "src": [
+                    "../Common/apiBase.js",
                     "api.js",
-                    "Private/api.js",
                     "apiCommon.js",
                     "apiDefines.js"
                 ],

Build/local/webword.json

 {
     "info": {
-        "version": "3.5.0",
-        "build": 167
+        "version": "3.6.0",
+        "build": 168
     },
     "update_src": {
         "revision": "HEAD",
@@ -22,7 +22,6 @@
                 "../../Common/downloaderfiles.js",
                 "../../Common/commonDefines.js",
                 "../../Common/editorscommon.js",
-                "../../Common/Private/editorscommon.js",
                 "../../Common/Shapes/Serialize.js",
                 "../../Common/Shapes/SerializeWriter.js",
                 "../../Common/SerializeCommonWordExcel.js",
@@ -34,7 +33,7 @@
                 "../../Common/FontsFreeType/FontManager.js",
                 "../../Common/FontsFreeType/font_map.js",
                 "../../Word/Drawing/Externals.js",
-                "../../Word/Drawing/GlobalLoaders.js",
+                "../../Common/GlobalLoaders.js",
                 "../../Word/Drawing/translations.js",
                 "../../Common/Charts/charts.js",
                 "../../Common/Charts/ChartsDrawer.js",
@@ -115,8 +114,12 @@
                 "../../Common/scroll.js",
                 "../../Word/Editor/SerializeCommon.js",
                 "../../Word/apiDefines.js",
+                "../../Common/apiBase.js",
                 "../../Word/api.js",
-                "../../Word/Private/api.js",
+				"../../Common/Private/license.js",
+                "../../Word/Private/license.js",
+				"../../Common/Private/versionHistory.js",
+				"../../Word/Private/comments.js",
                 "../../Word/Private/StyleManager.js",
                 "../../Word/Private/MailMerge.js",
                 "../../Word/Private/TrackRevisions.js",
@@ -143,15 +146,16 @@
                 "../../Excel/model/Workbook.js",
                 "../../Excel/model/CellInfo.js",
                 "../../Common/AdvancedOptions.js",
-                "../../Common/Locks.js",
-				"../../Word/Local/api.js",
+                "../../Common/Private/Locks.js",
+				"../../Common/Local/common.js",
+				"../../Word/Local/api.js"
             ],
             "dst": "../../Word/sdk-all.js",
             "externs": [
                 "../../Common/Build/Externs.js",
                 "../../Common/3rdparty/jquery/jquery.min.js",
                 "../../Common/3rdparty/Underscore/underscore-min.js",
-                "../../Common/3rdparty/Sockjs/sockjs-0.3.min.js",
+                "../../Common/3rdparty/Sockjs/sockjs.min.js",
                 "../../Common/3rdparty/XRegExp/xregexp-all-min.js",
                 "../../Common/3rdparty/jszip/jszip.min.js",
                 "../../Common/3rdparty/jszip-utils/jszip-utils.min.js",
@@ -160,7 +164,6 @@
             "map": "sdk-all.js.map",
             "log": "../../Word/Build/Log",
             "define": [
-                "ASC_DOCS_API_LOAD_COAUTHORING_SETTINGS=false",
                 "ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT=true"
             ]
         },
@@ -182,8 +185,8 @@
                 "expand": true,
                 "cwd": "../../Word/",
                 "src": [
+                    "../Common/apiBase.js",
                     "api.js",
-                    "Private/api.js",
                     "apiCommon.js",
                     "apiDefines.js"
                 ],