загрузка шрифтов при вставке в шейп

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

Excel/model/clipboard.js

@@ -1640,29 +1640,43 @@
 			_pasteInShape: function(worksheet, node, onlyFromLocalStorage, targetDocContent)
 			{
 				var oPasteProcessor = new PasteProcessor({WordControl:{m_oLogicDocument: targetDocContent}, FontLoader: {}}, false, false, true, true);
+				var newFonts;
 				
 				if(onlyFromLocalStorage)
 					node = this.lStorage.htmlInShape ? this.lStorage.htmlInShape : this.lStorage;
-					
-				oPasteProcessor._Execute(node, {}, true, true, false);
-				
-				targetDocContent.Remove(1, true, true);
-				
-				oPasteProcessor.InsertInPlace(targetDocContent , oPasteProcessor.aContent);
 				
-				worksheet.objectRender.controller.startRecalculate();
+				oPasteProcessor._Prepeare_recursive(node, true);
 				
-				//targetDocContent.Parent.parent.recalculate();
+				oPasteProcessor.aContent = [];
+                 
+				newFonts = this._convertFonts(oPasteProcessor.oFonts);
 				
-				/*if(onlyFromLocalStorage)
+				worksheet._loadFonts(newFonts, function () {
+					
+					oPasteProcessor._Execute(node, {}, true, true, false);
+					
+					targetDocContent.Remove(1, true, true);
+					
+					oPasteProcessor.InsertInPlace(targetDocContent , oPasteProcessor.aContent);
+					
+					worksheet.objectRender.controller.startRecalculate();
+					
+					window.GlobalPasteFlag = false;
+					window.GlobalPasteFlagCounter = 0;
+				})				
+			},
+			
+			_convertFonts: function(oFonts)
+			{
+				var newFonts = {};
+				var fontName;
+				for(var i in oFonts)
 				{
-					if(t.lStorage && t.lStorage.htmlInShape)
-						worksheet.objectRender.controller.curState.textObject.txBody.insertHtml(t.lStorage.htmlInShape);
-				}
-				else
-					worksheet.objectRender.controller.curState.textObject.txBody.insertHtml(node);*/
-				window.GlobalPasteFlag = false;
-				window.GlobalPasteFlagCounter = 0;
+					fontName = oFonts[i].Name;
+					fontName = this._checkFonts(fontName);
+					newFonts[fontName] = 1;
+				};
+				return newFonts;
 			},
 			
             _editorPasteExec: function (worksheet, node, isText,onlyFromLocalStorage)