Bug #31630 - [TextArt] Не изменяется прозрачность у дефолтного текста из меню настроек textart

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

Common/Drawings/Format/Shape.js

@@ -9,7 +9,7 @@ function CheckObjectLine(obj)
 
 function CheckWordArtTextPr(oTextPr)
 {
-    if(oTextPr.TextFill || oTextPr.TextOutline || (oTextPr.Unifill && oTextPr.Unifill.fill && oTextPr.Unifill.fill.type !== FILL_TYPE_SOLID))
+    if(oTextPr.TextFill || oTextPr.TextOutline || (oTextPr.Unifill && oTextPr.Unifill.fill && (oTextPr.Unifill.fill.type !== FILL_TYPE_SOLID || oTextPr.Unifill.transparent != null || oTextPr.Unifill.transparent < 255)))
         return true;
     return false;
 }
@@ -786,18 +786,24 @@ CShape.prototype =
         }
     },
 
-    applyTextFunction: function (docContentFunction, tableFunction, args) {
+    applyTextFunction: function (docContentFunction, tableFunction, args)
+    {
         var content_to_add = this.getDocContent();
-        if (!content_to_add) {
-            if (this.bWordShape) {
+        if (!content_to_add)
+        {
+            if (this.bWordShape)
+            {
                 this.createTextBoxContent();
             }
-            else {
+            else
+            {
                 this.createTextBody();
             }
             content_to_add = this.getDocContent();
+            content_to_add.Cursor_MoveToStartPos();
         }
-        if (content_to_add) {
+        if (content_to_add)
+        {
             docContentFunction.apply(content_to_add, args);
         }
         if(!editor || !editor.noCreatePoint || editor.exucuteHistory)

Common/Shapes/Serialize.js

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

PowerPoint/api.js

@@ -1840,7 +1840,7 @@ asc_docs_api.prototype.ShapeApply = function(prop)
                     History.UndoLastPoint();
                     var slide = this.WordControl.m_oLogicDocument.Slides[this.WordControl.m_oLogicDocument.CurPage];
                     slide.graphicObjects.applyDrawingProps(prop);
-                    slide.graphicObjects.recalculate();
+                    this.WordControl.m_oLogicDocument.Recalculate();
                     this.WordControl.m_oDrawingDocument.OnRecalculatePage(this.WordControl.m_oLogicDocument.CurPage, slide);
                     this.WordControl.m_oDrawingDocument.OnEndRecalculate();
                 }
@@ -1878,7 +1878,7 @@ asc_docs_api.prototype.ShapeApply = function(prop)
                     History.UndoLastPoint();
                     var slide = this.WordControl.m_oLogicDocument.Slides[this.WordControl.m_oLogicDocument.CurPage];
                     slide.graphicObjects.applyDrawingProps(prop);
-                    slide.graphicObjects.recalculate();
+                    this.WordControl.m_oLogicDocument.Recalculate();
                     this.WordControl.m_oDrawingDocument.OnRecalculatePage(this.WordControl.m_oLogicDocument.CurPage, slide);
                     this.WordControl.m_oDrawingDocument.OnEndRecalculate();
                 }