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

Исправлен баг с рисованием линейки, при таскании границ таблицы (баг 19376).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48286 954022d7-b5bf-4e40-9824-e11837661b57
parent eab11526
...@@ -6549,8 +6549,15 @@ CDocument.prototype = ...@@ -6549,8 +6549,15 @@ CDocument.prototype =
Selection_Is_TableBorderMove : function() Selection_Is_TableBorderMove : function()
{ {
if ( null != this.Selection.Data && true === this.Selection.Data.TableBorder && type_Table == this.Content[this.Selection.Data.Pos].GetType() ) if ( docpostype_HdrFtr === this.CurPos.Type )
return true; return this.HdrFtr.Selection_Is_TableBorderMove();
else if ( docpostype_DrawingObjects === this.CurPos.Type )
return this.DrawingObjects.selectionIsTableBorder();
else //if ( docpostype_Content === this.CurPos.Type )
{
if ( null != this.Selection.Data && true === this.Selection.Data.TableBorder && type_Table == this.Content[this.Selection.Data.Pos].GetType() )
return true;
}
return false; return false;
}, },
...@@ -6563,7 +6570,7 @@ CDocument.prototype = ...@@ -6563,7 +6570,7 @@ CDocument.prototype =
return this.HdrFtr.Selection_Check( X, Y, Page_Abs ); return this.HdrFtr.Selection_Check( X, Y, Page_Abs );
else if ( docpostype_DrawingObjects === this.CurPos.Type ) else if ( docpostype_DrawingObjects === this.CurPos.Type )
return this.DrawingObjects.selectionCheck( X, Y, Page_Abs ); return this.DrawingObjects.selectionCheck( X, Y, Page_Abs );
else //if ( docpostype_Content === thsi.CurPos.Type ) else //if ( docpostype_Content === this.CurPos.Type )
{ {
if ( true === this.Selection.Use ) if ( true === this.Selection.Use )
{ {
......
...@@ -408,6 +408,19 @@ CDocumentContent.prototype = ...@@ -408,6 +408,19 @@ CDocumentContent.prototype =
return false; return false;
}, },
Selection_Is_TableBorderMove : function()
{
if ( docpostype_DrawingObjects === this.CurPos.Type )
return this.DrawingObjects.selectionIsTableBorder();
else //if ( docpostype_Content === this.CurPos.Type )
{
if ( null != this.Selection.Data && true === this.Selection.Data.TableBorder && type_Table == this.Content[this.Selection.Data.Pos].GetType() )
return true;
}
return false;
},
Check_TableCoincidence : function(Table) Check_TableCoincidence : function(Table)
{ {
return this.Parent.Check_TableCoincidence( Table ); return this.Parent.Check_TableCoincidence( Table );
......
...@@ -946,6 +946,11 @@ CHeaderFooter.prototype = ...@@ -946,6 +946,11 @@ CHeaderFooter.prototype =
return this.Content.Selection_SetEnd(X, Y, PageIndex, MouseEvent); return this.Content.Selection_SetEnd(X, Y, PageIndex, MouseEvent);
}, },
Selection_Is_TableBorderMove : function()
{
return this.Content.Selection_Is_TableBorderMove();
},
Selection_Check : function(X, Y, Page_Abs) Selection_Check : function(X, Y, Page_Abs)
{ {
var HdrFtrPage = this.Content.Get_StartPage_Absolute(); var HdrFtrPage = this.Content.Get_StartPage_Absolute();
...@@ -2592,6 +2597,14 @@ CHeaderFooterController.prototype = ...@@ -2592,6 +2597,14 @@ CHeaderFooterController.prototype =
} }
}, },
Selection_Is_TableBorderMove : function()
{
if ( null != this.CurHdrFtr )
return this.CurHdrFtr.Selection_Is_TableBorderMove();
return false;
},
Selection_Check : function(X, Y, Page_Abs) Selection_Check : function(X, Y, Page_Abs)
{ {
if ( null != this.CurHdrFtr ) if ( null != this.CurHdrFtr )
......
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