Commit 04fd2b05 authored by SergeyLuzyanin's avatar SergeyLuzyanin

fix Bug 34643; fix bug with vertical text align in presentations; fix bug with...

fix Bug 34643; fix bug with vertical text align in presentations; fix bug with undo after remove chart title;
parent 1fbcd293
......@@ -2252,7 +2252,9 @@ CChartSpace.prototype.Refresh_RecalcData2 = function(pageIndex, object)
}
else
{
var bOldRecalculateRef = this.recalcInfo.recalculateReferences;
this.setRecalculateInfo();
this.recalcInfo.recalculateReferences = bOldRecalculateRef;
}
this.addToRecalculate();
};
......@@ -2333,6 +2335,10 @@ CChartSpace.prototype.getAllContents = function()
{
};
CChartSpace.prototype.getAllFonts = function (allFonts) {
this.documentGetAllFontNames(allFonts);
};
CChartSpace.prototype.documentGetAllFontNames = function(allFonts)
{
allFonts["+mn-lt"] = 1;
......
......@@ -609,20 +609,29 @@
CDrawingDocContent.prototype.Recalculate = function()
{
if(this.Parent){
if(this.Parent instanceof AscFormat.CShape){
this.Parent.recalculateContent();
return;
}
else if(this.Parent && this.Parent.parent){
if(this.Parent.parent instanceof AscFormat.CShape){
this.Parent.parent.recalculateContent();
if(typeof editor !== "undefined" && editor &&
(editor.isPresentationEditor || editor.isDocumentEditor)){
if(editor.WordControl && editor.WordControl.m_oLogicDocument){
editor.WordControl.m_oLogicDocument.Recalculate();
}
}
else{
if(this.Parent){
if(this.Parent instanceof AscFormat.CShape){
this.Parent.recalculateContent();
return;
}
else if(this.Parent && this.Parent.parent){
if(this.Parent.parent instanceof AscFormat.CShape){
this.Parent.parent.recalculateContent();
return;
}
}
}
if(this.XLimit > 0){
this.Recalculate_PageDrawing();
}
}
if(this.XLimit > 0){
this.Recalculate_PageDrawing();
}
};
......
......@@ -1618,10 +1618,10 @@ CPresentation.prototype =
}, [], false, AscDFH.historydescription_Presentation_AddChart);
},
Selection_Remove: function()
Selection_Remove: function(bNoResetChartSelection)
{
if(this.Slides[this.CurPage]){
this.Slides[this.CurPage].graphicObjects.resetSelection();
this.Slides[this.CurPage].graphicObjects.resetSelection(undefined, bNoResetChartSelection);
}
},
......
......@@ -227,7 +227,7 @@ CHistory.prototype =
if ( this.Index === this.Points.length - 1 )
this.LastState = this.Document.Get_SelectionState();
this.Document.Selection_Remove();
this.Document.Selection_Remove(true);
this.Internal_RecalcData_Clear();
......@@ -281,7 +281,7 @@ CHistory.prototype =
if ( true != this.Can_Redo() )
return null;
this.Document.Selection_Remove();
this.Document.Selection_Remove(true);
var Point = this.Points[++this.Index];
......
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