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

Bug 25592 - Изменяется привязка изображения в ячейке при повороте изображения

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57686 954022d7-b5bf-4e40-9824-e11837661b57
parent d039a832
...@@ -532,7 +532,12 @@ RotateState.prototype = ...@@ -532,7 +532,12 @@ RotateState.prototype =
if(j === check_paragraphs.length) if(j === check_paragraphs.length)
check_paragraphs.push(nearest_pos.Paragraph); check_paragraphs.push(nearest_pos.Paragraph);
} }
if(!e.CtrlKey) var arr_parent_paragraphs = [];
if(this instanceof RotateState)
{
check_paragraphs.length = 0;
}
if(!(e.CtrlKey && this instanceof MoveState))
{ {
for(i = 0; i < this.drawingObjects.arrTrackObjects.length; ++i) for(i = 0; i < this.drawingObjects.arrTrackObjects.length; ++i)
{ {
...@@ -548,6 +553,7 @@ RotateState.prototype = ...@@ -548,6 +553,7 @@ RotateState.prototype =
{ {
check_paragraphs.push(paragraph); check_paragraphs.push(paragraph);
} }
arr_parent_paragraphs.push(paragraph)
} }
} }
} }
...@@ -567,9 +573,19 @@ RotateState.prototype = ...@@ -567,9 +573,19 @@ RotateState.prototype =
original.parent.Set_XYForAdd(bounds.min_x, bounds.min_y, arr_nearest_pos[i], original.selectStartPage); original.parent.Set_XYForAdd(bounds.min_x, bounds.min_y, arr_nearest_pos[i], original.selectStartPage);
} }
for(i = 0; i < this.drawingObjects.arrTrackObjects.length; ++i) if(!(this instanceof RotateState))
{
for(i = 0; i < this.drawingObjects.arrTrackObjects.length; ++i)
{
this.drawingObjects.arrTrackObjects[i].originalObject.parent.Add_ToDocument2(arr_nearest_pos[i].Paragraph);
}
}
else
{ {
this.drawingObjects.arrTrackObjects[i].originalObject.parent.Add_ToDocument2(arr_nearest_pos[i].Paragraph); for(i = 0; i < this.drawingObjects.arrTrackObjects.length; ++i)
{
this.drawingObjects.arrTrackObjects[i].originalObject.parent.Add_ToDocument2(arr_parent_paragraphs[i]);
}
} }
} }
......
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