добавление текста в автофигуры

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

Excel/SpreadsheetTestMenu.html

@@ -169,6 +169,13 @@
 		<script src="model/DrawingObjects/Format/GroupShape.js"></script>
 		<script src="model/DrawingObjects/Format/Image.js"></script>
 		<script src="model/DrawingObjects/Format/Shape.js"></script>
+        <script src="model/DrawingObjects/Format/TextBody.js"></script>
+        <script src="model/DrawingObjects/Format/Styles.js"></script>
+        <script src="model/DrawingObjects/Format/Numbering.js"></script>
+        <script src="model/DrawingObjects/Format/ParagraphContent.js"></script>
+        <script src="model/DrawingObjects/Format/Paragraph.js"></script>
+        <script src="model/DrawingObjects/Format/DocumentContent.js"></script>
+        <script src="model/DrawingObjects/Format/FontClassification.js"></script>
 
         <script src="model/DrawingObjects/Tracks/AdjustmentTracks.js"></script>
         <script src="model/DrawingObjects/Tracks/ResizeTracks.js"></script>

Excel/model/DrawingObjects/Format/Paragraph.js

@@ -17,6 +17,15 @@ var type_Paragraph = 0x0001;
 
 var UnknownValue  = null;
 
+var docpostype_Content     = 0x00;
+var docpostype_FlowObjects = 0x01;
+var docpostype_HdrFtr      = 0x02;
+var docpostype_FlowShape   = 0x03;
+
+var selectionflag_Common        = 0x00;
+var selectionflag_Numbering     = 0x01;
+var selectionflag_DrawingObject = 0x002;
+
 // Класс Paragraph
 function Paragraph(DrawingDocument, Parent, PageNum, X, Y, XLimit, YLimit)
 {
@@ -46,7 +55,7 @@ function Paragraph(DrawingDocument, Parent, PageNum, X, Y, XLimit, YLimit)
     this.TextPr = new ParaTextPr();
     this.TextPr.Parent = this;
 
-    this.Bounds = new CDocumentBounds( X, Y, X_Right_Field, Y );
+    this.Bounds = new CDocumentBounds( X, Y, 4000, Y );
 
     this.RecalcInfo = new CParaRecalcInfo();
 
@@ -82,14 +91,14 @@ function Paragraph(DrawingDocument, Parent, PageNum, X, Y, XLimit, YLimit)
 
     this.NeedReDraw = true;
     this.DrawingDocument = DrawingDocument;
-    this.LogicDocument   = editor.WordControl.m_oLogicDocument;
+    //this.LogicDocument   = editor.WordControl.m_oLogicDocument;
 
     this.TurnOffRecalcEvent = false;
 
     this.ApplyToAll = false; // Специальный параметр, используемый в ячейках таблицы.
                              // True, если ячейка попадает в выделение по ячейкам.
 
-    this.Lock = new CLock(); // Зажат ли данный параграф другим пользователем
+   // this.Lock = new CLock(); // Зажат ли данный параграф другим пользователем
     if ( false === g_oIdCounter.m_bLoad )
     {
         this.Lock.Set_Type( locktype_Mine, false );
@@ -116,7 +125,7 @@ function Paragraph(DrawingDocument, Parent, PageNum, X, Y, XLimit, YLimit)
 
     this.SearchResults = new Object();
 
-    this.SpellChecker = new CParaSpellChecker();
+    //this.SpellChecker = new CParaSpellChecker();
 
     // Добавляем данный класс в таблицу Id (обязательно в конце конструктора)
     g_oTableId.Add( this, this.Id );
@@ -362,7 +371,7 @@ Paragraph.prototype =
         }
 
         // Передвинем все метки слов для проверки орфографии
-        this.SpellChecker.Update_OnAdd( this, Pos, Item.Type );
+      //  this.SpellChecker.Update_OnAdd( this, Pos, Item.Type );
     },
 
     // Добавляем несколько элементов в конец параграфа.
@@ -465,7 +474,7 @@ Paragraph.prototype =
         }
 
         // Передвинем все метки слов для проверки орфографии
-        this.SpellChecker.Update_OnRemove( this, Pos, 1 );
+       // this.SpellChecker.Update_OnRemove( this, Pos, 1 );
     },
 
     // Удаляем несколько элементов
@@ -589,7 +598,7 @@ Paragraph.prototype =
         }
 
         // Передвинем все метки слов для проверки орфографии
-        this.SpellChecker.Update_OnRemove( this, Pos, Count );
+       // this.SpellChecker.Update_OnRemove( this, Pos, Count );
     },
 
     Clear_ContentChanges : function()
@@ -2226,7 +2235,7 @@ Paragraph.prototype =
                 // при повторном обсчете строки, т.к. она стала меньше, то у нее и рассчитанная высота могла
                 // уменьшиться, а значит Ranges2 могло оказаться меньше чем Ranges). В таком случае не надо
                 // делать повторный пересчет, иначе будет зависание.
-                if ( -1 == FlowObjects_CompareRanges( Ranges, Ranges2 ) && true === FlowObjects_CheckInjection( Ranges, Ranges2 ) && false === bBreakPageLineEmpty )
+               /*if ( -1 == FlowObjects_CompareRanges( Ranges, Ranges2 ) && true === FlowObjects_CheckInjection( Ranges, Ranges2 ) && false === bBreakPageLineEmpty )
                 {
                     bEnd = false;
 
@@ -2274,7 +2283,7 @@ Paragraph.prototype =
                     nWordLen = 0;
                     nSpacesCount = 0;
                 }
-                else
+                else  */
                 {
                     if ( 0 != CurLine )
                         this.Lines[CurLine].W = X - this.X - ParaPr.Ind.Left;
@@ -3376,7 +3385,7 @@ Paragraph.prototype =
         this.FontMap.NeedRecalc = true;
 
         this.Internal_Recalculate_0();
-        this.Internal_CheckSpelling();
+       // this.Internal_CheckSpelling();
 
         var RecalcResult_1 = this.Internal_Recalculate_1_(StartPos, CurPage, CurLine);
         var RecalcResult_2 = this.Internal_Recalculate_2_(StartPos, CurPage, CurLine);
@@ -3432,7 +3441,7 @@ Paragraph.prototype =
     Internal_Draw_1 : function(CurPage, pGraphics, Pr)
     {
         // Если данный параграф зажат другим пользователем, рисуем соответствующий знак
-        if ( locktype_None != this.Lock.Get_Type() )
+        /*if ( locktype_None != this.Lock.Get_Type() )
         {
             if ( ( CurPage > 0 || false === this.Is_StartFromNewPage() || null === this.Get_DocumentPrev() ) )
             {
@@ -3442,14 +3451,14 @@ Paragraph.prototype =
 
                 pGraphics.DrawLockParagraph(this.Lock.Get_Type(), X_min, Y_top, Y_bottom);
             }
-        }
+        }      */
     },
 
     Internal_Draw_2 : function(CurPage, pGraphics, Pr)
     {
         // TODO: Как только будет поддержка параметра KeepNext раскоментировать тут.
-        if ( true === editor.ShowParaMarks && ( ( 0 === CurPage && ( this.Pages.length <= 1 || this.Pages[1].FirstLine > 0 ) ) || ( 1 === CurPage && this.Pages.length > 1 && this.Pages[1].FirstLine === 0 ) ) && ( /*true === Pr.ParaPr.KeepNext ||*/ true === Pr.ParaPr.KeepLines || true === Pr.ParaPr.PageBreakBefore ) )
-        {
+     //   if ( true === editor.ShowParaMarks && ( ( 0 === CurPage && ( this.Pages.length <= 1 || this.Pages[1].FirstLine > 0 ) ) || ( 1 === CurPage && this.Pages.length > 1 && this.Pages[1].FirstLine === 0 ) ) && ( /*true === Pr.ParaPr.KeepNext ||*/ true === Pr.ParaPr.KeepLines || true === Pr.ParaPr.PageBreakBefore ) )
+      /*  {
             var SpecFont = { FontFamily: { Name : "Arial", Index : -1 }, FontSize : 12, Italic : false, Bold : false };
             var SpecSym = String.fromCharCode( 0x25AA );
             pGraphics.SetFont( SpecFont );
@@ -3464,14 +3473,14 @@ Paragraph.prototype =
             var SpecX = Math.min( X, this.X ) - SpecW;
 
             pGraphics.FillText( SpecX, Y, SpecSym );
-        }
+        }                */
     },
 
     Internal_Draw_3 : function(CurPage, pGraphics)
     {
-        var DocumentComments = editor.WordControl.m_oLogicDocument.Comments;
-        var bDrawComments    = DocumentComments.Is_Use();
-        var CommentsFlag     = DocumentComments.Check_CurrentDraw();
+       // var DocumentComments = editor.WordControl.m_oLogicDocument.Comments;
+        var bDrawComments    = false;//DocumentComments.Is_Use();
+        var CommentsFlag     = comments_NoComment;//DocumentComments.Check_CurrentDraw();
 
         var CollaborativeChanges = 0;
         var StartPagePos = this.Lines[this.Pages[CurPage].StartLine].StartPos;
@@ -4235,8 +4244,8 @@ Paragraph.prototype =
                                 if ( true === CurTextPr.Underline )
                                     aUnderline.Add( Y + this.Lines[CurLine].Metrics.TextDescent * 0.4, Y + this.Lines[CurLine].Metrics.TextDescent * 0.4, X, X + Item.WidthVisible, (CurTextPr.FontSize / 18) * g_dKoef_pt_to_mm, CurTextPr.Color.r, CurTextPr.Color.g, CurTextPr.Color.b );
 
-                                if ( true != this.SpellChecker.Check_Spelling(Pos) )
-                                    aSpelling.Add( Y + this.Lines[CurLine].Metrics.TextDescent * 0.4, Y + this.Lines[CurLine].Metrics.TextDescent * 0.4, X, X + Item.WidthVisible, (CurTextPr.FontSize / 18) * g_dKoef_pt_to_mm, 0, 0, 0 );
+                               // if ( true != this.SpellChecker.Check_Spelling(Pos) )
+                               //     aSpelling.Add( Y + this.Lines[CurLine].Metrics.TextDescent * 0.4, Y + this.Lines[CurLine].Metrics.TextDescent * 0.4, X, X + Item.WidthVisible, (CurTextPr.FontSize / 18) * g_dKoef_pt_to_mm, 0, 0, 0 );
 
                                 X += Item.WidthVisible;
                             }
@@ -9437,7 +9446,7 @@ Paragraph.prototype =
                 editor.sync_HyperlinkPropCallback( HyperProps );
             }
 
-            this.SpellChecker.Document_UpdateInterfaceState( StartPos, EndPos );
+           // this.SpellChecker.Document_UpdateInterfaceState( StartPos, EndPos );
         }
         else
         {
@@ -9492,7 +9501,7 @@ Paragraph.prototype =
                 editor.sync_HyperlinkPropCallback( HyperProps );
             }
 
-            this.SpellChecker.Document_UpdateInterfaceState( this.CurPos.ContentPos, this.CurPos.ContentPos );
+           // this.SpellChecker.Document_UpdateInterfaceState( this.CurPos.ContentPos, this.CurPos.ContentPos );
         }
     },
 

Excel/model/DrawingObjects/Format/ParagraphContent.js

@@ -1661,7 +1661,7 @@ ParaEnd.prototype =
 {
     Draw : function(X,Y,Context, bEndCell)
     {
-        Context.SetFontSlot( fontslot_ASCII );
+       /* Context.SetFontSlot( fontslot_ASCII );
         
         if ( editor.ShowParaMarks )
         {
@@ -1669,7 +1669,7 @@ ParaEnd.prototype =
                 Context.FillText( X, Y, String.fromCharCode( 0x00A4 ) );
             else
                 Context.FillText( X, Y, String.fromCharCode( 0x00B6 ) );
-        }
+        } */
     },
 
     Measure : function(Context, bEndCell)

Excel/model/DrawingObjects/Format/TextBody.js

@@ -10,29 +10,146 @@ function CTxBody(shape)
     this.shape = shape;
 
     this.bodyPr = new CBodyPr();
+    this.bodyPr.setDefault();
     this.lstStyle = null;
 
-    this.content = new CDocumentContent(this, editor.WordControl.m_oLogicDocument.DrawingDocument, 0, 0, 0, 20000, false, false);
+    this.content = new CDocumentContent(this, /*editor.WordControl.m_oLogicDocument.DrawingDocument*/undefined, 0, 0, 200, 20000, false, false);
+    this.contentWidth = 0;
+    this.contentHeight = 0;
 
 }
 CTxBody.prototype =
 {
-    recalculate: function()
+    draw: function(graphics)
     {
+        this.content.Draw(0, graphics);
+    },
 
+    Get_Styles: function(level)
+    {
+        return new CStyles();//this.shape.Get_Styles(level);
     },
-    draw: function(graphics)
+
+    Get_Numbering: function()
     {
-        this.content.Draw(graphics);
+        return  new CNumbering();
     },
 
-    Get_Styles: function(level)
+    Get_TableStyleForPara: function()
     {
-        return this.shape.Get_Styles(level);
+        return null;
     },
 
     paragraphAdd: function(paraItem)
     {
         this.content.Paragraph_Add(paraItem);
+        this.content.Recalculate_Page(0, true );
+        if(this.bodyPr.anchor !== VERTICAL_ANCHOR_TYPE_TOP)
+        {
+            this.shape.calculateTransformTextMatrix();
+        }
+    },
+
+    recalculate: function()
+    {
+
+    },
+
+    getSummaryHeight: function()
+    {
+        return this.content.Get_SummaryHeight();
+    },
+
+    getBodyPr: function()
+    {
+        return this.bodyPr;
+    },
+
+
+    calculateContent: function()
+    {
+        var _l, _t, _r, _b;
+
+        var _body_pr = this.bodyPr;
+        var sp = this.shape;
+        if(isRealObject(sp.spPr.geometry) && isRealObject(sp.spPr.geometry.rect))
+        {
+            var _rect = sp.spPr.geometry.rect;
+            _l = _rect.l + _body_pr.lIns;
+            _t = _rect.t + _body_pr.tIns;
+            _r = _rect.r - _body_pr.rIns;
+            _b = _rect.b - _body_pr.bIns;
+        }
+        else
+        {
+            _l = _body_pr.lIns;
+            _t = _body_pr.tIns;
+            _r = sp.extX - _body_pr.rIns;
+            _b = sp.extY - _body_pr.bIns;
+        }
+
+        if(_body_pr.upright === false)
+        {
+            var _content_width;
+            if(!(_body_pr.vert === nVertTTvert || _body_pr.vert === nVertTTvert270))
+            {
+                _content_width = _r - _l;
+                this.contentWidth = _content_width;
+                this.contentHeight = _b - _t;
+            }
+            else
+            {
+                _content_width = _b - _t;
+                this.contentWidth = _content_width;
+                this.contentHeight = _r - _l;
+            }
+
+        }
+        else
+        {
+            var _full_rotate = sp.getFullRotate();
+            if((_full_rotate >= 0 && _full_rotate < Math.PI*0.25)
+                || (_full_rotate > 3*Math.PI*0.25 && _full_rotate < 5*Math.PI*0.25)
+                || (_full_rotate > 7*Math.PI*0.25 && _full_rotate < 2*Math.PI))
+            {
+                if(!(_body_pr.vert === nVertTTvert || _body_pr.vert === nVertTTvert270))
+                {
+                    _content_width = _r - _l;
+                    this.contentWidth = _content_width;
+                    this.contentHeight = _b - _t;
+                }
+                else
+                {
+                    _content_width = _b - _t;
+                    this.contentWidth = _content_width;
+                    this.contentHeight = _r - _l;
+                }
+            }
+            else
+            {
+                if(!(_body_pr.vert === nVertTTvert || _body_pr.vert === nVertTTvert270))
+                {
+                    _content_width = _b - _t;
+                    this.contentWidth = _content_width;
+                    this.contentHeight = _r - _l;
+                }
+                else
+                {
+                    _content_width = _r - _l;
+                    this.contentWidth  = _content_width;
+                    this.contentHeight = _b - _t;
+                }
+            }
+        }
+        this.content.Reset(0, 0, _content_width, 20000);
+        this.content.Recalculate_Page(0, true );
+    },
+
+    OnEndRecalculate_Page: function()
+    {},
+
+    Is_Cell: function()
+    {
+        return false;
     }
 };
\ No newline at end of file

Excel/model/DrawingObjects/States.js

@@ -38,6 +38,8 @@ var STATES_ID_POLY_LINE_ADD2 = 0x28;
 var STATES_ID_ADD_PPOLY_LINE2 = 0x29;
 var STATES_ID_ADD_PPOLY_LINE22 = 0x30;
 var STATES_ID_ADD_PPOLY_LINE23 = 0x31;
+var STATES_ID_TEXT_ADD = 0x32;
+
 
 
 
@@ -200,16 +202,172 @@ function NullState(drawingObjectsController, drawingObjects)
     {};
 
     this.onKeyDown = function(e)
+    {
+        var b_prevent_default = false;
+        switch (e.keyCode)
+        {
+            case 8:
+            {
+                b_prevent_default = true;
+            }
+        }
+        if(b_prevent_default)
+            e.preventDefault();
+    };
+
+    this.onKeyPress = function(e)
     {
         var selected_objects = this.drawingObjectsController.selectedObjects;
         if(selected_objects.length === 1 && selected_objects[0].isShape())
         {
+            if(isRealNumber(e.charCode))
+            {
+               selected_objects[0].paragraphAdd(new ParaText(String.fromCharCode(e.charCode)));
+               //this.drawingObjects.showDrawingObjects(true);
+            }
+        }
+
+    };
+
+    this.drawSelection = function(drawingDocument)
+    {
+        DrawDefaultSelection(this.drawingObjectsController, drawingDocument);
+    };
+
+    this.isPointInDrawingObjects = function(x, y)
+    {
+        var selected_objects = this.drawingObjectsController.selectedObjects;
+        if(selected_objects.length === 1)
+        {
+            var hit_to_adj = selected_objects[0].hitToAdjustment(x, y);
+            if(hit_to_adj.hit)
+            {
+                if(selected_objects[0].canChangeAdjustments())
+                {
+                    return {objectId: selected_objects[0].drawingBase.id, cursorType: "crosshair"};
+                }
+            }
+        }
+
+        for(var i = selected_objects.length - 1; i > -1; --i)
+        {
+            var hit_to_handles = selected_objects[i].hitToHandles(x, y);
+            if(hit_to_handles > -1)
+            {
+                if(hit_to_handles === 8)
+                {
+                    if(!selected_objects[i].canRotate())
+                        return null;
+                    return {objectId: selected_objects[i].drawingBase.id, cursorType: "crosshair"};
+                }
+                else
+                {
+                    if(!selected_objects[i].canResize())
+                        return null;
+                    this.drawingObjectsController.clearPreTrackObjects();
+                    var card_direction = selected_objects[i].getCardDirectionByNum(hit_to_handles);
+                    for(var j = 0; j < selected_objects.length; ++j)
+                    {
+                        if(selected_objects[j].canResize())
+                            this.drawingObjectsController.addPreTrackObject(selected_objects[j].createResizeTrack(card_direction));
+                    }
+                    return {objectId: selected_objects[i].drawingBase.id, cursorType: CURSOR_TYPES_BY_CARD_DIRECTION[card_direction]};
+                }
+            }
+        }
+
+        for(i = selected_objects.length - 1; i > -1; --i)
+        {
+            if(selected_objects[i].hitInBoundingRect(x, y))
+            {
+                if(!selected_objects[i].canMove())
+                    return null;
+                return {objectId: selected_objects[i].drawingBase.id, cursorType: "move"};
+            }
+        }
+
+        var arr_drawing_objects = this.drawingObjects.getDrawingObjects();
+        for(i = arr_drawing_objects.length-1; i > -1; --i)
+        {
+            var cur_drawing_base = arr_drawing_objects[i];
+            if(cur_drawing_base.isGraphicObject())
+            {
+                var cur_drawing = cur_drawing_base.graphicObject;
+                if(cur_drawing.isSimpleObject())
+                {
+                    var hit_in_inner_area = cur_drawing.hitInInnerArea(x, y);
+                    var hit_in_path = cur_drawing.hitInPath(x, y);
+                    var hit_in_text_rect = cur_drawing.hitInTextRect(x, y);
+                    if(hit_in_inner_area && !hit_in_text_rect || hit_in_path)
+                    {
+                        return {objectId: cur_drawing_base.id, cursorType: "move"};
+                    }
+                    else if(hit_in_text_rect)
+                    {
+                        //TODO
+                    }
+                }
+                else
+                {
+                    var grouped_objects = cur_drawing.getArrGraphicObjects();
+                    for(var j = grouped_objects.length - 1; j > -1; --j)
+                    {
+                        var cur_grouped_object = grouped_objects[j];
+                        var hit_in_inner_area = cur_grouped_object.hitInInnerArea(x, y);
+                        var hit_in_path = cur_grouped_object.hitInPath(x, y);
+                        var hit_in_text_rect = cur_grouped_object.hitInTextRect(x, y);
+                        if(hit_in_inner_area && !hit_in_text_rect || hit_in_path)
+                        {
+                            return {objectId: cur_drawing_base.id, cursorType: "move"};
+                        }
+                        else if(hit_in_text_rect)
+                        {
+                            //TODO
+                        }
+                    }
+                }
+            }
+        }
+        return null;
+    };
+}
+
+
+function TextAddState(drawingObjectsController, drawingObjects, textObject)
+{
+    this.id = STATES_ID_TEXT_ADD;
+    this.drawingObjectsController = drawingObjectsController;
+    this.drawingObjects = drawingObjects;
+    this.textObject = textObject;
+
+    this.onMouseDown = function(e, x, y)
+    {
+    };
 
+    this.onMouseMove = function(e, x, y)
+    {};
+
+    this.onMouseUp = function(e, x, y)
+    {};
+
+    this.onKeyDown = function(e)
+    {
+        var b_prevent_default = false;
+        switch (e.keyCode)
+        {
+            case 8:
+            {
+                b_prevent_default = true;
+            }
         }
+        if(b_prevent_default)
+            e.preventDefault();
     };
 
     this.onKeyPress = function(e)
     {
+        this.textObject.paragraphAdd(new ParaText(String.fromCharCode(e.charCode)));
+        //this.drawingObjects.showDrawingObjects(true);
     };
 
     this.drawSelection = function(drawingDocument)
@@ -2485,6 +2643,7 @@ function AddPolyLine2State3(drawingObjectsController, drawingObjects, polyline)
 
     this.onKeyPress = function(e)
     {
+
     };
 
     this.isPointInDrawingObjects = function(x, y)

Excel/model/DrawingObjects/Tracks/AdjustmentTracks.js

@@ -167,6 +167,8 @@ function XYAdjustmentTrack(originalShape, adjIndex)
     {
         this.originalShape.setAdjustmentValue(this.refX, this.geometry.gdLst[this.adjastment.gdRefX], this.refY, this.geometry.gdLst[this.adjastment.gdRefY]);
         this.originalShape.recalculateGeometry();
+        this.originalShape.calculateContent();
+        this.originalShape.calculateTransformTextMatrix();
     };
 
 }
