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

правка бага 21319 - Активна иконка маркерованного списка после применения undo

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50736 954022d7-b5bf-4e40-9824-e11837661b57
parent 88b0a10b
......@@ -106,10 +106,6 @@ CChartTitle.prototype =
return isRealObject(this.txBody) ? this.txBody.isEmpty() : true;
},
setType: function(type)
{
this.type = type;
},
Get_Styles: function()
{
......@@ -1183,7 +1179,7 @@ CChartTitle.prototype =
case historyitem_AutoShapes_SetChartTitleType:
{
w.WriteBool(isRealNumber(data.newPr));
is(isRealNumber(data.newPr));
if(isRealNumber(data.newPr));
{
w.WriteLong(data.newPr);
}
......
This diff is collapsed.
......@@ -938,8 +938,32 @@ CGraphicObjects.prototype = {
}
else
{
//editor.sync_PrLineSpacingCallBack(_empty_para_pr.Spacing);
//editor.UpdateParagraphProp(_empty_para_pr);
var _empty_para_pr =
{
Ind : { Left : UnknownValue, Right : UnknownValue, FirstLine : UnknownValue },
Jc : UnknownValue,
Spacing : { Line : UnknownValue, LineRule : UnknownValue, Before : UnknownValue, After : UnknownValue, AfterAutoSpacing : UnknownValue, BeforeAutoSpacing : UnknownValue },
PageBreakBefore : UnknownValue,
KeepLines : UnknownValue,
ContextualSpacing : UnknownValue,
Shd : UnknownValue,
StyleId : -1,
NumPr : null,
Brd :
{
Between : null,
Bottom : null,
Left : null,
Right : null
},
ListType:
{
Type: -1,
SubType: -1
}
};
editor.sync_PrLineSpacingCallBack(_empty_para_pr.Spacing);
editor.UpdateParagraphProp(_empty_para_pr);
}
if(text_props != null)
......@@ -960,7 +984,19 @@ CGraphicObjects.prototype = {
}
else
{
// editor.UpdateTextPr(_empty_text_pr);
var _empty_text_pr =
{
Bold : false,
Italic : false,
Underline : false,
Strikeout : false,
FontSize : "",
FontFamily : {Index : 0, Name : ""},
VertAlign : vertalign_Baseline,
Color : { r : 0, g : 0, b : 0},
HighLight : highlight_None
};
editor.UpdateTextPr(_empty_text_pr);
}
if(image_props !== null)
......
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