Commit c1182d46 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin

Undo при быстром совместном редактировании; перенес проверку залоченности в...

Undo при быстром совместном редактировании; перенес проверку залоченности в callback добавления картинки.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66466 954022d7-b5bf-4e40-9824-e11837661b57
parent 1a831037
......@@ -333,8 +333,20 @@ CShowPr.prototype.Copy = function(){
function CPresentation(DrawingDocument)
{
this.History = History;
History.Document = this;
this.History = History;
this.IdCounter = g_oIdCounter;
this.TableId = g_oTableId;
this.CollaborativeEditing = (("undefined" !== typeof(CCollaborativeEditing) && CollaborativeEditing instanceof CCollaborativeEditing) ? CollaborativeEditing : null);
this.Api = editor;
//------------------------------------------------------------------------
if (DrawingDocument)
{
if (this.History)
this.History.Set_LogicDocument(this);
if (this.CollaborativeEditing)
this.CollaborativeEditing.m_oLogicDocument = this;
}
//------------------------------------------------------------------------
......@@ -493,6 +505,14 @@ CPresentation.prototype =
},
Get_Api: function(){
return this.Api;
},
Get_CollaborativeEditing: function(){
return this.CollaborativeEditing;
},
addSlideMaster: function(pos, master)
{
History.Add(this, {Type: historyitem_Presentation_AddSlideMaster, pos: pos, master: master});
......
This diff is collapsed.
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