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

Правка багов с добавлением сплайнов и изменением аджастментов в переданных автофигурах.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56100 954022d7-b5bf-4e40-9824-e11837661b57
parent 9a8c4d00
...@@ -864,6 +864,7 @@ Geometry.prototype= ...@@ -864,6 +864,7 @@ Geometry.prototype=
if(typeof name === "string" && typeof val === "string") if(typeof name === "string" && typeof val === "string")
{ {
this.gdLst[name] = parseInt(val); this.gdLst[name] = parseInt(val);
this.avLst[name] = true;
} }
if(oldAvVal) if(oldAvVal)
{ {
......
...@@ -395,7 +395,7 @@ Path.prototype = { ...@@ -395,7 +395,7 @@ Path.prototype = {
var Y1 = readString(r); var Y1 = readString(r);
var X2 = readString(r); var X2 = readString(r);
var Y2 = readString(r); var Y2 = readString(r);
this.ArrPathCommandInfo.push({id: bezier3, X0: X0, Y0: Y0, X1: X1, Y1: Y1, X2: X2, Y2: Y2}); this.ArrPathCommandInfo.push({id: bezier4, X0: X0, Y0: Y0, X1: X1, Y1: Y1, X2: X2, Y2: Y2});
break; break;
} }
case arcTo: case arcTo:
......
...@@ -2055,10 +2055,15 @@ CGraphicObjects.prototype = ...@@ -2055,10 +2055,15 @@ CGraphicObjects.prototype =
{ {
if(object.group) if(object.group)
object = object.getMainGroup(); object = object.getMainGroup();
if(isRealObject(object) && isRealObject(object.parent))
{
return ret.bMarker ? DRAWING_ARRAY_TYPE_BEFORE : object.parent.getDrawingArrayType();
}
} }
if(isRealObject(object) && isRealObject(object.parent)) else
{ {
return ret.bMarker ? DRAWING_ARRAY_TYPE_BEFORE : object.parent.getDrawingArrayType(); return DRAWING_ARRAY_TYPE_BEFORE;
} }
} }
return -1; return -1;
......
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