Commit 4d3fba34 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

правка бага 21337 - [Copy&Paste] Невозможно вставить текст из внешнего источника в автофигуру

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50766 954022d7-b5bf-4e40-9824-e11837661b57
parent 10228e18
......@@ -3841,6 +3841,29 @@ PasteProcessor.prototype =
if(false == oThis.bNested)
{
var slide = presentation.Slides[presentation.CurPage];
if(slide.graphicObjects.State.id === STATES_ID_TEXT_ADD || slide.graphicObjects.State.id === STATES_ID_TEXT_ADD_IN_GROUP
&& arrShapes.length === 1 && arrImages.length === 0 && arrTables.length === 0)
{
if(presentation.Document_Is_SelectionLocked(changestype_Drawing_Props) === false)
{
var content;
var textObject = slide.graphicObjects.State.textObject;
if(textObject instanceof CShape)
{
content = textObject.txBody.content;
}
else
{
content = textObject.graphicObject.CurCell.Content;
}
presentation.recalcMap[textObject.Get_Id()] = textObject;
oThis.insertInPlace2(content, arrShapes[0].txBody.content.Content);
presentation.Recalculate();
}
}
else
{
var check_objectcs = arrShapes.concat(arrImages).concat(arrTables);
if(presentation.Document_Is_SelectionLocked(changestype_AddShapes, check_objectcs) === false)
{
......@@ -3862,6 +3885,7 @@ PasteProcessor.prototype =
}
presentation.Recalculate();
}
}
//oThis.InsertInDocument();
}
......
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