поправлен баг при сборке

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

Common/Drawings/Format/ChartSpace.js

@@ -9,6 +9,28 @@ var CHART_STYLE_MANAGER = null;
 var SKIP_LBL_LIMIT = 100;
 
 
+
+function ReadWBModel(oDrawing, oReader)
+{
+    if(isRealObject(window["Asc"]) && isRealObject(window["Asc"]["editor"]))
+    {
+        if(readBool(oReader))
+        {
+            var api = window["Asc"]["editor"];
+            if (api.wbModel )
+            {
+                var id = readString(oReader);
+                oDrawing.worksheet = api.wbModel.getWorksheetById(id);
+            }
+        }
+        else
+        {
+            oDrawing.worksheet = null;
+        }
+    }
+}
+
+
 function checkBlackUnifill(unifill, bLines)
 {
     if(unifill && unifill.fill && unifill.fill.color)
@@ -7977,19 +7999,7 @@ CChartSpace.prototype =
             }
             case historyitem_AutoShapes_SetWorksheet:
             {
-                if(readBool(r))
-                {
-                    var api = window["Asc"]["editor"];
-                    if ( api.wb )
-                    {
-                        var id = readString(r);
-                        this.worksheet = api.wbModel.getWorksheetById(id);
-                    }
-                }
-                else
-                {
-                    this.worksheet = null;
-                }
+                ReadWBModel(this, r);
                 break;
             }
             case historyitem_ChartSpace_SetParent:

Common/Drawings/Format/GroupShape.js

@@ -1821,19 +1821,7 @@ CGroupShape.prototype =
             }
             case historyitem_AutoShapes_SetWorksheet:
             {
-                if(readBool(r))
-                {
-                    var api = window["Asc"]["editor"];
-                    if ( api.wb )
-                    {
-                        var id = readString(r);
-                        this.worksheet = api.wbModel.getWorksheetById(id);
-                    }
-                }
-                else
-                {
-                    this.worksheet = null;
-                }
+                ReadWBModel(this, r);
                 break;
             }
             case historyitem_ShapeSetBDeleted:

Common/Drawings/Format/Image.js

@@ -926,19 +926,7 @@ CImageShape.prototype =
             }
             case historyitem_AutoShapes_SetWorksheet:
             {
-                if(readBool(r))
-                {
-                    var api = window["Asc"]["editor"];
-                    if ( api.wb )
-                    {
-                        var id = readString(r);
-                        this.worksheet = api.wbModel.getWorksheetById(id);
-                    }
-                }
-                else
-                {
-                    this.worksheet = null;
-                }
+                ReadWBModel(this, r);
                 break;
             }
             case historyitem_ShapeSetBDeleted:

Common/Drawings/Format/Shape.js

@@ -3814,19 +3814,7 @@ CShape.prototype =
                 }
                 case historyitem_AutoShapes_SetWorksheet:
                 {
-                    if(readBool(r))
-                    {
-                        var api = window["Asc"]["editor"];
-                        if ( api.wb )
-                        {
-                            var id = readString(r);
-                            this.worksheet = api.wbModel.getWorksheetById(id);
-                        }
-                    }
-                    else
-                    {
-                        this.worksheet = null;
-                    }
+                    ReadWBModel(this, r);
                     break;
                 }
                 case historyitem_ShapeSetBDeleted: