[ios] update

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

Excel/api.js

@@ -919,7 +919,9 @@ var editor;
    * asc_onEditorSelectionChanged	(asc_CFont)											- эвент на смену информации о выделении в редакторе ячейки
    * asc_onSelectionChanged		(asc_CCellInfo)										- эвент на смену информации о выделении
    * asc_onSelectionNameChanged	(sName)												- эвент на смену имени выделения (Id-ячейки, число выделенных столбцов/строк, имя диаграммы и др.)
-   * asc_onSelectionMathChanged	(asc_CSelectionMathInfo)							- эвент на смену математической информации о выделении
+   * asc_onSelection
+   *
+   * Changed	(asc_CSelectionMathInfo)							- эвент на смену математической информации о выделении
    * asc_onZoomChanged			(zoom)
    * asc_onSheetsChanged			()													- эвент на обновление списка листов
    * asc_onActiveSheetChanged		(indexActiveSheet)									- эвент на обновление активного листа
@@ -1429,10 +1431,13 @@ var editor;
 
   spreadsheet_api.prototype._sendWorkbookStyles = function() {
     if (this.wbModel) {
-      // Для нативной версии не генерируем стили
-      if (window["NATIVE_EDITOR_ENJINE"] && (!this.handlers.hasTrigger("asc_onInitTablePictures") || !this.handlers.hasTrigger("asc_onInitEditorStyles"))) {
-        return;
-      }
+
+        if (!window['IS_NATIVE_EDITOR']) {
+            // Для нативной версии не генерируем стили
+            if (window["NATIVE_EDITOR_ENJINE"] && (!this.handlers.hasTrigger("asc_onInitTablePictures") || !this.handlers.hasTrigger("asc_onInitEditorStyles"))) {
+                return;
+            }
+        }
 
       // Отправка стилей форматированных таблиц
       this.handlers.trigger("asc_onInitTablePictures", this.wb.getTablePictures());
@@ -2939,7 +2944,7 @@ var editor;
   };
   spreadsheet_api.prototype.asc_ApplyColorScheme = function(bRedraw) {
 
-    if (!window["NATIVE_EDITOR_ENJINE"]) {
+    if (window['IS_NATIVE_EDITOR'] || !window["NATIVE_EDITOR_ENJINE"]) {
       var wsViews = Asc["editor"].wb.wsViews;
       for (var i = 0; i < wsViews.length; ++i) {
         if (wsViews[i] && wsViews[i].objectRender && wsViews[i].objectRender.controller) {

Excel/model/clipboard.js

@@ -419,21 +419,25 @@
 				
 				var objectRender = worksheetView.objectRender;
 				var selectedImages = objectRender.getSelectedGraphicObjects();
-				
-				var drawingUrls = [];
-				if(selectedImages && selectedImages.length)
-				{
-					var url, correctUrl, graphicObj;
-					for(var i = 0; i < selectedImages.length; i++)
-					{
-						graphicObj = selectedImages[i];
-						if(graphicObj.isImage())
-						{
-							url = graphicObj;
-							drawingUrls[i] = graphicObj.getBase64Img();
-						}	
-					}
-				}
+
+                var drawingUrls = [];
+                if(selectedImages && selectedImages.length)
+                {
+                    var correctUrl, graphicObj;
+                    for(var i = 0; i < selectedImages.length; i++)
+                    {
+                        graphicObj = selectedImages[i];
+                        if(graphicObj.isImage())  {
+                            if(window["NativeCorrectImageUrlOnCopy"]) {
+                                correctUrl = window["NativeCorrectImageUrlOnCopy"](graphicObj.getImageUrl());
+                                drawingUrls[i] = correctUrl;
+                            }
+                            else {
+                                drawingUrls[i] = graphicObj.getBase64Img();
+                            }
+                        }
+                    }
+                }
 				
 				return {sBase64: sBase64, html: html, text: this.lStorageText, drawingUrls: drawingUrls};
 			},
@@ -1891,19 +1895,35 @@
 				if (pasteData) {
 					if(pasteData.Drawings && pasteData.Drawings.length)
 					{
-						if(!(window["Asc"]["editor"] && window["Asc"]["editor"].isChartEditor))
-						{
-							if(aPastedImages && aPastedImages.length)
-							{
-								t._loadImagesOnServer(aPastedImages, function() {
-									t._insertImagesFromBinary(worksheet, pasteData, isIntoShape);
-								});
-							}
-							else
-							{
-								t._insertImagesFromBinary(worksheet, pasteData, isIntoShape);
-							}
-						}
+                        if (window["NativeCorrectImageUrlOnPaste"]) {
+                            var url;
+                            for(var i = 0, length = aPastedImages.length; i < length; ++i)
+                            {
+                                url = window["NativeCorrectImageUrlOnPaste"](aPastedImages[i].Url);
+                                aPastedImages[i].Url = url;
+
+                                var imageElem = aPastedImages[i];
+                                if(null != imageElem)
+                                {
+                                    imageElem.SetUrl(url);
+                                }
+                            }
+
+                            t._insertImagesFromBinary(worksheet, pasteData, isIntoShape);
+                        }
+                        else if(!(window["Asc"]["editor"] && window["Asc"]["editor"].isChartEditor))
+                        {
+                            if(aPastedImages && aPastedImages.length)
+                            {
+                                t._loadImagesOnServer(aPastedImages, function() {
+                                    t._insertImagesFromBinary(worksheet, pasteData, isIntoShape);
+                                });
+                            }
+                            else
+                            {
+                                t._insertImagesFromBinary(worksheet, pasteData, isIntoShape);
+                            }
+                        }
 					}
 					else 
 					{