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

Excel/api.js

@@ -988,10 +988,8 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 						arr[i] = new asc_CTexture();
 						arr[i].Id = i;
 						arr[i].Image = g_oUserTexturePresets[i];
+						this.ImageLoader.LoadImage(g_oUserTexturePresets[i], 1);
 					}
-					this.ImageLoader.bIsAsyncLoadDocumentImages = false;
-					this.ImageLoader.LoadDocumentImages(g_oUserTexturePresets, false);
-					this.ImageLoader.bIsAsyncLoadDocumentImages = true;
 					
 					this.handlers.trigger("asc_onInitStandartTextures", arr);
 				}				
@@ -2170,6 +2168,9 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 				}
 			},
 			
+			asyncImageEndLoadedBackground: function() {
+			},
+			
 			// Cell interface
 			asc_getCellInfo: function (bExt) {
 				return this.wb.getWorksheet().getSelectionInfo(!!bExt);

Excel/model/DrawingObjects/DrawingObjectsController.js

@@ -1161,14 +1161,14 @@ function CreateAscStrokeEx(ln, _canChangeArrows) {
     ret.width /= 36000.0;
 
     if (ln.cap != null)
-        ret.put_linecap(ln.cap);
+        ret.asc_putLinecap(ln.cap);
 
     if (ln.LineJoin != null)
-        ret.put_linejoin(ln.LineJoin.type);
+        ret.asc_putLinejoin(ln.LineJoin.type);
 
     if (ln.headEnd != null)
     {
-        ret.put_linebeginstyle((ln.headEnd.type == null) ? LineEndType.None : ln.headEnd.type);
+        ret.asc_putLinebeginstyle((ln.headEnd.type == null) ? LineEndType.None : ln.headEnd.type);
 
         var _len = (null == ln.headEnd.len) ? 1 : (2 - ln.headEnd.len);
         var _w = (null == ln.headEnd.w) ? 1 : (2 - ln.headEnd.w);