WordArts

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

Common/Drawings/CommonController.js

@@ -4667,6 +4667,7 @@ DrawingObjectsController.prototype =
         this.handleEventMode = HANDLE_EVENT_MODE_CURSOR;
         oCursorInfo = this.curState.onMouseDown(e, x, y, pageIndex, bTextFlag);
         this.handleEventMode = HANDLE_EVENT_MODE_HANDLE;
+
         return !(isRealObject(oCursorInfo) && oTitle === oCursorInfo.title);
     },
 
@@ -4726,27 +4727,38 @@ DrawingObjectsController.prototype =
         }
         else {
             var oTargetTextObject = getTargetTextObject(this);
+
             if (oTargetTextObject) {
-                if (oTargetTextObject.recalcInfo.bRecalculatedTitle) {
+
+                var oBodyPr = oTargetTextObject.getBodyPr && oTargetTextObject.getBodyPr();
+                if(oBodyPr && oBodyPr.prstTxWarp)
+                {
+                    if (oTargetTextObject.recalcInfo.bRecalculatedTitle)
+                    {
                         oTargetTextObject.recalcInfo.recalcTitle = null;
                         oTargetTextObject.handleContent && oTargetTextObject.handleContent();
-                    if (this.document) {
                         oTargetTextObject.recalculate();
+                        oTargetTextObject.recalcInfo.bRecalculatedTitle = false;
+
+                    }
+                    if (this.document)
+                    {
                         this.document.DrawingDocument.OnRecalculatePage(oTargetTextObject.selectStartPage, this.document.Pages[oTargetTextObject.selectStartPage]);
                         this.document.DrawingDocument.OnEndRecalculate(false, true);
                     }
-                    else if (this.drawingObjects.cSld) {
-                        oTargetTextObject.recalculate();
-                        if (!(bNoRedraw === true)) {
+                    else if (this.drawingObjects.cSld)
+                    {
+                        if (!(bNoRedraw === true))
+                        {
                             editor.WordControl.m_oDrawingDocument.OnRecalculatePage(this.drawingObjects.num, this.drawingObjects);
                             editor.WordControl.m_oDrawingDocument.OnEndRecalculate(false, true);
                         }
                     }
-                    else {
+                    else
+                    {
                         oTargetTextObject.addToRecalculate();
                         this.startRecalculate();
                     }
-                    oTargetTextObject.recalcInfo.bRecalculatedTitle = false;
                 }
 
             }

Common/Drawings/Format/Geometry.js

@@ -26,6 +26,17 @@ var APPROXIMATE_EPSILON3 = 5;
 var cToRad = Math.PI/(60000*180);
 var cToDeg = 1/cToRad;
 
+var oGdLst = {};
+oGdLst["_3cd4"]= 16200000;
+oGdLst["_3cd8"]= 8100000;
+oGdLst["_5cd8"]= 13500000;
+oGdLst["_7cd8"]= 18900000;
+oGdLst["cd2"]= 10800000;
+oGdLst["cd4"]= 5400000;
+oGdLst["cd8"]= 2700000;
+oGdLst["l"]= 0;
+oGdLst["t"]= 0;
+
 function Cos(angle)
 {
     return Math.cos(cToRad*angle);
@@ -386,6 +397,17 @@ Geometry.prototype=
         }
     },
 
+    isEmpty: function()
+    {
+        if(this.pathLst.length === 0)
+            return true;
+        if(this.pathLst.length === 1)
+        {
+            return this.pathLst[0].ArrPathCommandInfo.length === 0;
+        }
+        return false;
+    },
+
     createDuplicate: function()
     {
         var g = new Geometry();
@@ -440,7 +462,19 @@ Geometry.prototype=
     AddAdj: function(name, formula, x, y, z)
     {
         History.Add(this, {Type: historyitem_GeometryAddAdj, name:name, oldVal:this.gdLst[name], newVal:x, oldAvVal: this.avLst[name]});
-        this.gdLst[name] = parseInt(x);
+        var dVal = parseInt(x);
+        if(isNaN(dVal))
+        {
+            if(isRealNumber(oGdLst[x]))
+            {
+                dVal = oGdLst[x];
+            }
+            else
+            {
+                dVal = 0;
+            }
+        }
+        this.gdLst[name] = dVal;
         this.avLst[name] = true;
     },
 
@@ -564,6 +598,7 @@ Geometry.prototype=
             case 6:
             {
                 this.pathLst[this.pathLst.length-1].close();
+                break;
             }
         }
     },
@@ -954,38 +989,38 @@ Geometry.prototype=
 
     Recalculate: function(w, h)
     {
-        this.gdLst["_3cd4"]=16200000;
-        this.gdLst["_3cd8"]=8100000;
-        this.gdLst["_5cd8"]=13500000;
-        this.gdLst["_7cd8"]=18900000;
-        this.gdLst["cd2"]=10800000;
-        this.gdLst["cd4"]=5400000;
-        this.gdLst["cd8"]=2700000;
-        this.gdLst["l"]=0;
-        this.gdLst["t"]=0;
-        this.gdLst["h"]=h;
-        this.gdLst["b"]=h;
-        this.gdLst["hd2"]=h/2;
-        this.gdLst["hd3"]=h/3;
-        this.gdLst["hd4"]=h/4;
-        this.gdLst["hd5"]=h/5;
-        this.gdLst["hd6"]=h/6;
-        this.gdLst["hd8"]=h/8;
-        this.gdLst["hd10"]=h/10;
-        this.gdLst["hd12"]=h/12;
-        this.gdLst["hd32"]=h/32;
-        this.gdLst["vc"]=h/2;
-        this.gdLst["w"]=w;
-        this.gdLst["r"]=w;
-        this.gdLst["wd2"]=w/2;
-        this.gdLst["wd3"]=w/3;
-        this.gdLst["wd4"]=w/4;
-        this.gdLst["wd5"]=w/5;
-        this.gdLst["wd6"]=w/6;
-        this.gdLst["wd8"]=w/8;
-        this.gdLst["wd10"]=w/10;
-        this.gdLst["wd12"]=w/12;
-        this.gdLst["wd32"]=w/32;
+        this.gdLst["_3cd4"]= 16200000;
+        this.gdLst["_3cd8"]= 8100000;
+        this.gdLst["_5cd8"]= 13500000;
+        this.gdLst["_7cd8"]= 18900000;
+        this.gdLst["cd2"]= 10800000;
+        this.gdLst["cd4"]= 5400000;
+        this.gdLst["cd8"]= 2700000;
+        this.gdLst["l"]= 0;
+        this.gdLst["t"]= 0;
+        this.gdLst["h"]= h;
+        this.gdLst["b"]= h;
+        this.gdLst["hd2"]= h/2;
+        this.gdLst["hd3"]= h/3;
+        this.gdLst["hd4"]= h/4;
+        this.gdLst["hd5"]= h/5;
+        this.gdLst["hd6"]= h/6;
+        this.gdLst["hd8"]= h/8;
+        this.gdLst["hd10"]= h/10;
+        this.gdLst["hd12"]= h/12;
+        this.gdLst["hd32"]= h/32;
+        this.gdLst["vc"]= h/2;
+        this.gdLst["w"]= w;
+        this.gdLst["r"]= w;
+        this.gdLst["wd2"]= w/2;
+        this.gdLst["wd3"]= w/3;
+        this.gdLst["wd4"]= w/4;
+        this.gdLst["wd5"]= w/5;
+        this.gdLst["wd6"]= w/6;
+        this.gdLst["wd8"]= w/8;
+        this.gdLst["wd10"] = w/10;
+        this.gdLst["wd12"] = w/12;
+        this.gdLst["wd32"] = w/32;
         this.gdLst["hc"]=w/2;
         this.gdLst["ls"]=Math.max(w,h);
         this.gdLst["ss"]=Math.min(w,h);
@@ -1152,6 +1187,11 @@ Geometry.prototype=
         return {hit: false, adjPolarFlag: null, adjNum: null};
     },
 
+    getArrayPolygonsByPaths: function(epsilon)
+    {
+        return GetArrayPolygonsByPaths(epsilon, this.pathLst);
+    },
+
 
     getArrayPolygons: function(epsilon)
     {
@@ -1493,6 +1533,25 @@ function GraphEdge(point1, point2)
     }
 }
 
+
+function GetArrayPolygonsByPaths(dEpsilon, aPathLst)
+{
+    var geom = new Geometry();
+    var aByPaths = [];
+    for(var i = 0; i < aPathLst.length; ++i)
+    {
+        geom.pathLst.length = 0;
+        geom.pathLst.push(aPathLst[i]);
+        var a = geom.getArrayPolygons(dEpsilon);
+        aByPaths[i] = [];
+        for(var t = 0; t < a.length; ++t)
+        {
+            aByPaths[i] = aByPaths[i].concat(a[t]);
+        }
+    }
+    return aByPaths;
+}
+
 function ComparisonEdgeByTopPoint(graphEdge1, graphEdge2)
 {
     return Math.min(graphEdge1.point1.y, graphEdge1.point2.y) - Math.min(graphEdge2.point1.y, graphEdge2.point2.y);

Common/Drawings/Format/Image.js

@@ -132,10 +132,6 @@ CImageShape.prototype =
             return this.blipFill.RasterImageId;
         return null;
     },
-    isSimpleObject: function()
-    {
-        return true;
-    },
 
     getSnapArrays: function(snapX, snapY)
     {
@@ -315,22 +311,6 @@ CImageShape.prototype =
         return new MoveShapeImageTrack(this);
     },
 
-
-    createRotateInGroupTrack: function()
-    {
-        return new RotateTrackShapeImageInGroup(this);
-    },
-
-    createResizeInGroupTrack: function(cardDirection)
-    {
-        return new ResizeTrackShapeImageInGroup(this, cardDirection);
-    },
-
-    createMoveInGroupTrack: function()
-    {
-        return new MoveShapeImageTrackInGroup(this);
-    },
-
     getInvertTransform: function()
     {
         if(this.recalcInfo.recalculateTransform)

Common/Drawings/Format/Path.js

@@ -25,6 +25,8 @@ function Path()
     this.ArrPathCommandInfo = [];
     this.ArrPathCommand = [];
 
+    this.IsHidden = false;//For WordArt
+
     this.Id = g_oIdCounter.Get_NewId();
     g_oTableId.Add(this, this.Id);
 }
@@ -1155,7 +1157,9 @@ function partition_bezier3(x0, y0, x1, y1, x2, y2, epsilon)
     var r01 = Math.sqrt(dx01*dx01 + dy01*dy01);
     var r12 = Math.sqrt(dx12*dx12 + dy12*dy12);
     if(Math.max(r01, r12) < epsilon)
+    {
         return [{x: x0, y: y0}, {x: x1, y: y1}, {x: x2, y: y2}];
+    }
 
     var x01 = (x0 + x1)*0.5;
     var y01 = (y0 + y1)*0.5;

Common/Drawings/TextDrawer.js

@@ -143,7 +143,7 @@ CTableStructure.prototype.Recalculate = function(oTheme, oColorMap, dWidth, dHei
         this.m_aBorders[i].Recalculate(oTheme, oColorMap, dWidth, dHeight, oShape);
     }
 };
-CTableStructure.prototype.draw = function(graphics)
+CTableStructure.prototype.draw = function(graphics, transform)
 {
     var i;
 

Common/Drawings/TrackObjects/RotateTracks.js

@@ -147,7 +147,7 @@ function OverlayObject(geometry, extX, extY, brush, pen, transform )
     }
 }
 
-function ObjectToDraw(brush, pen, extX, extY, geometry, transform)
+function ObjectToDraw(brush, pen, extX, extY, geometry, transform, oTextDrawer)
 {
     this.brush = brush;
     this.pen = pen;
@@ -156,6 +156,7 @@ function ObjectToDraw(brush, pen, extX, extY, geometry, transform)
     this.transform = transform;
     this.TransformMatrix = transform;
     this.geometry = geometry;
+    this.parentShape = null;
 }
 ObjectToDraw.prototype =
 {
@@ -175,6 +176,62 @@ ObjectToDraw.prototype =
             boundsChecker._z();
             boundsChecker._e();
         }
+    },
+
+    resetBrushPen: function(brush, pen)
+    {
+        this.brush = brush;
+        this.pen = pen;
+    },
+
+    Recalculate: function(oTheme, oColorMap, dWidth, dHeight, oShape, oParaLine)
+    {
+        if(this.brush)
+        {
+            this.brush.check(oTheme, oColorMap);
+        }
+        if(this.pen && this.pen.Fill)
+        {
+            this.pen.Fill.check(oTheme, oColorMap);
+        }
+        if(this.geometry)
+        {
+            this.geometry.Recalculate(dWidth, dHeight);
+        }
+        this.parentShape = oShape;
+        this.oParaLine = oParaLine;
+    },
+
+    draw: function(graphics, bNoParentShapeTransform, oTransformMatrix)
+    {
+        var oTransform;
+        if(oTransformMatrix)
+        {
+            oTransform = oTransformMatrix;
+        }
+        else
+        {
+            if(this.parentShape && !(bNoParentShapeTransform === true))
+            {
+                oTransform = this.parentShape.transformText;
+            }
+            else
+            {
+                oTransform = this.TransformMatrix;
+            }
+        }
+        graphics.SaveGrState();
+        graphics.SetIntegerGrid(false);
+        graphics.transform3(oTransform, false);
+        var shape_drawer = new CShapeDrawer();
+        shape_drawer.fromShape2(this, graphics, this.geometry);
+        shape_drawer.draw(this.geometry);
+        graphics.RestoreGrState();
+    },
+
+    createDuplicate: function(bNoCopyHiddeen)
+    {
+        var oCopy = new ObjectToDraw()
     }
 };
 function RotateTrackShapeImage(originalObject)

Common/Shapes/Serialize.js

@@ -6351,6 +6351,43 @@ function BinaryPPTYLoader()
             var _at = s.GetUChar();
             switch (_at)
             {
+                case 0://prstTxWarp
+                {
+                    var _end_rec3 = s.cur + s.GetULong() + 4;
+                    s.Skip2(1);// start attributes
+                    while(true)
+                    {
+                        var _at2 = s.GetUChar();
+                        if (_at2 == g_nodeAttributeEnd)
+                            break;
+                        switch (_at2) {
+                            case 0:
+                            {
+                                var sPrst = s.GetUChar();
+                                bodyPr.prstTxWarp = ExecuteNoHistory(function () {
+                                    return CreatePrstTxWarpGeometry(getPrstByNumber(sPrst));
+                                }, this, []);
+                                break;
+                            }
+                        }
+                    }
+                    while (s.cur < _end_rec3)
+                    {
+                       var _at = s.GetUChar();
+                       switch (_at)
+                       {
+                           case 0:
+                           {
+                               this.ReadGeomAdj(bodyPr.prstTxWarp );
+                               break;
+                           }
+                           default:
+                               break;
+                       }
+                    }
+                    s.Seek2(_end_rec3);
+                    break;
+                }
                 case 1:
                 {
                     var _end_rec2 = s.cur + s.GetULong() + 4;
@@ -6387,7 +6424,6 @@ function BinaryPPTYLoader()
                                 break;
                         }
                     }
-
                     if (txFit.type != -1)
                     {
                         bodyPr.textFit = txFit;

Excel/model/DrawingObjects/Format/ShapePrototype.js

@@ -480,6 +480,19 @@ CShape.prototype.recalculateContent = function()
         content.Set_StartPage(0);
         content.Reset(0, 0, this.contentWidth, 20000);
         content.Recalculate_Page(content.StartPage, true);
+
+        if(this.recalcInfo.recalcTitle)
+        {
+            this.recalcInfo.bRecalculatedTitle = true;
+            this.recalcInfo.recalcTitle = null;
+        }
+        else
+        {
+            var oTextWarpContent = this.checkTextWarp(content, body_pr, this.contentWidth, this.contentHeight);
+            this.txWarpStructParamarks = oTextWarpContent.oTxWarpStructParamarks;
+            this.txWarpStruct = oTextWarpContent.oTxWarpStruct;
+        }
+
     }
 };
 

PowerPoint/Editor/Format/GraphicFrame.js

@@ -242,11 +242,6 @@ CGraphicFrame.prototype =
         }
     },
 
-    isSimpleObject: function()
-    {
-        return true;
-    },
-
     Cursor_MoveToStartPos : function()
     {
         if(isRealObject(this.graphicObject))

PowerPoint/Editor/Format/ShapePrototype.js

@@ -524,7 +524,6 @@ CShape.prototype.recalculateContent = function()
                     this.txBody.contentWidth = h;
                     this.txBody.contentHeight = w;
                 }
-
             }
             else
             {
@@ -565,6 +564,19 @@ CShape.prototype.recalculateContent = function()
         content.Set_StartPage(0);
         content.Reset(0, 0, this.contentWidth, 20000);
         content.Recalculate_Page(content.StartPage, true);
+
+        if(this.recalcInfo.recalcTitle)
+        {
+            this.recalcInfo.bRecalculatedTitle = true;
+            this.recalcInfo.recalcTitle = null;
+        }
+        else
+        {
+            var oTextWarpContent = this.checkTextWarp(content, body_pr, this.contentWidth, this.contentHeight);
+            this.txWarpStructParamarks = oTextWarpContent.oTxWarpStructParamarks;
+            this.txWarpStruct = oTextWarpContent.oTxWarpStruct;
+        }
+
     }
 };
 
@@ -665,13 +677,16 @@ 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.contentHeight2 = this.txBody.contentHeight2;
 
 
-          // if (w !== this.contentWidth3)
-            {
             var content_ = this.getDocContent();
             if(content_ && content_.Content[0])
             {
@@ -685,8 +700,6 @@ CShape.prototype.recalculateContent2 = function()
             content.Reset(0, 0, w, 20000);
             content.Recalculate_Page(content.StartPage, true);
 
-               // this.contentWidth3 = w;
-            }
         }
         else
         {

Word/Editor/DocumentContent.js

@@ -1175,6 +1175,11 @@ CDocumentContent.prototype =
         if ( PageNum < 0 || PageNum >= this.Pages.length )
             return;
 
+
+        if(pGraphics.Start_Command)
+        {
+            pGraphics.Start_Command(DRAW_COMMAND_CONTENT);
+        }
         var Bounds = this.Pages[PageNum].Bounds;
 
         var bClip = false;
@@ -1204,6 +1209,10 @@ CDocumentContent.prototype =
         {
             pGraphics.RestoreGrState();
         }
+        if(pGraphics.End_Command)
+        {
+            pGraphics.End_Command();
+        }
     },
 
     // Составляем полный массив всех ParaDrawing используемых в данном классе (с учетом всех вложенных DocumentContent)

Word/Editor/GraphicObjects/DrawingStates.js

@@ -2,6 +2,12 @@ var MOVE_DELTA = 1/100000;
 var SNAP_DISTANCE = 1.27;
 
 
+function checkEmptyPlaceholderContent(content)
+{
+    if(!content || content.Parent && content.Parent.txWarpStruct)
+        return content;
+    return null;
+}
 
 function StartAddNewShape(drawingObjects, preset)
 {
@@ -137,6 +143,13 @@ NullState.prototype =
         var ret;
         var selection = this.drawingObjects.selection;
         var b_no_handle_selected = false;
+
+        var start_target_doc_content, end_target_doc_content;
+        if(this.drawingObjects.handleEventMode === HANDLE_EVENT_MODE_HANDLE)
+        {
+            start_target_doc_content = checkEmptyPlaceholderContent(this.drawingObjects.getTargetDocContent());
+        }
+
         if(selection.wrapPolygonSelection)
         {
             b_no_handle_selected = true;
@@ -190,11 +203,27 @@ NullState.prototype =
         {
             ret = handleSelectedObjects(this.drawingObjects, e, x, y, selection.groupSelection, pageIndex, true);
             if(ret)
+            {
+                end_target_doc_content = checkEmptyPlaceholderContent(this.drawingObjects.getTargetDocContent());
+                if((start_target_doc_content || end_target_doc_content) && (start_target_doc_content !== end_target_doc_content))
+                {
+                    this.drawingObjects.drawingDocument.OnRecalculatePage( pageIndex, this.document.Pages[pageIndex] );
+                    this.drawingObjects.drawingDocument.OnEndRecalculate( false, true );
+                }
                 return ret;
+            }
             ret = handleFloatObjects(this.drawingObjects, selection.groupSelection.arrGraphicObjects, e, x, y, selection.groupSelection, pageIndex, true);
             if(ret)
+            {
+                end_target_doc_content = checkEmptyPlaceholderContent(this.drawingObjects.getTargetDocContent());
+                if ((start_target_doc_content || end_target_doc_content) && (start_target_doc_content !== end_target_doc_content))
+                {
+                    this.drawingObjects.drawingDocument.OnRecalculatePage(pageIndex, this.document.Pages[pageIndex]);
+                    this.drawingObjects.drawingDocument.OnEndRecalculate(false, true);
+                }
                 return ret;
             }
+        }
         else if(selection.chartSelection)
         {}
         if(this.drawingObjects.handleEventMode === HANDLE_EVENT_MODE_HANDLE)
@@ -213,8 +242,16 @@ NullState.prototype =
         {
             ret = handleSelectedObjects(this.drawingObjects, e, x, y, null, pageIndex, true);
             if(ret)
+            {
+                end_target_doc_content = checkEmptyPlaceholderContent(this.drawingObjects.getTargetDocContent());
+                if ((start_target_doc_content || end_target_doc_content) && (start_target_doc_content !== end_target_doc_content))
+                {
+                    this.drawingObjects.drawingDocument.OnRecalculatePage(pageIndex, this.drawingObjects.document.Pages[pageIndex]);
+                    this.drawingObjects.drawingDocument.OnEndRecalculate(false, true);
+                }
                 return ret;
             }
+        }
 
         var drawing_page;
         if(this.drawingObjects.document.CurPos.Type !== docpostype_HdrFtr)
@@ -227,7 +264,15 @@ NullState.prototype =
         }
         ret = handleFloatObjects(this.drawingObjects, drawing_page.beforeTextObjects, e, x, y, null, pageIndex, true);
         if(ret)
+        {
+            end_target_doc_content = checkEmptyPlaceholderContent(this.drawingObjects.getTargetDocContent());
+            if ((start_target_doc_content || end_target_doc_content) && (start_target_doc_content !== end_target_doc_content))
+            {
+                this.drawingObjects.drawingDocument.OnRecalculatePage(pageIndex, this.drawingObjects.document.Pages[pageIndex]);
+                this.drawingObjects.drawingDocument.OnEndRecalculate(false, true);
+            }
             return ret;
+        }
 
         var no_shape_child_array = [];
         for(var i = 0; i < drawing_page.inlineObjects.length; ++i)
@@ -237,18 +282,47 @@ NullState.prototype =
         }
         ret = handleInlineObjects(this.drawingObjects, no_shape_child_array, e, x, y, pageIndex, true);
         if(ret)
+        {
+            end_target_doc_content = checkEmptyPlaceholderContent(this.drawingObjects.getTargetDocContent());
+            if ((start_target_doc_content || end_target_doc_content) && (start_target_doc_content !== end_target_doc_content))
+            {
+                this.drawingObjects.drawingDocument.OnRecalculatePage(pageIndex, this.drawingObjects.document.Pages[pageIndex]);
+                this.drawingObjects.drawingDocument.OnEndRecalculate(false, true);
+            }
             return ret;
+        }
 
         if(!bTextFlag)
         {
             ret = handleFloatObjects(this.drawingObjects, drawing_page.wrappingObjects, e, x, y, null, pageIndex, true);
             if(ret)
+            {
+                end_target_doc_content = checkEmptyPlaceholderContent(this.drawingObjects.getTargetDocContent());
+                if ((start_target_doc_content || end_target_doc_content) && (start_target_doc_content !== end_target_doc_content))
+                {
+                    this.drawingObjects.drawingDocument.OnRecalculatePage(pageIndex, this.drawingObjects.document.Pages[pageIndex]);
+                    this.drawingObjects.drawingDocument.OnEndRecalculate(false, true);
+                }
                 return ret;
+            }
 
             ret = handleFloatObjects(this.drawingObjects, drawing_page.behindDocObjects, e, x, y, null, pageIndex, true);
             if(ret)
+            {
+                end_target_doc_content = checkEmptyPlaceholderContent(this.drawingObjects.getTargetDocContent());
+                if ((start_target_doc_content || end_target_doc_content) && (start_target_doc_content !== end_target_doc_content))
+                {
+                    this.drawingObjects.drawingDocument.OnRecalculatePage(pageIndex, this.drawingObjects.document.Pages[pageIndex]);
+                    this.drawingObjects.drawingDocument.OnEndRecalculate(false, true);
+                }
                 return ret;
             }
+        }
+        if(start_target_doc_content)
+        {
+            this.drawingObjects.drawingDocument.OnRecalculatePage(pageIndex, this.drawingObjects.document.Pages[pageIndex]);
+            this.drawingObjects.drawingDocument.OnEndRecalculate(false, true);
+        }
         return null;
 
     },

Word/Editor/GraphicObjects/Format/ShapePrototype.js

@@ -44,7 +44,6 @@ CShape.prototype.recalcContent = function()
     {
         this.recalcInfo.recalculateContent = true;
     }
-
 };
 
 CShape.prototype.getDrawingDocument = function()
@@ -199,7 +198,7 @@ CShape.prototype.recalculateTxBoxContent = function()
     if(this.textBoxContent === null || this.textBoxContent.Parent !== this)
         return;
     var _l, _t, _r, _b;
-
+    this.txWarpStruct = null;
     var body_pr = this.getBodyPr();
     var l_ins = typeof body_pr.lIns === "number" ? body_pr.lIns : 2.54;
     var t_ins = typeof body_pr.tIns === "number" ? body_pr.tIns : 1.27;
@@ -222,7 +221,6 @@ CShape.prototype.recalculateTxBoxContent = function()
         _r = this.extX - r_ins;
         _b = this.extY - b_ins;
     }
-
     if(!_body_pr.upright)
     {
         var _content_width;
@@ -279,6 +277,19 @@ CShape.prototype.recalculateTxBoxContent = function()
     var RecalcResult = recalcresult2_NextPage;
     while ( recalcresult2_End != RecalcResult  )
         RecalcResult = this.textBoxContent.Recalculate_Page( CurPage++, true );
+
+    if(this.recalcInfo.recalcTitle)
+    {
+        this.recalcInfo.bRecalculatedTitle = true;
+        this.recalcInfo.recalcTitle = null;
+    }
+    else
+    {
+       var oTextWarpContent = this.checkTextWarp(this.textBoxContent, _body_pr, _r - _l, _b - _t);
+       this.txWarpStructParamarks = oTextWarpContent.oTxWarpStructParamarks;
+       this.txWarpStruct = oTextWarpContent.oTxWarpStruct;
+    }
+
 };
 
 CShape.prototype.recalculate = function ()
