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

Сделано, чтобы нельзя было выделять букцицу и автофигуру одновременно (баг 21896).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51347 954022d7-b5bf-4e40-9824-e11837661b57
parent e8001e3e
...@@ -9751,6 +9751,8 @@ CDocument.prototype = ...@@ -9751,6 +9751,8 @@ CDocument.prototype =
} }
else if ( docpostype_DrawingObjects === this.CurPos.Type ) else if ( docpostype_DrawingObjects === this.CurPos.Type )
{ {
// Вызываем данную функцию, чтобы убрать рамку буквицы
this.DrawingDocument.Set_RulerState_Paragraph( null );
return this.DrawingObjects.documentUpdateRulersState(); return this.DrawingObjects.documentUpdateRulersState();
} }
else //if ( docpostype_Content === this.CurPos.Type ) else //if ( docpostype_Content === this.CurPos.Type )
......
...@@ -1333,7 +1333,11 @@ CDocumentContent.prototype = ...@@ -1333,7 +1333,11 @@ CDocumentContent.prototype =
Document_UpdateRulersState : function(CurPage) Document_UpdateRulersState : function(CurPage)
{ {
if ( docpostype_DrawingObjects === this.CurPos.Type ) if ( docpostype_DrawingObjects === this.CurPos.Type )
{
// Вызываем данную функцию, чтобы убрать рамку буквицы
this.DrawingDocument.Set_RulerState_Paragraph( null );
this.LogicDocument.DrawingObjects.documentUpdateRulersState(CurPage); this.LogicDocument.DrawingObjects.documentUpdateRulersState(CurPage);
}
else //if ( docpostype_Content === this.CurPos.Type ) else //if ( docpostype_Content === this.CurPos.Type )
{ {
if ( true === this.Selection.Use ) if ( true === this.Selection.Use )
......
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