Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[PE][SSE] Fix custom bullets

Browse source
This commit is contained in:
Julia Radzhabova 2022-05-13 12:56:47 +03:00
parent 5ab9ea3550
commit fd386eea95
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -538,7 +538,7 @@ define([
rec.get('data').subtype = 0x1000; rec.get('data').subtype = 0x1000;
rec.set('drawdata', {type: type, char: symbol, specialFont: bullet.asc_getSpecialFont()}); rec.set('drawdata', {type: type, char: symbol, specialFont: bullet.asc_getSpecialFont()});
rec.set('tip', ''); rec.set('tip', '');
this.updateBulletTip(this.toolbar.mnuMarkersPicker.dataViewItems[8], ''); this.toolbar.mnuMarkersPicker.dataViewItems && this.updateBulletTip(this.toolbar.mnuMarkersPicker.dataViewItems[8], '');
drawDefBullet = false; drawDefBullet = false;
idx = 8; idx = 8;
} }
@ -548,7 +548,7 @@ define([
rec.get('data').subtype = 0x1000; rec.get('data').subtype = 0x1000;
rec.set('drawdata', {type: type, imageId: id}); rec.set('drawdata', {type: type, imageId: id});
rec.set('tip', ''); rec.set('tip', '');
this.updateBulletTip(this.toolbar.mnuMarkersPicker.dataViewItems[8], ''); this.toolbar.mnuMarkersPicker.dataViewItems && this.updateBulletTip(this.toolbar.mnuMarkersPicker.dataViewItems[8], '');
drawDefBullet = false; drawDefBullet = false;
idx = 8; idx = 8;
} }
@ -595,7 +595,7 @@ define([
rec.get('data').subtype = 8; rec.get('data').subtype = 8;
rec.set('drawdata', this.toolbar._markersArr[8]); rec.set('drawdata', this.toolbar._markersArr[8]);
rec.set('tip', this.toolbar.tipMarkersDash); rec.set('tip', this.toolbar.tipMarkersDash);
this.updateBulletTip(this.toolbar.mnuMarkersPicker.dataViewItems[8], this.toolbar.tipMarkersDash); this.toolbar.mnuMarkersPicker.dataViewItems && this.updateBulletTip(this.toolbar.mnuMarkersPicker.dataViewItems[8], this.toolbar.tipMarkersDash);
} }
} }
}, },

6
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -2143,7 +2143,7 @@ define([
rec.set('subtype', 0x1000); rec.set('subtype', 0x1000);
rec.set('drawdata', {type: bullettype, char: symbol, specialFont: bullet.asc_getSpecialFont()}); rec.set('drawdata', {type: bullettype, char: symbol, specialFont: bullet.asc_getSpecialFont()});
rec.set('tip', ''); rec.set('tip', '');
this.updateBulletTip(documentHolder.paraBulletsPicker.dataViewItems[7], ''); documentHolder.paraBulletsPicker.dataViewItems && this.updateBulletTip(documentHolder.paraBulletsPicker.dataViewItems[7], '');
drawDefBullet = false; drawDefBullet = false;
} }
@ -2154,7 +2154,7 @@ define([
rec.set('subtype', 0x1000); rec.set('subtype', 0x1000);
rec.set('drawdata', {type: bullettype, imageId: id}); rec.set('drawdata', {type: bullettype, imageId: id});
rec.set('tip', ''); rec.set('tip', '');
this.updateBulletTip(documentHolder.paraBulletsPicker.dataViewItems[7], ''); documentHolder.paraBulletsPicker.dataViewItems && this.updateBulletTip(documentHolder.paraBulletsPicker.dataViewItems[7], '');
drawDefBullet = false; drawDefBullet = false;
} }
} }
@ -2165,7 +2165,7 @@ define([
defrec.set('subtype', 8); defrec.set('subtype', 8);
defrec.set('drawdata', documentHolder._markersArr[7]); defrec.set('drawdata', documentHolder._markersArr[7]);
defrec.set('tip', documentHolder.tipMarkersDash); defrec.set('tip', documentHolder.tipMarkersDash);
this.updateBulletTip(documentHolder.paraBulletsPicker.dataViewItems[7], documentHolder.tipMarkersDash); documentHolder.paraBulletsPicker.dataViewItems && this.updateBulletTip(documentHolder.paraBulletsPicker.dataViewItems[7], documentHolder.tipMarkersDash);
} }
} else if (elType == Asc.c_oAscTypeSelectElement.Paragraph) { } else if (elType == Asc.c_oAscTypeSelectElement.Paragraph) {
documentHolder.pmiTextAdvanced.textInfo = selectedObjects[i].asc_getObjectValue(); documentHolder.pmiTextAdvanced.textInfo = selectedObjects[i].asc_getObjectValue();