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

баг с табом

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60330 954022d7-b5bf-4e40-9824-e11837661b57
parent 76205821
...@@ -1578,7 +1578,22 @@ CPresentation.prototype = ...@@ -1578,7 +1578,22 @@ CPresentation.prototype =
if(this.Slides[this.CurPage]) if(this.Slides[this.CurPage])
{ {
var graphicObjects = this.Slides[this.CurPage].graphicObjects; var graphicObjects = this.Slides[this.CurPage].graphicObjects;
graphicObjects. selectNextObject(!e.ShiftKey ? 1 : -1); var target_content = graphicObjects.getTargetDocContent(undefined, true);
if(target_content)
{
if(target_content instanceof CTable)
{
target_content.Cursor_MoveToCell( true === e.ShiftKey ? false : true );
}
else
{
this.Paragraph_Add( new ParaTab() );
}
}
else
{
graphicObjects.selectNextObject(!e.ShiftKey ? 1 : -1);
}
this.Document_UpdateInterfaceState(); this.Document_UpdateInterfaceState();
} }
bRetValue = true; bRetValue = true;
...@@ -1588,7 +1603,7 @@ CPresentation.prototype = ...@@ -1588,7 +1603,7 @@ CPresentation.prototype =
var Hyperlink = this.Hyperlink_Check(false); var Hyperlink = this.Hyperlink_Check(false);
if ( null != Hyperlink && false === e.ShiftKey ) if ( null != Hyperlink && false === e.ShiftKey )
{ {
editor.sync_HyperlinkClickCallback( Hyperlink.Get_Value() ) editor.sync_HyperlinkClickCallback( Hyperlink.Get_Value() );
Hyperlink.Set_Visited(true); Hyperlink.Set_Visited(true);
// TODO: Пока сделаем так, потом надо будет переделать // TODO: Пока сделаем так, потом надо будет переделать
...@@ -3854,6 +3869,12 @@ CPresentation.prototype = ...@@ -3854,6 +3869,12 @@ CPresentation.prototype =
return true; return true;
} }
if(CheckType === changestype_None && isRealObject(AdditionalData) && AdditionalData.CheckType === changestype_Table_Properties)
{
CheckType = changestype_Drawing_Props;
}
var cur_slide = this.Slides[this.CurPage]; var cur_slide = this.Slides[this.CurPage];
var slide_id = cur_slide.deleteLock.Get_Id(); var slide_id = cur_slide.deleteLock.Get_Id();
......
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