Bug 24447 - Сбрасывается выделение с текста в автофигуре, при открытии контекстного меню

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

Common/Drawings/CommonController.js

@@ -251,8 +251,8 @@ DrawingObjectsController.prototype =
         }
         if(this.selection.textSelection)
         {
-            var content = this.selection.textSelection.getDocContent();
-            content && content.Selection_Remove();
+           // var content = this.selection.textSelection.getDocContent();
+           // content && content.Selection_Remove();
             this.selection.textSelection = null;
         }
         if(this.selection.chartSelection)

Common/Drawings/Format/Shape.js

@@ -2724,7 +2724,19 @@ CShape.prototype =
             var tx, ty;
             tx = this.invertTransformText.TransformPointX(x, y);
             ty = this.invertTransformText.TransformPointY(x, y);
-            content.Selection_SetStart(tx, ty, slideIndex, e);
+            if(e.Button === g_mouse_button_right)
+            {
+                if(content.Selection_Check(tx, ty, 0))
+                {
+                    this.rightButtonFlag = true;
+                    return;
+                }
+            }
+            if(!(content.Is_TextSelectionUse() && e.ShiftKey))
+                content.Selection_SetStart(tx, ty, slideIndex, e);
+            else
+                content.Selection_SetEnd(tx, ty, slideIndex, e);
+
         }
     },
 
@@ -2735,8 +2747,12 @@ CShape.prototype =
             var tx, ty;
             tx = this.invertTransformText.TransformPointX(x, y);
             ty = this.invertTransformText.TransformPointY(x, y);
-            content.Selection_SetEnd(tx, ty, slideIndex, e);
+            if(!(e.Type === g_mouse_event_type_up && this.rightButtonFlag))
+            {
+                content.Selection_SetEnd(tx, ty, slideIndex, e);
+            }
         }
+        delete this.rightButtonFlag;
     },
 
     Get_Theme: function()