Commit 60d7fcfe authored by Ilya Kirillov's avatar Ilya Kirillov

Changes relation map is now common for all changes. Math changes were added to...

Changes relation map is now common for all changes. Math changes were added to changes relation map.
parent d5d39dc1
...@@ -2818,6 +2818,15 @@ ...@@ -2818,6 +2818,15 @@
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// //
// Карта зависимости изменений. Изменения зависят только от изменений для того же класса, но вот типы могут быть
// разными. В основном изменения зависят только от изменений такого же типа.
//
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
window['AscDFH'].changesRelationMap = {};
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// Базовые классы для изменений // Базовые классы для изменений
// //
// Разница между классами Property и Value в том, что Property могут быть undefined, а Value всегда значение // Разница между классами Property и Value в том, что Property могут быть undefined, а Value всегда значение
......
...@@ -383,10 +383,8 @@ AscDFH.changesFactory[AscDFH.historyitem_Common_AddWatermark] = AscCommon.CChang ...@@ -383,10 +383,8 @@ AscDFH.changesFactory[AscDFH.historyitem_Common_AddWatermark] = AscCommon.CChang
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
// Карта зависимости изменений // Карта зависимости изменений
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
AscDFH.tableidRelationMap = {}; AscDFH.changesRelationMap[AscDFH.historyitem_TableId_Add] = [AscDFH.historyitem_TableId_Add];
AscDFH.tableidRelationMap[AscDFH.historyitem_TableId_Add] = [AscDFH.historyitem_TableId_Add]; AscDFH.changesRelationMap[AscDFH.historyitem_TableId_Reset] = [AscDFH.historyitem_TableId_Reset];
AscDFH.tableidRelationMap[AscDFH.historyitem_TableId_Reset] = [AscDFH.historyitem_TableId_Reset]; AscDFH.changesRelationMap[AscDFH.historyitem_TableId_Description] = [AscDFH.historyitem_TableId_Description];
AscDFH.tableidRelationMap[AscDFH.historyitem_TableId_Description] = [AscDFH.historyitem_TableId_Description]; AscDFH.changesRelationMap[AscDFH.historyitem_Common_AddWatermark] = [AscDFH.historyitem_Common_AddWatermark];
AscDFH.tableidRelationMap[AscDFH.historyitem_Common_AddWatermark] = [AscDFH.historyitem_Common_AddWatermark];
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
...@@ -48,22 +48,17 @@ AscDFH.changesFactory[AscDFH.historyitem_ParaComment_CommentId] = CChangesParaCo ...@@ -48,22 +48,17 @@ AscDFH.changesFactory[AscDFH.historyitem_ParaComment_CommentId] = CChangesParaCo
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
// Карта зависимости изменений // Карта зависимости изменений
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
AscDFH.commentRelationMap = {}; AscDFH.changesRelationMap[AscDFH.historyitem_Comment_Change] = [AscDFH.historyitem_Comment_Change];
AscDFH.commentRelationMap[AscDFH.historyitem_Comment_Change] = [AscDFH.historyitem_Comment_Change]; AscDFH.changesRelationMap[AscDFH.historyitem_Comment_TypeInfo] = [AscDFH.historyitem_Comment_TypeInfo];
AscDFH.commentRelationMap[AscDFH.historyitem_Comment_TypeInfo] = [AscDFH.historyitem_Comment_TypeInfo]; AscDFH.changesRelationMap[AscDFH.historyitem_Comments_Add] = [
AscDFH.commentsRelationMap = {};
AscDFH.commentsRelationMap[AscDFH.historyitem_Comments_Add] = [
AscDFH.historyitem_Comments_Add, AscDFH.historyitem_Comments_Add,
AscDFH.historyitem_Comments_Remove AscDFH.historyitem_Comments_Remove
]; ];
AscDFH.commentsRelationMap[AscDFH.historyitem_Comments_Remove] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Comments_Remove] = [
AscDFH.historyitem_Comments_Add, AscDFH.historyitem_Comments_Add,
AscDFH.historyitem_Comments_Remove AscDFH.historyitem_Comments_Remove
]; ];
AscDFH.changesRelationMap[AscDFH.historyitem_ParaComment_CommentId] = [AscDFH.historyitem_ParaComment_CommentId];
AscDFH.paracommentRelationMap = {};
AscDFH.changesFactory[AscDFH.historyitem_ParaComment_CommentId] = [AscDFH.historyitem_ParaComment_CommentId];
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
/** /**
......
...@@ -47,19 +47,18 @@ AscDFH.changesFactory[AscDFH.historyitem_Document_MathSettings] = CChangesD ...@@ -47,19 +47,18 @@ AscDFH.changesFactory[AscDFH.historyitem_Document_MathSettings] = CChangesD
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
// Карта зависимости изменений // Карта зависимости изменений
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
AscDFH.documentChangesRelationMap = {}; AscDFH.changesRelationMap[AscDFH.historyitem_Document_AddItem] = [
AscDFH.documentChangesRelationMap[AscDFH.historyitem_Document_AddItem] = [
AscDFH.historyitem_Document_AddItem, AscDFH.historyitem_Document_AddItem,
AscDFH.historyitem_Document_RemoveItem AscDFH.historyitem_Document_RemoveItem
]; ];
AscDFH.documentChangesRelationMap[AscDFH.historyitem_Document_RemoveItem] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Document_RemoveItem] = [
AscDFH.historyitem_Document_AddItem, AscDFH.historyitem_Document_AddItem,
AscDFH.historyitem_Document_RemoveItem AscDFH.historyitem_Document_RemoveItem
]; ];
AscDFH.documentChangesRelationMap[AscDFH.historyitem_Document_DefaultTab] = [AscDFH.historyitem_Document_DefaultTab]; AscDFH.changesRelationMap[AscDFH.historyitem_Document_DefaultTab] = [AscDFH.historyitem_Document_DefaultTab];
AscDFH.documentChangesRelationMap[AscDFH.historyitem_Document_EvenAndOddHeaders] = [AscDFH.historyitem_Document_EvenAndOddHeaders]; AscDFH.changesRelationMap[AscDFH.historyitem_Document_EvenAndOddHeaders] = [AscDFH.historyitem_Document_EvenAndOddHeaders];
AscDFH.documentChangesRelationMap[AscDFH.historyitem_Document_DefaultLanguage] = [AscDFH.historyitem_Document_DefaultLanguage]; AscDFH.changesRelationMap[AscDFH.historyitem_Document_DefaultLanguage] = [AscDFH.historyitem_Document_DefaultLanguage];
AscDFH.documentChangesRelationMap[AscDFH.historyitem_Document_MathSettings] = [AscDFH.historyitem_Document_MathSettings]; AscDFH.changesRelationMap[AscDFH.historyitem_Document_MathSettings] = [AscDFH.historyitem_Document_MathSettings];
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
/** /**
......
...@@ -43,12 +43,11 @@ AscDFH.changesFactory[AscDFH.historyitem_DocumentContent_RemoveItem] = CChangesD ...@@ -43,12 +43,11 @@ AscDFH.changesFactory[AscDFH.historyitem_DocumentContent_RemoveItem] = CChangesD
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
// Карта зависимости изменений // Карта зависимости изменений
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
AscDFH.documentcontentChangesRelationMap = {}; AscDFH.changesRelationMap[AscDFH.historyitem_DocumentContent_AddItem] = [
AscDFH.documentcontentChangesRelationMap[AscDFH.historyitem_DocumentContent_AddItem] = [
AscDFH.historyitem_DocumentContent_AddItem, AscDFH.historyitem_DocumentContent_AddItem,
AscDFH.historyitem_DocumentContent_RemoveItem AscDFH.historyitem_DocumentContent_RemoveItem
]; ];
AscDFH.documentcontentChangesRelationMap[AscDFH.historyitem_DocumentContent_RemoveItem] = [ AscDFH.changesRelationMap[AscDFH.historyitem_DocumentContent_RemoveItem] = [
AscDFH.historyitem_DocumentContent_AddItem, AscDFH.historyitem_DocumentContent_AddItem,
AscDFH.historyitem_DocumentContent_RemoveItem AscDFH.historyitem_DocumentContent_RemoveItem
]; ];
......
...@@ -45,14 +45,13 @@ AscDFH.changesFactory[AscDFH.historyitem_Hyperlink_RemoveItem] = CChangesHyperli ...@@ -45,14 +45,13 @@ AscDFH.changesFactory[AscDFH.historyitem_Hyperlink_RemoveItem] = CChangesHyperli
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
// Карта зависимости изменений // Карта зависимости изменений
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
AscDFH.hyperlinkChangesRelationMap = {}; AscDFH.changesRelationMap[AscDFH.historyitem_Hyperlink_Value] = [AscDFH.historyitem_Hyperlink_Value];
AscDFH.hyperlinkChangesRelationMap[AscDFH.historyitem_Hyperlink_Value] = [AscDFH.historyitem_Hyperlink_Value]; AscDFH.changesRelationMap[AscDFH.historyitem_Hyperlink_ToolTip] = [AscDFH.historyitem_Hyperlink_ToolTip];
AscDFH.hyperlinkChangesRelationMap[AscDFH.historyitem_Hyperlink_ToolTip] = [AscDFH.historyitem_Hyperlink_ToolTip]; AscDFH.changesRelationMap[AscDFH.historyitem_Hyperlink_AddItem] = [
AscDFH.hyperlinkChangesRelationMap[AscDFH.historyitem_Hyperlink_AddItem] = [
AscDFH.historyitem_Hyperlink_AddItem, AscDFH.historyitem_Hyperlink_AddItem,
AscDFH.historyitem_Hyperlink_RemoveItem AscDFH.historyitem_Hyperlink_RemoveItem
]; ];
AscDFH.hyperlinkChangesRelationMap[AscDFH.historyitem_Hyperlink_RemoveItem] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Hyperlink_RemoveItem] = [
AscDFH.historyitem_Hyperlink_AddItem, AscDFH.historyitem_Hyperlink_AddItem,
AscDFH.historyitem_Hyperlink_RemoveItem AscDFH.historyitem_Hyperlink_RemoveItem
]; ];
......
...@@ -94,6 +94,100 @@ AscDFH.changesFactory[AscDFH.historyitem_MathMatrix_Interval] = CChangesMat ...@@ -94,6 +94,100 @@ AscDFH.changesFactory[AscDFH.historyitem_MathMatrix_Interval] = CChangesMat
AscDFH.changesFactory[AscDFH.historyitem_MathMatrix_Plh] = CChangesMathMatrixPlh; AscDFH.changesFactory[AscDFH.historyitem_MathMatrix_Plh] = CChangesMathMatrixPlh;
AscDFH.changesFactory[AscDFH.historyitem_MathDegree_SubSupType] = CChangesMathDegreeSubSupType; AscDFH.changesFactory[AscDFH.historyitem_MathDegree_SubSupType] = CChangesMathDegreeSubSupType;
//----------------------------------------------------------------------------------------------------------------------
// Карта зависимости изменений
//----------------------------------------------------------------------------------------------------------------------
AscDFH.changesRelationMap[AscDFH.historyitem_MathContent_AddItem] = [
AscDFH.historyitem_MathContent_AddItem,
AscDFH.historyitem_MathContent_RemoveItem
];
AscDFH.changesRelationMap[AscDFH.historyitem_MathContent_RemoveItem] = [
AscDFH.historyitem_MathContent_AddItem,
AscDFH.historyitem_MathContent_RemoveItem
];
AscDFH.changesRelationMap[AscDFH.historyitem_MathContent_ArgSize] = [AscDFH.historyitem_MathContent_ArgSize];
AscDFH.changesRelationMap[AscDFH.historyitem_MathPara_Jc] = [AscDFH.historyitem_MathPara_Jc];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBase_AddItems] = [
AscDFH.historyitem_MathBase_AddItems,
AscDFH.historyitem_MathBase_RemoveItems
];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBase_RemoveItems] = [
AscDFH.historyitem_MathBase_AddItems,
AscDFH.historyitem_MathBase_RemoveItems
];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBase_FontSize] = [AscDFH.historyitem_MathBase_FontSize];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBase_Shd] = [AscDFH.historyitem_MathBase_Shd];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBase_Color] = [AscDFH.historyitem_MathBase_Color];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBase_Unifill] = [AscDFH.historyitem_MathBase_Unifill];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBase_Underline] = [AscDFH.historyitem_MathBase_Underline];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBase_Strikeout] = [AscDFH.historyitem_MathBase_Strikeout];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBase_DoubleStrikeout] = [AscDFH.historyitem_MathBase_DoubleStrikeout];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBase_Italic] = [AscDFH.historyitem_MathBase_Italic];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBase_Bold] = [AscDFH.historyitem_MathBase_Bold];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBase_RFontsAscii] = [AscDFH.historyitem_MathBase_RFontsAscii];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBase_RFontsHAnsi] = [AscDFH.historyitem_MathBase_RFontsHAnsi];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBase_RFontsCS] = [AscDFH.historyitem_MathBase_RFontsCS];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBase_RFontsEastAsia] = [AscDFH.historyitem_MathBase_RFontsEastAsia];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBase_RFontsHint] = [AscDFH.historyitem_MathBase_RFontsHint];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBase_HighLight] = [AscDFH.historyitem_MathBase_HighLight];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBase_ReviewType] = [AscDFH.historyitem_MathBase_ReviewType];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBase_TextFill] = [AscDFH.historyitem_MathBase_TextFill];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBase_TextOutline] = [AscDFH.historyitem_MathBase_TextOutline];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBox_AlnAt] = [AscDFH.historyitem_MathBox_AlnAt];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBox_ForcedBreak] = [AscDFH.historyitem_MathBox_ForcedBreak];
AscDFH.changesRelationMap[AscDFH.historyitem_MathFraction_Type] = [AscDFH.historyitem_MathFraction_Type];
AscDFH.changesRelationMap[AscDFH.historyitem_MathRadical_HideDegree] = [AscDFH.historyitem_MathRadical_HideDegree];
AscDFH.changesRelationMap[AscDFH.historyitem_MathNary_LimLoc] = [AscDFH.historyitem_MathNary_LimLoc];
AscDFH.changesRelationMap[AscDFH.historyitem_MathNary_UpperLimit] = [AscDFH.historyitem_MathNary_UpperLimit];
AscDFH.changesRelationMap[AscDFH.historyitem_MathNary_LowerLimit] = [AscDFH.historyitem_MathNary_LowerLimit];
AscDFH.changesRelationMap[AscDFH.historyitem_MathDelimiter_BegOper] = [AscDFH.historyitem_MathDelimiter_BegOper];
AscDFH.changesRelationMap[AscDFH.historyitem_MathDelimiter_EndOper] = [AscDFH.historyitem_MathDelimiter_EndOper];
AscDFH.changesRelationMap[AscDFH.historyitem_MathDelimiter_Grow] = [AscDFH.historyitem_MathDelimiter_Grow];
AscDFH.changesRelationMap[AscDFH.historyitem_MathDelimiter_Shape] = [AscDFH.historyitem_MathDelimiter_Shape];
AscDFH.changesRelationMap[AscDFH.historyitem_MathDelimiter_SetColumn] = [AscDFH.historyitem_MathDelimiter_SetColumn];
AscDFH.changesRelationMap[AscDFH.historyitem_MathGroupChar_Pr] = [AscDFH.historyitem_MathGroupChar_Pr];
AscDFH.changesRelationMap[AscDFH.historyitem_MathLimit_Type] = [AscDFH.historyitem_MathLimit_Type];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBorderBox_Top] = [AscDFH.historyitem_MathBorderBox_Top];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBorderBox_Bot] = [AscDFH.historyitem_MathBorderBox_Bot];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBorderBox_Left] = [AscDFH.historyitem_MathBorderBox_Left];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBorderBox_Right] = [AscDFH.historyitem_MathBorderBox_Right];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBorderBox_Hor] = [AscDFH.historyitem_MathBorderBox_Hor];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBorderBox_Ver] = [AscDFH.historyitem_MathBorderBox_Ver];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBorderBox_TopLTR] = [AscDFH.historyitem_MathBorderBox_TopLTR];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBorderBox_TopRTL] = [AscDFH.historyitem_MathBorderBox_TopRTL];
AscDFH.changesRelationMap[AscDFH.historyitem_MathBar_LinePos] = [AscDFH.historyitem_MathBar_LinePos];
AscDFH.changesRelationMap[AscDFH.historyitem_MathMatrix_AddRow] = [
AscDFH.historyitem_MathMatrix_AddRow,
AscDFH.historyitem_MathMatrix_RemoveRow,
AscDFH.historyitem_MathMatrix_AddColumn,
AscDFH.historyitem_MathMatrix_RemoveColumn
];
AscDFH.changesRelationMap[AscDFH.historyitem_MathMatrix_RemoveRow] = [
AscDFH.historyitem_MathMatrix_AddRow,
AscDFH.historyitem_MathMatrix_RemoveRow,
AscDFH.historyitem_MathMatrix_AddColumn,
AscDFH.historyitem_MathMatrix_RemoveColumn
];
AscDFH.changesRelationMap[AscDFH.historyitem_MathMatrix_AddColumn] = [
AscDFH.historyitem_MathMatrix_AddRow,
AscDFH.historyitem_MathMatrix_RemoveRow,
AscDFH.historyitem_MathMatrix_AddColumn,
AscDFH.historyitem_MathMatrix_RemoveColumn
];
AscDFH.changesRelationMap[AscDFH.historyitem_MathMatrix_RemoveColumn] = [
AscDFH.historyitem_MathMatrix_AddRow,
AscDFH.historyitem_MathMatrix_RemoveRow,
AscDFH.historyitem_MathMatrix_AddColumn,
AscDFH.historyitem_MathMatrix_RemoveColumn
];
AscDFH.changesRelationMap[AscDFH.historyitem_MathMatrix_BaseJc] = [AscDFH.historyitem_MathMatrix_BaseJc];
AscDFH.changesRelationMap[AscDFH.historyitem_MathMatrix_ColumnJc] = [AscDFH.historyitem_MathMatrix_ColumnJc];
AscDFH.changesRelationMap[AscDFH.historyitem_MathMatrix_Interval] = [AscDFH.historyitem_MathMatrix_Interval];
AscDFH.changesRelationMap[AscDFH.historyitem_MathMatrix_Plh] = [AscDFH.historyitem_MathMatrix_Plh];
AscDFH.changesRelationMap[AscDFH.historyitem_MathDegree_SubSupType] = [AscDFH.historyitem_MathDegree_SubSupType];
//----------------------------------------------------------------------------------------------------------------------
/** /**
* @constructor * @constructor
* @extends {AscDFH.CChangesBaseContentChange} * @extends {AscDFH.CChangesBaseContentChange}
...@@ -1259,6 +1353,11 @@ CChangesMathMatrixAddRow.prototype.CreateReverseChange = function() ...@@ -1259,6 +1353,11 @@ CChangesMathMatrixAddRow.prototype.CreateReverseChange = function()
// TODO: Это изменение надо целиком переделать // TODO: Это изменение надо целиком переделать
return new CChangesMathMatrixRemoveRow(this.Class, this.Pos, this.Items); return new CChangesMathMatrixRemoveRow(this.Class, this.Pos, this.Items);
}; };
CChangesMathMatrixAddRow.prototype.Merge = function(oChange)
{
// TODO: Это изменение надо целиком переделать
return true;
};
/** /**
* @constructor * @constructor
* @extends {AscDFH.CChangesBase} * @extends {AscDFH.CChangesBase}
...@@ -1350,6 +1449,11 @@ CChangesMathMatrixRemoveRow.prototype.CreateReverseChange = function() ...@@ -1350,6 +1449,11 @@ CChangesMathMatrixRemoveRow.prototype.CreateReverseChange = function()
// TODO: Это изменение надо целиком переделать // TODO: Это изменение надо целиком переделать
return new CChangesMathMatrixAddRow(this.Class, this.Pos, this.Items); return new CChangesMathMatrixAddRow(this.Class, this.Pos, this.Items);
}; };
CChangesMathMatrixRemoveRow.prototype.Merge = function(oChange)
{
// TODO: Это изменение надо целиком переделать
return true;
};
/** /**
* @constructor * @constructor
* @extends {AscDFH.CChangesBase} * @extends {AscDFH.CChangesBase}
...@@ -1381,6 +1485,11 @@ CChangesMathMatrixAddColumn.prototype.CreateReverseChange = function() ...@@ -1381,6 +1485,11 @@ CChangesMathMatrixAddColumn.prototype.CreateReverseChange = function()
// TODO: Это изменение надо целиком переделать // TODO: Это изменение надо целиком переделать
return new CChangesMathMatrixRemoveColumn(this.Class, this.Pos, this.Items); return new CChangesMathMatrixRemoveColumn(this.Class, this.Pos, this.Items);
}; };
CChangesMathMatrixAddColumn.prototype.Merge = function(oChange)
{
// TODO: Это изменение надо целиком переделать
return true;
};
/** /**
* @constructor * @constructor
* @extends {AscDFH.CChangesBase} * @extends {AscDFH.CChangesBase}
...@@ -1412,6 +1521,11 @@ CChangesMathMatrixRemoveColumn.prototype.CreateReverseChange = function() ...@@ -1412,6 +1521,11 @@ CChangesMathMatrixRemoveColumn.prototype.CreateReverseChange = function()
// TODO: Это изменение надо целиком переделать // TODO: Это изменение надо целиком переделать
return new CChangesMathMatrixAddColumn(this.Class, this.Pos, this.Items); return new CChangesMathMatrixAddColumn(this.Class, this.Pos, this.Items);
}; };
CChangesMathMatrixRemoveColumn.prototype.Merge = function(oChange)
{
// TODO: Это изменение надо целиком переделать
return true;
};
/** /**
* @constructor * @constructor
* @extends {AscDFH.CChangesBaseLongProperty} * @extends {AscDFH.CChangesBaseLongProperty}
...@@ -1506,7 +1620,6 @@ CChangesMathMatrixColumnJc.prototype.CreateReverseChange = function() ...@@ -1506,7 +1620,6 @@ CChangesMathMatrixColumnJc.prototype.CreateReverseChange = function()
{ {
return new CChangesMathMatrixColumnJc(this.Class, this.New, this.Old, this.ColumnIndex); return new CChangesMathMatrixColumnJc(this.Class, this.New, this.Old, this.ColumnIndex);
}; };
/** /**
* @constructor * @constructor
* @extends {AscDFH.CChangesBaseProperty} * @extends {AscDFH.CChangesBaseProperty}
......
...@@ -44,17 +44,16 @@ AscDFH.changesFactory[AscDFH.historyitem_AbstractNum_ParaPrChange] = CChangesAbs ...@@ -44,17 +44,16 @@ AscDFH.changesFactory[AscDFH.historyitem_AbstractNum_ParaPrChange] = CChangesAbs
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
// Карта зависимости изменений // Карта зависимости изменений
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
AscDFH.abstractnumRelationMap = {}; AscDFH.changesRelationMap[AscDFH.historyitem_AbstractNum_LvlChange] = [
AscDFH.abstractnumRelationMap[AscDFH.historyitem_AbstractNum_LvlChange] = [
AscDFH.historyitem_AbstractNum_LvlChange, AscDFH.historyitem_AbstractNum_LvlChange,
AscDFH.historyitem_AbstractNum_TextPrChange, AscDFH.historyitem_AbstractNum_TextPrChange,
AscDFH.historyitem_AbstractNum_ParaPrChange AscDFH.historyitem_AbstractNum_ParaPrChange
]; ];
AscDFH.abstractnumRelationMap[AscDFH.historyitem_AbstractNum_TextPrChange] = [ AscDFH.changesRelationMap[AscDFH.historyitem_AbstractNum_TextPrChange] = [
AscDFH.historyitem_AbstractNum_LvlChange, AscDFH.historyitem_AbstractNum_LvlChange,
AscDFH.historyitem_AbstractNum_TextPrChange AscDFH.historyitem_AbstractNum_TextPrChange
]; ];
AscDFH.abstractnumRelationMap[AscDFH.historyitem_AbstractNum_ParaPrChange] = [ AscDFH.changesRelationMap[AscDFH.historyitem_AbstractNum_ParaPrChange] = [
AscDFH.historyitem_AbstractNum_LvlChange, AscDFH.historyitem_AbstractNum_LvlChange,
AscDFH.historyitem_AbstractNum_ParaPrChange AscDFH.historyitem_AbstractNum_ParaPrChange
]; ];
......
...@@ -60,26 +60,25 @@ AscDFH.changesFactory[AscDFH.historyitem_Drawing_SetSizeRelV] = CChangesPa ...@@ -60,26 +60,25 @@ AscDFH.changesFactory[AscDFH.historyitem_Drawing_SetSizeRelV] = CChangesPa
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
// Карта зависимости изменений // Карта зависимости изменений
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
AscDFH.paradrawingChangesRelationMap = {}; AscDFH.changesRelationMap[AscDFH.historyitem_Drawing_DrawingType] = [AscDFH.historyitem_Drawing_DrawingType];
AscDFH.paradrawingChangesRelationMap[AscDFH.historyitem_Drawing_DrawingType] = [AscDFH.historyitem_Drawing_DrawingType]; AscDFH.changesRelationMap[AscDFH.historyitem_Drawing_WrappingType] = [AscDFH.historyitem_Drawing_WrappingType];
AscDFH.paradrawingChangesRelationMap[AscDFH.historyitem_Drawing_WrappingType] = [AscDFH.historyitem_Drawing_WrappingType]; AscDFH.changesRelationMap[AscDFH.historyitem_Drawing_Distance] = [AscDFH.historyitem_Drawing_Distance];
AscDFH.paradrawingChangesRelationMap[AscDFH.historyitem_Drawing_Distance] = [AscDFH.historyitem_Drawing_Distance]; AscDFH.changesRelationMap[AscDFH.historyitem_Drawing_AllowOverlap] = [AscDFH.historyitem_Drawing_AllowOverlap];
AscDFH.paradrawingChangesRelationMap[AscDFH.historyitem_Drawing_AllowOverlap] = [AscDFH.historyitem_Drawing_AllowOverlap]; AscDFH.changesRelationMap[AscDFH.historyitem_Drawing_PositionH] = [AscDFH.historyitem_Drawing_PositionH];
AscDFH.paradrawingChangesRelationMap[AscDFH.historyitem_Drawing_PositionH] = [AscDFH.historyitem_Drawing_PositionH]; AscDFH.changesRelationMap[AscDFH.historyitem_Drawing_PositionV] = [AscDFH.historyitem_Drawing_PositionV];
AscDFH.paradrawingChangesRelationMap[AscDFH.historyitem_Drawing_PositionV] = [AscDFH.historyitem_Drawing_PositionV]; AscDFH.changesRelationMap[AscDFH.historyitem_Drawing_BehindDoc] = [AscDFH.historyitem_Drawing_BehindDoc];
AscDFH.paradrawingChangesRelationMap[AscDFH.historyitem_Drawing_BehindDoc] = [AscDFH.historyitem_Drawing_BehindDoc]; AscDFH.changesRelationMap[AscDFH.historyitem_Drawing_SetGraphicObject] = [AscDFH.historyitem_Drawing_SetGraphicObject];
AscDFH.paradrawingChangesRelationMap[AscDFH.historyitem_Drawing_SetGraphicObject] = [AscDFH.historyitem_Drawing_SetGraphicObject]; AscDFH.changesRelationMap[AscDFH.historyitem_Drawing_SetSimplePos] = [AscDFH.historyitem_Drawing_SetSimplePos];
AscDFH.paradrawingChangesRelationMap[AscDFH.historyitem_Drawing_SetSimplePos] = [AscDFH.historyitem_Drawing_SetSimplePos]; AscDFH.changesRelationMap[AscDFH.historyitem_Drawing_SetExtent] = [AscDFH.historyitem_Drawing_SetExtent];
AscDFH.paradrawingChangesRelationMap[AscDFH.historyitem_Drawing_SetExtent] = [AscDFH.historyitem_Drawing_SetExtent]; AscDFH.changesRelationMap[AscDFH.historyitem_Drawing_SetWrapPolygon] = [AscDFH.historyitem_Drawing_SetWrapPolygon];
AscDFH.paradrawingChangesRelationMap[AscDFH.historyitem_Drawing_SetWrapPolygon] = [AscDFH.historyitem_Drawing_SetWrapPolygon]; AscDFH.changesRelationMap[AscDFH.historyitem_Drawing_SetLocked] = [AscDFH.historyitem_Drawing_SetLocked];
AscDFH.paradrawingChangesRelationMap[AscDFH.historyitem_Drawing_SetLocked] = [AscDFH.historyitem_Drawing_SetLocked]; AscDFH.changesRelationMap[AscDFH.historyitem_Drawing_SetRelativeHeight] = [AscDFH.historyitem_Drawing_SetRelativeHeight];
AscDFH.paradrawingChangesRelationMap[AscDFH.historyitem_Drawing_SetRelativeHeight] = [AscDFH.historyitem_Drawing_SetRelativeHeight]; AscDFH.changesRelationMap[AscDFH.historyitem_Drawing_SetEffectExtent] = [AscDFH.historyitem_Drawing_SetEffectExtent];
AscDFH.paradrawingChangesRelationMap[AscDFH.historyitem_Drawing_SetEffectExtent] = [AscDFH.historyitem_Drawing_SetEffectExtent]; AscDFH.changesRelationMap[AscDFH.historyitem_Drawing_SetParent] = [AscDFH.historyitem_Drawing_SetParent];
AscDFH.paradrawingChangesRelationMap[AscDFH.historyitem_Drawing_SetParent] = [AscDFH.historyitem_Drawing_SetParent]; AscDFH.changesRelationMap[AscDFH.historyitem_Drawing_SetParaMath] = [AscDFH.historyitem_Drawing_SetParaMath];
AscDFH.paradrawingChangesRelationMap[AscDFH.historyitem_Drawing_SetParaMath] = [AscDFH.historyitem_Drawing_SetParaMath]; AscDFH.changesRelationMap[AscDFH.historyitem_Drawing_LayoutInCell] = [AscDFH.historyitem_Drawing_LayoutInCell];
AscDFH.paradrawingChangesRelationMap[AscDFH.historyitem_Drawing_LayoutInCell] = [AscDFH.historyitem_Drawing_LayoutInCell]; AscDFH.changesRelationMap[AscDFH.historyitem_Drawing_SetSizeRelH] = [AscDFH.historyitem_Drawing_SetSizeRelH];
AscDFH.paradrawingChangesRelationMap[AscDFH.historyitem_Drawing_SetSizeRelH] = [AscDFH.historyitem_Drawing_SetSizeRelH]; AscDFH.changesRelationMap[AscDFH.historyitem_Drawing_SetSizeRelV] = [AscDFH.historyitem_Drawing_SetSizeRelV];
AscDFH.paradrawingChangesRelationMap[AscDFH.historyitem_Drawing_SetSizeRelV] = [AscDFH.historyitem_Drawing_SetSizeRelV];
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
/** /**
......
...@@ -70,64 +70,63 @@ AscDFH.changesFactory[AscDFH.historyitem_TextPr_Fill] = CChangesParaT ...@@ -70,64 +70,63 @@ AscDFH.changesFactory[AscDFH.historyitem_TextPr_Fill] = CChangesParaT
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
// Карта зависимости изменений // Карта зависимости изменений
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
AscDFH.paratextprChangesRelationMap = {}; AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_Bold] = [
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_Bold] = [
AscDFH.historyitem_TextPr_Bold, AscDFH.historyitem_TextPr_Bold,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_Italic] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_Italic] = [
AscDFH.historyitem_TextPr_Italic, AscDFH.historyitem_TextPr_Italic,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_Strikeout] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_Strikeout] = [
AscDFH.historyitem_TextPr_Strikeout, AscDFH.historyitem_TextPr_Strikeout,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_Underline] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_Underline] = [
AscDFH.historyitem_TextPr_Underline, AscDFH.historyitem_TextPr_Underline,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_FontSize] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_FontSize] = [
AscDFH.historyitem_TextPr_FontSize, AscDFH.historyitem_TextPr_FontSize,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_Color] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_Color] = [
AscDFH.historyitem_TextPr_Color, AscDFH.historyitem_TextPr_Color,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_VertAlign] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_VertAlign] = [
AscDFH.historyitem_TextPr_VertAlign, AscDFH.historyitem_TextPr_VertAlign,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_HighLight] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_HighLight] = [
AscDFH.historyitem_TextPr_HighLight, AscDFH.historyitem_TextPr_HighLight,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_RStyle] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_RStyle] = [
AscDFH.historyitem_TextPr_RStyle, AscDFH.historyitem_TextPr_RStyle,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_Spacing] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_Spacing] = [
AscDFH.historyitem_TextPr_Spacing, AscDFH.historyitem_TextPr_Spacing,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_DStrikeout] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_DStrikeout] = [
AscDFH.historyitem_TextPr_DStrikeout, AscDFH.historyitem_TextPr_DStrikeout,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_Caps] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_Caps] = [
AscDFH.historyitem_TextPr_Caps, AscDFH.historyitem_TextPr_Caps,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_SmallCaps] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_SmallCaps] = [
AscDFH.historyitem_TextPr_SmallCaps, AscDFH.historyitem_TextPr_SmallCaps,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_Position] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_Position] = [
AscDFH.historyitem_TextPr_Position, AscDFH.historyitem_TextPr_Position,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_Value] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_Value] = [
AscDFH.historyitem_TextPr_Bold, AscDFH.historyitem_TextPr_Bold,
AscDFH.historyitem_TextPr_Italic, AscDFH.historyitem_TextPr_Italic,
AscDFH.historyitem_TextPr_Strikeout, AscDFH.historyitem_TextPr_Strikeout,
...@@ -158,7 +157,7 @@ AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_Value] = ...@@ -158,7 +157,7 @@ AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_Value] =
AscDFH.historyitem_TextPr_Outline, AscDFH.historyitem_TextPr_Outline,
AscDFH.historyitem_TextPr_Fill AscDFH.historyitem_TextPr_Fill
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_RFonts] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_RFonts] = [
AscDFH.historyitem_TextPr_RFonts, AscDFH.historyitem_TextPr_RFonts,
AscDFH.historyitem_TextPr_RFonts_Ascii, AscDFH.historyitem_TextPr_RFonts_Ascii,
AscDFH.historyitem_TextPr_RFonts_HAnsi, AscDFH.historyitem_TextPr_RFonts_HAnsi,
...@@ -167,66 +166,66 @@ AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_RFonts] = ...@@ -167,66 +166,66 @@ AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_RFonts] =
AscDFH.historyitem_TextPr_RFonts_Hint, AscDFH.historyitem_TextPr_RFonts_Hint,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_RFonts_Ascii] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_RFonts_Ascii] = [
AscDFH.historyitem_TextPr_RFonts_Ascii, AscDFH.historyitem_TextPr_RFonts_Ascii,
AscDFH.historyitem_TextPr_RFonts, AscDFH.historyitem_TextPr_RFonts,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_RFonts_HAnsi] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_RFonts_HAnsi] = [
AscDFH.historyitem_TextPr_RFonts_HAnsi, AscDFH.historyitem_TextPr_RFonts_HAnsi,
AscDFH.historyitem_TextPr_RFonts, AscDFH.historyitem_TextPr_RFonts,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_RFonts_CS] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_RFonts_CS] = [
AscDFH.historyitem_TextPr_RFonts_CS, AscDFH.historyitem_TextPr_RFonts_CS,
AscDFH.historyitem_TextPr_RFonts, AscDFH.historyitem_TextPr_RFonts,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_RFonts_EastAsia] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_RFonts_EastAsia] = [
AscDFH.historyitem_TextPr_RFonts_EastAsia, AscDFH.historyitem_TextPr_RFonts_EastAsia,
AscDFH.historyitem_TextPr_RFonts, AscDFH.historyitem_TextPr_RFonts,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_RFonts_Hint] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_RFonts_Hint] = [
AscDFH.historyitem_TextPr_RFonts_Hint, AscDFH.historyitem_TextPr_RFonts_Hint,
AscDFH.historyitem_TextPr_RFonts, AscDFH.historyitem_TextPr_RFonts,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_Lang] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_Lang] = [
AscDFH.historyitem_TextPr_Lang, AscDFH.historyitem_TextPr_Lang,
AscDFH.historyitem_TextPr_Lang_Bidi, AscDFH.historyitem_TextPr_Lang_Bidi,
AscDFH.historyitem_TextPr_Lang_EastAsia, AscDFH.historyitem_TextPr_Lang_EastAsia,
AscDFH.historyitem_TextPr_Lang_Val, AscDFH.historyitem_TextPr_Lang_Val,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_Lang_Bidi] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_Lang_Bidi] = [
AscDFH.historyitem_TextPr_Lang_Bidi, AscDFH.historyitem_TextPr_Lang_Bidi,
AscDFH.historyitem_TextPr_Lang, AscDFH.historyitem_TextPr_Lang,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_Lang_EastAsia] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_Lang_EastAsia] = [
AscDFH.historyitem_TextPr_Lang_EastAsia, AscDFH.historyitem_TextPr_Lang_EastAsia,
AscDFH.historyitem_TextPr_Lang, AscDFH.historyitem_TextPr_Lang,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_Lang_Val] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_Lang_Val] = [
AscDFH.historyitem_TextPr_Lang_Val, AscDFH.historyitem_TextPr_Lang_Val,
AscDFH.historyitem_TextPr_Lang, AscDFH.historyitem_TextPr_Lang,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_Unifill] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_Unifill] = [
AscDFH.historyitem_TextPr_Unifill, AscDFH.historyitem_TextPr_Unifill,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_FontSizeCS] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_FontSizeCS] = [
AscDFH.historyitem_TextPr_FontSizeCS, AscDFH.historyitem_TextPr_FontSizeCS,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_Outline] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_Outline] = [
AscDFH.historyitem_TextPr_Outline, AscDFH.historyitem_TextPr_Outline,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
AscDFH.paratextprChangesRelationMap[AscDFH.historyitem_TextPr_Fill] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TextPr_Fill] = [
AscDFH.historyitem_TextPr_Fill, AscDFH.historyitem_TextPr_Fill,
AscDFH.historyitem_TextPr_Value AscDFH.historyitem_TextPr_Value
]; ];
......
...@@ -91,130 +91,129 @@ function private_ParagraphChangesOnSetValue(oParagraph) ...@@ -91,130 +91,129 @@ function private_ParagraphChangesOnSetValue(oParagraph)
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
// Карта зависимости изменений // Карта зависимости изменений
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
AscDFH.paragraphChangesRelationMap = {}; AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_AddItem] = [
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_AddItem] = [
AscDFH.historyitem_Paragraph_AddItem, AscDFH.historyitem_Paragraph_AddItem,
AscDFH.historyitem_Paragraph_RemoveItem AscDFH.historyitem_Paragraph_RemoveItem
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_RemoveItem] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_RemoveItem] = [
AscDFH.historyitem_Paragraph_AddItem, AscDFH.historyitem_Paragraph_AddItem,
AscDFH.historyitem_Paragraph_RemoveItem AscDFH.historyitem_Paragraph_RemoveItem
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Numbering] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Numbering] = [
AscDFH.historyitem_Paragraph_Numbering, AscDFH.historyitem_Paragraph_Numbering,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Align] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Align] = [
AscDFH.historyitem_Paragraph_Align, AscDFH.historyitem_Paragraph_Align,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Ind_First] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Ind_First] = [
AscDFH.historyitem_Paragraph_Ind_First, AscDFH.historyitem_Paragraph_Ind_First,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Ind_Right] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Ind_Right] = [
AscDFH.historyitem_Paragraph_Ind_Right, AscDFH.historyitem_Paragraph_Ind_Right,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Ind_Left] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Ind_Left] = [
AscDFH.historyitem_Paragraph_Ind_Left, AscDFH.historyitem_Paragraph_Ind_Left,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_ContextualSpacing] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_ContextualSpacing] = [
AscDFH.historyitem_Paragraph_ContextualSpacing, AscDFH.historyitem_Paragraph_ContextualSpacing,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_KeepLines] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_KeepLines] = [
AscDFH.historyitem_Paragraph_KeepLines, AscDFH.historyitem_Paragraph_KeepLines,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_KeepNext] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_KeepNext] = [
AscDFH.historyitem_Paragraph_KeepNext, AscDFH.historyitem_Paragraph_KeepNext,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_PageBreakBefore] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_PageBreakBefore] = [
AscDFH.historyitem_Paragraph_PageBreakBefore, AscDFH.historyitem_Paragraph_PageBreakBefore,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Spacing_Line] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Spacing_Line] = [
AscDFH.historyitem_Paragraph_Spacing_Line, AscDFH.historyitem_Paragraph_Spacing_Line,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Spacing_LineRule] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Spacing_LineRule] = [
AscDFH.historyitem_Paragraph_Spacing_LineRule, AscDFH.historyitem_Paragraph_Spacing_LineRule,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Spacing_Before] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Spacing_Before] = [
AscDFH.historyitem_Paragraph_Spacing_Before, AscDFH.historyitem_Paragraph_Spacing_Before,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Spacing_After] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Spacing_After] = [
AscDFH.historyitem_Paragraph_Spacing_After, AscDFH.historyitem_Paragraph_Spacing_After,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Spacing_AfterAutoSpacing] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Spacing_AfterAutoSpacing] = [
AscDFH.historyitem_Paragraph_Spacing_AfterAutoSpacing, AscDFH.historyitem_Paragraph_Spacing_AfterAutoSpacing,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Spacing_BeforeAutoSpacing] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Spacing_BeforeAutoSpacing] = [
AscDFH.historyitem_Paragraph_Spacing_BeforeAutoSpacing, AscDFH.historyitem_Paragraph_Spacing_BeforeAutoSpacing,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Shd_Value] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Shd_Value] = [
AscDFH.historyitem_Paragraph_Shd_Value, AscDFH.historyitem_Paragraph_Shd_Value,
AscDFH.historyitem_Paragraph_Shd, AscDFH.historyitem_Paragraph_Shd,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Shd_Color] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Shd_Color] = [
AscDFH.historyitem_Paragraph_Shd_Color, AscDFH.historyitem_Paragraph_Shd_Color,
AscDFH.historyitem_Paragraph_Shd, AscDFH.historyitem_Paragraph_Shd,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Shd_Unifill] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Shd_Unifill] = [
AscDFH.historyitem_Paragraph_Shd_Unifill, AscDFH.historyitem_Paragraph_Shd_Unifill,
AscDFH.historyitem_Paragraph_Shd, AscDFH.historyitem_Paragraph_Shd,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Shd] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Shd] = [
AscDFH.historyitem_Paragraph_Shd_Value, AscDFH.historyitem_Paragraph_Shd_Value,
AscDFH.historyitem_Paragraph_Shd_Color, AscDFH.historyitem_Paragraph_Shd_Color,
AscDFH.historyitem_Paragraph_Shd_Unifill, AscDFH.historyitem_Paragraph_Shd_Unifill,
AscDFH.historyitem_Paragraph_Shd, AscDFH.historyitem_Paragraph_Shd,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_WidowControl] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_WidowControl] = [
AscDFH.historyitem_Paragraph_WidowControl, AscDFH.historyitem_Paragraph_WidowControl,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Tabs] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Tabs] = [
AscDFH.historyitem_Paragraph_Tabs, AscDFH.historyitem_Paragraph_Tabs,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_PStyle] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_PStyle] = [
AscDFH.historyitem_Paragraph_PStyle, AscDFH.historyitem_Paragraph_PStyle,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Borders_Between] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Borders_Between] = [
AscDFH.historyitem_Paragraph_Borders_Between, AscDFH.historyitem_Paragraph_Borders_Between,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Borders_Bottom] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Borders_Bottom] = [
AscDFH.historyitem_Paragraph_Borders_Bottom, AscDFH.historyitem_Paragraph_Borders_Bottom,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Borders_Left] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Borders_Left] = [
AscDFH.historyitem_Paragraph_Borders_Left, AscDFH.historyitem_Paragraph_Borders_Left,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Borders_Right] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Borders_Right] = [
AscDFH.historyitem_Paragraph_Borders_Right, AscDFH.historyitem_Paragraph_Borders_Right,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Borders_Top] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Borders_Top] = [
AscDFH.historyitem_Paragraph_Borders_Top, AscDFH.historyitem_Paragraph_Borders_Top,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Pr] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_Pr] = [
AscDFH.historyitem_Paragraph_Pr, AscDFH.historyitem_Paragraph_Pr,
AscDFH.historyitem_Paragraph_Numbering, AscDFH.historyitem_Paragraph_Numbering,
AscDFH.historyitem_Paragraph_Align, AscDFH.historyitem_Paragraph_Align,
...@@ -247,25 +246,25 @@ AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Pr] ...@@ -247,25 +246,25 @@ AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_Pr]
AscDFH.historyitem_Paragraph_PresentationPr_Level, AscDFH.historyitem_Paragraph_PresentationPr_Level,
AscDFH.historyitem_Paragraph_FramePr AscDFH.historyitem_Paragraph_FramePr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_PresentationPr_Bullet] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_PresentationPr_Bullet] = [
AscDFH.historyitem_Paragraph_PresentationPr_Bullet, AscDFH.historyitem_Paragraph_PresentationPr_Bullet,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_PresentationPr_Level] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_PresentationPr_Level] = [
AscDFH.historyitem_Paragraph_PresentationPr_Level, AscDFH.historyitem_Paragraph_PresentationPr_Level,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_FramePr] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_FramePr] = [
AscDFH.historyitem_Paragraph_FramePr, AscDFH.historyitem_Paragraph_FramePr,
AscDFH.historyitem_Paragraph_Pr AscDFH.historyitem_Paragraph_Pr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_SectionPr] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_SectionPr] = [
AscDFH.historyitem_Paragraph_SectionPr AscDFH.historyitem_Paragraph_SectionPr
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_PrChange] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_PrChange] = [
AscDFH.historyitem_Paragraph_PrChange AscDFH.historyitem_Paragraph_PrChange
]; ];
AscDFH.paragraphChangesRelationMap[AscDFH.historyitem_Paragraph_PrReviewInfo] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Paragraph_PrReviewInfo] = [
AscDFH.historyitem_Paragraph_PrReviewInfo AscDFH.historyitem_Paragraph_PrReviewInfo
]; ];
......
...@@ -74,47 +74,45 @@ AscDFH.changesFactory[AscDFH.historyitem_Styles_ChangeDefaultParaPr] = CChangesS ...@@ -74,47 +74,45 @@ AscDFH.changesFactory[AscDFH.historyitem_Styles_ChangeDefaultParaPr] = CChangesS
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
// Карта зависимости изменений // Карта зависимости изменений
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
AscDFH.styleChangesRelationMap = {}; AscDFH.changesRelationMap[AscDFH.historyitem_Style_TextPr] = [AscDFH.historyitem_Style_TextPr];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_TextPr] = [AscDFH.historyitem_Style_TextPr]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_ParaPr] = [AscDFH.historyitem_Style_ParaPr];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_ParaPr] = [AscDFH.historyitem_Style_ParaPr]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_TablePr] = [AscDFH.historyitem_Style_TablePr];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_TablePr] = [AscDFH.historyitem_Style_TablePr]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_TableRowPr] = [AscDFH.historyitem_Style_TableRowPr];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_TableRowPr] = [AscDFH.historyitem_Style_TableRowPr]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_TableCellPr] = [AscDFH.historyitem_Style_TableCellPr];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_TableCellPr] = [AscDFH.historyitem_Style_TableCellPr]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_TableBand1Horz] = [AscDFH.historyitem_Style_TableBand1Horz];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_TableBand1Horz] = [AscDFH.historyitem_Style_TableBand1Horz]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_TableBand1Vert] = [AscDFH.historyitem_Style_TableBand1Vert];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_TableBand1Vert] = [AscDFH.historyitem_Style_TableBand1Vert]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_TableBand2Horz] = [AscDFH.historyitem_Style_TableBand2Horz];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_TableBand2Horz] = [AscDFH.historyitem_Style_TableBand2Horz]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_TableBand2Vert] = [AscDFH.historyitem_Style_TableBand2Vert];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_TableBand2Vert] = [AscDFH.historyitem_Style_TableBand2Vert]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_TableFirstCol] = [AscDFH.historyitem_Style_TableFirstCol];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_TableFirstCol] = [AscDFH.historyitem_Style_TableFirstCol]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_TableFirstRow] = [AscDFH.historyitem_Style_TableFirstRow];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_TableFirstRow] = [AscDFH.historyitem_Style_TableFirstRow]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_TableLastCol] = [AscDFH.historyitem_Style_TableLastCol];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_TableLastCol] = [AscDFH.historyitem_Style_TableLastCol]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_TableLastRow] = [AscDFH.historyitem_Style_TableLastRow];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_TableLastRow] = [AscDFH.historyitem_Style_TableLastRow]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_TableTLCell] = [AscDFH.historyitem_Style_TableTLCell];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_TableTLCell] = [AscDFH.historyitem_Style_TableTLCell]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_TableTRCell] = [AscDFH.historyitem_Style_TableTRCell];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_TableTRCell] = [AscDFH.historyitem_Style_TableTRCell]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_TableBLCell] = [AscDFH.historyitem_Style_TableBLCell];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_TableBLCell] = [AscDFH.historyitem_Style_TableBLCell]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_TableBRCell] = [AscDFH.historyitem_Style_TableBRCell];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_TableBRCell] = [AscDFH.historyitem_Style_TableBRCell]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_TableWholeTable] = [AscDFH.historyitem_Style_TableWholeTable];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_TableWholeTable] = [AscDFH.historyitem_Style_TableWholeTable]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_Name] = [AscDFH.historyitem_Style_Name];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_Name] = [AscDFH.historyitem_Style_Name]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_BasedOn] = [AscDFH.historyitem_Style_BasedOn];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_BasedOn] = [AscDFH.historyitem_Style_BasedOn]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_Next] = [AscDFH.historyitem_Style_Next];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_Next] = [AscDFH.historyitem_Style_Next]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_Type] = [AscDFH.historyitem_Style_Type];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_Type] = [AscDFH.historyitem_Style_Type]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_QFormat] = [AscDFH.historyitem_Style_QFormat];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_QFormat] = [AscDFH.historyitem_Style_QFormat]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_UiPriority] = [AscDFH.historyitem_Style_UiPriority];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_UiPriority] = [AscDFH.historyitem_Style_UiPriority]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_Hidden] = [AscDFH.historyitem_Style_Hidden];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_Hidden] = [AscDFH.historyitem_Style_Hidden]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_SemiHidden] = [AscDFH.historyitem_Style_SemiHidden];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_SemiHidden] = [AscDFH.historyitem_Style_SemiHidden]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_UnhideWhenUsed] = [AscDFH.historyitem_Style_UnhideWhenUsed];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_UnhideWhenUsed] = [AscDFH.historyitem_Style_UnhideWhenUsed]; AscDFH.changesRelationMap[AscDFH.historyitem_Style_Link] = [AscDFH.historyitem_Style_Link];
AscDFH.styleChangesRelationMap[AscDFH.historyitem_Style_Link] = [AscDFH.historyitem_Style_Link];
AscDFH.changesRelationMap[AscDFH.historyitem_Styles_Add] = [
AscDFH.stylesChangesRelationMap = {};
AscDFH.stylesChangesRelationMap[AscDFH.historyitem_Styles_Add] = [
AscDFH.historyitem_Styles_Add, AscDFH.historyitem_Styles_Add,
AscDFH.historyitem_Styles_Remove AscDFH.historyitem_Styles_Remove
]; ];
AscDFH.stylesChangesRelationMap[AscDFH.historyitem_Styles_Remove] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Styles_Remove] = [
AscDFH.historyitem_Styles_Add, AscDFH.historyitem_Styles_Add,
AscDFH.historyitem_Styles_Remove AscDFH.historyitem_Styles_Remove
]; ];
AscDFH.stylesChangesRelationMap[AscDFH.historyitem_Styles_ChangeDefaultTextPr] = [AscDFH.historyitem_Styles_ChangeDefaultTextPr]; AscDFH.changesRelationMap[AscDFH.historyitem_Styles_ChangeDefaultTextPr] = [AscDFH.historyitem_Styles_ChangeDefaultTextPr];
AscDFH.stylesChangesRelationMap[AscDFH.historyitem_Styles_ChangeDefaultParaPr] = [AscDFH.historyitem_Styles_ChangeDefaultParaPr]; AscDFH.changesRelationMap[AscDFH.historyitem_Styles_ChangeDefaultParaPr] = [AscDFH.historyitem_Styles_ChangeDefaultParaPr];
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
......
...@@ -54,48 +54,47 @@ AscDFH.changesFactory[AscDFH.historyitem_TableCell_NoWrap] = CChangesTabl ...@@ -54,48 +54,47 @@ AscDFH.changesFactory[AscDFH.historyitem_TableCell_NoWrap] = CChangesTabl
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
// Карта зависимости изменений // Карта зависимости изменений
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
AscDFH.tablecellChangesRelationMap = {}; AscDFH.changesRelationMap[AscDFH.historyitem_TableCell_GridSpan] = [
AscDFH.tablecellChangesRelationMap[AscDFH.historyitem_TableCell_GridSpan] = [
AscDFH.historyitem_TableCell_GridSpan, AscDFH.historyitem_TableCell_GridSpan,
AscDFH.historyitem_TableCell_Pr AscDFH.historyitem_TableCell_Pr
]; ];
AscDFH.tablecellChangesRelationMap[AscDFH.historyitem_TableCell_Margins] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TableCell_Margins] = [
AscDFH.historyitem_TableCell_Margins, AscDFH.historyitem_TableCell_Margins,
AscDFH.historyitem_TableCell_Pr AscDFH.historyitem_TableCell_Pr
]; ];
AscDFH.tablecellChangesRelationMap[AscDFH.historyitem_TableCell_Shd] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TableCell_Shd] = [
AscDFH.historyitem_TableCell_Shd, AscDFH.historyitem_TableCell_Shd,
AscDFH.historyitem_TableCell_Pr AscDFH.historyitem_TableCell_Pr
]; ];
AscDFH.tablecellChangesRelationMap[AscDFH.historyitem_TableCell_VMerge] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TableCell_VMerge] = [
AscDFH.historyitem_TableCell_VMerge, AscDFH.historyitem_TableCell_VMerge,
AscDFH.historyitem_TableCell_Pr AscDFH.historyitem_TableCell_Pr
]; ];
AscDFH.tablecellChangesRelationMap[AscDFH.historyitem_TableCell_Border_Left] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TableCell_Border_Left] = [
AscDFH.historyitem_TableCell_Border_Left, AscDFH.historyitem_TableCell_Border_Left,
AscDFH.historyitem_TableCell_Pr AscDFH.historyitem_TableCell_Pr
]; ];
AscDFH.tablecellChangesRelationMap[AscDFH.historyitem_TableCell_Border_Right] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TableCell_Border_Right] = [
AscDFH.historyitem_TableCell_Border_Right, AscDFH.historyitem_TableCell_Border_Right,
AscDFH.historyitem_TableCell_Pr AscDFH.historyitem_TableCell_Pr
]; ];
AscDFH.tablecellChangesRelationMap[AscDFH.historyitem_TableCell_Border_Top] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TableCell_Border_Top] = [
AscDFH.historyitem_TableCell_Border_Top, AscDFH.historyitem_TableCell_Border_Top,
AscDFH.historyitem_TableCell_Pr AscDFH.historyitem_TableCell_Pr
]; ];
AscDFH.tablecellChangesRelationMap[AscDFH.historyitem_TableCell_Border_Bottom] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TableCell_Border_Bottom] = [
AscDFH.historyitem_TableCell_Border_Bottom, AscDFH.historyitem_TableCell_Border_Bottom,
AscDFH.historyitem_TableCell_Pr AscDFH.historyitem_TableCell_Pr
]; ];
AscDFH.tablecellChangesRelationMap[AscDFH.historyitem_TableCell_VAlign] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TableCell_VAlign] = [
AscDFH.historyitem_TableCell_VAlign, AscDFH.historyitem_TableCell_VAlign,
AscDFH.historyitem_TableCell_Pr AscDFH.historyitem_TableCell_Pr
]; ];
AscDFH.tablecellChangesRelationMap[AscDFH.historyitem_TableCell_W] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TableCell_W] = [
AscDFH.historyitem_TableCell_W, AscDFH.historyitem_TableCell_W,
AscDFH.historyitem_TableCell_Pr AscDFH.historyitem_TableCell_Pr
]; ];
AscDFH.tablecellChangesRelationMap[AscDFH.historyitem_TableCell_Pr] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TableCell_Pr] = [
AscDFH.historyitem_TableCell_GridSpan, AscDFH.historyitem_TableCell_GridSpan,
AscDFH.historyitem_TableCell_Margins, AscDFH.historyitem_TableCell_Margins,
AscDFH.historyitem_TableCell_Shd, AscDFH.historyitem_TableCell_Shd,
...@@ -110,11 +109,11 @@ AscDFH.tablecellChangesRelationMap[AscDFH.historyitem_TableCell_Pr] = ...@@ -110,11 +109,11 @@ AscDFH.tablecellChangesRelationMap[AscDFH.historyitem_TableCell_Pr] =
AscDFH.historyitem_TableCell_TextDirection, AscDFH.historyitem_TableCell_TextDirection,
AscDFH.historyitem_TableCell_NoWrap AscDFH.historyitem_TableCell_NoWrap
]; ];
AscDFH.tablecellChangesRelationMap[AscDFH.historyitem_TableCell_TextDirection] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TableCell_TextDirection] = [
AscDFH.historyitem_TableCell_TextDirection, AscDFH.historyitem_TableCell_TextDirection,
AscDFH.historyitem_TableCell_Pr AscDFH.historyitem_TableCell_Pr
]; ];
AscDFH.tablecellChangesRelationMap[AscDFH.historyitem_TableCell_NoWrap] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TableCell_NoWrap] = [
AscDFH.historyitem_TableCell_NoWrap, AscDFH.historyitem_TableCell_NoWrap,
AscDFH.historyitem_TableCell_Pr AscDFH.historyitem_TableCell_Pr
]; ];
......
...@@ -66,92 +66,91 @@ AscDFH.changesFactory[AscDFH.historyitem_Table_TableLayout] = CChanges ...@@ -66,92 +66,91 @@ AscDFH.changesFactory[AscDFH.historyitem_Table_TableLayout] = CChanges
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
// Карта зависимости изменений // Карта зависимости изменений
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
AscDFH.tableChangesRelationMap = {}; AscDFH.changesRelationMap[AscDFH.historyitem_Table_TableW] = [
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_TableW] = [
AscDFH.historyitem_Table_TableW, AscDFH.historyitem_Table_TableW,
AscDFH.historyitem_Table_Pr AscDFH.historyitem_Table_Pr
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_TableCellMar] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_TableCellMar] = [
AscDFH.historyitem_Table_TableCellMar, AscDFH.historyitem_Table_TableCellMar,
AscDFH.historyitem_Table_Pr AscDFH.historyitem_Table_Pr
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_TableAlign] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_TableAlign] = [
AscDFH.historyitem_Table_TableAlign, AscDFH.historyitem_Table_TableAlign,
AscDFH.historyitem_Table_Pr AscDFH.historyitem_Table_Pr
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_TableInd] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_TableInd] = [
AscDFH.historyitem_Table_TableInd, AscDFH.historyitem_Table_TableInd,
AscDFH.historyitem_Table_Pr AscDFH.historyitem_Table_Pr
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_TableBorder_Left] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_TableBorder_Left] = [
AscDFH.historyitem_Table_TableBorder_Left, AscDFH.historyitem_Table_TableBorder_Left,
AscDFH.historyitem_Table_Pr AscDFH.historyitem_Table_Pr
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_TableBorder_Top] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_TableBorder_Top] = [
AscDFH.historyitem_Table_TableBorder_Top, AscDFH.historyitem_Table_TableBorder_Top,
AscDFH.historyitem_Table_Pr AscDFH.historyitem_Table_Pr
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_TableBorder_Right] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_TableBorder_Right] = [
AscDFH.historyitem_Table_TableBorder_Right, AscDFH.historyitem_Table_TableBorder_Right,
AscDFH.historyitem_Table_Pr AscDFH.historyitem_Table_Pr
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_TableBorder_Bottom] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_TableBorder_Bottom] = [
AscDFH.historyitem_Table_TableBorder_Bottom, AscDFH.historyitem_Table_TableBorder_Bottom,
AscDFH.historyitem_Table_Pr AscDFH.historyitem_Table_Pr
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_TableBorder_InsideH] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_TableBorder_InsideH] = [
AscDFH.historyitem_Table_TableBorder_InsideH, AscDFH.historyitem_Table_TableBorder_InsideH,
AscDFH.historyitem_Table_Pr AscDFH.historyitem_Table_Pr
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_TableBorder_InsideV] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_TableBorder_InsideV] = [
AscDFH.historyitem_Table_TableBorder_InsideV, AscDFH.historyitem_Table_TableBorder_InsideV,
AscDFH.historyitem_Table_Pr AscDFH.historyitem_Table_Pr
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_TableShd] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_TableShd] = [
AscDFH.historyitem_Table_TableShd, AscDFH.historyitem_Table_TableShd,
AscDFH.historyitem_Table_Pr AscDFH.historyitem_Table_Pr
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_Inline] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_Inline] = [
AscDFH.historyitem_Table_Inline AscDFH.historyitem_Table_Inline
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_AddRow] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_AddRow] = [
AscDFH.historyitem_Table_AddRow, AscDFH.historyitem_Table_AddRow,
AscDFH.historyitem_Table_RemoveRow AscDFH.historyitem_Table_RemoveRow
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_RemoveRow] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_RemoveRow] = [
AscDFH.historyitem_Table_AddRow, AscDFH.historyitem_Table_AddRow,
AscDFH.historyitem_Table_RemoveRow AscDFH.historyitem_Table_RemoveRow
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_TableGrid] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_TableGrid] = [
AscDFH.historyitem_Table_TableGrid AscDFH.historyitem_Table_TableGrid
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_TableLook] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_TableLook] = [
AscDFH.historyitem_Table_TableLook AscDFH.historyitem_Table_TableLook
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_TableStyleRowBandSize] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_TableStyleRowBandSize] = [
AscDFH.historyitem_Table_TableStyleRowBandSize, AscDFH.historyitem_Table_TableStyleRowBandSize,
AscDFH.historyitem_Table_Pr AscDFH.historyitem_Table_Pr
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_TableStyleColBandSize] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_TableStyleColBandSize] = [
AscDFH.historyitem_Table_TableStyleColBandSize, AscDFH.historyitem_Table_TableStyleColBandSize,
AscDFH.historyitem_Table_Pr AscDFH.historyitem_Table_Pr
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_TableStyle] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_TableStyle] = [
AscDFH.historyitem_Table_TableStyle AscDFH.historyitem_Table_TableStyle
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_AllowOverlap] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_AllowOverlap] = [
AscDFH.historyitem_Table_AllowOverlap AscDFH.historyitem_Table_AllowOverlap
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_PositionH] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_PositionH] = [
AscDFH.historyitem_Table_PositionH AscDFH.historyitem_Table_PositionH
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_PositionV] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_PositionV] = [
AscDFH.historyitem_Table_PositionV AscDFH.historyitem_Table_PositionV
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_Distance] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_Distance] = [
AscDFH.historyitem_Table_Distance AscDFH.historyitem_Table_Distance
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_Pr] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_Pr] = [
AscDFH.historyitem_Table_TableW, AscDFH.historyitem_Table_TableW,
AscDFH.historyitem_Table_TableCellMar, AscDFH.historyitem_Table_TableCellMar,
AscDFH.historyitem_Table_TableAlign, AscDFH.historyitem_Table_TableAlign,
...@@ -168,7 +167,7 @@ AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_Pr] = ...@@ -168,7 +167,7 @@ AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_Pr] =
AscDFH.historyitem_Table_Pr, AscDFH.historyitem_Table_Pr,
AscDFH.historyitem_Table_TableLayout AscDFH.historyitem_Table_TableLayout
]; ];
AscDFH.tableChangesRelationMap[AscDFH.historyitem_Table_TableLayout] = [ AscDFH.changesRelationMap[AscDFH.historyitem_Table_TableLayout] = [
AscDFH.historyitem_Table_TableLayout, AscDFH.historyitem_Table_TableLayout,
AscDFH.historyitem_Table_Pr AscDFH.historyitem_Table_Pr
]; ];
......
...@@ -49,36 +49,35 @@ AscDFH.changesFactory[AscDFH.historyitem_TableRow_Pr] = CChangesTableRo ...@@ -49,36 +49,35 @@ AscDFH.changesFactory[AscDFH.historyitem_TableRow_Pr] = CChangesTableRo
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
// Карта зависимости изменений // Карта зависимости изменений
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
AscDFH.tablerowChangesRelationMap = {}; AscDFH.changesRelationMap[AscDFH.historyitem_TableRow_Before] = [
AscDFH.tablerowChangesRelationMap[AscDFH.historyitem_TableRow_Before] = [
AscDFH.historyitem_TableRow_Before, AscDFH.historyitem_TableRow_Before,
AscDFH.historyitem_TableRow_Pr AscDFH.historyitem_TableRow_Pr
]; ];
AscDFH.tablerowChangesRelationMap[AscDFH.historyitem_TableRow_After] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TableRow_After] = [
AscDFH.historyitem_TableRow_After, AscDFH.historyitem_TableRow_After,
AscDFH.historyitem_TableRow_Pr AscDFH.historyitem_TableRow_Pr
]; ];
AscDFH.tablerowChangesRelationMap[AscDFH.historyitem_TableRow_CellSpacing] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TableRow_CellSpacing] = [
AscDFH.historyitem_TableRow_CellSpacing, AscDFH.historyitem_TableRow_CellSpacing,
AscDFH.historyitem_TableRow_Pr AscDFH.historyitem_TableRow_Pr
]; ];
AscDFH.tablerowChangesRelationMap[AscDFH.historyitem_TableRow_Height] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TableRow_Height] = [
AscDFH.historyitem_TableRow_Height, AscDFH.historyitem_TableRow_Height,
AscDFH.historyitem_TableRow_Pr AscDFH.historyitem_TableRow_Pr
]; ];
AscDFH.tablerowChangesRelationMap[AscDFH.historyitem_TableRow_AddCell] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TableRow_AddCell] = [
AscDFH.historyitem_TableRow_AddCell, AscDFH.historyitem_TableRow_AddCell,
AscDFH.historyitem_TableRow_RemoveCell AscDFH.historyitem_TableRow_RemoveCell
]; ];
AscDFH.tablerowChangesRelationMap[AscDFH.historyitem_TableRow_RemoveCell] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TableRow_RemoveCell] = [
AscDFH.historyitem_TableRow_AddCell, AscDFH.historyitem_TableRow_AddCell,
AscDFH.historyitem_TableRow_RemoveCell AscDFH.historyitem_TableRow_RemoveCell
]; ];
AscDFH.tablerowChangesRelationMap[AscDFH.historyitem_TableRow_TableHeader] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TableRow_TableHeader] = [
AscDFH.historyitem_TableRow_TableHeader, AscDFH.historyitem_TableRow_TableHeader,
AscDFH.historyitem_TableRow_Pr AscDFH.historyitem_TableRow_Pr
]; ];
AscDFH.tablerowChangesRelationMap[AscDFH.historyitem_TableRow_Pr] = [ AscDFH.changesRelationMap[AscDFH.historyitem_TableRow_Pr] = [
AscDFH.historyitem_TableRow_Before, AscDFH.historyitem_TableRow_Before,
AscDFH.historyitem_TableRow_After, AscDFH.historyitem_TableRow_After,
AscDFH.historyitem_TableRow_CellSpacing, AscDFH.historyitem_TableRow_CellSpacing,
......
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