for ios

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

Excel/model/Workbook.js

@@ -3261,6 +3261,12 @@ Woorksheet.prototype.initPostOpen = function(handlers){
 		this.sheetViews.push(new asc.asc_CSheetViewSettings());
 	}
 
+    if (window['IS_NATIVE_EDITOR']) {
+        for (var j = this.sheetViews.length - 1; j >= 0; --j) {
+            this.sheetViews[j].pane = null;
+        }
+    }
+	
 	this.handlers = handlers;
 	this._setHandlersTablePart();
 };

Excel/native/native.js

@@ -777,6 +777,7 @@ var FT_Common = new _FT_Common();
 
 var global_memory_stream_menu = CreateNativeMemoryStream();
 
+
 function asc_menu_ReadColor(_params, _cursor) {
     var _color = new asc_CColor();
     var _continue = true;
@@ -5082,6 +5083,10 @@ function offline_apply_event(type,params) {
 
         case 9 : // ASC_MENU_EVENT_TYPE_IMAGE
         {
+            var ws = _api.wb.getWorksheet();
+            if (ws && ws.objectRender && ws.objectRender.controller) {
+                var selectedImageProp =  ws.objectRender.controller.getGraphicObjectProps();
+
                 var _imagePr =  new asc_CImgProperty();
                 while (_continue)
                 {
@@ -5195,11 +5200,12 @@ function offline_apply_event(type,params) {
                         }
                         case 21:
                         {
+                            var urlSource = selectedImageProp[0].Value.ImageUrl;
+                            if (urlSource) {
                                 var bIsNeed = params[_current.pos++];
-
                                 if (bIsNeed)
                                 {
-                            var _originSize = this.Native["GetOriginalImageSize"](_imagePr.ImageUrl);
+                                    var _originSize = window["native"]["GetOriginalImageSize"](urlSource);
                                     var _w = _originSize[0] * 25.4 / 96.0;
                                     var _h = _originSize[1] * 25.4 / 96.0;
 
@@ -5233,14 +5239,15 @@ function offline_apply_event(type,params) {
 //                            var __w = Math.max(1, _page_width - (_page_x_left_margin + _page_x_right_margin));
 //                            var __h = Math.max(1, _page_height - (_page_y_top_margin + _page_y_bottom_margin));
 //
-                            var wI = (undefined !== _w) ? Math.max(_w * 25.4 / 96.0, 1) : 1;
-                            var hI = (undefined !== _h) ? Math.max(_h * 25.4 / 96.0, 1) : 1;
+                                    // var wI = (undefined !== _w) ? Math.max(_w * 25.4 / 96.0, 1) : 1;
+                                    //var hI = (undefined !== _h) ? Math.max(_h * 25.4 / 96.0, 1) : 1;
 
-                            wI = Math.max(5, Math.min(wI, __w));
-                            hI = Math.max(5, Math.min(hI, __h));
+                                    // wI = Math.max(5, Math.min(wI, _w));
+                                    //hI = Math.max(5, Math.min(hI, _h));
 
-                            _imagePr.Width = wI;
-                            _imagePr.Height = hI;
+                                    _imagePr.Width = _w;
+                                    _imagePr.Height = _h;
+                                }
                             }
 
                             break;
@@ -5254,11 +5261,10 @@ function offline_apply_event(type,params) {
                     }
                 }
 
-            var ws = _api.wb.getWorksheet();
-            var objectRender = ws.objectRender;
-            ws.objectRender.setGraphicObjectProps(_imagePr);
+                ws.objectRender.controller.setGraphicObjectProps(_imagePr);
 
                // _api.asc_setGraphicObjectProps(_imagePr);
+            }
             break;
         }