Переделана схема работы с нумерацией параграфов, изменен алгоритм рассчета...

Переделана схема работы с нумерацией параграфов, изменен алгоритм рассчета положения нумерации относительно параграфа.

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

Word/Editor/Document.js

@@ -5344,8 +5344,14 @@ CDocument.prototype =
                         if ( null == this.Selection.Data || this.Selection.Data.length <= 0 )
                             break;
 
-                        var NumPr = this.Content[this.Selection.Data[0]].Numbering_Get();
-                        VisTextPr = this.Numbering.Get_AbstractNum( NumPr.NumId ).Lvl[NumPr.Lvl].TextPr;
+                        var CurPara = this.Content[this.Selection.Data[0]];
+                        for ( var Index = 0; Index < this.Selection.Data.length; Index++ )
+                        {
+                            if ( this.CurPos.ContentPos === this.Selection.Data[Index] )
+                                CurPara = this.Content[this.Selection.Data[Index]];
+                        }
+
+                        VisTextPr = CurPara.Internal_Get_NumberingTextPr();
 
                         break;
                     }

Word/Editor/DocumentContent.js

@@ -5526,8 +5526,14 @@ CDocumentContent.prototype =
                         if ( null == this.Selection.Data || this.Selection.Data.length <= 0 )
                             break;
 
-                        var NumPr = this.Content[this.Selection.Data[0]].Numbering_Get();
-                        VisTextPr = this.Numbering.Get_AbstractNum( NumPr.NumId ).Lvl[NumPr.Lvl].TextPr;
+                        var CurPara = this.Content[this.Selection.Data[0]];
+                        for ( var Index = 0; Index < this.Selection.Data.length; Index++ )
+                        {
+                            if ( this.CurPos.ContentPos === this.Selection.Data[Index] )
+                                CurPara = this.Content[this.Selection.Data[Index]];
+                        }
+
+                        VisTextPr = CurPara.Internal_Get_NumberingTextPr();
 
                         break;
                     }

Word/Editor/ParagraphContent.js

@@ -168,6 +168,11 @@ ParaText.prototype =
         return true;
     },
 
+    Can_AddNumbering : function()
+    {
+        return true;
+    },
+
     Copy : function()
     {
         return new ParaText( this.Value );
@@ -331,6 +336,11 @@ ParaSpace.prototype =
         return true;
     },
 
+    Can_AddNumbering : function()
+    {
+        return true;
+    },
+
     Copy : function()
     {
         return new ParaSpace(this.Value);
@@ -398,6 +408,11 @@ ParaTextPr.prototype =
         return true;
     },
 
+    Can_AddNumbering : function()
+    {
+        return false;
+    },
+
     Set_Id : function(newId)
     {
         g_oTableId.Reset_Id( this, newId, this.Id );
@@ -1690,6 +1705,11 @@ ParaEnd.prototype =
         return true;
     },
 
+    Can_AddNumbering : function()
+    {
+        return true;
+    },
+
     Copy : function()
     {
         return new ParaEnd();
@@ -1813,6 +1833,14 @@ ParaNewLine.prototype =
         return true;
     },
 
+    Can_AddNumbering : function()
+    {
+        if ( break_Line === this.BreakType )
+            return true;
+
+        return false;
+    },
+
     Copy : function()
     {
         return new ParaNewLine(this.BreakType);
@@ -1876,6 +1904,12 @@ ParaNewLineRendered.prototype =
         return false;
     },
 
+    Can_AddNumbering : function()
+    {
+        return false;
+    },
+
+
     Write_ToBinary : function(Writer)
     {
         // Long   : Type
@@ -1912,6 +1946,12 @@ ParaInlineBreak.prototype =
         return false;
     },
 
+    Can_AddNumbering : function()
+    {
+        return false;
+    },
+
+
     Write_ToBinary : function(Writer)
     {
         // Long   : Type
@@ -1948,6 +1988,11 @@ ParaPageBreakRenderer.prototype =
         return false;
     },
 
+    Can_AddNumbering : function()
+    {
+        return false;
+    },
+
     Write_ToBinary : function(Writer)
     {
         // Long   : Type
@@ -1989,6 +2034,12 @@ ParaEmpty.prototype =
         return true;
     },
 
+    Can_AddNumbering : function()
+    {
+        return false;
+    },
+
+
     Copy : function()
     {
         return new ParaEmpty(this.NeedToDelete);
@@ -2018,6 +2069,7 @@ ParaEmpty.prototype =
 function ParaNumbering()
 {
     this.Type = para_Numbering;
+    this.Pos  = -1;
 
     this.Internal =
     {
@@ -2058,6 +2110,11 @@ ParaNumbering.prototype =
         return true;
     },
 
+    Can_AddNumbering : function()
+    {
+        return false;
+    },
+
     Copy : function()
     {
         return new ParaNumbering();
@@ -2122,6 +2179,11 @@ ParaTab.prototype =
         return true;
     },
 
+    Can_AddNumbering : function()
+    {
+        return true;
+    },
+
     Copy : function()
     {
         return new ParaTab();
@@ -3301,6 +3363,14 @@ ParaDrawing.prototype =
         return true;
     },
 
+    Can_AddNumbering : function()
+    {
+        if ( drawing_Inline === this.DrawingType )
+            return true;
+
+        return false;
+    },
+
     Copy : function()
     {
         return this.copy();
@@ -6031,6 +6101,11 @@ ParaPageNum.prototype =
         return true;
     },
 
+    Can_AddNumbering : function()
+    {
+        return true;
+    },
+
     Copy : function()
     {
         return new ParaPageNum();
@@ -6076,6 +6151,12 @@ ParaFlowObjectAnchor.prototype =
         return false;
     },
 
+    Can_AddNumbering : function()
+    {
+        return false;
+    },
+
+
     Set_FlowObject : function(Object)
     {
         this.FlowObject = Object;
@@ -6137,6 +6218,11 @@ ParaHyperlinkStart.prototype =
         return true;
     },
 
+    Can_AddNumbering : function()
+    {
+        return false;
+    },
+
     Copy : function()
     {
         var Hyper = new ParaHyperlinkStart();
@@ -6377,6 +6463,12 @@ ParaHyperlinkEnd.prototype =
         return true;
     },
 
+    Can_AddNumbering : function()
+    {
+        return false;
+    },
+
+
     Copy : function()
     {
         return new ParaHyperlinkEnd();
@@ -6419,6 +6511,12 @@ ParaCollaborativeChangesStart.prototype =
         return false;
     },
 
+    Can_AddNumbering : function()
+    {
+        return false;
+    },
+
+
     Write_ToBinary : function(Writer)
     {
         // Long   : Type
@@ -6455,6 +6553,12 @@ ParaCollaborativeChangesEnd.prototype =
         return false;
     },
 
+    Can_AddNumbering : function()
+    {
+        return false;
+    },
+
+
     Write_ToBinary : function(Writer)
     {
         // Long   : Type
@@ -6493,6 +6597,12 @@ ParaCommentStart.prototype =
         return true;
     },
 
+    Can_AddNumbering : function()
+    {
+        return false;
+    },
+
+
     Copy : function()
     {
         return new ParaCommentStart(this.Id);
@@ -6537,6 +6647,12 @@ ParaCommentEnd.prototype =
         return true;
     },
 
+    Can_AddNumbering : function()
+    {
+        return false;
+    },
+
+
     Copy : function()
     {
         return new ParaCommentEnd(this.Id);
@@ -6589,6 +6705,12 @@ ParaPresentationNumbering.prototype =
         return true;
     },
 
+    Can_AddNumbering : function()
+    {
+        return false;
+    },
+
+
     Copy : function()
     {
         return new ParaPresentationNumbering();