git-svn-id:...

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

PowerPoint/Editor/Format/GroupShape.js

@@ -596,14 +596,10 @@ CGroupShape.prototype =
         if(this.spPr.xfrm.isNotNullForGroup())
         {
             var xfrm = this.spPr.xfrm;
-            xfrm.offX *= kw;
-            xfrm.offY *= kh;
-            xfrm.extX *= kw;
-            xfrm.extY *= kh;
-            xfrm.chOffX *= kw;
-            xfrm.chOffY *= kh;
-            xfrm.chExtX *= kw;
-            xfrm.chExtY *= kh;
+            this.setOffset(xfrm.offX*kw, xfrm.offY*kh);
+            this.setExtents(xfrm.extX*kw, xfrm.extY*kh);
+            this.setChildOffset(xfrm.chOffX*kw, xfrm.chOffY*kh);
+            this.setChildExtents(xfrm.chExtX*kw, xfrm.chExtY*kh);
         }
         for(var i = 0; i < this.spTree.length; ++i)
         {

PowerPoint/Editor/Format/Image.js

@@ -286,10 +286,8 @@ CImageShape.prototype =
         if(this.spPr.xfrm.isNotNull())
         {
             var xfrm = this.spPr.xfrm;
-            xfrm.offX*=kw;
-            xfrm.offY*=kh;
-            xfrm.extX*=kw;
-            xfrm.extY*=kh;
+            this.setOffset(xfrm.offX*kw, xfrm.offY*kh);
+            this.setExtents(xfrm.extX*kw, xfrm.extY*kh);
         }
     },
 

PowerPoint/Editor/Format/Presentation.js

