Bug #28854 - [Docx] Нумерация страниц в конкретном документе не поддержалась;

Bug #31330 - Нумерация страниц не учитывается в автофигурах 

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

Common/Drawings/Format/Shape.js

@@ -7,8 +7,9 @@ function CheckObjectLine(obj)
 }
 
 
-function CheckWordArtTextPr(oTextPr)
+function CheckWordArtTextPr(oRun)
 {
+    var oTextPr = oRun.Get_CompiledPr()
     if(oTextPr.TextFill || oTextPr.TextOutline || (oTextPr.Unifill && oTextPr.Unifill.fill && (oTextPr.Unifill.fill.type !== FILL_TYPE_SOLID || oTextPr.Unifill.transparent != null && oTextPr.Unifill.transparent < 254.5)))
         return true;
     return false;
@@ -5353,7 +5354,7 @@ CShape.prototype =
         {
             if(aContent[j].Type === para_Run)
             {
-                if(fCallback(aContent[j].Get_CompiledPr()))
+                if(fCallback(aContent[j]))
                 {
                     return true;
                 }

Word/Editor/GraphicObjects/Format/ShapePrototype.js

@@ -978,17 +978,38 @@ CShape.prototype.setRecalcObject =  function(object)
 };
 
 
-CShape.prototype.setStartPage = function(pageIndex, bNoResetSelectPage)
+CShape.prototype.setStartPage = function(pageIndex, bNoResetSelectPage, bCheckContent)
 {
     if(!(bNoResetSelectPage === true))
         this.selectStartPage = pageIndex;
     var content = this.getDocContent && this.getDocContent();
-    content && content.Set_StartPage(pageIndex);
+    if(content)
+    {
+        content.Set_StartPage(pageIndex);
+        if(true === bCheckContent)
+        {
+            if(this.bWordShape && this.checkContentByCallback && this.checkContentByCallback(content,
+                function(oRun){
+                    for(var i = 0; i < oRun.Content.length; ++i){
+                        if(oRun.Content[i].Type === para_PageNum){
+                            return true;
+                        }
+                    }
+                    return false;
+                }
+            ))
+            {
+                this.recalcInfo.recalculateTxBoxContent = true;
+                this.recalcInfo.recalculateTransformText = true;
+                this.recalculateText();
+            }
+        }
+    }
     if(Array.isArray(this.spTree))
     {
         for(var i = 0; i < this.spTree.length; ++i)
         {
-            this.spTree[i].setStartPage && this.spTree[i].setStartPage(pageIndex);
+            this.spTree[i].setStartPage && this.spTree[i].setStartPage(pageIndex, undefined, bCheckContent);
         }
     }
 };

Word/Editor/ParagraphContent.js

@@ -4775,7 +4775,10 @@ ParaDrawing.prototype =
         }
         this.setPageIndex(pageIndex);
         if(typeof this.GraphicObj.setStartPage === "function")
-            this.GraphicObj.setStartPage(pageIndex, this.DocumentContent && this.DocumentContent.Is_HdrFtr());
+        {
+            var bIsHfdFtr = this.DocumentContent && this.DocumentContent.Is_HdrFtr();
+            this.GraphicObj.setStartPage(pageIndex, bIsHfdFtr, bIsHfdFtr);
+        }
         var bInline = this.Is_Inline();
         var _x = (this.PositionH.Align || bInline) ? x - this.GraphicObj.bounds.x : x;
         var _y = (this.PositionV.Align || bInline) ? y - this.GraphicObj.bounds.y : y;