@@ -316,5 +318,8 @@ function PolarAdjustmentTrack(originalShape, adjIndex)
     this.trackEnd = function()
     {
         this.originalShape.setAdjustmentValue(this.refR, this.geometry.gdLst[this.adjastment.gdRefR], this.refAng, this.geometry.gdLst[this.adjastment.gdRefAng]);
+        this.originalShape.recalculateGeometry();
+        this.originalShape.calculateContent();
+        this.originalShape.calculateTransformTextMatrix();
     };
 }
\ No newline at end of file

Excel/model/DrawingObjects/Tracks/MoveTracks.js

@@ -47,6 +47,7 @@ function MoveShapeImageTrack(originalObject)
     {
         this.originalObject.setPosition(this.x, this.y);
         this.originalObject.recalculateTransform();
+        this.originalObject.calculateTransformTextMatrix();
         this.originalObject.updateDrawingBaseCoordinates();
     };
 }
@@ -104,6 +105,7 @@ function MoveShapeImageTrackInGroup(originalObject)
         var xfrm = this.originalObject.group.spPr.xfrm;
         this.originalObject.setPosition(this.x/scale_scale_coefficients.cx + xfrm.chOffX, this.y/scale_scale_coefficients.cy + xfrm.chOffY);
         this.originalObject.recalculateTransform();