@@ -5477,6 +5477,9 @@ CPresentation.prototype =
             {
                 var kw = Data.oldW/this.Width;
                 var kh = Data.oldH/this.Height;
+
+                this.Width = Data.oldW;
+                this.Height = Data.oldH;
                 var b_is_on = History.Is_On();
                 if(b_is_on)
                 {
@@ -5486,12 +5489,17 @@ CPresentation.prototype =
                 for(var i = 0; i < this.slideMasters.length; ++i)
                 {
                     this.slideMasters[i].changeSize(kw, kh);
+                    var master = this.slideMasters[i];
+                    for(var j = 0; j < master.sldLayoutLst.length; ++j)
+                    {
+                        master.sldLayoutLst[j].changeSize(kw, kh);
+                    }
                 }
 
-                for(var i = 0; i < this.slideLayouts.length; ++i)
-                {
-                    this.slideLayouts[i].changeSize(kw, kh);
-                }
+               // for(var i = 0; i < this.slideLayouts.length; ++i)
+               // {
+               //     this.slideLayouts[i].changeSize(kw, kh);
+               // }
 
                 for(var i = 0; i < this.Slides.length; ++i)
                 {
@@ -5539,6 +5547,8 @@ CPresentation.prototype =
             {
                 var kw = Data.newW/this.Width;
                 var kh = Data.newH/this.Height;
+                this.Width = Data.newW;
+                this.Height = Data.newH;
                 var b_is_on = History.Is_On();
                 if(b_is_on)
                 {
@@ -5548,12 +5558,17 @@ CPresentation.prototype =
                 for(var i = 0; i < this.slideMasters.length; ++i)
                 {
                     this.slideMasters[i].changeSize(kw, kh);
+                    var master = this.slideMasters[i];
+                    for(var j = 0; j < master.sldLayoutLst.length; ++j)
+                    {
+                        master.sldLayoutLst[j].changeSize(kw, kh);
+                    }
                 }
 
-                for(var i = 0; i < this.slideLayouts.length; ++i)
-                {
-                    this.slideLayouts[i].changeSize(kw, kh);
-                }
+               // for(var i = 0; i < this.slideLayouts.length; ++i)
+               // {
+               //     this.slideLayouts[i].changeSize(kw, kh);
+               // }
 
                 for(var i = 0; i < this.Slides.length; ++i)
                 {
@@ -6093,9 +6108,15 @@ CPresentation.prototype =
 
         var _master_width = _new_master.Width;
         var _master_height = _new_master.Height;
-        if(Math.abs(_master_height - this.Height) > 1 || Math.abs(_master_width - this.Width) > 1)
+        if(_master_height !== this.Height || _master_width !== this.Width)
         {
-         //   _new_master.setSize(this.Width, this.Height);
+            var kw = this.Width/_master_width;
+            var kh = this.Height/_master_height;
+            themeInfo.Master.changeSize(kw, kh);
+            for(var i = 0; i < themeInfo.Master.sldLayoutLst.length; ++i)
+            {
+                themeInfo.Master.sldLayoutLst[i].changeSize(kw, kh);
+            }
         }
 
         _new_master.recalculate();
@@ -6163,12 +6184,17 @@ CPresentation.prototype =
             for(var i = 0; i < this.slideMasters.length; ++i)
             {
                 this.slideMasters[i].changeSize(kw, kh);
+                var master = this.slideMasters[i];
+                for(var j = 0; j < master.sldLayoutLst.length; ++j)
+                {
+                    master.sldLayoutLst[j].changeSize(kw, kh);
+                }
             }
 
-            for(var i = 0; i < this.slideLayouts.length; ++i)
-            {
-                this.slideLayouts[i].changeSize(kw, kh);
-            }
+           // for(var i = 0; i < this.slideLayouts.length; ++i)
+           // {
+           //     this.slideLayouts[i].changeSize(kw, kh);
+           // }
 
             for(var i = 0; i < this.Slides.length; ++i)
             {
@@ -6724,12 +6750,17 @@ CPresentation.prototype =
                 for(var i = 0; i < this.slideMasters.length; ++i)
                 {
                     this.slideMasters[i].changeSize(kw, kh);
+                    var master = this.slideMasters[i];
+                    for(var j = 0; j < master.sldLayoutLst.length; ++j)
+                    {
+                        master.sldLayoutLst[j].changeSize(kw, kh);
+                    }
                 }
 
-                for(var i = 0; i < this.slideLayouts.length; ++i)
-                {
-                    this.slideLayouts[i].changeSize(kw, kh);
-                }
+                //for(var i = 0; i < this.slideLayouts.length; ++i)
+                //{
+                //    this.slideLayouts[i].changeSize(kw, kh);
+                //}
 
                 for(var i = 0; i < this.Slides.length; ++i)
                 {

PowerPoint/Editor/Format/Shape.js

@@ -1989,10 +1989,8 @@ CShape.prototype =
         if(this.spPr.xfrm.isNotNull())
         {
             var xfrm = this.spPr.xfrm;
-            xfrm.offX*=kw;
-            xfrm.offY*=kh;
-            xfrm.extX*=kw;
-            xfrm.extY*=kh;
+            this.setOffset(xfrm.offX*kw, xfrm.offY*kh);
+            this.setExtents(xfrm.extX*kw, xfrm.extY*kh);
         }
     },
 

PowerPoint/Editor/Format/Slide.js

@@ -2344,7 +2344,7 @@ SlideComments.prototype =
                 var id = r.GetString2();
                 var pos2 = this.m_oContentChanges.Check( contentchanges_Add, pos);
                 this.comments.splice(pos2, 0,  g_oTableId.Get_ById(id));
-                editor.sync_AddComment( id, this.comments[pos].Data);
+                editor.sync_AddComment( id, this.comments[pos2].Data);
                 break;
             }
             case historyitem_RemoveComment:
@@ -2352,7 +2352,7 @@ SlideComments.prototype =
                 var pos = r.GetLong();
                 var pos2 = this.m_oContentChanges.Check( contentchanges_Remove, pos);
 
-                var comment = this.comments.splice(pos, 1)[0];
+                var comment = this.comments.splice(pos2, 1)[0];
                 editor.sync_RemoveComment(comment.Id);
                 break;
             }