Commit a19f00ce authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Добавлено поле Vanish в текстовые настройки.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56177 954022d7-b5bf-4e40-9824-e11837661b57
parent d3e457da
...@@ -6410,6 +6410,7 @@ function CTextPr() ...@@ -6410,6 +6410,7 @@ function CTextPr()
this.Lang = new CLang(); this.Lang = new CLang();
this.Unifill = undefined; this.Unifill = undefined;
this.Shd = undefined; this.Shd = undefined;
this.Vanish = undefined;
} }
CTextPr.prototype = CTextPr.prototype =
...@@ -6441,6 +6442,7 @@ CTextPr.prototype = ...@@ -6441,6 +6442,7 @@ CTextPr.prototype =
this.Lang = new CLang(); this.Lang = new CLang();
this.Unifill = undefined; this.Unifill = undefined;
this.Shd = undefined; this.Shd = undefined;
this.Vanish = undefined;
}, },
Copy : function() Copy : function()
...@@ -6491,6 +6493,8 @@ CTextPr.prototype = ...@@ -6491,6 +6493,8 @@ CTextPr.prototype =
if (undefined !== this.Shd ) if (undefined !== this.Shd )
TextPr.Shd = this.Shd.Copy(); TextPr.Shd = this.Shd.Copy();
TextPr.Vanish = this.Vanish;
return TextPr; return TextPr;
}, },
...@@ -6573,6 +6577,9 @@ CTextPr.prototype = ...@@ -6573,6 +6577,9 @@ CTextPr.prototype =
if ( undefined !== TextPr.Shd ) if ( undefined !== TextPr.Shd )
this.Shd = TextPr.Shd.Copy(); this.Shd = TextPr.Shd.Copy();
if ( undefined !== TextPr.Vanish )
this.Vanish = TextPr.Vanish;
}, },
Init_Default : function() Init_Default : function()
...@@ -6605,6 +6612,7 @@ CTextPr.prototype = ...@@ -6605,6 +6612,7 @@ CTextPr.prototype =
this.Lang.Init_Default(); this.Lang.Init_Default();
this.Unifill = undefined; this.Unifill = undefined;
this.Shd = undefined; this.Shd = undefined;
this.Vanish = false;
}, },
Set_FromObject : function(TextPr) Set_FromObject : function(TextPr)
...@@ -6670,6 +6678,8 @@ CTextPr.prototype = ...@@ -6670,6 +6678,8 @@ CTextPr.prototype =
} }
else else
this.Shd = undefined; this.Shd = undefined;
this.Vanish = TextPr.Vanish;
}, },
Compare : function(TextPr) Compare : function(TextPr)
...@@ -6761,6 +6771,10 @@ CTextPr.prototype = ...@@ -6761,6 +6771,10 @@ CTextPr.prototype =
this.Lang.Compare( TextPr.Lang ); this.Lang.Compare( TextPr.Lang );
//Result_TextPr.Unifill = CompareUniFill(this.Unifill, TextPr.Unifill); //Result_TextPr.Unifill = CompareUniFill(this.Unifill, TextPr.Unifill);
// Vanish
if ( undefined !== this.Vanish && this.Vanish !== TextPr.Vanish )
this.Vanish = undefined;
return this; return this;
}, },
...@@ -6923,6 +6937,12 @@ CTextPr.prototype = ...@@ -6923,6 +6937,12 @@ CTextPr.prototype =
Flags |= 8388608; Flags |= 8388608;
} }
if ( undefined !== this.Vanish )
{
Writer.WriteBool( this.Vanish );
Flags |= 16777216;
}
var EndPos = Writer.GetCurPosition(); var EndPos = Writer.GetCurPosition();
Writer.Seek( StartPos ); Writer.Seek( StartPos );
Writer.WriteLong( Flags ); Writer.WriteLong( Flags );
...@@ -7046,6 +7066,10 @@ CTextPr.prototype = ...@@ -7046,6 +7066,10 @@ CTextPr.prototype =
this.Shd = new CDocumentShd(); this.Shd = new CDocumentShd();
this.Shd.Read_FromBinary( Reader ); this.Shd.Read_FromBinary( Reader );
} }
// Vanish
if ( Flags & 16777216 )
this.Vanish = Reader.GetBool();
}, },
Check_NeedRecalc : function() Check_NeedRecalc : function()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment