[ios] update

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

Excel/native/native.js

@@ -3216,8 +3216,11 @@ function OfflineEditor () {
         this.asc_WriteAllWorksheets(true);
 
         _api.asc_SendThemeColorScheme();
+        _api.asc_ApplyColorScheme(false);
 
-        this.offline_generateStyle();
+        //_api.asc_SendThemeColorScheme();
+
+        //this.offline_generateStyle();
 
         window["NativeSupportTimeouts"] = true;
 
@@ -3299,6 +3302,18 @@ function OfflineEditor () {
             asc_WriteColorSchemes(schemes, stream);
             window["native"]["OnCallMenuEvent"](2404, stream); // ASC_SPREADSHEETS_EVENT_TYPE_COLOR_SCHEMES
         });
+
+//        _api.asc_registerCallback('asc_onInitTablePictures',   function () {
+//            var stream = global_memory_stream_menu;
+//            stream["ClearNoAttack"]();
+//            window["native"]["OnCallMenuEvent"](2406, stream); // ASC_SPREADSHEETS_EVENT_TYPE_CELL_STYLES
+//        });
+
+        _api.asc_registerCallback('asc_onInitEditorStyles', function () {
+            var stream = global_memory_stream_menu;
+            stream["ClearNoAttack"]();
+            window["native"]["OnCallMenuEvent"](2405, stream); // ASC_SPREADSHEETS_EVENT_TYPE_TABLE_STYLES
+        });
     };
     this.updateFrozen = function () {
         var ws = _api.wb.getWorksheet();
@@ -3916,37 +3931,10 @@ function OfflineEditor () {
     };
 
     this.offline_afteInit = function () {
-
-        _api.asc_ApplyColorScheme = function(bRedraw) {
-
-            var wsViews = Asc["editor"].wb.wsViews;
-            for (var i = 0; i < wsViews.length; ++i) {
-                if (wsViews[i] && wsViews[i].objectRender && wsViews[i].objectRender.controller) {
-                    wsViews[i].objectRender.controller.startRecalculate();
-                }
-            }
-
-            //    this.chartPreviewManager.clearPreviews();
-            //    this.textArtPreviewManager.clear();
-
-            // На view-режиме не нужно отправлять стили
-            if (true !== this.asc_getViewerMode() && !this.isMobileVersion) {
-                // Отправка стилей
-                this._sendWorkbookStyles();
-            }
-
-            if (bRedraw) {
-                this.handlers.trigger("asc_onUpdateChartStyles");
-                this.wb.drawWS();
-            }
-        };
     };
 }
 var _s = new OfflineEditor();
 
-
-
-
 function offline_of() {_s.openFile();}
 function offline_stz(v) {_s.zoom = v; _api.asc_setZoom(v);}
 function offline_ds(x, y, width, height, ratio) {_s.drawSheet(x, y, width, height, ratio);}

Excel/native/utils.js

@@ -1317,14 +1317,13 @@
 			this.docStylesImage = "";
 			this.docStyles = null;
 
-            //var tw = this.native.GetStyleWidth();
-            //var th = this.native.GetStyleHeight();
             var sd = this.native.GetDeviceScale();
 
-            this.styleThumbnailWidth	       = 80 * (72 / 96);//112;
-            this.styleThumbnailHeight	   = 40 * (72 / 96);//38;
-            this.styleThumbnailWidthPt	   = this.styleThumbnailWidth;// * (72 / 96);
-            this.styleThumbnailHeightPt	   = this.styleThumbnailHeight;// * ( 72 / 96);
+            this.styleThumbnailWidth = 92 * 72 / 96;
+            this.styleThumbnailHeight = 48 * 72 / 96;
+
+            this.styleThumbnailWidthPt = Math.floor(this.styleThumbnailWidth * 72 / 96);
+            this.styleThumbnailHeightPt = Math.floor(this.styleThumbnailHeight * 72 / 96);
 
 			this.styleThumbnailWidthWithRetina	= this.styleThumbnailWidth;
 			this.styleThumbnailHeightWithRetina	= this.styleThumbnailHeight;
@@ -1343,6 +1342,9 @@
 			asc_getDefaultStylesImage: function () { return this.defaultStylesImage; },
 			asc_getDocStylesImage: function () { return this.docStylesImage; },
 			generateStylesAll: function (cellStylesAll, fmgrGraphics, oFont, stringRenderer) {
+
+                this.native.SetStylesType(0);
+
 				this.generateDefaultStyles(cellStylesAll, fmgrGraphics, oFont, stringRenderer);
 				this.generateDocumentStyles(cellStylesAll, fmgrGraphics, oFont, stringRenderer);
 			},