Fixed bug #34476

ff075675 · Ilya Kirillov · 20fc404d · ff075675
Commit ff075675 authored Mar 22, 2017 by Ilya Kirillov
Hide whitespace changes
Inline Side-by-side

Showing with 114 additions and 105 deletions

word/Editor/Styles.js word/Editor/Styles.js +114 -105

No files found.
--- a/word/Editor/Styles.js
+++ b/word/Editor/Styles.js
@@ -8964,139 +8964,148 @@ CFramePr.prototype =
        this.YAlign  = FramePr.YAlign;
    },
-    Write_ToBinary : function(Writer)
+	Write_ToBinary : function(Writer)
-    {
+	{
-        var StartPos = Writer.GetCurPosition();
+		var StartPos = Writer.GetCurPosition();
-        Writer.Skip(4);
+		Writer.Skip(4);
-        var Flags = 0;
+		var Flags = 0;
-        if ( undefined != this.DropCap )
+		if (undefined != this.DropCap)
-        {
+		{
-            Writer.WriteLong( this.DropCap );
+			Writer.WriteLong(this.DropCap);
-            Flags |= 1;
+			Flags |= 1;
-        }
+		}
-        if ( undefined != this.H )
+		if (undefined != this.H)
-        {
+		{
-            Writer.WriteDouble( this.H );
+			Writer.WriteDouble(this.H);
-            Flags |= 2;
+			Flags |= 2;
-        }
+		}
-        if ( undefined != this.HAnchor )
+		if (undefined != this.HAnchor)
-        {
+		{
-            Writer.WriteLong( this.HAnchor );
+			Writer.WriteLong(this.HAnchor);
-            Flags |= 4;
+			Flags |= 4;
-        }
+		}
-        if ( undefined != this.HRule )
+		if (undefined != this.HRule)
-        {
+		{
-            Writer.WriteLong( this.HRule );
+			Writer.WriteLong(this.HRule);
-            Flags |= 8;
+			Flags |= 8;
-        }
+		}
-        if ( undefined != this.HSpace )
+		if (undefined != this.HSpace)
-        {
+		{
-            Writer.WriteDouble( this.HSpace );
+			Writer.WriteDouble(this.HSpace);
-            Flags |= 16;
+			Flags |= 16;
-        }
+		}
-        if ( undefined != this.Lines )
+		if (undefined != this.Lines)
-        {
+		{
-            Writer.WriteLong( this.Lines );
+			Writer.WriteLong(this.Lines);
-            Flags |= 32;
+			Flags |= 32;
-        }
+		}
-        if ( undefined != this.VAnchor )
+		if (undefined != this.VAnchor)
-        {
+		{
-            Writer.WriteLong( this.VAnchor );
+			Writer.WriteLong(this.VAnchor);
-            Flags |= 64;
+			Flags |= 64;
-        }
+		}
-        if ( undefined != this.VSpace )
+		if (undefined != this.VSpace)
-        {
+		{
-            Writer.WriteDouble( this.VSpace );
+			Writer.WriteDouble(this.VSpace);
-            Flags |= 128;
+			Flags |= 128;
-        }
+		}
-        if ( undefined != this.W )
+		if (undefined != this.W)
-        {
+		{
-            Writer.WriteDouble( this.W );
+			Writer.WriteDouble(this.W);
-            Flags |= 256;
+			Flags |= 256;
-        }
+		}
-        if ( undefined != this.X )
+		if (undefined != this.X)
-        {
+		{
-            Writer.WriteDouble( this.X );
+			Writer.WriteDouble(this.X);
-            Flags |= 512;
+			Flags |= 512;
-        }
+		}
-        if ( undefined != this.XAlign )
+		if (undefined != this.XAlign)
-        {
+		{
-            Writer.WriteLong( this.XAlign );
+			Writer.WriteLong(this.XAlign);
-            Flags |= 1024;
+			Flags |= 1024;
-        }
+		}
-        if ( undefined != this.Y )
+		if (undefined != this.Y)
-        {
+		{
-            Writer.WriteDouble( this.Y );
+			Writer.WriteDouble(this.Y);
-            Flags |= 2048;
+			Flags |= 2048;
-        }
+		}
-        if ( undefined != this.YAlign )
+		if (undefined != this.YAlign)
-        {
+		{
-            Writer.WriteLong( this.YAlign );
+			Writer.WriteLong(this.YAlign);
-            Flags |= 4096;
+			Flags |= 4096;
-        }
+		}
-        var EndPos = Writer.GetCurPosition();
+		if (undefined !== this.Wrap)
-        Writer.Seek( StartPos );
+		{
-        Writer.WriteLong( Flags );
+			Writer.WriteLong(this.Wrap);
-        Writer.Seek( EndPos );
+			Flags |= 8192;
-    },
+		}
-    Read_FromBinary : function(Reader)
+		var EndPos = Writer.GetCurPosition();
-    {
+		Writer.Seek(StartPos);
-        var Flags = Reader.GetLong();
+		Writer.WriteLong(Flags);
+		Writer.Seek(EndPos);
+	},
-        if ( Flags & 1 )
+	Read_FromBinary : function(Reader)
-            this.DropCap = Reader.GetLong();
+	{
+		var Flags = Reader.GetLong();
-        if ( Flags & 2 )
+		if (Flags & 1)
-            this.H = Reader.GetDouble();
+			this.DropCap = Reader.GetLong();
-        if ( Flags & 4 )
+		if (Flags & 2)
-            this.HAnchor = Reader.GetLong();
+			this.H = Reader.GetDouble();
-        if ( Flags & 8 )
+		if (Flags & 4)
-            this.HRule = Reader.GetLong();
+			this.HAnchor = Reader.GetLong();
-        if ( Flags & 16 )
+		if (Flags & 8)
-            this.HSpace = Reader.GetDouble();
+			this.HRule = Reader.GetLong();
-        if ( Flags & 32 )
+		if (Flags & 16)
-            this.Lines = Reader.GetLong();
+			this.HSpace = Reader.GetDouble();
-        if ( Flags & 64 )
+		if (Flags & 32)
-            this.VAnchor = Reader.GetLong();
+			this.Lines = Reader.GetLong();
-        if ( Flags & 128 )
+		if (Flags & 64)
-            this.VSpace = Reader.GetDouble();
+			this.VAnchor = Reader.GetLong();
-        if ( Flags & 256 )
+		if (Flags & 128)
-            this.W = Reader.GetDouble();
+			this.VSpace = Reader.GetDouble();
-        if ( Flags & 512 )
+		if (Flags & 256)
-            this.X = Reader.GetDouble();
+			this.W = Reader.GetDouble();
-        if ( Flags & 1024 )
+		if (Flags & 512)
-            this.XAlign = Reader.GetLong();
+			this.X = Reader.GetDouble();
-        if ( Flags & 2048 )
+		if (Flags & 1024)
-            this.Y = Reader.GetDouble();
+			this.XAlign = Reader.GetLong();
-        if ( Flags & 4096 )
+		if (Flags & 2048)
-            this.YAlign = Reader.GetLong();
+			this.Y = Reader.GetDouble();
-    },
+		if (Flags & 4096)
+			this.YAlign = Reader.GetLong();
+		if (Flags & 8192)
+			this.Wrap = Reader.GetLong();
+	},
    Init_Default_DropCap : function(bInside)
    {