Bug 28861 - Кнопка Default Size для Image всегда заблокирована

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

Common/Drawings/CommonController.js

@@ -5227,7 +5227,7 @@ DrawingObjectsController.prototype =
                 {
                     new_image_props =
                     {
-                        imageUrl: drawing.getImageUrl(),
+                        ImageUrl: drawing.getImageUrl(),
                         w: drawing.extX,
                         h: drawing.extY,
                         locked: locked,
@@ -5238,8 +5238,8 @@ DrawingObjectsController.prototype =
                         image_props = new_image_props;
                     else
                     {
-                        if(image_props.imageUrl !== null && image_props.imageUrl !== new_image_props.imageUrl)
-                            image_props.imageUrl = null;
+                        if(image_props.ImageUrl !== null && image_props.ImageUrl !== new_image_props.ImageUrl)
+                            image_props.ImageUrl = null;
                         if(image_props.w != null && image_props.w !== new_image_props.w)
                             image_props.w = null;
                         if(image_props.h != null && image_props.h !== new_image_props.h)
@@ -5410,8 +5410,8 @@ DrawingObjectsController.prototype =
                             image_props = group_drawing_props.imageProps;
                         else
                         {
-                            if(image_props.imageUrl !== null && image_props.imageUrl !== group_drawing_props.imageProps.imageUrl)
-                                image_props.imageUrl = null;
+                            if(image_props.ImageUrl !== null && image_props.ImageUrl !== group_drawing_props.imageProps.ImageUrl)
+                                image_props.ImageUrl = null;
 
                             if(image_props.w != null && image_props.w !== group_drawing_props.imageProps.w)
                                 image_props.w = null;
@@ -5585,7 +5585,7 @@ DrawingObjectsController.prototype =
             image_props = new asc_CImgProperty();
             image_props.Width = props.imageProps.w;
             image_props.Height = props.imageProps.h;
-            image_props.ImageUrl = props.imageProps.imageUrl;
+            image_props.ImageUrl = props.imageProps.ImageUrl;
             image_props.Locked = props.imageProps.locked === true;
             ret.push(image_props);
         }

PowerPoint/Editor/Format/Presentation.js

@@ -251,6 +251,9 @@ function CPresentation(DrawingDocument)
     this.notes        = [];
     this.globalTableStyles = null;
 
+
+    this.Width = 254;
+    this.Height = 142;
     this.updateSlideIndex = false;
     this.recalcMap = {};
     this.bClearSearch = true;
@@ -2702,6 +2705,12 @@ CPresentation.prototype =
     {
         return false;
     },
+
+
+    Get_PageSizesByDrawingObjects: function()
+    {
+        return {W: Page_Width, H: Page_Height};
+    },
 //-----------------------------------------------------------------------------------
 // Дополнительные функции
 //-----------------------------------------------------------------------------------
@@ -2777,6 +2786,8 @@ CPresentation.prototype =
 
             if(drawing_props.imageProps)
             {
+                drawing_props.imageProps.Width = drawing_props.imageProps.w;
+                drawing_props.imageProps.Height = drawing_props.imageProps.h;
                 editor.sync_ImgPropCallback(drawing_props.imageProps);
             }
 
@@ -3315,8 +3326,6 @@ CPresentation.prototype =
             }
             case historyitem_Presentation_SlideSize:
             {
-                var kw = Data.oldW/this.Width;
-                var kh = Data.oldH/this.Height;
 
                 this.Width = Data.oldW;
                 this.Height = Data.oldH;

Word/Editor/GraphicObjects/GraphicObjects.js

@@ -320,7 +320,7 @@ CGraphicObjects.prototype =
             if(props_by_types.imageProps)
             {
                 image_props = new asc_CImgProperty(para_drawing_props);
-                image_props.ImageUrl = props_by_types.imageProps.imageUrl;
+                image_props.ImageUrl = props_by_types.imageProps.ImageUrl;
                 image_props.Width = props_by_types.imageProps.w;
                 image_props.Height = props_by_types.imageProps.h;
             }