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

Word/Editor/Document.js

@@ -7276,8 +7276,6 @@ CDocument.prototype =
             this.Content[Start].Selection.EndPos   = this.Content[Start].Content.length - 1;
         }
 
-        this.Content[ContentPos].Selection_SetEnd( X, Y, this.CurPage, MouseEvent );
-
         for ( var Index = Start; Index <= End; Index++ )
         {
             var Item = this.Content[Index];
@@ -7294,6 +7292,8 @@ CDocument.prototype =
                             Item.Selection.EndPos   = Item.Content.length - 1;
                         else
                             Item.Selection.StartPos = Item.Content.length - 1;
+
+                        Item.Selection_Internal_Update();
                     }
                     else //if ( type_Table === ItemType )
                     {
@@ -7319,6 +7319,8 @@ CDocument.prototype =
                             Item.Selection.StartPos = Item.Internal_GetStartPos();
                         else
                             Item.Selection.EndPos   = Item.Internal_GetStartPos();
+
+                        Item.Selection_Internal_Update();
                     }
                     else //if ( type_Table === ItemType )
                     {
@@ -7348,6 +7350,8 @@ CDocument.prototype =
                             Item.Selection.EndPos   = Item.Internal_GetStartPos();
                             Item.Selection.StartPos = Item.Content.length - 1;
                         }
+
+                        Item.Selection_Internal_Update();
                     }
                     else //if ( type_Table === ItemType )
                     {
@@ -7374,6 +7378,8 @@ CDocument.prototype =
             }
         }
 
+        this.Content[ContentPos].Selection_SetEnd( X, Y, this.CurPage, MouseEvent );
+
         // Проверяем, чтобы у нас в селект не попали элементы, в которых не выделено ничего
         if ( true === this.Content[End].Selection_IsEmpty() )
         {

Word/Editor/ParagraphContent.js

@@ -7491,8 +7491,11 @@ function ParaMath()
 
     this.Type  = para_Math;
 
+    this.Jc   = undefined;
     this.Math = new CMathComposition();
 
+    this.Inline = false; // внутристроковая формула или нет (проверяемся внутри Internal_Recalculate_0)
+
     this.Width        = 0;
     this.Height       = 0;
     this.WidthVisible = 0;
@@ -7549,6 +7552,34 @@ ParaMath.prototype =
         return true;
     },
 
+    Selection_SetStart : function(X, Y, PageNum)
+    {
+        this.Math.Selection_SetStart( X, Y, PageNum );
+        console.log( "Start x=" + X +" y=" + Y );
+    },
+
+    Selection_SetEnd : function(X, Y, PageNum, MouseEvent)
+    {
+        this.Math.Selection_SetEnd( X, Y, PageNum, MouseEvent );
+        console.log( "End x=" + X +" y=" + Y );
+    },
+
+    Selection_Beginning : function()
+    {
+        this.Math.Selection_Beginning();
+    },
+
+    Selection_Ending : function()
+    {
+        this.Math.Selection_Ending();
+    },
+
+    Selection_Draw : function()
+    {
+        this.Math.Selection_Draw();
+        console.log( "Selection draw" );
+    },
+
     Copy : function()
     {
         var Math = new ParaMath();