git-svn-id:...

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49964 954022d7-b5bf-4e40-9824-e11837661b57

Common/Charts/DrawingObjects.js

@@ -2732,8 +2732,8 @@ function DrawingObjects() {
 		aImagesSync = [];
 		aObjectsSync = [];
 		
-		// Смещаем 0,0
-		scrollOffset.x = worksheet.getCellLeft(0, 0);
+		// Смещаем 0,0
+		scrollOffset.x = worksheet.getCellLeft(0, 0);
 		scrollOffset.y = worksheet.getCellTop(0, 0);
 		
 		for (var i = 0; currentSheet.model.Drawings && (i < currentSheet.model.Drawings.length); i++) {
@@ -2779,6 +2779,18 @@ function DrawingObjects() {
 				drawingObject.graphicObject.drawingBase = drawingObject;
                 drawingObject.graphicObject.drawingObjects = _this;
                 drawingObject.graphicObject.setDrawingDocument(this.drawingDocument);
+                var xfrm = drawingObject.graphicObject.spPr.xfrm;
+
+                if(!xfrm || !xfrm.isNotNull())
+                {
+                    if(isRealObject(drawingObject.graphicObject.drawingBase))
+                    {
+                        var metrics = drawingObject.graphicObject.drawingBase.getGraphicObjectMetrics();
+                        drawingObject.graphicObject.setXfrmObject(new CXfrm());
+                        drawingObject.graphicObject.spPr.xfrm.setPosition(metrics.x, metrics.y);
+                        drawingObject.graphicObject.spPr.xfrm.setExtents(metrics.extX, metrics.extY);
+                    }
+                }
 				drawingObject.graphicObject.recalculate();
 				aObjects.push( drawingObject );
 			}
@@ -2787,6 +2799,18 @@ function DrawingObjects() {
 				aObjectsSync[aObjectsSync.length] = drawingObject;
                 drawingObject.graphicObject.drawingBase = drawingObject;
                 drawingObject.graphicObject.drawingObjects = _this;
+                var xfrm = drawingObject.graphicObject.spPr.xfrm;
+
+                if(!xfrm || !xfrm.isNotNull())
+                {
+                    if(isRealObject(drawingObject.graphicObject.drawingBase))
+                    {
+                        var metrics = drawingObject.graphicObject.drawingBase.getGraphicObjectMetrics();
+                        drawingObject.graphicObject.setXfrmObject(new CXfrm());
+                        drawingObject.graphicObject.spPr.xfrm.setPosition(metrics.x, metrics.y);
+                        drawingObject.graphicObject.spPr.xfrm.setExtents(metrics.extX, metrics.extY);
+                    }
+                }
                 drawingObject.graphicObject.recalculate(aImagesSync);
 			}
 
@@ -2794,6 +2818,18 @@ function DrawingObjects() {
 
                 drawingObject.graphicObject.drawingBase = drawingObject;
                 drawingObject.graphicObject.drawingObjects = _this;
+                var xfrm = drawingObject.graphicObject.spPr.xfrm;
+
+                if(!xfrm || !xfrm.isNotNull())
+                {
+                    if(isRealObject(drawingObject.graphicObject.drawingBase))
+                    {
+                        var metrics = drawingObject.graphicObject.drawingBase.getGraphicObjectMetrics();
+                        drawingObject.graphicObject.setXfrmObject(new CXfrm());
+                        drawingObject.graphicObject.spPr.xfrm.setPosition(metrics.x, metrics.y);
+                        drawingObject.graphicObject.spPr.xfrm.setExtents(metrics.extX, metrics.extY);
+                    }
+                }
                 drawingObject.graphicObject.setDrawingDocument(this.drawingDocument);
                 drawingObject.graphicObject.recalculate(aImagesSync);
                 aObjects.push( drawingObject );
@@ -2904,9 +2940,9 @@ function DrawingObjects() {
 		
 		for ( var i = 0; i < _this.controller.selectedObjects.length; i++ ) {
 			if ( _this.controller.selectedObjects[i].isChart() ) {
-				_this.selectDrawingObjectRange(_this.controller.selectedObjects[i].Id);
+				_this.selectDrawingObjectRange(_this.controller.selectedObjects[i].Id);
 				shapeOverlayCtx.ClearMode = true;
-				_this.controller.selectedObjects[i].draw(shapeOverlayCtx);
+				_this.controller.selectedObjects[i].draw(shapeOverlayCtx);
 				shapeOverlayCtx.ClearMode = false;
 			}
 		}
@@ -3572,7 +3608,7 @@ function DrawingObjects() {
 									
 										var cell = graphicObject.chart.range.intervalObject.worksheet.getCell(new CellAddress(range.bbox.r1, j, 0));
 										cell.setNumFormat(data.NumCache[index].numFormatStr);
-										cell.setValue(data.NumCache[index].val);
+										cell.setValue(data.NumCache[index].val);
 										index++;
 									}
 								}
@@ -4167,14 +4203,14 @@ function DrawingObjects() {
 		var top = worksheet.getCellTop(0, 3) + pxToMm(1);
 		var left = worksheet.getCellLeft(0, 3) + pxToMm(1);
 		
-		// выход за границу слева или сверху
-		if ( y < 0 ) {
-			response.result = false;
-			response.y = Math.abs(y);
-		}
-		if ( x < 0 ) {
-			response.result = false;
-			response.x = Math.abs(x);
+		// выход за границу слева или сверху
+		if ( y < 0 ) {
+			response.result = false;
+			response.y = Math.abs(y);
+		}
+		if ( x < 0 ) {
+			response.result = false;
+			response.x = Math.abs(x);
 		}
 		
 		// выход за границу справа
@@ -4237,7 +4273,7 @@ function DrawingObjects() {
 		}
 	}
 	
-	_this.restoreScrollOffset = function() {
+	_this.restoreScrollOffset = function() {
 	
 		shapeCtx.m_oCoordTransform.tx = scrollOffset.x;
 		shapeCtx.m_oCoordTransform.ty = scrollOffset.y;

Common/Shapes/Serialize.js

@@ -6291,6 +6291,7 @@ function BinaryPPTYLoader()
                     {
                         s.Skip2(1); // type
                         var _paragraph = this.ReadParagraph(txbody.content);
+                        _paragraph.Set_Parent(txbody.content);
                         txbody.content.Internal_Content_Add(txbody.content.Content.length, _paragraph);
                         if(_paragraph.f_type != undefined || _paragraph.f_text != undefined || _paragraph.f_id != undefined)
                         {