Skip to content

S
sdkjs
Commit ef45a769 authored by Ilya Kirillov's avatar Ilya Kirillov
Browse files
Options

Now changes can be added in an old style like objects and in a new style like classes.

parent 5f9d129f
Hide whitespace changes
Inline Side-by-side
Showing with 205 additions and 146 deletions
common/Drawings/Format/Constants.js
View file @ ef45a769
......@@ -2882,6 +2882,15 @@
// В большинстве случаев загрузка чужого изменения работает как простое Redo
this.Redo();
};
CChangesBase.prototype.IsChangesClass = function()
{
// TODO: Эта функция добавлена пока все изменения не переделаны на классы
return true;
};
CChangesBase.prototype.GetClass = function()
{
return this.Class;
};
window['AscDFH'].CChangesBase = CChangesBase;
/**
* Базовый класс для изменения свойств.
......@@ -2896,7 +2905,7 @@
this.Old = Old;
this.New = New;
}
AscCommon.extendClass(CChangesBase, CChangesBaseProperty);
AscCommon.extendClass(CChangesBaseProperty, CChangesBase);
CChangesBaseProperty.prototype.Undo = function()
{
this.private_SetValue(this.Old);
......@@ -2919,7 +2928,7 @@
{
CChangesBaseBoolProperty.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(CChangesBaseProperty, CChangesBaseBoolProperty);
AscCommon.extendClass(CChangesBaseBoolProperty, CChangesBaseProperty);
CChangesBaseBoolProperty.prototype.WriteToBinary = function(Writer)
{
// Long : Flag
......@@ -2986,7 +2995,7 @@
{
CChangesBaseDoubleProperty.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(CChangesBaseProperty, CChangesBaseDoubleProperty);
AscCommon.extendClass(CChangesBaseDoubleProperty, CChangesBaseProperty);
CChangesBaseDoubleProperty.prototype.WriteToBinary = function(Writer)
{
// Long : Flag
......@@ -3052,7 +3061,7 @@
{
CChangesBaseObjectProperty.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(CChangesBaseProperty, CChangesBaseObjectProperty);
AscCommon.extendClass(CChangesBaseObjectProperty, CChangesBaseProperty);
CChangesBaseObjectProperty.prototype.WriteToBinary = function(Writer)
{
// Long : Flag
......@@ -3144,7 +3153,7 @@
{
CChangesBaseLongProperty.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(CChangesBaseProperty, CChangesBaseLongProperty);
AscCommon.extendClass(CChangesBaseLongProperty, CChangesBaseProperty);
CChangesBaseLongProperty.prototype.WriteToBinary = function(Writer)
{
// Long : Flag
......@@ -3210,7 +3219,7 @@
{
CChangesBaseStringProperty.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(CChangesBaseProperty, CChangesBaseStringProperty);
AscCommon.extendClass(CChangesBaseStringProperty, CChangesBaseProperty);
CChangesBaseStringProperty.prototype.WriteToBinary = function(Writer)
{
// Long : Flag
......
word/Editor/History.js
View file @ ef45a769
......@@ -381,7 +381,7 @@ CHistory.prototype =
// Регистрируем новое изменение:
// Class - объект, в котором оно произошло
// Data - сами изменения
Add : function(Class, Data)
Add : function(_Class, Data)
{
if (0 !== this.TurnOffHistory || this.Index < 0)
return;
......@@ -393,25 +393,35 @@ CHistory.prototype =
if ( this.RecIndex >= this.Index )
this.RecIndex = this.Index - 1;
var Binary_Pos = this.BinaryWriter.GetCurPosition();
var Binary_Pos = this.BinaryWriter.GetCurPosition();
this.BinaryWriter.WriteString2(Class.Get_Id());
Class.Save_Changes( Data, this.BinaryWriter );
var Class;
if (_Class && _Class.IsChangesClass && _Class.IsChangesClass())
{
Class = _Class.GetClass();
Data = _Class;
var Binary_Len = this.BinaryWriter.GetCurPosition() - Binary_Pos;
this.BinaryWriter.WriteString2(Class.Get_Id());
_Class.WriteToBinary(this.BinaryWriter);
}
else
{
Class = _Class;
this.BinaryWriter.WriteString2(Class.Get_Id());
Class.Save_Changes(Data, this.BinaryWriter);
}
var Binary_Len = this.BinaryWriter.GetCurPosition() - Binary_Pos;
var Item = {
Class : Class,
Data : Data,
Binary : {
Pos : Binary_Pos,
Len : Binary_Len
},
var Item =
{
Class : Class,
Data : Data,
Binary:
{
Pos : Binary_Pos,
Len : Binary_Len
},
NeedRecalc : !this.MinorChanges
};
NeedRecalc : !this.MinorChanges
};
this.Points[this.Index].Items.push( Item );
......
word/Editor/Run.js
View file @ ef45a769
......@@ -1034,7 +1034,7 @@ ParaRun.prototype.private_UpdateCompositeInputPositionsOnRemove = function(Pos,
// Добавляем элемент в позицию с сохранием в историю
ParaRun.prototype.Add_ToContent = function(Pos, Item, UpdatePosition)
{
History.Add( this, { Type : AscDFH.historyitem_ParaRun_AddItem, Pos : Pos, EndPos : Pos, Items : [ Item ] } );
History.Add(new CChangesRunAddItem(this, Pos, [Item], Pos));
this.Content.splice( Pos, 0, Item );
if (true === UpdatePosition)
......@@ -1090,7 +1090,7 @@ ParaRun.prototype.Remove_FromContent = function(Pos, Count, UpdatePosition)
{
// Получим массив удаляемых элементов
var DeletedItems = this.Content.slice( Pos, Pos + Count );
History.Add( this, { Type : AscDFH.historyitem_Paragraph_RemoveItem, Pos : Pos, EndPos : Pos + Count - 1, Items : DeletedItems } );
History.Add(new CChangesRunRemoveItem(this, Pos, DeletedItems, Pos + Count - 1));
this.Content.splice( Pos, Count );
......@@ -1154,7 +1154,7 @@ ParaRun.prototype.Concat_ToContent = function(NewItems)
var StartPos = this.Content.length;
this.Content = this.Content.concat( NewItems );
History.Add( this, { Type : AscDFH.historyitem_ParaRun_AddItem, Pos : StartPos, EndPos : this.Content.length - 1, Items : NewItems, Color : false } );
History.Add(new CChangesRunAddItem(this, StartPos, NewItems, this.Content.length - 1, false));
this.private_UpdateTrackRevisionOnChangeContent(true);
......@@ -1597,7 +1597,7 @@ ParaRun.prototype.Split = function (ContentPos, Depth)
ParaRun.prototype.Split2 = function(CurPos, Parent, ParentPos)
{
History.Add(this, {Type : AscDFH.historyitem_ParaRun_OnStartSplit, Pos : CurPos});
History.Add(new CChangesRunOnStartSplit(this, CurPos));
AscCommon.CollaborativeEditing.OnStart_SplitRun(this, CurPos);
// Если задается Parent и ParentPos, тогда ран автоматически добавляется в родительский класс
......@@ -1735,7 +1735,7 @@ ParaRun.prototype.Split2 = function(CurPos, Parent, ParentPos)
}
}
History.Add(this, {Type : AscDFH.historyitem_ParaRun_OnEndSplit, NewRun : NewRun});
History.Add(new CChangesRunOnEndSplit(this, NewRun));
AscCommon.CollaborativeEditing.OnEnd_SplitRun(NewRun);
return NewRun;
};
......@@ -6176,7 +6176,7 @@ ParaRun.prototype.Set_Pr = function(TextPr)
var OldValue = this.Pr;
this.Pr = TextPr;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_TextPr, New : TextPr, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunTextPr(this, OldValue, TextPr, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(true);
this.protected_UpdateSpellChecking();
......@@ -6444,7 +6444,7 @@ ParaRun.prototype.Apply_TextPr = function(TextPr, IncFontSize, ApplyToAll)
ParaRun.prototype.Split_Run = function(Pos)
{
History.Add(this, {Type : AscDFH.historyitem_ParaRun_OnStartSplit, Pos : Pos});
History.Add(new CChangesRunOnStartSplit(this, Pos));
AscCommon.CollaborativeEditing.OnStart_SplitRun(this, Pos);
// Создаем новый ран
......@@ -6526,7 +6526,7 @@ ParaRun.prototype.Split_Run = function(Pos)
}
}
History.Add(this, {Type : AscDFH.historyitem_ParaRun_OnEndSplit, NewRun : NewRun});
History.Add(new CChangesRunOnEndSplit(this, NewRun));
AscCommon.CollaborativeEditing.OnEnd_SplitRun(NewRun);
return NewRun;
};
......@@ -6741,26 +6741,50 @@ ParaRun.prototype.Add_PrChange = function()
if (false === this.Have_PrChange())
{
this.Pr.Add_PrChange();
History.Add(this, {Type : AscDFH.historyitem_ParaRun_PrChange, New : {PrChange : this.Pr.PrChange, ReviewInfo : this.Pr.ReviewInfo}, Old : {PrChange : undefined, ReviewInfo : undefined}});
this.private_UpdateTrackRevisions();
History.Add(new CChangesRunPrChange(this,
{
PrChange : undefined,
ReviewInfo : undefined
},
{
PrChange : this.Pr.PrChange,
ReviewInfo : this.Pr.ReviewInfo
}));
this.private_UpdateTrackRevisions();
}
};
ParaRun.prototype.Set_PrChange = function(PrChange, ReviewInfo)
{
History.Add(this, {Type : AscDFH.historyitem_ParaRun_PrChange, New : {PrChange : PrChange, ReviewInfo : ReviewInfo ? ReviewInfo.Copy() : undefined}, Old : {PrChange : this.Pr.PrChange, ReviewInfo : this.Pr.ReviewInfo ? this.Pr.ReviewInfo.Copy() : undefined}});
this.Pr.Set_PrChange(PrChange, ReviewInfo);
History.Add(new CChangesRunPrChange(this,
{
PrChange : this.Pr.PrChange,
ReviewInfo : this.Pr.ReviewInfo ? this.Pr.ReviewInfo.Copy() : undefined
},
{
PrChange : PrChange,
ReviewInfo : ReviewInfo ? ReviewInfo.Copy() : undefined
}));
this.Pr.Set_PrChange(PrChange, ReviewInfo);
this.private_UpdateTrackRevisions();
};
ParaRun.prototype.Remove_PrChange = function()
{
if (true === this.Have_PrChange())
{
History.Add(this, {Type : AscDFH.historyitem_ParaRun_PrChange, New : {PrChange : undefined, ReviewInfo : undefined}, Old : {PrChange : this.Pr.PrChange, ReviewInfo : this.Pr.ReviewInfo}});
this.Pr.Remove_PrChange();
this.private_UpdateTrackRevisions();
}
if (true === this.Have_PrChange())
{
History.Add(new CChangesRunPrChange(this,
{
PrChange : this.Pr.PrChange,
ReviewInfo : this.Pr.ReviewInfo
},
{
PrChange : undefined,
ReviewInfo : undefined
}));
this.Pr.Remove_PrChange();
this.private_UpdateTrackRevisions();
}
};
ParaRun.prototype.Reject_PrChange = function()
......@@ -6789,7 +6813,7 @@ ParaRun.prototype.Set_Bold = function(Value)
var OldValue = this.Pr.Bold;
this.Pr.Bold = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_Bold, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunBold(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(true);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
......@@ -6808,7 +6832,7 @@ ParaRun.prototype.Set_Italic = function(Value)
var OldValue = this.Pr.Italic;
this.Pr.Italic = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_Italic, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunItalic(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(true);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
......@@ -6827,7 +6851,7 @@ ParaRun.prototype.Set_Strikeout = function(Value)
var OldValue = this.Pr.Strikeout;
this.Pr.Strikeout = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_Strikeout, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunStrikeout(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(false);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
......@@ -6846,7 +6870,7 @@ ParaRun.prototype.Set_Underline = function(Value)
var OldValue = this.Pr.Underline;
this.Pr.Underline = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_Underline, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunUnderline(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(false);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
......@@ -6865,7 +6889,7 @@ ParaRun.prototype.Set_FontSize = function(Value)
var OldValue = this.Pr.FontSize;
this.Pr.FontSize = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_FontSize, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunFontSize(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(true);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
......@@ -6884,7 +6908,7 @@ ParaRun.prototype.Set_Color = function(Value)
var OldValue = this.Pr.Color;
this.Pr.Color = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_Color, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunColor(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(false);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
......@@ -6898,7 +6922,7 @@ ParaRun.prototype.Set_Unifill = function(Value, bForce)
var OldValue = this.Pr.Unifill;
this.Pr.Unifill = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_Unifill, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunUnifill(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(false);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
......@@ -6911,7 +6935,7 @@ ParaRun.prototype.Set_TextFill = function(Value, bForce)
var OldValue = this.Pr.TextFill;
this.Pr.TextFill = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_TextFill, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunTextFill(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(false);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
......@@ -6925,7 +6949,7 @@ ParaRun.prototype.Set_TextOutline = function(Value)
var OldValue = this.Pr.TextOutline;
this.Pr.TextOutline = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_TextOutline, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunTextOutline(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(false);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
......@@ -6944,7 +6968,7 @@ ParaRun.prototype.Set_VertAlign = function(Value)
var OldValue = this.Pr.VertAlign;
this.Pr.VertAlign = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_VertAlign, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunVertAlign(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(true);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
......@@ -6962,7 +6986,7 @@ ParaRun.prototype.Set_HighLight = function(Value)
if ( (undefined === Value && undefined !== OldValue) || ( highlight_None === Value && highlight_None !== OldValue ) || ( Value instanceof CDocumentColor && ( undefined === OldValue || highlight_None === OldValue || false === Value.Compare(OldValue) ) ) )
{
this.Pr.HighLight = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_HighLight, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunHighLight(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(false);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
......@@ -6981,7 +7005,7 @@ ParaRun.prototype.Set_RStyle = function(Value)
var OldValue = this.Pr.RStyle;
this.Pr.RStyle = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_RStyle, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunRStyle(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(true);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
......@@ -6999,7 +7023,7 @@ ParaRun.prototype.Set_Spacing = function(Value)
var OldValue = this.Pr.Spacing;
this.Pr.Spacing = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_Spacing, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunSpacing(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(true);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
......@@ -7018,7 +7042,7 @@ ParaRun.prototype.Set_DStrikeout = function(Value)
var OldValue = this.Pr.DStrikeout;
this.Pr.DStrikeout = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_DStrikeout, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunDStrikeout(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(false);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
......@@ -7037,7 +7061,7 @@ ParaRun.prototype.Set_Caps = function(Value)
var OldValue = this.Pr.Caps;
this.Pr.Caps = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_Caps, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunCaps(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(true);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
}
......@@ -7055,7 +7079,7 @@ ParaRun.prototype.Set_SmallCaps = function(Value)
var OldValue = this.Pr.SmallCaps;
this.Pr.SmallCaps = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_SmallCaps, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunSmallCaps(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(true);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
}
......@@ -7073,7 +7097,7 @@ ParaRun.prototype.Set_Position = function(Value)
var OldValue = this.Pr.Position;
this.Pr.Position = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_Position, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunPosition(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(false);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
......@@ -7091,7 +7115,7 @@ ParaRun.prototype.Set_RFonts = function(Value)
var OldValue = this.Pr.RFonts;
this.Pr.RFonts = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_RFonts, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunRFonts(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(true);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
......@@ -7144,7 +7168,7 @@ ParaRun.prototype.Set_RFonts_Ascii = function(Value)
var OldValue = this.Pr.RFonts.Ascii;
this.Pr.RFonts.Ascii = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_RFonts_Ascii, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunRFontsAscii(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(true);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
}
......@@ -7157,7 +7181,7 @@ ParaRun.prototype.Set_RFonts_HAnsi = function(Value)
var OldValue = this.Pr.RFonts.HAnsi;
this.Pr.RFonts.HAnsi = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_RFonts_HAnsi, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunRFontsHAnsi(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(true);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
}
......@@ -7170,7 +7194,7 @@ ParaRun.prototype.Set_RFonts_CS = function(Value)
var OldValue = this.Pr.RFonts.CS;
this.Pr.RFonts.CS = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_RFonts_CS, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunRFontsCS(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(true);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
}
......@@ -7183,7 +7207,7 @@ ParaRun.prototype.Set_RFonts_EastAsia = function(Value)
var OldValue = this.Pr.RFonts.EastAsia;
this.Pr.RFonts.EastAsia = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_RFonts_EastAsia, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunRFontsEastAsia(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(true);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
}
......@@ -7196,7 +7220,7 @@ ParaRun.prototype.Set_RFonts_Hint = function(Value)
var OldValue = this.Pr.RFonts.Hint;
this.Pr.RFonts.Hint = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_RFonts_Hint, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunRFontsHint(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(true);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
}
......@@ -7210,7 +7234,7 @@ ParaRun.prototype.Set_Lang = function(Value)
if ( undefined != Value )
this.Pr.Lang.Set_FromObject( Value );
History.Add( this, { Type : AscDFH.historyitem_ParaRun_Lang, New : this.Pr.Lang, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunLang(this, OldValue, this.Pr.Lang, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(false);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
};
......@@ -7239,7 +7263,7 @@ ParaRun.prototype.Set_Lang_Bidi = function(Value)
var OldValue = this.Pr.Lang.Bidi;
this.Pr.Lang.Bidi = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_Lang_Bidi, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunLangBidi(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(false);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
}
......@@ -7252,7 +7276,7 @@ ParaRun.prototype.Set_Lang_EastAsia = function(Value)
var OldValue = this.Pr.Lang.EastAsia;
this.Pr.Lang.EastAsia = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_Lang_EastAsia, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunLangEastAsia(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(false);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
}
......@@ -7265,7 +7289,7 @@ ParaRun.prototype.Set_Lang_Val = function(Value)
var OldValue = this.Pr.Lang.Val;
this.Pr.Lang.Val = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_Lang_Val, New : Value, Old : OldValue, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunLangVal(this, OldValue, Value, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(false);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
}
......@@ -7286,7 +7310,7 @@ ParaRun.prototype.Set_Shd = function(Shd)
else
this.Pr.Shd = undefined;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_Shd, New : this.Pr.Shd, Old : OldShd, Color : this.private_IsCollPrChangeMine() } );
History.Add(new CChangesRunShd(this, OldShd, this.Pr.Shd, this.private_IsCollPrChangeMine()));
this.Recalc_CompiledPr(false);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
};
......@@ -8037,7 +8061,7 @@ ParaRun.prototype.Math_Apply_Style = function(Value)
var OldValue = this.MathPrp.sty;
this.MathPrp.sty = Value;
History.Add( this, { Type : AscDFH.historyitem_ParaRun_MathStyle, New : Value, Old : OldValue } );
History.Add(new CChangesRunMathStyle(this, OldValue, Value));
this.Recalc_CompiledPr(true);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
......@@ -8266,16 +8290,16 @@ ParaRun.prototype.Check_ForcedBreak = function(bStart, bEnd)
};
ParaRun.prototype.Set_MathForcedBreak = function(bInsert)
{
if(bInsert == true && false == this.MathPrp.IsBreak())
{
History.Add(this, {Type: AscDFH.historyitem_ParaRun_MathForcedBreak, bInsert: true, alnAt: undefined });
this.MathPrp.Insert_ForcedBreak();
}
else if(bInsert == false && true == this.MathPrp.IsBreak())
{
History.Add(this, {Type: AscDFH.historyitem_ParaRun_MathForcedBreak, bInsert: false, alnAt: this.MathPrp.Get_AlnAt()});
this.MathPrp.Delete_ForcedBreak();
}
if (bInsert == true && false == this.MathPrp.IsBreak())
{
History.Add(new CChangesRunMathForcedBreak(this, true, undefined));
this.MathPrp.Insert_ForcedBreak();
}
else if (bInsert == false && true == this.MathPrp.IsBreak())
{
History.Add(new CChangesRunMathForcedBreak(this, false, this.MathPrp.Get_AlnAt()));
this.MathPrp.Delete_ForcedBreak();
}
};
ParaRun.prototype.Math_SplitRunForcedBreak = function()
{
......@@ -8329,7 +8353,7 @@ ParaRun.prototype.Set_MathPr = function(MPrp)
var OldValue = this.MathPrp;
this.MathPrp.Set_Pr(MPrp);
History.Add( this, { Type : AscDFH.historyitem_ParaRun_MathPrp, New : this.MathPrp, Old : OldValue } );
History.Add(new CChangesRunMathPrp(this, OldValue, this.MathPrp));
this.Recalc_CompiledPr(true);
this.private_UpdateTrackRevisionOnChangeTextPr(true);
};
......@@ -8535,18 +8559,34 @@ ParaRun.prototype.Set_ReviewType = function(Value)
this.ReviewType = Value;
this.ReviewInfo.Update();
History.Add(this, {Type : AscDFH.historyitem_ParaRun_ReviewType, New : {ReviewType : this.ReviewType, ReviewInfo : this.ReviewInfo.Copy()}, Old : {ReviewType : OldReviewType, ReviewInfo : OldReviewInfo}});
this.private_UpdateTrackRevisions();
}
History.Add(new CChangesRunReviewType(this,
{
ReviewType : OldReviewType,
ReviewInfo : OldReviewInfo
},
{
ReviewType : this.ReviewType,
ReviewInfo : this.ReviewInfo.Copy()
}));
this.private_UpdateTrackRevisions();
}
};
ParaRun.prototype.Set_ReviewTypeWithInfo = function(ReviewType, ReviewInfo)
{
History.Add(this, {Type : AscDFH.historyitem_ParaRun_ReviewType, Old : {ReviewType : this.ReviewType, ReviewInfo : this.ReviewInfo ? this.ReviewInfo.Copy() : undefined}, New : {ReviewType : ReviewType, ReviewInfo : ReviewInfo ? ReviewInfo.Copy() : undefined}});
History.Add(new CChangesRunReviewType(this,
{
ReviewType : this.ReviewType,
ReviewInfo : this.ReviewInfo ? this.ReviewInfo.Copy() : undefined
},
{
ReviewType : ReviewType,
ReviewInfo : ReviewInfo ? ReviewInfo.Copy() : undefined
}));
this.ReviewType = ReviewType;
this.ReviewInfo = ReviewInfo;
this.ReviewType = ReviewType;
this.ReviewInfo = ReviewInfo;
this.private_UpdateTrackRevisions();
this.private_UpdateTrackRevisions();
};
ParaRun.prototype.Get_Parent = function()
{
......@@ -8686,7 +8726,7 @@ ParaRun.prototype.private_UpdateTrackRevisionOnChangeContent = function(bUpdateI
{
var OldReviewInfo = this.ReviewInfo.Copy();
this.ReviewInfo.Update();
History.Add(this, {Type : AscDFH.historyitem_ParaRun_ContentReviewInfo, Old : OldReviewInfo, New : this.ReviewInfo.Copy()});
History.Add(new CChangesRunContentReviewInfo(this, OldReviewInfo, this.ReviewInfo.Copy()));
}
}
};
......@@ -8700,7 +8740,7 @@ ParaRun.prototype.private_UpdateTrackRevisionOnChangeTextPr = function(bUpdateIn
{
var OldReviewInfo = this.Pr.ReviewInfo.Copy();
this.Pr.ReviewInfo.Update();
History.Add(this, {Type : AscDFH.historyitem_ParaRun_PrReviewInfo, Old : OldReviewInfo, New : this.Pr.ReviewInfo.Copy()});
History.Add(new CChangesRunPrReviewInfo(this, OldReviewInfo, this.Pr.ReviewInfo.Copy()));
}
}
};
......@@ -8946,7 +8986,7 @@ ParaRun.prototype.Displace_BreakOperator = function(isForward, bBrkBefore, Count
if(AlnAt !== NewAlnAt)
{
History.Add(this, {Type: AscDFH.historyitem_ParaRun_MathAlnAt, New: NewAlnAt, Old: AlnAt});
History.Add(new CChangesRunMathAlnAt(this, AlnAt, NewAlnAt));
}
}
}
......
word/Editor/RunChanges.js
View file @ ef45a769
......@@ -54,7 +54,7 @@ function CChangesRunAddItem(Class, Pos, Items, EndPos)
this.UseArray = false;
this.PosArray = [];
}
AscCommon.extendClass(AscDFH.CChangesBase, CChangesRunAddItem);
AscCommon.extendClass(CChangesRunAddItem, AscDFH.CChangesBase);
CChangesRunAddItem.prototype.Type = AscDFH.historyitem_ParaRun_AddItem;
CChangesRunAddItem.prototype.Undo = function()
{
......@@ -173,7 +173,7 @@ function CChangesRunRemoveItem(Class, Pos, Items, EndPos)
this.UseArray = false;
this.PosArray = [];
}
AscCommon.extendClass(AscDFH.CChangesBase, CChangesRunRemoveItem);
AscCommon.extendClass(CChangesRunRemoveItem, AscDFH.CChangesBase);
CChangesRunRemoveItem.prototype.Type = AscDFH.historyitem_ParaRun_RemoveItem;
CChangesRunRemoveItem.prototype.Undo = function()
{
......@@ -286,11 +286,11 @@ CChangesRunRemoveItem.prototype.Load = function()
* @constructor
* @extends {AscDFH.CChangesBaseBoolProperty}
*/
function CChangesRunBold(Class, Old, New)
function CChangesRunBold(Class, Old, New, Color)
{
CChangesRunBold.superclass.constructor.call(this, Class, Old, New);
CChangesRunBold.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseBoolProperty, CChangesRunBold);
AscCommon.extendClass(CChangesRunBold, AscDFH.CChangesBaseBoolProperty);
CChangesRunBold.Type = AscDFH.historyitem_ParaRun_Bold;
CChangesRunBold.prototype.private_SetValue = function(Value)
{
......@@ -311,11 +311,11 @@ CChangesRunBold.prototype.Load = function(Color)
* @constructor
* @extends {AscDFH.CChangesBaseBoolProperty}
*/
function CChangesRunItalic(Class, Old, New)
function CChangesRunItalic(Class, Old, New, Color)
{
CChangesRunItalic.superclass.constructor.call(this, Class, Old, New);
CChangesRunItalic.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseBoolProperty, CChangesRunItalic);
AscCommon.extendClass(CChangesRunItalic, AscDFH.CChangesBaseBoolProperty);
CChangesRunItalic.Type = AscDFH.historyitem_ParaRun_Italic;
CChangesRunItalic.prototype.private_SetValue = function(Value)
{
......@@ -336,11 +336,11 @@ CChangesRunItalic.prototype.Load = function(Color)
* @constructor
* @extends {AscDFH.CChangesBaseBoolProperty}
*/
function CChangesRunStrikeout(Class, Old, New)
function CChangesRunStrikeout(Class, Old, New, Color)
{
CChangesRunStrikeout.superclass.constructor.call(this, Class, Old, New);
CChangesRunStrikeout.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseBoolProperty, CChangesRunStrikeout);
AscCommon.extendClass(CChangesRunStrikeout, AscDFH.CChangesBaseBoolProperty);
CChangesRunStrikeout.Type = AscDFH.historyitem_ParaRun_Strikeout;
CChangesRunStrikeout.prototype.private_SetValue = function(Value)
{
......@@ -361,11 +361,11 @@ CChangesRunStrikeout.prototype.Load = function(Color)
* @constructor
* @extends {AscDFH.CChangesBaseBoolProperty}
*/
function CChangesRunUnderline(Class, Old, New)
function CChangesRunUnderline(Class, Old, New, Color)
{
CChangesRunUnderline.superclass.constructor.call(this, Class, Old, New);
CChangesRunUnderline.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseBoolProperty, CChangesRunUnderline);
AscCommon.extendClass(CChangesRunUnderline, AscDFH.CChangesBaseBoolProperty);
CChangesRunUnderline.Type = AscDFH.historyitem_ParaRun_Underline;
CChangesRunUnderline.prototype.private_SetValue = function(Value)
{
......@@ -386,11 +386,11 @@ CChangesRunUnderline.prototype.Load = function(Color)
* @constructor
* @extends {AscDFH.CChangesBaseDoubleProperty}
*/
function CChangesRunFontSize(Class, Old, New)
function CChangesRunFontSize(Class, Old, New, Color)
{
CChangesRunFontSize.superclass.constructor.call(this, Class, Old, New);
CChangesRunFontSize.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseDoubleProperty, CChangesRunFontSize);
AscCommon.extendClass(CChangesRunFontSize, AscDFH.CChangesBaseDoubleProperty);
CChangesRunFontSize.Type = AscDFH.historyitem_ParaRun_FontSize;
CChangesRunFontSize.prototype.private_SetValue = function(Value)
{
......@@ -411,11 +411,11 @@ CChangesRunFontSize.prototype.Load = function(Color)
* @constructor
* @extends {AscDFH.CChangesBaseObjectProperty}
*/
function CChangesRunColor(Class, Old, New)
function CChangesRunColor(Class, Old, New, Color)
{
CChangesRunColor.superclass.constructor.call(this, Class, Old, New);
CChangesRunColor.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseObjectProperty, CChangesRunColor);
AscCommon.extendClass(CChangesRunColor, AscDFH.CChangesBaseObjectProperty);
CChangesRunColor.Type = AscDFH.historyitem_ParaRun_Color;
CChangesRunColor.prototype.private_CreateObject = function()
{
......@@ -440,11 +440,11 @@ CChangesRunColor.prototype.Load = function(Color)
* @constructor
* @extends {AscDFH.CChangesBaseLongProperty}
*/
function CChangesRunVertAlign(Class, Old, New)
function CChangesRunVertAlign(Class, Old, New, Color)
{
CChangesRunVertAlign.superclass.constructor.call(this, Class, Old, New);
CChangesRunVertAlign.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseLongProperty, CChangesRunVertAlign);
AscCommon.extendClass(CChangesRunVertAlign, AscDFH.CChangesBaseLongProperty);
CChangesRunVertAlign.Type = AscDFH.historyitem_ParaRun_VertAlign;
CChangesRunVertAlign.prototype.private_SetValue = function(Value)
{
......@@ -469,7 +469,7 @@ function CChangesRunHighLight(Class, Old, New, Color)
{
CChangesRunHighLight.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseProperty, CChangesRunHighLight);
AscCommon.extendClass(CChangesRunHighLight, AscDFH.CChangesBaseProperty);
CChangesRunHighLight.Type = AscDFH.historyitem_ParaRun_HighLight;
CChangesRunHighLight.prototype.WriteToBinary = function(Writer)
{
......@@ -574,7 +574,7 @@ function CChangesRunRStyle(Class, Old, New, Color)
{
CChangesRunRStyle.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseStringProperty, CChangesRunRStyle);
AscCommon.extendClass(CChangesRunRStyle, AscDFH.CChangesBaseStringProperty);
CChangesRunRStyle.Type = AscDFH.historyitem_ParaRun_RStyle;
CChangesRunRStyle.prototype.private_SetValue = function(Value)
{
......@@ -599,7 +599,7 @@ function CChangesRunSpacing(Class, Old, New, Color)
{
CChangesRunSpacing.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseDoubleProperty, CChangesRunSpacing);
AscCommon.extendClass(CChangesRunSpacing, AscDFH.CChangesBaseDoubleProperty);
CChangesRunSpacing.Type = AscDFH.historyitem_ParaRun_Spacing;
CChangesRunSpacing.prototype.private_SetValue = function(Value)
{
......@@ -624,7 +624,7 @@ function CChangesRunDStrikeout(Class, Old, New, Color)
{
CChangesRunDStrikeout.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseBoolProperty, CChangesRunDStrikeout);
AscCommon.extendClass(CChangesRunDStrikeout, AscDFH.CChangesBaseBoolProperty);
CChangesRunDStrikeout.Type = AscDFH.historyitem_ParaRun_DStrikeout;
CChangesRunDStrikeout.prototype.private_SetValue = function(Value)
{
......@@ -649,7 +649,7 @@ function CChangesRunCaps(Class, Old, New, Color)
{
CChangesRunCaps.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseBoolProperty, CChangesRunCaps);
AscCommon.extendClass(CChangesRunCaps, AscDFH.CChangesBaseBoolProperty);
CChangesRunCaps.Type = AscDFH.historyitem_ParaRun_Caps;
CChangesRunCaps.prototype.private_SetValue = function(Value)
{
......@@ -674,7 +674,7 @@ function CChangesRunSmallCaps(Class, Old, New, Color)
{
CChangesRunSmallCaps.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseBoolProperty, CChangesRunSmallCaps);
AscCommon.extendClass(CChangesRunSmallCaps, AscDFH.CChangesBaseBoolProperty);
CChangesRunSmallCaps.Type = AscDFH.historyitem_ParaRun_SmallCaps;
CChangesRunSmallCaps.prototype.private_SetValue = function(Value)
{
......@@ -699,7 +699,7 @@ function CChangesRunPosition(Class, Old, New, Color)
{
CChangesRunPosition.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseDoubleProperty, CChangesRunPosition);
AscCommon.extendClass(CChangesRunPosition, AscDFH.CChangesBaseDoubleProperty);
CChangesRunPosition.Type = AscDFH.historyitem_ParaRun_Position;
CChangesRunPosition.prototype.private_SetValue = function(Value)
{
......@@ -724,7 +724,7 @@ function CChangesRunRFonts(Class, Old, New, Color)
{
CChangesRunRFonts.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseObjectProperty, CChangesRunRFonts);
AscCommon.extendClass(CChangesRunRFonts, AscDFH.CChangesBaseObjectProperty);
CChangesRunRFonts.Type = AscDFH.historyitem_ParaRun_RFonts;
CChangesRunRFonts.prototype.private_CreateObject = function()
{
......@@ -757,7 +757,7 @@ function CChangesRunLang(Class, Old, New, Color)
{
CChangesRunLang.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseObjectProperty, CChangesRunLang);
AscCommon.extendClass(CChangesRunLang, AscDFH.CChangesBaseObjectProperty);
CChangesRunLang.Type = AscDFH.historyitem_ParaRun_Lang;
CChangesRunLang.prototype.private_CreateObject = function()
{
......@@ -791,7 +791,7 @@ function CChangesRunRFontsAscii(Class, Old, New, Color)
{
CChangesRunRFontsAscii.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseProperty, CChangesRunRFontsAscii);
AscCommon.extendClass(CChangesRunRFontsAscii, AscDFH.CChangesBaseProperty);
CChangesRunRFontsAscii.Type = AscDFH.historyitem_ParaRun_RFonts_Ascii;
CChangesRunRFontsAscii.prototype.WriteToBinary = function(Writer)
{
......@@ -884,7 +884,7 @@ function CChangesRunRFontsHAnsi(Class, Old, New, Color)
{
CChangesRunRFontsHAnsi.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseProperty, CChangesRunRFontsHAnsi);
AscCommon.extendClass(CChangesRunRFontsHAnsi, AscDFH.CChangesBaseProperty);
CChangesRunRFontsHAnsi.Type = AscDFH.historyitem_ParaRun_RFonts_HAnsi;
CChangesRunRFontsHAnsi.prototype.WriteToBinary = function(Writer)
{
......@@ -977,7 +977,7 @@ function CChangesRunRFontsCS(Class, Old, New, Color)
{
CChangesRunRFontsCS.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseProperty, CChangesRunRFontsCS);
AscCommon.extendClass(CChangesRunRFontsCS, AscDFH.CChangesBaseProperty);
CChangesRunRFontsCS.Type = AscDFH.historyitem_ParaRun_RFonts_CS;
CChangesRunRFontsCS.prototype.WriteToBinary = function(Writer)
{
......@@ -1070,7 +1070,7 @@ function CChangesRunRFontsEastAsia(Class, Old, New, Color)
{
CChangesRunRFontsEastAsia.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseProperty, CChangesRunRFontsEastAsia);
AscCommon.extendClass(CChangesRunRFontsEastAsia, AscDFH.CChangesBaseProperty);
CChangesRunRFontsEastAsia.Type = AscDFH.historyitem_ParaRun_RFonts_EastAsia;
CChangesRunRFontsEastAsia.prototype.WriteToBinary = function(Writer)
{
......@@ -1163,7 +1163,7 @@ function CChangesRunRFontsHint(Class, Old, New, Color)
{
CChangesRunRFontsHint.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseLongProperty, CChangesRunRFontsHint);
AscCommon.extendClass(CChangesRunRFontsHint, AscDFH.CChangesBaseLongProperty);
CChangesRunRFontsHint.Type = AscDFH.historyitem_ParaRun_RFonts_Hint;
CChangesRunRFontsHint.prototype.private_SetValue = function(Value)
{
......@@ -1188,7 +1188,7 @@ function CChangesRunLangBidi(Class, Old, New, Color)
{
CChangesRunLangBidi.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseLongProperty, CChangesRunLangBidi);
AscCommon.extendClass(CChangesRunLangBidi, AscDFH.CChangesBaseLongProperty);
CChangesRunLangBidi.Type = AscDFH.historyitem_ParaRun_Lang_Bidi;
CChangesRunLangBidi.prototype.private_SetValue = function(Value)
{
......@@ -1214,7 +1214,7 @@ function CChangesRunLangEastAsia(Class, Old, New, Color)
{
CChangesRunLangEastAsia.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseLongProperty, CChangesRunLangEastAsia);
AscCommon.extendClass(CChangesRunLangEastAsia, AscDFH.CChangesBaseLongProperty);
CChangesRunLangEastAsia.Type = AscDFH.historyitem_ParaRun_Lang_EastAsia;
CChangesRunLangEastAsia.prototype.private_SetValue = function(Value)
{
......@@ -1240,7 +1240,7 @@ function CChangesRunLangVal(Class, Old, New, Color)
{
CChangesRunLangVal.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseLongProperty, CChangesRunLangVal);
AscCommon.extendClass(CChangesRunLangVal, AscDFH.CChangesBaseLongProperty);
CChangesRunLangVal.Type = AscDFH.historyitem_ParaRun_Lang_Val;
CChangesRunLangVal.prototype.private_SetValue = function(Value)
{
......@@ -1266,7 +1266,7 @@ function CChangesRunTextPr(Class, Old, New, Color)
{
CChangesRunTextPr.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseObjectProperty, CChangesRunTextPr);
AscCommon.extendClass(CChangesRunTextPr, AscDFH.CChangesBaseObjectProperty);
CChangesRunTextPr.Type = AscDFH.historyitem_ParaRun_TextPr;
CChangesRunTextPr.prototype.private_CreateObject = function()
{
......@@ -1310,7 +1310,7 @@ function CChangesRunUnifill(Class, Old, New, Color)
{
CChangesRunUnifill.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseObjectProperty, CChangesRunUnifill);
AscCommon.extendClass(CChangesRunUnifill, AscDFH.CChangesBaseObjectProperty);
CChangesRunUnifill.Type = AscDFH.historyitem_ParaRun_Unifill;
CChangesRunUnifill.prototype.private_CreateObject = function()
{
......@@ -1350,7 +1350,7 @@ function CChangesRunShd(Class, Old, New, Color)
{
CChangesRunShd.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseObjectProperty, CChangesRunShd);
AscCommon.extendClass(CChangesRunShd, AscDFH.CChangesBaseObjectProperty);
CChangesRunShd.Type = AscDFH.historyitem_ParaRun_Shd;
CChangesRunShd.prototype.private_CreateObject = function()
{
......@@ -1390,7 +1390,7 @@ function CChangesRunMathStyle(Class, Old, New)
{
CChangesRunMathStyle.superclass.constructor.call(this, Class, Old, New);
}
AscCommon.extendClass(AscDFH.CChangesBaseLongProperty, CChangesRunMathStyle);
AscCommon.extendClass(CChangesRunMathStyle, AscDFH.CChangesBaseLongProperty);
CChangesRunMathStyle.Type = AscDFH.historyitem_ParaRun_MathStyle;
CChangesRunMathStyle.prototype.private_SetValue = function(Value)
{
......@@ -1408,7 +1408,7 @@ function CChangesRunMathPrp(Class, Old, New, Color)
{
CChangesRunMathPrp.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseObjectProperty, CChangesRunMathPrp);
AscCommon.extendClass(CChangesRunMathPrp, AscDFH.CChangesBaseObjectProperty);
CChangesRunMathPrp.Type = AscDFH.historyitem_ParaRun_MathPrp;
CChangesRunMathPrp.prototype.private_CreateObject = function()
{
......@@ -1434,7 +1434,7 @@ function CChangesRunReviewType(Class, Old, New, Color)
{
CChangesRunMathPrp.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseProperty, CChangesRunReviewType);
AscCommon.extendClass(CChangesRunReviewType, AscDFH.CChangesBaseProperty);
CChangesRunReviewType.Type = AscDFH.historyitem_ParaRun_ReviewType;
CChangesRunReviewType.prototype.WriteToBinary = function(Writer)
{
......@@ -1485,7 +1485,7 @@ function CChangesRunPrChange(Class, Old, New, Color)
{
CChangesRunPrChange.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseProperty, CChangesRunPrChange);
AscCommon.extendClass(CChangesRunPrChange, AscDFH.CChangesBaseProperty);
CChangesRunPrChange.Type = AscDFH.historyitem_ParaRun_PrChange;
CChangesRunPrChange.prototype.WriteToBinary = function(Writer)
{
......@@ -1594,7 +1594,7 @@ function CChangesRunTextFill(Class, Old, New, Color)
{
CChangesRunTextFill.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseObjectProperty, CChangesRunTextFill);
AscCommon.extendClass(CChangesRunTextFill, AscDFH.CChangesBaseObjectProperty);
CChangesRunTextFill.Type = AscDFH.historyitem_ParaRun_TextFill;
CChangesRunTextFill.prototype.private_CreateObject = function()
{
......@@ -1623,7 +1623,7 @@ function CChangesRunTextOutline(Class, Old, New, Color)
{
CChangesRunTextOutline.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseObjectProperty, CChangesRunTextOutline);
AscCommon.extendClass(CChangesRunTextOutline, AscDFH.CChangesBaseObjectProperty);
CChangesRunTextOutline.Type = AscDFH.historyitem_ParaRun_TextOutline;
CChangesRunTextOutline.prototype.private_CreateObject = function()
{
......@@ -1652,7 +1652,7 @@ function CChangesRunPrReviewInfo(Class, Old, New, Color)
{
CChangesRunPrReviewInfo.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseObjectProperty, CChangesRunPrReviewInfo);
AscCommon.extendClass(CChangesRunPrReviewInfo, AscDFH.CChangesBaseObjectProperty);
CChangesRunPrReviewInfo.Type = AscDFH.historyitem_ParaRun_PrReviewInfo;
CChangesRunPrReviewInfo.prototype.private_CreateObject = function()
{
......@@ -1671,7 +1671,7 @@ function CChangesRunContentReviewInfo(Class, Old, New, Color)
{
CChangesRunContentReviewInfo.superclass.constructor.call(this, Class, Old, New, Color);
}
AscCommon.extendClass(AscDFH.CChangesBaseObjectProperty, CChangesRunContentReviewInfo);
AscCommon.extendClass(CChangesRunContentReviewInfo, AscDFH.CChangesBaseObjectProperty);
CChangesRunContentReviewInfo.Type = AscDFH.historyitem_ParaRun_ContentReviewInfo;
CChangesRunContentReviewInfo.prototype.private_CreateObject = function()
{
......@@ -1695,7 +1695,7 @@ function CChangesRunOnStartSplit(Class, Pos)
CChangesRunOnStartSplit.superclass.constructor.call(this, Class);
this.Pos = Pos;
}
AscCommon.extendClass(AscDFH.CChangesBase, CChangesRunOnStartSplit);
AscCommon.extendClass(CChangesRunOnStartSplit, AscDFH.CChangesBase);
CChangesRunOnStartSplit.prototype.Type = AscDFH.historyitem_ParaRun_OnStartSplit;
CChangesRunOnStartSplit.prototype.Undo = function()
{
......@@ -1725,7 +1725,7 @@ function CChangesRunOnEndSplit(Class, NewRun)
CChangesRunOnEndSplit.superclass.constructor.call(this, Class);
this.NewRun = NewRun;
}
AscCommon.extendClass(AscDFH.CChangesBase, CChangesRunOnEndSplit);
AscCommon.extendClass(CChangesRunOnEndSplit, AscDFH.CChangesBase);
CChangesRunOnEndSplit.prototype.Type = AscDFH.historyitem_ParaRun_OnEndSplit;
CChangesRunOnEndSplit.prototype.Undo = function()
{
......@@ -1758,7 +1758,7 @@ function CChangesRunMathAlnAt(Class, Old, New)
this.Old = Old;
this.New = New;
}
AscCommon.extendClass(AscDFH.CChangesBase, CChangesRunMathAlnAt);
AscCommon.extendClass(CChangesRunMathAlnAt, AscDFH.CChangesBase);
CChangesRunMathAlnAt.prototype.Type = AscDFH.historyitem_ParaRun_MathAlnAt;
CChangesRunMathAlnAt.prototype.Undo = function()
{
......@@ -1822,7 +1822,7 @@ function CChangesRunMathForcedBreak(Class, bInsert, alnAt)
this.bInsert = bInsert;
this.alnAt = alnAt;
}
AscCommon.extendClass(AscDFH.CChangesBase, CChangesRunMathForcedBreak);
AscCommon.extendClass(CChangesRunMathForcedBreak, AscDFH.CChangesBase);
CChangesRunMathForcedBreak.prototype.Type = AscDFH.historyitem_ParaRun_MathForcedBreak;
CChangesRunMathForcedBreak.prototype.Undo = function()
{
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7