Commit 80bd32ba authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

правка для вставки картинок из excel

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56263 954022d7-b5bf-4e40-9824-e11837661b57
parent deeeb3c0
...@@ -1561,7 +1561,7 @@ CopyProcessor.prototype = ...@@ -1561,7 +1561,7 @@ CopyProcessor.prototype =
curParaRun.Selection.StartPos = inIndex; curParaRun.Selection.StartPos = inIndex;
curParaRun.Selection.Use = true; curParaRun.Selection.Use = true;
paragraph.Selection.EndPos = paragraphIndex + 1; paragraph.Selection.EndPos = paragraphIndex;
paragraph.Selection.StartPos = paragraphIndex; paragraph.Selection.StartPos = paragraphIndex;
paragraph.Selection.Use = true; paragraph.Selection.Use = true;
...@@ -3868,6 +3868,8 @@ PasteProcessor.prototype = ...@@ -3868,6 +3868,8 @@ PasteProcessor.prototype =
{ {
//пока только распознаём только графические объекты //пока только распознаём только графические объекты
var aContent = null; var aContent = null;
var aPastedImages = [];
var imageUrl, images = [];
var drawings = aContentExcel.aWorksheets[0].Drawings; var drawings = aContentExcel.aWorksheets[0].Drawings;
if(drawings && drawings.length) if(drawings && drawings.length)
...@@ -3894,14 +3896,22 @@ PasteProcessor.prototype = ...@@ -3894,14 +3896,22 @@ PasteProcessor.prototype =
tempParaRun.Content[0].GraphicObj = graphicObj; tempParaRun.Content[0].GraphicObj = graphicObj;
tempParaRun.Content[0].GraphicObj.parent = tempParaRun.Content[0]; tempParaRun.Content[0].GraphicObj.parent = tempParaRun.Content[0];
tempParagraph.Content.splice(tempParagraph.Content.length - 1, 0, tempParaRun); tempParagraph.Content.splice(tempParagraph.Content.length - 1, 0, tempParaRun);
if(graphicObj.isImage())
{
imageUrl = graphicObj.getImageUrl();
aPastedImages[aPastedImages.length] = new CBuilderImages(graphicObj.blipFill, imageUrl);
images[images.length] = imageUrl;
}
}; };
aContent = []; aContent = [];
aContent[0] = tempParagraph; aContent[0] = tempParagraph;
}; };
return {content: aContent, aPastedImages: []}; return {content: aContent, aPastedImages: aPastedImages, images: images};
}, },
_readFromBinaryExcel: function(base64) _readFromBinaryExcel: function(base64)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment