При сборке не инициализируем objectRenderer. Из-за этого не собирались файлы.

Удалил лишние функции.

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

Common/Charts/DrawingObjects.js

@@ -1317,8 +1317,8 @@ function DrawingObjects() {
     var autoShapeTrack = null;
     var scrollOffset = new ScrollOffset();
 
-    var aObjects = null;
-    var aImagesSync = null;
+    var aObjects = [];
+    var aImagesSync = [];
     var aBoundsCheckers = [];
 
     _this.zoom = { last: 1, current: 1 };
@@ -1413,11 +1413,6 @@ function DrawingObjects() {
         return ( (_t.graphicObject.lockType != c_oAscLockTypes.kLockTypeNone) && (_t.graphicObject.lockType != c_oAscLockTypes.kLockTypeMine) )
     };
 
-    DrawingBase.prototype.getWorkbook = function() {
-        var _t = this;
-        return (_t.worksheet ? _t.worksheet.model.workbook : null);
-    };
-
     DrawingBase.prototype.getCanvasContext = function() {
         return _this.drawingDocument.CanvasHitContext;
     };
@@ -2003,10 +1998,6 @@ function DrawingObjects() {
         autoShapeTrack.Graphics.CalculateFullTransform();
     };
 
-    _this.getWorkbook = function() {
-        return (worksheet ? worksheet.model.workbook : null);
-    };
-
     _this.getCanvasContext = function() {
         return _this.drawingDocument.CanvasHitContext;
     };

Common/SerializeCommonWordExcel.js

@@ -934,28 +934,3 @@ function isRealObject(obj)
 {
     return obj !== null && typeof obj === "object";
 }
-function WriteObjectLong(Writer, Object)
-{
-    var field_count = 0;
-    for(var key in Object)
-    {
-        ++field_count;
-    }
-    Writer.WriteLong(field_count);
-    for(key in Object)
-    {
-        Writer.WriteString2(key);
-        Writer.WriteLong(Object[key]);
-    }
-}
-function ReadObjectLong(Reader)
-{
-    var ret = {};
-    var field_count = Reader.GetLong();
-    for(var index =0; index < field_count; ++index)
-    {
-        var key = Reader.GetString2();
-        ret[key] = Reader.GetLong();
-    }
-    return ret;
-}

Excel/view/WorkbookView.js

@@ -653,7 +653,9 @@
 
 		WorkbookView.prototype._onGetSelectionState = function () {
 			var ws = this.getWorksheet();
-			var res = ws.objectRender.controller.getSelectionState();
+			var res = null;
+			if (isRealObject(ws.objectRender) && isRealObject(ws.objectRender.controller))
+				res = ws.objectRender.controller.getSelectionState();
 			// ToDo лучше на getSelectionState возвращать null
 			return (res && res[0] && res[0].focus) ? res : null;
 		};

Excel/view/WorksheetView.js

@@ -1076,7 +1076,8 @@
 
 		WorksheetView.prototype._prepareDrawingObjects = function () {
 			this.objectRender = new DrawingObjects();
-			this.objectRender.init(this);
+			if (!window["NATIVE_EDITOR_ENJINE"])
+				this.objectRender.init(this);
 		};
 
 		WorksheetView.prototype._initWorksheetDefaultWidth = function () {