Commit 1a9bf599 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Bug 26405 - Убрать возможность добавлять текст к автофигурам типа "Lines"

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59169 954022d7-b5bf-4e40-9824-e11837661b57
parent 164728a1
...@@ -22,6 +22,21 @@ function CheckLinePreset(preset) ...@@ -22,6 +22,21 @@ function CheckLinePreset(preset)
return preset === "line"; return preset === "line";
} }
function CheckLinePresetForParagraphAdd(preset)
{
return preset === "line" ||
preset === "bentConnector2" ||
preset === "bentConnector3" ||
preset === "bentConnector4" ||
preset === "bentConnector5" ||
preset === "curvedConnector2" ||
preset === "curvedConnector3" ||
preset === "curvedConnector4" ||
preset === "curvedConnector5" ||
preset === "straightConnector1";
}
function CompareGroups(a, b) function CompareGroups(a, b)
{ {
if(a.group == null && b.group == null) if(a.group == null && b.group == null)
...@@ -1021,7 +1036,7 @@ DrawingObjectsController.prototype = ...@@ -1021,7 +1036,7 @@ DrawingObjectsController.prototype =
{ {
this.applyDocContentFunction(docContentFunction, args, tableFunction); this.applyDocContentFunction(docContentFunction, args, tableFunction);
} }
else if(this.selectedObjects.length === 1 && ((this.selectedObjects[0].getObjectType() === historyitem_type_Shape && !CheckLinePreset(this.selectedObjects[0].getPresetGeom())) || this.selectedObjects[0].getObjectType() === historyitem_type_GraphicFrame)) else if(this.selectedObjects.length === 1 && ((this.selectedObjects[0].getObjectType() === historyitem_type_Shape && !CheckLinePresetForParagraphAdd(this.selectedObjects[0].getPresetGeom())) || this.selectedObjects[0].getObjectType() === historyitem_type_GraphicFrame))
{ {
this.selection.textSelection = this.selectedObjects[0]; this.selection.textSelection = this.selectedObjects[0];
if(this.selectedObjects[0].getObjectType() === historyitem_type_GraphicFrame) if(this.selectedObjects[0].getObjectType() === historyitem_type_GraphicFrame)
......
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