Commit 66393e4d authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

прака для бага #21328

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50833 954022d7-b5bf-4e40-9824-e11837661b57
parent fb20dcf1
......@@ -1720,7 +1720,7 @@ CopyProcessor.prototype =
var sBase64 = this.oBinaryFileWriter.GetResult();
if(this.ElemToSelect.children && this.ElemToSelect.children.length == 1 && window.USER_AGENT_SAFARI_MACOS)
{
$(this.ElemToSelect.children[0]).css("font-weight", "normal");;
$(this.ElemToSelect.children[0]).css("font-weight", "normal");
$(this.ElemToSelect.children[0]).wrap(document.createElement("b"));
}
if(this.ElemToSelect.children[0])
......@@ -4105,9 +4105,14 @@ PasteProcessor.prototype =
History.TurnOff();
var sub;
if(typeof binary_shape === "string")
sub = binary_shape.substr(0, 12);
if(typeof binary_shape === "string" &&( sub === "TeamLabShape" || sub === "TeamLabImage" || sub === "TeamLabChart" || sub === "TeamLabGroup"))
var checkSheetsData;
if(typeof binary_shape === "string")
{
sub = binary_shape.substr(0, 12);
//чтобы не возникало ошибок при copy/paste из word в excel
checkSheetsData = binary_shape.substring(12, 18);
}
if(typeof binary_shape === "string" &&( sub === "TeamLabShape" || sub === "TeamLabImage" || sub === "TeamLabChart" || sub === "TeamLabGroup") && checkSheetsData != "Sheets")
{
var reader = CreateBinaryReader(binary_shape, 12, binary_shape.length);
var first_string = null;
......@@ -5712,9 +5717,14 @@ PasteProcessor.prototype =
{
var binary_shape = node.getAttribute("alt");
var sub;
var checkSheetsData;
if(typeof binary_shape === "string")
sub = binary_shape.substr(0, 12);
if(typeof binary_shape === "string" &&( sub === "TeamLabShape" || sub === "TeamLabImage" || sub === "TeamLabChart" || sub === "TeamLabGroup"))
{
sub = binary_shape.substr(0, 12);
//чтобы не возникало ошибок при copy/paste из word в excel
checkSheetsData = binary_shape.substring(12, 18);
}
if(typeof binary_shape === "string" &&( sub === "TeamLabShape" || sub === "TeamLabImage" || sub === "TeamLabChart" || sub === "TeamLabGroup") && checkSheetsData != "Sheets")
{
var reader = CreateBinaryReader(binary_shape, 12, binary_shape.length);
if(isRealObject(reader))
......@@ -5805,9 +5815,14 @@ PasteProcessor.prototype =
if(oTargetDocument && oDrawingDocument)
{
var sub;
var checkSheetsData;
if(typeof binary_shape === "string")
sub = binary_shape.substr(0, 12);
if(typeof binary_shape === "string" &&( sub === "TeamLabShape" || sub === "TeamLabImage" || sub === "TeamLabChart" || sub === "TeamLabGroup"))
{
sub = binary_shape.substr(0, 12);
//чтобы не возникало ошибок при copy/paste из word в excel
checkSheetsData = binary_shape.substring(12, 18);
}
if(typeof binary_shape === "string" &&( sub === "TeamLabShape" || sub === "TeamLabImage" || sub === "TeamLabChart" || sub === "TeamLabGroup") && checkSheetsData != 'Sheets')
{
var reader = CreateBinaryReader(binary_shape, 12, binary_shape.length);
if(isRealObject(reader))
......
......@@ -2638,10 +2638,10 @@
var binary_shape = array[i].image.getAttribute("alt");
var sub;
if(typeof binary_shape === "string")
sub = binary_shape.substr(0, 12);
if(typeof binary_shape === "string" &&( sub === "TeamLabShape" || sub === "TeamLabImage" || sub === "TeamLabChart" || sub === "TeamLabGroup"))
sub = binary_shape.substr(0, 18);
if(typeof binary_shape === "string" &&( sub === "TeamLabShapeSheets" || sub === "TeamLabImageSheets" || sub === "TeamLabChartSheets" || sub === "TeamLabGroupSheets"))
{
var reader = CreateBinaryReader(binary_shape, 12, binary_shape.length);
var reader = CreateBinaryReader(binary_shape, 18, binary_shape.length);
reader.GetLong();
if(isRealObject(reader))
reader.oImages = this.oImages;
......@@ -2661,22 +2661,22 @@
var Drawing;
switch(first_string)
{
case "TeamLabImage":
case "TeamLabImageSheets":
{
Drawing = new CImageShape();
break;
}
case "TeamLabShape":
case "TeamLabShapeSheets":
{
Drawing = new CShape();
break;
}
case "TeamLabGroup":
case "TeamLabGroupSheets":
{
Drawing = new CGroupShape();
break;
}
case "TeamLabChart":
case "TeamLabChartSheets":
{
Drawing = new CChartAsGroup();
Drawing.setAscChart(new asc_CChart());
......
......@@ -7039,9 +7039,9 @@
var binary_shape = val.addImages[im].tag.getAttribute("alt");
var sub;
if (typeof binary_shape === "string")
sub = binary_shape.substr(0, 12);
if (typeof binary_shape === "string" &&( sub === "TeamLabShape" || sub === "TeamLabImage" || sub === "TeamLabChart" || sub === "TeamLabGroup")) {
var reader = CreateBinaryReader(binary_shape, 12, binary_shape.length);
sub = binary_shape.substr(0, 18);
if (typeof binary_shape === "string" &&( sub === "TeamLabShapeSheets" || sub === "TeamLabImageSheets" || sub === "TeamLabChartSheets" || sub === "TeamLabGroupSheets")) {
var reader = CreateBinaryReader(binary_shape, 18, binary_shape.length);
reader.GetLong();
if (isRealObject(reader))
reader.oImages = this.oImages;
......@@ -7059,19 +7059,19 @@
var Drawing;
switch(first_string) {
case "TeamLabImage": {
case "TeamLabImageSheets": {
Drawing = new CImageShape();
break;
}
case "TeamLabShape": {
case "TeamLabShapeSheets": {
Drawing = new CShape();
break;
}
case "TeamLabGroup": {
case "TeamLabGroupSheets": {
Drawing = new CGroupShape();
break;
}
case "TeamLabChart": {
case "TeamLabChartSheets": {
Drawing = new CChartAsGroup();
break;
}
......
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