Merged revision(s) from AVS/Sources/TeamlabOffice/branches/TeamlabOffice_v3.6_Opensource:

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

Build/opensource/webexcel.json

@@ -27,7 +27,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",
@@ -38,6 +38,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",
@@ -156,10 +157,11 @@
 				"../../Word/Math/operators.js",
 				"../../Word/Math/accent.js",
 				"../../Word/Math/borderBox.js",
-				
+				"../../Common/CollaborativeEditingBase.js",
                 "../../Excel/model/DrawingObjects/GlobalCounters.js",
 
                 "../../Word/apiCommon.js",
+                "../../Common/apiBase.js",
                 "../../Excel/api.js",
                 "../../Common/Shapes/EditorSettings.js"
             ],

Build/opensource/webpowerpoint.json

@@ -13,7 +13,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",
@@ -34,6 +34,7 @@
                 "../../Word/Editor/Styles.js",
                 "../../Word/Editor/Numbering.js",
                 "../../Word/Drawing/Metafile.js",
+				"../../Common/CollaborativeEditingBase.js",
                 "../../PowerPoint/Editor/CollaborativeEditing.js",
 
                 "../../Word/Drawing/GraphicsEvents.js",
@@ -136,6 +137,7 @@
                 "../../PowerPoint/Editor/Format/GroupPrototype.js",
                 "../../PowerPoint/Editor/Format/ChartSpacePrototype.js",
                 "../../PowerPoint/Editor/Format/GraphicFrame.js",
+                "../../Common/apiBase.js",
                 "../../PowerPoint/api.js",
                 "../../PowerPoint/apiCommon.js",
                 "../../Word/apiCommon.js",
@@ -145,7 +147,6 @@
 				"../../Excel/model/Workbook.js",
 				"../../Excel/model/CellInfo.js",
 				"../../Common/AdvancedOptions.js",
-                "../../Common/Locks.js",
                 "../../Common/Shapes/EditorSettings.js",
                 "../../PowerPoint/themes/Themes.js"
             ],

Build/opensource/webword.json

@@ -29,7 +29,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",
 
 
@@ -107,6 +107,7 @@
                 "../../Word/Drawing/HatchPattern.js",
                 "../../Word/Drawing/ShapeDrawer.js",
                 "../../Word/Drawing/Metafile.js",
+				"../../Common/CollaborativeEditingBase.js",
                 "../../Word/Drawing/DrawingDocument.js",
                 "../../Word/Drawing/GraphicsEvents.js",
                 "../../Common/Scrolls/iscroll.js",
@@ -118,6 +119,7 @@
                 "../../Common/scroll.js",
                 "../../Word/Editor/SerializeCommon.js",
                 "../../Word/apiDefines.js",
+                "../../Common/apiBase.js",
                 "../../Word/api.js",
                 "../../Word/apiCommon.js",
                 "../../Word/document/empty.js",
@@ -142,7 +144,6 @@
 				"../../Excel/model/Workbook.js",
 				"../../Excel/model/CellInfo.js",
 				"../../Common/AdvancedOptions.js",
-				"../../Common/Locks.js",
 				"../../Common/Shapes/EditorSettings.js"
             ],
             "dst": "../../Word/sdk-all.js"