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

bug #31605 - Подвисание вкладки с редактором, после того как вставить textart...

bug #31605 - Подвисание вкладки с редактором, после того как вставить textart и таблицу в автофигуру, а затем изменить текст

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68183 954022d7-b5bf-4e40-9824-e11837661b57
parent 2b3d0c81
...@@ -871,6 +871,8 @@ function CTextDrawer(dWidth, dHeight, bDivByLInes, oTheme, bDivGlyphs) ...@@ -871,6 +871,8 @@ function CTextDrawer(dWidth, dHeight, bDivByLInes, oTheme, bDivGlyphs)
this.m_oObjectToDraw = null; this.m_oObjectToDraw = null;
this.m_bTurnOff = false;
this.bCheckLines = false; this.bCheckLines = false;
this.lastX = null; this.lastX = null;
this.lastY = null; this.lastY = null;
...@@ -1385,6 +1387,8 @@ CTextDrawer.prototype = ...@@ -1385,6 +1387,8 @@ CTextDrawer.prototype =
// path commands // path commands
_s : function() _s : function()
{ {
if(this.m_bTurnOff)
return;
this.Get_PathToDraw(true); this.Get_PathToDraw(true);
}, },
_e : function() _e : function()
...@@ -1400,6 +1404,8 @@ CTextDrawer.prototype = ...@@ -1400,6 +1404,8 @@ CTextDrawer.prototype =
}, },
_m : function(x,y) _m : function(x,y)
{ {
if(this.m_bTurnOff)
return;
var oPathToDraw = this.Get_PathToDraw(); var oPathToDraw = this.Get_PathToDraw();
if(oPathToDraw) if(oPathToDraw)
{ {
...@@ -1410,6 +1416,9 @@ CTextDrawer.prototype = ...@@ -1410,6 +1416,9 @@ CTextDrawer.prototype =
}, },
_l : function(x,y) _l : function(x,y)
{ {
if(this.m_bTurnOff)
return;
if(this.bCheckLines) if(this.bCheckLines)
{ {
if(Math.abs(x - this.lastX) < EPSILON_TEXT_AUTOFIT && Math.abs(x - this.lastX) < Math.abs(y - this.lastY)) if(Math.abs(x - this.lastX) < EPSILON_TEXT_AUTOFIT && Math.abs(x - this.lastX) < Math.abs(y - this.lastY))
...@@ -1947,6 +1956,8 @@ CTextDrawer.prototype = ...@@ -1947,6 +1956,8 @@ CTextDrawer.prototype =
rect : function(x,y,w,h) rect : function(x,y,w,h)
{ {
if(this.m_bTurnOff)
return;
var oLastCommand = this.m_aStack[this.m_aStack.length - 1]; var oLastCommand = this.m_aStack[this.m_aStack.length - 1];
if(oLastCommand && (oLastCommand.m_nDrawType === 2 || oLastCommand.m_nDrawType === 4)) if(oLastCommand && (oLastCommand.m_nDrawType === 2 || oLastCommand.m_nDrawType === 4))
{ {
...@@ -2073,12 +2084,12 @@ CTextDrawer.prototype = ...@@ -2073,12 +2084,12 @@ CTextDrawer.prototype =
StartClipPath : function() StartClipPath : function()
{ {
this.private_removeVectors(); this.m_bTurnOff = true;
}, },
EndClipPath : function() EndClipPath : function()
{ {
this.private_restoreVectors(); this.m_bTurnOff = false;
}, },
SetTextPr : function(textPr, theme) SetTextPr : function(textPr, theme)
......
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