@@ -417,6 +428,7 @@ CShape.prototype.recalculateContent = function()
         }
         content.Reset(0, 0, w, h);
         content.Recalculate_Page(content.StartPage, true);
+
     }
 };
 
@@ -927,3 +939,9 @@ CShape.prototype.getStyles = function()
 {
     return {styles: editor.WordControl.m_oLogicDocument.Styles, styleId: null};
 };
+
+
+CShape.prototype.getDrawingObjectsController = function()
+{
+    return editor.WordControl.m_oLogicDocument.DrawingObjects;
+};
\ No newline at end of file

Word/Editor/Numbering.js

@@ -2131,8 +2131,6 @@ function CPresentationBullet()
             }
         }
 
-        Context.p_color( oColor.r, oColor.g, oColor.b, 255 );
-        Context.b_color1( oColor.r, oColor.g, oColor.b, 255 );
 
         var OldTextPr  = Context.GetTextPr();
         var OldTextPr2 = g_oTextMeasurer.GetTextPr();
@@ -2146,6 +2144,8 @@ function CPresentationBullet()
         var FontSlot = g_font_detector.Get_FontClass( sT.charCodeAt(0), Hint, lcid, bCS, bRTL );
         Context.SetTextPr( this.m_oTextPr, PDSE.Theme );
         Context.SetFontSlot( FontSlot );
+        Context.p_color( oColor.r, oColor.g, oColor.b, 255 );
+        Context.b_color1( oColor.r, oColor.g, oColor.b, 255 );
         g_oTextMeasurer.SetTextPr( this.m_oTextPr, PDSE.Theme  );
         g_oTextMeasurer.SetFontSlot( FontSlot );
 

Word/Editor/Table.js

@@ -3799,6 +3799,10 @@ CTable.prototype =
     {
         if ( this.HeaderInfo.Count > 0 && PNum > this.HeaderInfo.PageIndex && true === this.HeaderInfo.Pages[PNum].Draw )
         {
+            if(pGraphics.Start_Command)
+            {
+                pGraphics.Start_Command(DRAW_COMMAND_TABLE_ROW);
+            }
             var HeaderPage = this.HeaderInfo.Pages[PNum];
             for ( var CurRow = 0; CurRow < this.HeaderInfo.Count; CurRow++ )
             {
@@ -3817,6 +3821,10 @@ CTable.prototype =
                     Cell.Content_Draw(PNum, pGraphics);
                 }
             }
+            if(pGraphics.End_Command)
+            {
+                pGraphics.End_Command();
+            }
         }
 
         // Рисуем содержимое всех ячеек. Его рисуем в нормальном порядке, потому что некоторые элементы
@@ -3826,6 +3834,10 @@ CTable.prototype =
             var Row = this.Content[CurRow];
             var CellsCount = Row.Get_CellsCount();
 
+            if(pGraphics.Start_Command)
+            {
+                pGraphics.Start_Command(DRAW_COMMAND_TABLE_ROW);
+            }
             for ( var CurCell = 0; CurCell < CellsCount; CurCell++ )
             {
                 var Cell = Row.Get_Cell( CurCell );
@@ -3865,6 +3877,11 @@ CTable.prototype =
                 // Выводим содержимое таблицы
                 Cell.Content_Draw(PNum, pGraphics);
             }
+
+            if(pGraphics.End_Command)
+            {
+                pGraphics.End_Command();
+            }
         }
     },