Исправлен баг в работе нумерации (баг 21577).

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

Исправлен баг в работе нумерации (баг 21577).
git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50968 954022d7-b5bf-4e40-9824-e11837661b57
5f28d1da · Ilya.Kirillov · Alexander.Trofimov · 948695f5 · 5f28d1da · 5f28d1da
Commit 5f28d1da authored Oct 17, 2013 by Ilya.Kirillov Committed by Alexander.Trofimov May 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

Word/Editor/Paragraph.js Word/Editor/Paragraph.js +5 -5

Word/api.js Word/api.js +1 -1

No files found.
--- a/Word/Editor/Paragraph.js
+++ b/Word/Editor/Paragraph.js
@@ -1153,7 +1153,7 @@ Paragraph.prototype =
                        if ( para_Numbering === NumberingType )
                        {
                            var NumPr = ParaPr.NumPr;
-                            if ( undefined === NumPr || undefined === NumPr.NumId || 0 === NumPr.NumId )
+                            if ( undefined === NumPr || undefined === NumPr.NumId || 0 === NumPr.NumId || "0" === ParaPr.NumPr.NumId )
                            {
                                // Так мы обнуляем все рассчитанные ширины данного элемента
                                NumberingItem.Measure( g_oTextMeasurer, undefined );
@@ -3602,7 +3602,7 @@ Paragraph.prototype =
        var ParaPr = Pr.ParaPr;
        var NumPr  = ParaPr.NumPr;

-        if ( undefined === NumPr || undefined === NumPr.NumId || 0 === NumPr.NumId )
+        if ( undefined === NumPr || undefined === NumPr.NumId || 0 === NumPr.NumId || "0" === ParaPr.NumPr.NumId )
            return new CTextPr();

        var Numbering = this.Parent.Get_Numbering();
@@ -4162,7 +4162,7 @@ Paragraph.prototype =
                        if ( para_Numbering === NumberingType )
                        {
                            var NumPr = Pr.ParaPr.NumPr;
-                            if ( undefined === NumPr || undefined === NumPr.NumId || 0 === NumPr.NumId )
+                            if ( undefined === NumPr || undefined === NumPr.NumId || 0 === NumPr.NumId || "0" === ParaPr.NumPr.NumId )
                                break;

                            var Numbering = this.Parent.Get_Numbering();
@@ -4577,7 +4577,7 @@ Paragraph.prototype =
                    if ( para_Numbering === this.Numbering.Type )
                    {
                        var NumPr = Pr.ParaPr.NumPr;
-                        if ( undefined === NumPr || undefined === NumPr.NumId || 0 === NumPr.NumId )
+                        if ( undefined === NumPr || undefined === NumPr.NumId || 0 === NumPr.NumId || "0" === ParaPr.NumPr.NumId )
                            break;

                        var Numbering = this.Parent.Get_Numbering();
@@ -10532,7 +10532,7 @@ Paragraph.prototype =
            {
                var ParaPr = this.CompiledPr.Pr.ParaPr;
                var NumPr = ParaPr.NumPr;
-                if ( undefined === NumPr || undefined === NumPr.NumId || 0 === NumPr.NumId )
+                if ( undefined === NumPr || undefined === NumPr.NumId || 0 === NumPr.NumId || "0" === ParaPr.NumPr.NumId )
                    continue;

                var Numbering = this.Parent.Get_Numbering();

--- a/Word/api.js
+++ b/Word/api.js
@@ -2424,7 +2424,7 @@ asc_docs_api.prototype.UpdateParagraphProp = function(ParaPr)
    else
        ParaPr.StyleName = this.WordControl.m_oLogicDocument.Styles.Style[ParaPr.PStyle].Name;

-    if ( null == ParaPr.NumPr || 0 === ParaPr.NumPr.NumId )
+    if ( null == ParaPr.NumPr || 0 === ParaPr.NumPr.NumId || "0" === ParaPr.NumPr.NumId )
        ParaPr.ListType = {Type: -1, SubType : -1};
    else
    {