(2.0.0.174): ASCOfficeDocxFile2

Bug 25921 - Не сохраняются значения Paddings параграфа при экспорте в docx и переоткрытии документа.

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

Common/SerializeCommonWordExcel.js

@@ -122,7 +122,7 @@ BinaryCommonWriter.prototype.WriteItemWithLengthEnd = function(nStart)
 BinaryCommonWriter.prototype.WriteBorder = function(border)
 {
 	var _this = this;
-    if(border_None != border.Value)
+    if(null != border.Value)
     {
         var color = null;
         if (null != border.Color)
@@ -135,27 +135,22 @@ BinaryCommonWriter.prototype.WriteBorder = function(border)
         }
         if (null != color && !color.Auto)
             this.WriteColor(c_oSerBorderType.Color, color);
-        if(null != border.Space)
-        {
+        if (null != border.Space) {
             this.memory.WriteByte(c_oSerBorderType.Space);
             this.memory.WriteByte(c_oSerPropLenType.Double);
             this.memory.WriteDouble(border.Space);
         }
-        if(null != border.Size)
-        {
+        if (null != border.Size) {
             this.memory.WriteByte(c_oSerBorderType.Size);
             this.memory.WriteByte(c_oSerPropLenType.Double);
             this.memory.WriteDouble(border.Size);
         }
-		if(null != border.Unifill || (null != border.Color && border.Color.Auto))
-        {
-			this.memory.WriteByte(c_oSerBorderType.ColorTheme);
-			this.memory.WriteByte(c_oSerPropLenType.Variable);
-			this.WriteItemWithLength(function(){_this.WriteColorTheme(border.Unifill, border.Color);});
+        if (null != border.Unifill || (null != border.Color && border.Color.Auto)) {
+            this.memory.WriteByte(c_oSerBorderType.ColorTheme);
+            this.memory.WriteByte(c_oSerPropLenType.Variable);
+            this.WriteItemWithLength(function () { _this.WriteColorTheme(border.Unifill, border.Color); });
         }
-    }
-    if(null != border.Value)
-    {
+
         this.memory.WriteByte(c_oSerBorderType.Value);
         this.memory.WriteByte(c_oSerPropLenType.Byte);
         this.memory.WriteByte(border.Value);

Word/Editor/Serialize2.js

@@ -5794,10 +5794,6 @@ function Binary_pPrReader(doc, oReadResult, stream)
             Border.Size = this.bcr.ReadDouble();
         }
         else if( c_oSerBorderType.Value === type )
-        {
-            Border.Value = this.stream.GetUChar();
-        }
-		else if( c_oSerBorderType.Value === type )
         {
             Border.Value = this.stream.GetUChar();
         }