Свойства для шейпов и картинок

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

Common/Charts/DrawingObjects.js

@@ -4111,13 +4111,6 @@ function DrawingObjects() {
 		}
 	}
 	
-	_this.getGraphicObjectProps = function() {
-		
-		var props = [];
-		var selectedObjects = _this.controller.selectedObjects;
-		return props;
-	}
-	
 	_this.insertUngroupedObjects = function(idGroup, aGraphics) {
 		
 		if ( idGroup && aGraphics.length ) {

Excel/api.js

@@ -2101,7 +2101,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 			
 			asc_getGraphicObjectProps: function() {
 				var ws = this.wb.getWorksheet();
-				return ws.objectRender.getGraphicObjectProps();
+				return ws.objectRender.controller.getGraphicObjectProps();
 			},
 			
 			asyncImageStartLoaded: function() {

Excel/apiDefines.js

@@ -323,6 +323,17 @@ var c_oAscStyleImage = {
 	Document	: 1
 };
 
+var c_oAscFill = {
+    FILL_TYPE_BLIP   : 1,
+    FILL_TYPE_NOFILL : 2,
+    FILL_TYPE_SOLID	 : 3
+};
+
+var c_oAscStrokeType = {
+    STROKE_NONE: 0,
+    STROKE_COLOR: 1
+};
+ 
 var c_oAscCoAuthoringMeBorderColor					= "rgba(22,156,0,1)";
 var c_oAscCoAuthoringOtherBorderColor				= "rgba(238,53,37,1)";
 var c_oAscCoAuthoringLockTablePropertiesBorderColor	= "rgba(255,144,0,1)";

Excel/model/DrawingObjects/Format/Image.js

@@ -348,6 +348,12 @@ CImage.prototype =
             return this.group.getFullFlipH() ? !this.flipH : this.flipH;
     },
 
+	getImageUrl: function()
+    {
+        if(isRealObject(this.blipFill))
+            return this.blipFill.RasterImageId;
+        return null;
+    },
 
     getFullFlipV: function()
     {

Excel/model/DrawingObjects/Format/Shape.js

@@ -1097,6 +1097,57 @@ CShape.prototype =
         return {kd1: 1, kd2: 1};
     },
 
+	getPresetGeom: function()
+    {
+        if(this.spPr.geometry != null)
+        {
+            return this.spPr.geometry.preset;
+        }
+        else
+        {
+            return null;
+        }
+    },
+	
+	getFill: function()
+    {
+        return this.brush;
+    },
+	
+	 getStroke: function()
+    {
+        if(!isRealObject(this.pen))
+            return null;
+        return this.pen;
+    },
+	
+	canChangeArrows : function()
+    {
+        if(this.spPr.geometry == null)
+        {
+            return false;
+        }
+        var _path_list = this.spPr.geometry.pathLst;
+        var _path_index;
+        var _path_command_index;
+        var _path_command_arr;
+        for(_path_index = 0; _path_index < _path_list.length; ++_path_index)
+        {
+            _path_command_arr = _path_list[_path_index].ArrPathCommandInfo;
+            for(_path_command_index = 0; _path_command_index < _path_command_arr.length; ++ _path_command_index)
+            {
+                if(_path_command_arr[_path_command_index].id == 5)
+                {
+                    break;
+                }
+            }
+            if(_path_command_index == _path_command_arr.length)
+            {
+                return true;
+            }
+        }
+        return false;
+    },
 
     getRotateAngle: function(x, y)
     {