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

PowerPoint/Editor/Format/Chart.js

@@ -220,8 +220,8 @@ CChartAsGroup.prototype =
         var bin =  w.pos + ";" + w.GetBase64Memory();
 
         var new_chart_data = new asc_CChart(this.chart);
-       /* var r = CreateBinaryReader(bin, 0, bin.length);
-        new_chart_data.Read_FromBinary2(r);   */
+        /* var r = CreateBinaryReader(bin, 0, bin.length);
+         new_chart_data.Read_FromBinary2(r);   */
 
         if(chart.styleId != null)
             new_chart_data.asc_setStyleId(chart.styleId);
@@ -1107,7 +1107,7 @@ CChartAsGroup.prototype =
         t_y = invert_transform.TransformPointY(x, y);
         var radius = this.getParentObjects().presentation.DrawingDocument.GetMMPerDot(TRACK_CIRCLE_RADIUS);
 
-        var sqr_x = t_x*t_y, sqr_y = t_y*t_y;
+        var sqr_x = t_x*t_x, sqr_y = t_y*t_y;
         if(Math.sqrt(sqr_x + sqr_y) < radius)
             return 0;
 
@@ -1490,7 +1490,7 @@ CChartAsGroup.prototype =
         if(is_on)
             History.TurnOn();
 
-     //   this.recalculate();
+        //   this.recalculate();
 
     },
 

PowerPoint/Editor/Format/GroupShape.js

@@ -1453,7 +1453,7 @@ CGroupShape.prototype =
         t_y = invert_transform.TransformPointY(x, y);
         var radius = this.getParentObjects().presentation.DrawingDocument.GetMMPerDot(TRACK_CIRCLE_RADIUS);
 
-        var sqr_x = t_x*t_y, sqr_y = t_y*t_y;
+        var sqr_x = t_x*t_x, sqr_y = t_y*t_y;
         if(Math.sqrt(sqr_x + sqr_y) < radius)
             return 0;
 

PowerPoint/Editor/Format/Image.js

@@ -1003,7 +1003,7 @@ CImageShape.prototype =
         t_y = invert_transform.TransformPointY(x, y);
         var radius = this.getParentObjects().presentation.DrawingDocument.GetMMPerDot(TRACK_CIRCLE_RADIUS);
 
-        var sqr_x = t_x*t_y, sqr_y = t_y*t_y;
+        var sqr_x = t_x*t_x, sqr_y = t_y*t_y;
         if(Math.sqrt(sqr_x + sqr_y) < radius)
             return 0;
 

PowerPoint/Editor/Format/TextBody.js

