git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48187 954022d7-b5bf-4e40-9824-e11837661b57

Word/Editor/Paragraph.js

@@ -3209,6 +3209,14 @@ Paragraph.prototype =
         var X = this.Lines[CurLine].Ranges[CurRange].XVisible;
         var Y = this.Pages[CurPage].Y + this.Lines[CurLine].Y;
 
+        if ( Pos < this.Lines[CurLine].Ranges[CurRange].StartPos )
+        {
+            if ( true === ReturnTarget )
+                return { X : X, Y : TargetY, Height : 0, Internal : { Line : CurLine, Page : CurPage, Range : CurRange } };
+            else
+                return { X : X, Y : Y, PageNum : CurPage + this.Get_StartPage_Absolute(), Internal : { Line : CurLine, Page : CurPage, Range : CurRange } };
+        }
+
         for ( var ItemNum = this.Lines[CurLine].Ranges[CurRange].StartPos; ItemNum < this.Content.length; ItemNum++ )
         {
             var Item = this.Content[ItemNum];
@@ -3310,6 +3318,11 @@ Paragraph.prototype =
                 }
             }
         }
+
+        if ( true === ReturnTarget )
+            return { X : X, Y : TargetY, Height : Height, Internal : { Line : CurLine, Page : CurPage, Range : CurRange } };
+        else
+            return { X : X, Y : Y, PageNum : CurPage + this.Get_StartPage_Absolute(), Internal : { Line : CurLine, Page : CurPage, Range : CurRange } };
     },
 
     // Нужно ли добавлять нумерацию в начале данной строки

Word/menu/main_menu.js

@@ -989,15 +989,16 @@ $("#td_formatmodel,#td_info, #td_redo, #td_undo, #td_orient, #td_bold, #td_itali
 			editor.AddImageUrl("Test.jpg", 0);
 			break;
 		case "td_imageInText":
-			/*
+
 			var _img = new Image();
             _img.onload = function(){
-                editor.WordControl.m_oLogicDocument.Add_InlineImage( 50, 50, this );
+                editor.WordControl.m_oLogicDocument.Create_NewHistoryPoint();
+                editor.WordControl.m_oLogicDocument.Add_InlineImage( 50, 50, this.src );
             };
 			//_img.innerHtml = "./Images/Test.jpg";
             _img.src = "./Images/Test.jpg";
-            */
-            editor.AddImage(true);
+
+            //editor.AddImage(true);
             break;
 		case "td_imageInText2":
             editor.AddImageUrl("./Images/Test.jpg");