Commit 6c1324df authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Сделан вызов функции рисования обтекаемых фигур.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57325 954022d7-b5bf-4e40-9824-e11837661b57
parent 4d505a4b
...@@ -1161,6 +1161,9 @@ CDocumentContent.prototype = ...@@ -1161,6 +1161,9 @@ CDocumentContent.prototype =
bClip = true; bClip = true;
} }
if ( this.LogicDocument )
LogicDocument.DrawingObjects.drawWrappingObjectsInContent(this.Get_StartPage_Absolute() + PageNum, this);
var Page_StartPos = this.Pages[PageNum].Pos; var Page_StartPos = this.Pages[PageNum].Pos;
var Page_EndPos = this.Pages[PageNum].EndPos; var Page_EndPos = this.Pages[PageNum].EndPos;
for ( var Index = Page_StartPos; Index <= Page_EndPos; Index++ ) for ( var Index = Page_StartPos; Index <= Page_EndPos; Index++ )
...@@ -1170,7 +1173,6 @@ CDocumentContent.prototype = ...@@ -1170,7 +1173,6 @@ CDocumentContent.prototype =
if ( true === bClip ) if ( true === bClip )
{ {
//pGraphics.RemoveClipRect();
pGraphics.RestoreGrState(); pGraphics.RestoreGrState();
} }
}, },
...@@ -3923,12 +3925,6 @@ CDocumentContent.prototype = ...@@ -3923,12 +3925,6 @@ CDocumentContent.prototype =
Item.Select_All(); Item.Select_All();
} }
if ( PrevClass.Correct_Content )
{
PrevClass.Correct_Content();
PrevPos = ParaNearPos.NearPos.ContentPos.Data[ParaNearPos.Classes.length - 2];
}
if ( true === bNeedSelect ) if ( true === bNeedSelect )
{ {
PrevClass.Selection.Use = true; PrevClass.Selection.Use = true;
...@@ -3949,6 +3945,11 @@ CDocumentContent.prototype = ...@@ -3949,6 +3945,11 @@ CDocumentContent.prototype =
this.Selection.StartPos = DstIndex; this.Selection.StartPos = DstIndex;
this.Selection.EndPos = DstIndex; this.Selection.EndPos = DstIndex;
} }
if ( PrevClass.Correct_Content )
{
PrevClass.Correct_Content();
}
} }
else else
{ {
......
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