правка бага 21405 - Закрывать всплывающее окно с комментариями при переходе между листами

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

PowerPoint/Editor/Format/Chart.js

@@ -222,46 +222,6 @@ CChartAsGroup.prototype =
         }
     },
 
-    setSizes: function(posX, posY, w, h, flipH, flipV)
-    {
-        var data = {};
-        data.Type = historyitem_SetSizes;
-        data.oldW = this.extX;
-        data.oldH = this.extY;
-        data.newW = w;
-        data.newH = h;
-        data.oldFlipH = this.absFlipH;
-        data.oldFlipV = this.absFlipV;
-        data.newFlipH = flipH;
-        data.newFlipV = flipV;
-        data.oldPosX = this.x;
-        data.oldPosY = this.y;
-        data.newPosX = posX;
-        data.newPosY = posY;
-
-        History.Add(this, data);
-
-        this.spPr.xfrm.extX = w;
-        this.spPr.xfrm.extY = h;
-        this.spPr.xfrm.flipH = flipH;
-        this.spPr.xfrm.flipV = flipV;
-        this.extX = w;
-        this.extY = h;
-        this.absFlipH = flipH;
-        this.absFlipV = flipV;
-        this.x = posX;
-        this.y = posY;
-        if(this.parent)
-        {
-            this.parent.absOffsetX = posX;
-            this.parent.absOffsetY = posY;
-            this.parent.absExtX = w;
-            this.parent.absExtY = h;
-            this.parent.flipH = flipH;
-            this.parent.flipV = flipV;
-        }
-        this.calculateAfterResize();
-    },
 
     calculateAfterResize: function()
     {

PowerPoint/Editor/Format/ChartTitle.js

@@ -642,18 +642,14 @@ CChartTitle.prototype =
                 var rect = this.spPr.geometry.rect;
                 this.clipRect = {x: rect.l, y: rect.t, w: rect.r - rect.l, h: rect.b - rect.t};
             }
-            else
-            {
-                this.clipRect = {x: 0, y: 0, w: this.absExtX, h: this.absExtY};
-            }
         }
         else
         {
             var _full_rotate = this.getFullRotate();
             var _full_flip = this.getFullFlip();
 
-            var _hc = this.absExtX*0.5;
-            var _vc = this.absExtY*0.5;
+            var _hc = this.extX*0.5;
+            var _vc = this.extY*0.5;
             var _transformed_shape_xc = this.transform.TransformPointX(_hc, _vc);
             var _transformed_shape_yc = this.transform.TransformPointY(_hc, _vc);
 

PowerPoint/Editor/Format/Image.js

@@ -1024,6 +1024,26 @@ CImageShape.prototype =
         return {hit:false};
     },
 
+    getPlaceholderType: function()
+    {
+        return this.isPlaceholder() ? this.nvPicPr.nvPr.ph.type : null;
+    },
+
+    getPlaceholderIndex: function()
+    {
+        return this.isPlaceholder() ? this.nvPicPr.nvPr.ph.idx : null;
+    },
+
+    getPhType: function()
+    {
+        return this.isPlaceholder() ? this.nvPicPr.nvPr.ph.type : null;
+    },
+
+    getPhIndex: function()
+    {
+        return this.isPlaceholder() ? this.nvPicPr.nvPr.ph.idx : null;
+    },
+
 
     hitInBoundingRect: function(x, y)
     {

PowerPoint/Editor/Format/Presentation.js

@@ -5165,6 +5165,7 @@ CPresentation.prototype =
             {
                 this.Slides[oldCurPage].graphicObjects.resetSelectionState();
             }
+            editor.asc_hideComments();
             //this.DrawingDocument.m_oWordControl.GoToPage(this.CurPage);
             //this.Document_UpdateSelectionState();
             //this.Document_UpdateInterfaceState();

PowerPoint/Editor/Format/Shape.js

@@ -1120,23 +1120,14 @@ CShape.prototype =
                     }
                 }
             }
-            if(isRealObject(this.spPr.geometry) && isRealObject(this.spPr.geometry.rect))
-            {
-                var rect = this.spPr.geometry.rect;
-                this.clipRect = {x: rect.l, y: rect.t, w: rect.r - rect.l, h: rect.b - rect.t};
-            }
-            else
-            {
-                this.clipRect = {x: 0, y: 0, w: this.absExtX, h: this.absExtY};
-            }
         }
         else
         {
             var _full_rotate = this.getFullRotate();
             var _full_flip = this.getFullFlip();
 
-            var _hc = this.absExtX*0.5;
-            var _vc = this.absExtY*0.5;
+            var _hc = this.extX*0.5;
+            var _vc = this.extY*0.5;
             var _transformed_shape_xc = this.transform.TransformPointX(_hc, _vc);
             var _transformed_shape_yc = this.transform.TransformPointY(_hc, _vc);
 
@@ -1486,7 +1477,7 @@ CShape.prototype =
             }
             else
             {
-                this.clipRect = {x: 0, y: 0, w: this.absExtX, h: this.absExtY};
+                this.clipRect = {x: 0, y: 0, w: this.extX, h: this.extY};
             }
         }
         else
@@ -1494,8 +1485,8 @@ CShape.prototype =
             var _full_rotate = this.getFullRotate();
             var _full_flip = this.getFullFlip();
 
-            var _hc = this.absExtX*0.5;
-            var _vc = this.absExtY*0.5;
+            var _hc = this.extX*0.5;
+            var _vc = this.extY*0.5;
             var _transformed_shape_xc = this.transform.TransformPointX(_hc, _vc);
             var _transformed_shape_yc = this.transform.TransformPointY(_hc, _vc);
 

PowerPoint/Editor/GraphicObjects.js

@@ -47,6 +47,10 @@ CGraphicObjects.prototype = {
             obj.group = old_gr;
             --count;
         }
+        for(var i = 0;  i< this.slide.comments.length; ++i)
+        {
+            this.slide.comments[i].selected = false;
+        }
         this.changeCurrentState(new NullState(this, this.slide));
     },