@@ -220,7 +220,7 @@ CTextBody.prototype =
         var Doc = this.content;
         if ( true === Doc.Is_SelectionUse() && !Doc.Selection_IsEmpty())
         {
-           drawingDocument.UpdateTargetTransform(this.shape.transformText);
+            drawingDocument.UpdateTargetTransform(this.shape.transformText);
             drawingDocument.TargetEnd();
             drawingDocument.SelectEnabled(true);
             drawingDocument.SelectClear();
@@ -636,9 +636,9 @@ CTextBody.prototype =
     draw: function(graphics)
     {
         /*if(this.content.Is_Empty() && isRealObject(this.phContent))
-            this.content2.Draw(graphics);
-        else
-            this.content.Draw(0, graphics);  */
+         this.content2.Draw(graphics);
+         else
+         this.content.Draw(0, graphics);  */
 
         if((!this.content || this.content.Is_Empty()) && this.content2!=null && !this.shape.addTextFlag && (this.shape.isEmptyPlaceholder ? this.shape.isEmptyPlaceholder() : false))
         {
@@ -914,13 +914,13 @@ CTextBody.prototype =
             var par = this.content.Content[i];
             for(var j = 0; j < par.Lines.length; ++j)
             {
-                if(par.Lines[j].Ranges[0].W + 1> max_width)
+                if(par.Lines[j].Ranges[0].W + 1 > max_width)
                 {
-                    max_width = par.Lines[j].Ranges[0].W;
+                    max_width = par.Lines[j].Ranges[0].W + 1;
                 }
             }
         }
-        return max_width + r_ins + l_ins;
+        return max_width + 1 + r_ins + l_ins;
     },
 
     getRectHeight: function(maxHeight, width)

PowerPoint/Editor/GraphicObjects.js

@@ -813,7 +813,7 @@ CGraphicObjects.prototype = {
             case STATES_ID_TEXT_ADD:
             case STATES_ID_GROUP:
             case STATES_ID_TEXT_ADD_IN_GROUP:
-           // case STATES_ID_TEXT_ADD_IN_GROUP:
+                // case STATES_ID_TEXT_ADD_IN_GROUP:
             {
                 if(this.State.id === STATES_ID_GROUP || this.State.id === STATES_ID_TEXT_ADD_IN_GROUP)
                 {
@@ -1128,8 +1128,11 @@ CGraphicObjects.prototype = {
                         SubType: -1
                     }
                 };
-                editor.sync_PrLineSpacingCallBack(_empty_para_pr.Spacing);
-                editor.UpdateParagraphProp(_empty_para_pr);
+                editor.sync_ParaSpacingLine( _empty_para_pr.Spacing );
+                editor.Update_ParaInd(_empty_para_pr.Ind);
+                editor.sync_PrAlignCallBack(_empty_para_pr.Jc);
+                editor.sync_ParaStyleName(_empty_para_pr.StyleName);
+                editor.sync_ListType(_empty_para_pr.ListType);
             }
 
             if(text_props != null)
@@ -1195,7 +1198,7 @@ CGraphicObjects.prototype = {
         switch(this.State.id)
         {
             case STATES_ID_NULL:
-            //case STATES_ID_TEXT_ADD:
+                //case STATES_ID_TEXT_ADD:
                 // case STATES_ID_TEXT_ADD_IN_GROUP:
             {
                 var shapes = by_types.shapes;
@@ -2116,8 +2119,10 @@ CGraphicObjects.prototype = {
         image.setGeometry( CreateGeometry("rect"));
         image.spPr.geometry.Init(5, 5);
         image.setXfrm((this.slide.presentation.Width - W)/2, (this.slide.presentation.Height - H)/2, W, H, null, null, null);
-        if(editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_AddShape, image) === false)
+        if (editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_AddShape, image) === false)
         {
+            this.resetSelectionState();
+            image.select(this);
             this.slide.addToSpTreeToPos(this.slide.cSld.spTree.length, image);
             editor.WordControl.m_oLogicDocument.recalcMap[image.Id] = image;
         }
@@ -2380,9 +2385,9 @@ CGraphicObjects.prototype = {
                                 if(_tmp_sel_state.textSelectionState != undefined)
                                 {
                                     /*if(_prev_sel_state != undefined && _tmp_sel_state.textObject != _prev_sel_state.textObject)
-                                    {
-                                        return _arr_sel_states[_pos_sel_state];
-                                    }*/
+                                     {
+                                     return _arr_sel_states[_pos_sel_state];
+                                     }*/
                                     var _text_sel_state = _tmp_sel_state.textSelectionState;
                                     if(b_table && isRealNumber(cur_row) && isRealNumber(cur_cell))
                                     {
@@ -2573,7 +2578,7 @@ CGraphicObjects.prototype = {
                                             }
                                         }
                                     }
-                                    }
+                                }
 
 
                                 _prev_sel_state = _tmp_sel_state;
@@ -3353,7 +3358,7 @@ CGraphicObjects.prototype = {
                 break;
             }
         }
-       // this.updateSelectionState()
+        // this.updateSelectionState()
     },
 
     recalculateCurPos: function()
@@ -3392,16 +3397,16 @@ CGraphicObjects.prototype = {
     {
         this.State.onMouseUp(e, x, y);
         this.slide.presentation.Document_UpdateInterfaceState();
-       /* if(this.State.id === STATES_ID_NULL)
-        { */
-            if(this.selectedObjects.length > 0)
-            {
-                var _data = new CContextMenuData();
-                _data.Type = c_oAscContextMenuTypes.Main;
-                _data.X_abs = e.X;
-                _data.Y_abs = e.Y;
-                editor.sync_ContextMenuCallback(_data);
-            }
+        /* if(this.State.id === STATES_ID_NULL)
+         { */
+        if(this.selectedObjects.length > 0)
+        {
+            var _data = new CContextMenuData();
+            _data.Type = c_oAscContextMenuTypes.Main;
+            _data.X_abs = e.X;
+            _data.Y_abs = e.Y;
+            editor.sync_ContextMenuCallback(_data);
+        }
         //}
     },