Commit 1d73a5dc authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Для shape без текста выставляем default настройки для шрифта

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51545 954022d7-b5bf-4e40-9824-e11837661b57
parent d4094da7
...@@ -5758,11 +5758,13 @@ ...@@ -5758,11 +5758,13 @@
_getSelectionInfoObject: function (bExt) { _getSelectionInfoObject: function (bExt) {
var objectInfo = new asc_CCellInfo(); var objectInfo = new asc_CCellInfo();
var defaults = this.settings.cells;
var selectionType = c_oAscSelectionType.RangeShape;
objectInfo.flags = new asc_CCellFlag(); objectInfo.flags = new asc_CCellFlag();
var graphicObjects = this.objectRender.getSelectedGraphicObjects(); var graphicObjects = this.objectRender.getSelectedGraphicObjects();
if (graphicObjects.length) if (graphicObjects.length)
objectInfo.flags.selectionType = this.objectRender.getGraphicSelectionType(graphicObjects[0].Id); selectionType = objectInfo.flags.selectionType = this.objectRender.getGraphicSelectionType(graphicObjects[0].Id);
var textPr = this.objectRender.controller.getParagraphTextPr(); var textPr = this.objectRender.controller.getParagraphTextPr();
var paraPr = this.objectRender.controller.getParagraphParaPr(); var paraPr = this.objectRender.controller.getParagraphParaPr();
...@@ -5807,6 +5809,11 @@ ...@@ -5807,6 +5809,11 @@
objectInfo.hyperlink = new asc_CHyperlink(hyperlink); objectInfo.hyperlink = new asc_CHyperlink(hyperlink);
} }
} else if (c_oAscSelectionType.RangeShape == selectionType) {
// Может быть не задано текста, поэтому выставим по умолчанию
objectInfo.font = new asc_CFont();
objectInfo.font.name = defaults.fontName;
objectInfo.font.size = defaults.fontSize;
} }
// Заливка не нужна как таковая // Заливка не нужна как таковая
......
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