+        this.originalObject.calculateTransformTextMatrix();
     }
 }
 

Excel/model/DrawingObjects/Tracks/ResizeTracks.js

@@ -1133,6 +1133,8 @@ function ResizeTrackShapeImageInGroup(originalObject, cardDirection)
         this.originalObject.setExtents(this.resizedExtX/scale_scale_coefficients.cx, this.resizedExtY/scale_scale_coefficients.cy);
         this.originalObject.setFlips(this.resizedflipH, this.resizedflipV);
         this.originalObject.recalculateTransform();
+        this.originalObject.calculateContent();
+        this.originalObject.calculateTransformTextMatrix();
     };
 }
 

Excel/model/DrawingObjects/Tracks/RotateTracks.js

@@ -123,6 +123,8 @@ function RotateTrackShapeImage(originalObject)
     {
         this.originalObject.setRotate(this.angle);
         this.originalObject.recalculateTransform();
+        this.originalObject.calculateContent();
+        this.originalObject.calculateTransformTextMatrix();
     }
 }
 
@@ -183,6 +185,8 @@ function RotateTrackShapeImageInGroup(originalObject)
     {
         this.originalObject.setRotate(this.angle);
         this.originalObject.recalculateTransform();
+        this.originalObject.calculateContent();
+        this.originalObject.calculateTransformTextMatrix();
     }
 }
 

