Commit 795e8617 authored by SergeyLuzyanin's avatar SergeyLuzyanin

fix Bug 35087

parent df32de80
......@@ -260,15 +260,6 @@ var editor;
return new AscCommon.asc_CListType(AscFormat.fGetListTypeFromBullet(oParaPr && oParaPr.Bullet));
};
spreadsheet_api.prototype.asc_setListType = function(type, subtype){
var ws = this.wb.getWorksheet();
var oParaPr;
if (ws && ws.objectRender && ws.objectRender.controller) {
ws.objectRender.setListType(type, subtype);
}
};
spreadsheet_api.prototype.asc_setLocale = function(val) {
if (!this.isLoadFullApi) {
this.tmpLocale = val;
......@@ -2670,9 +2661,10 @@ var editor;
spreadsheet_api.prototype.asc_setListType = function (type, subtype) {
var t = this;
if(type === 0){
var sNeedFont = AscFormat.fGetFontByNumInfo(type, subtype);
if(typeof sNeedFont === "string" && sNeedFont.length > 0){
var t = this, fonts = {};
fonts["Wingdings"] = 1;
fonts[sNeedFont] = 1;
t._loadFonts(fonts, function() {t.asc_setListType2(type, subtype);});
}
else{
......
......@@ -10905,6 +10905,35 @@ function ApplyPresetToChartSpace(oChartSpace, aPreset, bCreate){
return ListType;
}
function fGetFontByNumInfo(Type, SubType){
if(SubType >= 0){
if(Type === 0){
switch(SubType)
{
case 0:
case 1:
{
return "Arial";
}
case 2:
{
return "Courier New";
}
case 3:
case 4:
case 5:
case 6:
case 7:
{
return "Wingdings";
}
}
}
}
return null;
}
function fGetPresentationBulletByNumInfo(NumInfo){
var bullet = new AscFormat.CBullet();
if(NumInfo.SubType < 0)
......@@ -11111,5 +11140,6 @@ function ApplyPresetToChartSpace(oChartSpace, aPreset, bCreate){
window['AscFormat'].CreateBlipFillUniFillFromUrl = CreateBlipFillUniFillFromUrl;
window['AscFormat'].fGetListTypeFromBullet = fGetListTypeFromBullet;
window['AscFormat'].fGetPresentationBulletByNumInfo = fGetPresentationBulletByNumInfo;
window['AscFormat'].fGetFontByNumInfo = fGetFontByNumInfo;
window['AscFormat'].CreateBlipFillRasterImageId = CreateBlipFillRasterImageId;
})(window);
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