Commit 5fcb16b7 authored by Alexey Golubev's avatar Alexey Golubev

v4.4.3

parents 9ec43aeb d6d1322e
......@@ -1626,11 +1626,21 @@ CDLbl.prototype =
Get_Theme: function()
{
return this.chart.Get_Theme();
if(this.chart){
return this.chart.Get_Theme();
}
return null;
},
Get_ColorMap: function()
{
return this.chart.Get_ColorMap();
if(this.chart){
return this.chart.Get_ColorMap();
}
else {
return AscFormat.G_O_DEFAULT_COLOR_MAP;
}
},
Get_AbsolutePage: function()
......
......@@ -3635,6 +3635,15 @@ CUniFill.prototype =
if(unifill.fill!=null)
{
this.fill = unifill.fill.createDuplicate();
if(this.fill.type === c_oAscFill.FILL_TYPE_PATT){
var _patt_fill = this.fill;
if(!_patt_fill.fgClr){
_patt_fill.setFgColor(CreateUniColorRGB(0, 0, 0));
}
if(!_patt_fill.bgClr){
_patt_fill.bgClr = CreateUniColorRGB(255, 255, 255);
}
}
}
if(unifill.transparent != null)
{
......
......@@ -499,7 +499,7 @@ ChangeAdjState.prototype =
{
if(this.drawingObjects.isViewMode() === false)
{
var trackObjects = this.drawingObjects.arrTrackObjects;
var trackObjects = [].concat(this.drawingObjects.arrTrackObjects);
var drawingObjects = this.drawingObjects;
this.drawingObjects.checkSelectedObjectsAndCallback(function()
{
......
......@@ -830,6 +830,9 @@
};
baseEditorsApi.prototype.asc_onOpenChartFrame = function()
{
if(this.isMobileVersion){
return;
}
this.isOpenedChartFrame = true;
};
baseEditorsApi.prototype.asc_onCloseChartFrame = function()
......
......@@ -52,7 +52,12 @@ AscDFH.drawingsConstructorsMap[AscDFH.historyitem_Comment_Change] = CCommentData
AscDFH.drawingsChangesMap[AscDFH.historyitem_Comment_Position] = function(oClass, value){oClass.x = value.a; oClass.y = value.b;};
AscDFH.drawingsChangesMap[AscDFH.historyitem_Comment_Change] = function(oClass, value){oClass.Data = value;};
AscDFH.drawingsChangesMap[AscDFH.historyitem_Comment_Change] = function(oClass, value){
oClass.Data = value;
if(value){
editor.sync_ChangeCommentData(oClass.Id, value);
}
};
AscDFH.drawingsChangesMap[AscDFH.historyitem_Comment_TypeInfo] = function(oClass, value){oClass.m_oTypeInfo = value;};
function ParaComment(Start, Id)
......
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