Commit bf9df7da authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Bug 29352 - Ошибка в консоли при открытии pptx файла

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@62597 954022d7-b5bf-4e40-9824-e11837661b57
parent e1a664f8
...@@ -1132,6 +1132,12 @@ CShape.prototype = ...@@ -1132,6 +1132,12 @@ CShape.prototype =
this.transformText = this.localTransformText.CreateDublicate(); this.transformText = this.localTransformText.CreateDublicate();
this.invertTransformText = global_MatrixTransformer.Invert(this.transformText); this.invertTransformText = global_MatrixTransformer.Invert(this.transformText);
if(this.txBody && this.txBody.content2)
{
this.transformText2 = new CMatrix();
this.clipRect2 = this.checkTransformTextMatrix(this.transformText2, this.txBody.content2, oBodyPr, false);
this.invertTransformText2 = global_MatrixTransformer.Invert(this.transformText);
}
if(oBodyPr.prstTxWarp) if(oBodyPr.prstTxWarp)
{ {
if(this.bWordShape) if(this.bWordShape)
...@@ -4172,6 +4178,7 @@ CShape.prototype = ...@@ -4172,6 +4178,7 @@ CShape.prototype =
var oRet = {oTxWarpStruct: null, oTxWarpStructParamarks: null}; var oRet = {oTxWarpStruct: null, oTxWarpStructParamarks: null};
if(oBodyPr.prstTxWarp) if(oBodyPr.prstTxWarp)
{ {
var bNeedRecalcContent = (oBodyPr.prstTxWarp.pathLst.length % 2) === 1;
var oTextDrawer = new CTextDrawer(dWidth, dHeight, true); var oTextDrawer = new CTextDrawer(dWidth, dHeight, true);
var warpGeometry = oBodyPr.prstTxWarp; var warpGeometry = oBodyPr.prstTxWarp;
warpGeometry.Recalculate(dWidth, dHeight); warpGeometry.Recalculate(dWidth, dHeight);
......
...@@ -146,7 +146,6 @@ CTableStructure.prototype.Recalculate = function(oTheme, oColorMap, dWidth, dHei ...@@ -146,7 +146,6 @@ CTableStructure.prototype.Recalculate = function(oTheme, oColorMap, dWidth, dHei
CTableStructure.prototype.draw = function(graphics, transform) CTableStructure.prototype.draw = function(graphics, transform)
{ {
var i; var i;
for(i = 0; i < this.m_aBorders.length; ++i) for(i = 0; i < this.m_aBorders.length; ++i)
{ {
this.m_aBorders[i].draw(graphics); this.m_aBorders[i].draw(graphics);
......
...@@ -331,8 +331,6 @@ CShape.prototype.recalculate = function () ...@@ -331,8 +331,6 @@ CShape.prototype.recalculate = function ()
if(this.bDeleted) if(this.bDeleted)
return; return;
ExecuteNoHistory(function(){ ExecuteNoHistory(function(){
if (this.recalcInfo.recalculateBrush) { if (this.recalcInfo.recalculateBrush) {
this.recalculateBrush(); this.recalculateBrush();
this.recalcInfo.recalculateBrush = false; this.recalcInfo.recalculateBrush = false;
...@@ -360,6 +358,7 @@ CShape.prototype.recalculate = function () ...@@ -360,6 +358,7 @@ CShape.prototype.recalculate = function ()
if (this.recalcInfo.recalculateTransformText) { if (this.recalcInfo.recalculateTransformText) {
this.recalculateTransformText(); this.recalculateTransformText();
this.recalcInfo.recalculateTransformText = false;
} }
if(this.recalcInfo.recalculateBounds) if(this.recalcInfo.recalculateBounds)
...@@ -492,7 +491,6 @@ CShape.prototype.recalculateContent = function() ...@@ -492,7 +491,6 @@ CShape.prototype.recalculateContent = function()
this.txWarpStructParamarks = oTextWarpContent.oTxWarpStructParamarks; this.txWarpStructParamarks = oTextWarpContent.oTxWarpStructParamarks;
this.txWarpStruct = oTextWarpContent.oTxWarpStruct; this.txWarpStruct = oTextWarpContent.oTxWarpStruct;
} }
} }
}; };
......
...@@ -679,9 +679,6 @@ CShape.prototype.recalculateContent2 = function() ...@@ -679,9 +679,6 @@ CShape.prototype.recalculateContent2 = function()
} }
var oTextWarpContent = this.checkTextWarp(content, body_pr, this.txBody.contentWidth2, this.txBody.contentHeight2);
this.txWarpStructParamarks2 = oTextWarpContent.oTxWarpStructParamarks;
this.txWarpStruct2 = oTextWarpContent.oTxWarpStruct;
} }
this.contentWidth2 = this.txBody.contentWidth2; this.contentWidth2 = this.txBody.contentWidth2;
this.contentHeight2 = this.txBody.contentHeight2; this.contentHeight2 = this.txBody.contentHeight2;
...@@ -700,10 +697,16 @@ CShape.prototype.recalculateContent2 = function() ...@@ -700,10 +697,16 @@ CShape.prototype.recalculateContent2 = function()
content.Reset(0, 0, w, 20000); content.Reset(0, 0, w, 20000);
content.Recalculate_Page(content.StartPage, true); content.Recalculate_Page(content.StartPage, true);
var oTextWarpContent = this.checkTextWarp(content, body_pr, this.txBody.contentWidth2, this.txBody.contentHeight2);
this.txWarpStructParamarks2 = oTextWarpContent.oTxWarpStructParamarks;
this.txWarpStruct2 = oTextWarpContent.oTxWarpStruct;
} }
else else
{ {
this.txBody.content2 = null; this.txBody.content2 = null;
this.txWarpStructParamarks2 = null;
this.txWarpStruct2 = null;
} }
} }
......
"use strict"; "use strict";
function CGraphicObjects(document, drawingDocument, api, documentContent) function CGraphicObjects(document, drawingDocument, api)
{ {
this.api = api; this.api = api;
this.document = document; this.document = document;
......
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