title, description

cell/model/DrawingObjects/Format/ShapePrototype.js

@@ -215,11 +215,43 @@ function addToDrawings(worksheet, graphic, position, lockByDefault, anchor)
 
 CShape.prototype.addToDrawingObjects =  function(pos)
 {
-    var controller = this.getDrawingObjectsController();
     var position = addToDrawings(this.worksheet, this, pos, /*lockByDefault*/undefined, undefined);
     var data = {Type: AscDFH.historyitem_AutoShapes_AddToDrawingObjects, Pos: position};
     History.Add(this, data);
     this.worksheet.addContentChanges(new AscCommon.CContentChangesElement(AscCommon.contentchanges_Add, data.Pos, 1, data));
+
+    var nv_sp_pr, bNeedSet = false;
+    switch(this.getObjectType()){
+        case AscDFH.historyitem_type_Shape:{
+            if(!this.nvSpPr){
+                bNeedSet = true;
+            }
+            break;
+        }
+        case AscDFH.historyitem_type_ChartSpace:{
+            if(!this.nvGraphicFramePr){
+                bNeedSet = true;
+            }
+            break;
+        }
+        case AscDFH.historyitem_type_ImageShape:{
+            if(!this.nvPicPr){
+                bNeedSet = true;
+            }
+            break;
+        }
+        case AscDFH.historyitem_type_GroupShape:{
+            if(!this.nvGrpSpPr){
+                bNeedSet = true;
+            }
+            break;
+        }
+    }
+    if(bNeedSet){
+        nv_sp_pr = new AscFormat.UniNvPr();
+        nv_sp_pr.cNvPr.setId(++AscFormat.Ax_Counter.GLOBAL_AX_ID_COUNTER);
+        this.setNvSpPr(nv_sp_pr);
+    }
 };
 
 

common/Drawings/CommonController.js

@@ -2531,6 +2531,11 @@ DrawingObjectsController.prototype =
             objects_by_type.charts[i].setTitle(props.title);
         }
 
+        for(i = 0; i < objects_by_type.images.length; ++i)
+        {
+            objects_by_type.images[i].setTitle(props.title);
+        }
+
         for(i = 0; i < objects_by_type.shapes.length; ++i)
         {
             objects_by_type.shapes[i].setDescription(props.description);
@@ -2544,6 +2549,11 @@ DrawingObjectsController.prototype =
             objects_by_type.charts[i].setDescription(props.description);
         }
 
+        for(i = 0; i < objects_by_type.images.length; ++i)
+        {
+            objects_by_type.images[i].setDescription(props.description);
+        }
+
         if(typeof props.ImageUrl === "string" && props.ImageUrl.length > 0)
         {
             for(i = 0; i < objects_by_type.images.length; ++i)
@@ -7314,6 +7324,10 @@ DrawingObjectsController.prototype =
             shape_props.ShapeProperties.canChangeArrows = props.shapeProps.canChangeArrows;
             shape_props.ShapeProperties.bFromChart = props.shapeProps.bFromChart;
             shape_props.ShapeProperties.lockAspect = props.shapeProps.lockAspect;
+            shape_props.ShapeProperties.description = props.shapeProps.description;
+            shape_props.ShapeProperties.title = props.shapeProps.title;
+            shape_props.description = props.shapeProps.description;
+            shape_props.title = props.shapeProps.title;
             shape_props.ShapeProperties.textArtProperties = AscFormat.CreateAscTextArtProps(props.shapeProps.textArtProperties);
             shape_props.lockAspect = props.shapeProps.lockAspect;
             if(props.shapeProps.textArtProperties)
@@ -7382,6 +7396,9 @@ DrawingObjectsController.prototype =
             image_props.oleWidth = props.imageProps.oleWidth;
             image_props.oleHeight = props.imageProps.oleHeight;
 
+            image_props.description = props.imageProps.description;
+            image_props.title = props.imageProps.title;
+
             if(!bParaLocked)
             {
                 bParaLocked = image_props.Locked;
@@ -7400,6 +7417,9 @@ DrawingObjectsController.prototype =
             {
                 bParaLocked = chart_props.Locked;
             }
+
+            chart_props.description = props.chartProps.description;
+            chart_props.title = props.chartProps.title;
             ret.push(chart_props);
         }
         for (i = 0; i < ret.length; i++)

common/Drawings/Format/GraphicObjectBase.js

@@ -428,6 +428,9 @@
     };
 
     CGraphicObjectBase.prototype.setTitle = function(sTitle){
+        if(undefined === sTitle){
+            return;
+        }
         var oNvPr = this.getNvProps();
         if(oNvPr){
             oNvPr.setTitle(sTitle ? sTitle : null);
@@ -435,6 +438,9 @@
     };
 
     CGraphicObjectBase.prototype.setDescription = function(sDescription){
+        if(undefined === sDescription){
+            return;
+        }
         var oNvPr = this.getNvProps();
         if(oNvPr){
             oNvPr.setDecr(sDescription ? sDescription : null);

slide/api.js

@@ -3924,6 +3924,9 @@ background-repeat: no-repeat;\
 		ImagePr.Width      = null === obj.Width ? null : parseFloat(obj.Width);
 		ImagePr.Height     = null === obj.Height ? null : parseFloat(obj.Height);
 
+		ImagePr.title       = obj.title;
+		ImagePr.description = obj.description;
+
 		if (undefined != obj.Position)
 		{
 			ImagePr.Position =