Commit f92032e0 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Bug 27423 - Запретить вставку таблицы в заголовок диаграммы

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59512 954022d7-b5bf-4e40-9824-e11837661b57
parent 98036180
...@@ -6583,7 +6583,7 @@ CDocumentContent.prototype = ...@@ -6583,7 +6583,7 @@ CDocumentContent.prototype =
Pr.Ind.FirstLine = StartPr.Ind.FirstLine; Pr.Ind.FirstLine = StartPr.Ind.FirstLine;
Result_ParaPr = Pr; Result_ParaPr = Pr;
Result_ParaPr.CanAddTable = ( true === Pr.Locked ? false : true ); Result_ParaPr.CanAddTable = ( true === Pr.Locked ? false : true ) && !(this.bPresentation === true);
if(Result_ParaPr.Shd && Result_ParaPr.Shd.Unifill) if(Result_ParaPr.Shd && Result_ParaPr.Shd.Unifill)
{ {
Result_ParaPr.Shd.Unifill.check(this.Get_Theme(), this.Get_ColorMap()); Result_ParaPr.Shd.Unifill.check(this.Get_Theme(), this.Get_ColorMap());
...@@ -6648,7 +6648,7 @@ CDocumentContent.prototype = ...@@ -6648,7 +6648,7 @@ CDocumentContent.prototype =
Pr.Ind.FirstLine = StartPr.Ind.FirstLine; Pr.Ind.FirstLine = StartPr.Ind.FirstLine;
Result_ParaPr = Pr; Result_ParaPr = Pr;
Result_ParaPr.CanAddTable = ( true === Locked ? false : true ); Result_ParaPr.CanAddTable = ( true === Locked ? false : true ) && !(this.bPresentation === true);
} }
else else
{ {
...@@ -6660,7 +6660,7 @@ CDocumentContent.prototype = ...@@ -6660,7 +6660,7 @@ CDocumentContent.prototype =
Result_ParaPr = ParaPr.Copy(); Result_ParaPr = ParaPr.Copy();
Result_ParaPr.Locked = Locked; Result_ParaPr.Locked = Locked;
Result_ParaPr.CanAddTable = ( ( true === Locked ) ? ( ( true === Item.Cursor_IsEnd() ) ? true : false ) : true ); Result_ParaPr.CanAddTable = ( ( true === Locked ) ? ( ( true === Item.Cursor_IsEnd() ) ? true : false ) : true ) && !(this.bPresentation === true);
} }
else if ( type_Table == Item.GetType() ) else if ( type_Table == Item.GetType() )
{ {
......
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