Commit 61ad07fc authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov

- Fix: При добавлении граф.объекта не приходили свойства в меню(только при клике)

- Fix: При добавлении диаграммы не было селекта

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48852 954022d7-b5bf-4e40-9824-e11837661b57
parent a5295a41
...@@ -186,6 +186,7 @@ CChartAsGroup.prototype = ...@@ -186,6 +186,7 @@ CChartAsGroup.prototype =
addToDrawingObjects: function() addToDrawingObjects: function()
{ {
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_Add_To_Drawing_Objects, null, null, new UndoRedoDataGraphicObjects(this.Id, new UndoRedoDataClosePath()), null); History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_Add_To_Drawing_Objects, null, null, new UndoRedoDataGraphicObjects(this.Id, new UndoRedoDataClosePath()), null);
this.select(this.drawingObjects.controller);
this.drawingObjects.addGraphicObject(this); this.drawingObjects.addGraphicObject(this);
}, },
...@@ -489,7 +490,7 @@ CChartAsGroup.prototype = ...@@ -489,7 +490,7 @@ CChartAsGroup.prototype =
} }
this.init(); this.init();
this.addToDrawingObjects() this.addToDrawingObjects();
}, },
setDrawingBase: function(drawingBase) setDrawingBase: function(drawingBase)
......
...@@ -5725,7 +5725,13 @@ ...@@ -5725,7 +5725,13 @@
cell_info.flags.merge = !!this._getMergedCellsRange(c1, r1); cell_info.flags.merge = !!this._getMergedCellsRange(c1, r1);
cell_info.flags.shrinkToFit = c.getShrinkToFit(); cell_info.flags.shrinkToFit = c.getShrinkToFit();
cell_info.flags.wrapText = c.getWrap(); cell_info.flags.wrapText = c.getWrap();
cell_info.flags.selectionType = this.activeRange.type;
var graphicObjects = this.objectRender.getSelectedGraphicObjects();
if ( graphicObjects.length == 1 )
cell_info.flags.selectionType = this.objectRender.getGraphicSelectionType(graphicObjects[0].Id);
else
cell_info.flags.selectionType = this.activeRange.type;
cell_info.flags.lockText = ("" !== cell_info.text && (isNumberFormat || "" !== cell_info.formula)); cell_info.flags.lockText = ("" !== cell_info.text && (isNumberFormat || "" !== cell_info.formula));
cell_info.font = new asc_CFont(); cell_info.font = new asc_CFont();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment