Исправлен баг с copy/paste нескольких картинок

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

Common/Charts/DrawingObjects.js

@@ -529,29 +529,14 @@ asc_CChart.prototype = {
 				
 			var baseColors = api.chartStyleManager.getBaseColors( parseInt(this.styleId) );
 			var colors = generateColors(count, baseColors, true);
-		}
+			
 			for ( var i = 0; i < colors.length; i++ ) {
 				var rgbColor = new RGBColor(colors[i]);
-			
 				var uniColor = CreateUniColorRGB(rgbColor.r, rgbColor.g, rgbColor.b);
-			
-			/*var theme, colorMap;
-			RGBA = {R: 0, G: 0, B: 0, A: 255};
-			
-			if ( api_sheet ) {
-				theme = api_sheet.wbModel.theme;
-				colorMap = GenerateDefaultColorMap().color_map;
+				uniColors.push(uniColor);
 			}
-			else {
-				theme  = api_doc.WordControl.m_oLogicDocument.theme;
-				colorMap = api_doc.WordControl.m_oLogicDocument.clrSchemeMap.color_map;
-				if ( colorMap == null )
-					colorMap = GenerateDefaultColorMap().color_map;
 		}
-			uniColor.Calculate(theme, colorMap, RGBA);*/
 		
-			uniColors.push(uniColor);
-		}
 		return uniColors;
 	},
 	

Common/Charts/charts.js

@@ -1816,7 +1816,7 @@ function insertChart(chart, activeWorkSheet, width, height, isNewChart) {
 }
 
 function arrReverse(arr) {
-	if(!arr)
+	if(!arr || !arr.length)
 		return;
 	var newarr = [];
 	for (i = 0; i < arr[0].length; ++i) {

Excel/view/WorksheetView.js

@@ -7153,6 +7153,15 @@
 										pasteExec();
 										if(val.addImages && val.addImages.length != 0)
 										{
+											var api = asc["editor"];
+											var aImagesSync = [];
+											for(var im = 0; im < val.addImages.length; im++)
+											{
+												aImagesSync.push(val.addImages[im].tag.src);
+											}
+											api.ImageLoader.LoadDocumentImages(aImagesSync);
+											t.objectRender.asyncImagesDocumentEndLoaded = function() {
+											
 												for(var im = 0; im < val.addImages.length; im++)//вставляем изображения
 												{
 													var src = val.addImages[im].tag.src;
@@ -7219,6 +7228,7 @@
 													}	
 												}
 											}
+										}
 									});
 								}
 								else