Commit cd471931 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@51280 954022d7-b5bf-4e40-9824-e11837661b57
parent 1d964126
...@@ -2844,7 +2844,7 @@ function DrawingObjects() { ...@@ -2844,7 +2844,7 @@ function DrawingObjects() {
if(isRealObject(drawingObject.graphicObject.drawingBase)) if(isRealObject(drawingObject.graphicObject.drawingBase))
{ {
var metrics = drawingObject.graphicObject.drawingBase.getGraphicObjectMetrics(); var metrics = drawingObject.graphicObject.drawingBase.getGraphicObjectMetrics();
drawingObject.graphicObject.setXfrmObject(new CXfrm()); //drawingObject.graphicObject.setXfrmObject(new CXfrm());
drawingObject.graphicObject.spPr.xfrm.setPosition(metrics.x, metrics.y); drawingObject.graphicObject.spPr.xfrm.setPosition(metrics.x, metrics.y);
drawingObject.graphicObject.spPr.xfrm.setExtents(metrics.extX, metrics.extY); drawingObject.graphicObject.spPr.xfrm.setExtents(metrics.extX, metrics.extY);
} }
...@@ -2869,7 +2869,7 @@ function DrawingObjects() { ...@@ -2869,7 +2869,7 @@ function DrawingObjects() {
if(isRealObject(drawingObject.graphicObject.drawingBase)) if(isRealObject(drawingObject.graphicObject.drawingBase))
{ {
var metrics = drawingObject.graphicObject.drawingBase.getGraphicObjectMetrics(); var metrics = drawingObject.graphicObject.drawingBase.getGraphicObjectMetrics();
drawingObject.graphicObject.setXfrmObject(new CXfrm()); //drawingObject.graphicObject.setXfrmObject(new CXfrm());
drawingObject.graphicObject.spPr.xfrm.setPosition(metrics.x, metrics.y); drawingObject.graphicObject.spPr.xfrm.setPosition(metrics.x, metrics.y);
drawingObject.graphicObject.spPr.xfrm.setExtents(metrics.extX, metrics.extY); drawingObject.graphicObject.spPr.xfrm.setExtents(metrics.extX, metrics.extY);
} }
...@@ -4924,7 +4924,6 @@ function DrawingObjects() { ...@@ -4924,7 +4924,6 @@ function DrawingObjects() {
objectInfo.id = graphicObjectInfo.objectId; objectInfo.id = graphicObjectInfo.objectId;
objectInfo.object = _this.getDrawingBase(graphicObjectInfo.objectId); objectInfo.object = _this.getDrawingBase(graphicObjectInfo.objectId);
objectInfo.cursor = graphicObjectInfo.cursorType; objectInfo.cursor = graphicObjectInfo.cursorType;
objectInfo.hyperlink = graphicObjectInfo.hyperlink;
objectInfo.isGraphicObject = true; objectInfo.isGraphicObject = true;
return objectInfo; return objectInfo;
...@@ -5220,9 +5219,10 @@ function writeToBinaryParagraph(p, w) ...@@ -5220,9 +5219,10 @@ function writeToBinaryParagraph(p, w)
for ( var Index = 0; Index < Len; Index++ ) for ( var Index = 0; Index < Len; Index++ )
{ {
var Item = p.Content[Index]; var Item = p.Content[Index];
if ( true === Item.Is_RealContent() ) if ( true === Item.Is_RealContent())
{ {
writeToBinaryParagraphContent(Item, w); writeToBinaryParagraphContent(Item, w);
w.WriteLong(Index);
Count++; Count++;
} }
} }
...@@ -5246,6 +5246,7 @@ function readFromBinaryParagraph(p, r) ...@@ -5246,6 +5246,7 @@ function readFromBinaryParagraph(p, r)
for ( var Index = 0; Index < Count; Index++ ) for ( var Index = 0; Index < Count; Index++ )
{ {
var Element = readFromBinaryParagraphContent(r); var Element = readFromBinaryParagraphContent(r);
var index_test = r.GetLong();
if ( null != Element ) if ( null != Element )
p.Content.push( Element ); p.Content.push( Element );
} }
......
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