Перешел на общую функцию asc_addImage. Старую пока оставил для меню, на всякий случай.

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

Excel/api.js

@@ -2621,17 +2621,17 @@ var editor;
 
   spreadsheet_api.prototype.asc_changeImageFromFile = function() {
     this.isImageChangeUrl = true;
-    this.asc_showImageFileDialog();
+    this.asc_addImage();
   };
 
   spreadsheet_api.prototype.asc_changeShapeImageFromFile = function() {
     this.isShapeImageChangeUrl = true;
-    this.asc_showImageFileDialog();
+    this.asc_addImage();
   };
 
   spreadsheet_api.prototype.asc_changeArtImageFromFile = function() {
     this.isTextArtChangeUrl = true;
-    this.asc_showImageFileDialog();
+    this.asc_addImage();
   };
 
   spreadsheet_api.prototype.asc_putPrLineSpacing = function(type, value) {
@@ -3483,6 +3483,7 @@ var editor;
   prot["asc_getWordChartObject"] = prot.asc_getWordChartObject;
   prot["asc_cleanWorksheet"] = prot.asc_cleanWorksheet;
   prot["asc_showImageFileDialog"] = prot.asc_showImageFileDialog;
+  prot["asc_addImage"] = prot.asc_addImage;
   prot["asc_setData"] = prot.asc_setData;
   prot["asc_getData"] = prot.asc_getData;
 

PowerPoint/Local/api.js

@@ -122,6 +122,10 @@ asc_docs_api.prototype.AddImage = function()
 {
 	window["AscDesktopEditor"]["LocalFileGetImageUrlFromOpenFileDialog"]();
 };
+asc_docs_api.prototype.asc_addImage = function()
+{
+  window["AscDesktopEditor"]["LocalFileGetImageUrlFromOpenFileDialog"]();
+};
 asc_docs_api.prototype.asc_isOffline = function()
 {
 	return true;

PowerPoint/api.js

@@ -2847,22 +2847,22 @@ asc_docs_api.prototype.sync_TblAlignChangedCallback = function(style){
 asc_docs_api.prototype.ChangeImageFromFile = function()
 {
     this.isImageChangeUrl = true;
-    this.AddImage();
+    this.asc_addImage();
 };
 asc_docs_api.prototype.ChangeShapeImageFromFile = function()
 {
     this.isShapeImageChangeUrl = true;
-    this.AddImage();
+    this.asc_addImage();
 };
 asc_docs_api.prototype.ChangeSlideImageFromFile = function()
 {
     this.isSlideImageChangeUrl = true;
-    this.AddImage();
+    this.asc_addImage();
 };
 asc_docs_api.prototype.ChangeArtImageFromFile = function()
 {
     this.isTextArtChangeUrl = true;
-    this.AddImage();
+    this.asc_addImage();
 };
 
 asc_docs_api.prototype.AddImage = function(){

PowerPoint/apiExport.js

@@ -230,6 +230,7 @@ asc_docs_api.prototype['ChangeShapeImageFromFile'] = asc_docs_api.prototype.Chan
 asc_docs_api.prototype['ChangeSlideImageFromFile'] = asc_docs_api.prototype.ChangeSlideImageFromFile;
 asc_docs_api.prototype['ChangeArtImageFromFile'] = asc_docs_api.prototype.ChangeArtImageFromFile;
 asc_docs_api.prototype['AddImage'] = asc_docs_api.prototype.AddImage;
+asc_docs_api.prototype['asc_addImage'] = asc_docs_api.prototype.asc_addImage;
 asc_docs_api.prototype['StartAddShape'] = asc_docs_api.prototype.StartAddShape;
 asc_docs_api.prototype['AddTextArt'] = asc_docs_api.prototype.AddTextArt;
 asc_docs_api.prototype['canGroup'] = asc_docs_api.prototype.canGroup;

PowerPoint/menu/main_menu2.js

@@ -815,7 +815,7 @@ $("#td_orient, #td_redo, #td_undo, #td_bold, #td_italic, #td_underline, #td_prin
 			//_img.innerHtml = "./Images/Test.jpg";
             _img.src = "./Images/Test.jpg";
             */
-            editor.AddImage(true);
+            editor.asc_addImage(true);
             break;
 		case "td_imageInText2":
             editor.AddImageUrl("./Images/Test.jpg");

Word/Local/api.js

@@ -128,6 +128,10 @@ asc_docs_api.prototype.AddImage = function()
 {
 	window["AscDesktopEditor"]["LocalFileGetImageUrlFromOpenFileDialog"]();
 };
+asc_docs_api.prototype.asc_addImage = function()
+{
+  window["AscDesktopEditor"]["LocalFileGetImageUrlFromOpenFileDialog"]();
+};
 asc_docs_api.prototype.asc_isOffline = function()
 {
 	return true;

Word/api.js

@@ -4340,12 +4340,12 @@ asc_docs_api.prototype.sync_TblAlignChangedCallback = function(style){
 asc_docs_api.prototype.ChangeImageFromFile = function()
 {
     this.isImageChangeUrl = true;
-    this.AddImage();
+    this.asc_addImage();
 };
 asc_docs_api.prototype.ChangeShapeImageFromFile = function()
 {
     this.isShapeImageChangeUrl = true;
-    this.AddImage();
+    this.asc_addImage();
 };
 
 asc_docs_api.prototype.AddImage = function(){

Word/apiExport.js

@@ -341,6 +341,7 @@ asc_docs_api.prototype['sync_TblAlignChangedCallback'] = asc_docs_api.prototype.
 asc_docs_api.prototype['ChangeImageFromFile'] = asc_docs_api.prototype.ChangeImageFromFile;
 asc_docs_api.prototype['ChangeShapeImageFromFile'] = asc_docs_api.prototype.ChangeShapeImageFromFile;
 asc_docs_api.prototype['AddImage'] = asc_docs_api.prototype.AddImage;
+asc_docs_api.prototype['asc_addImage'] = asc_docs_api.prototype.asc_addImage;
 asc_docs_api.prototype['AddImageUrl2'] = asc_docs_api.prototype.AddImageUrl2;
 asc_docs_api.prototype['AddImageUrl'] = asc_docs_api.prototype.AddImageUrl;
 asc_docs_api.prototype['AddImageUrlAction'] = asc_docs_api.prototype.AddImageUrlAction;