Excel/model/History.js

@@ -94,6 +94,46 @@ var historyitem_AutoFilter_Empty	= 3;
 var historyitem_AutoFilter_ApplyDF	= 4;
 var historyitem_AutoFilter_ApplyMF	= 5;
 
+
+// Типы изменений в классе CDocumentContent
+var historyitem_DocumentContent_AddItem     = 1; // Добавляем элемент в документ
+var historyitem_DocumentContent_RemoveItem  = 2; // Удаляем элемент из документа
+
+// Типы изменений в классе Paragraph
+var historyitem_Paragraph_AddItem                   =  1; // Добавляем элемент в параграф
+var historyitem_Paragraph_RemoveItem                =  2; // Удаляем элемент из параграфа
+var historyitem_Paragraph_Numbering                 =  3; // Добавляем/Убираем/Изменяем нумерацию у параграфа
+var historyitem_Paragraph_Align                     =  4; // Изменяем прилегание параграфа
+var historyitem_Paragraph_Ind_First                 =  5; // Изменяем отспут первой строки
+var historyitem_Paragraph_Ind_Right                 =  6; // Изменяем правый отступ
+var historyitem_Paragraph_Ind_Left                  =  7; // Изменяем левый отступ
+var historyitem_Paragraph_ContextualSpacing         =  8; // Изменяем свойство contextualSpacing
+var historyitem_Paragraph_KeepLines                 =  9; // Изменяем свойство KeepLines
+var historyitem_Paragraph_KeepNext                  = 10; // Изменяем свойство KeepNext
+var historyitem_Paragraph_PageBreakBefore           = 11; // Изменяем свойство PageBreakBefore
+var historyitem_Paragraph_Spacing_Line              = 12; // Изменяем свойство Spacing.Line
+var historyitem_Paragraph_Spacing_LineRule          = 13; // Изменяем свойство Spacing.LineRule
+var historyitem_Paragraph_Spacing_Before            = 14; // Изменяем свойство Spacing.Before
+var historyitem_Paragraph_Spacing_After             = 15; // Изменяем свойство Spacing.After
+var historyitem_Paragraph_Spacing_AfterAutoSpacing  = 16; // Изменяем свойство Spacing.AfterAutoSpacing
+var historyitem_Paragraph_Spacing_BeforeAutoSpacing = 17; // Изменяем свойство Spacing.BeforeAutoSpacing
+var historyitem_Paragraph_Shd_Value                 = 18; // Изменяем свойство Shd.Value
+var historyitem_Paragraph_Shd_Color                 = 19; // Изменяем свойство Shd.Color
+var historyitem_Paragraph_WidowControl              = 20; // Изменяем свойство WidowControl
+var historyitem_Paragraph_Tabs                      = 21; // Изменяем табы у параграфа
+var historyitem_Paragraph_PStyle                    = 22; // Изменяем стиль параграфа
+var historyitem_Paragraph_DocNext                   = 23; // Изменяем указатель на следующий объект
+var historyitem_Paragraph_DocPrev                   = 24; // Изменяем указатель на предыдущий объект
+var historyitem_Paragraph_Parent                    = 25; // Изменяем указатель на родительский объект
+var historyitem_Paragraph_Borders_Between           = 26; // Изменяем промежуточную границу
+var historyitem_Paragraph_Borders_Bottom            = 27; // Изменяем верхнюю границу
+var historyitem_Paragraph_Borders_Left              = 28; // Изменяем левую границу
+var historyitem_Paragraph_Borders_Right             = 29; // Изменяем правую границу
+var historyitem_Paragraph_Borders_Top               = 30; // Изменяем нижнюю границу
+var historyitem_Paragraph_Pr                        = 31; // Изменяем свойства полностью
+var historyitem_Paragraph_PresentationPr_Bullet     = 32; // Изменяем свойства нумерации у параграфа в презентации
+var historyitem_Paragraph_PresentationPr_Level      = 33; // Изменяем уровень параграфа в презентациях
+
 // Типы изменений в классе CTableId
 var historyitem_TableId_Add   = 1; // Добавили новую ссылку в глобальную таблицу
 var historyitem_TableId_Reset = 2; // Изменили Id ссылки