diff --git a/common/Drawings/Format/GraphicFrame.js b/common/Drawings/Format/GraphicFrame.js index e4ceeb0842cd7b7788daaf7c0839cc5260c87f4d..77b3d2697788c8b1fae972052ef4281d155d1ff0 100644 --- a/common/Drawings/Format/GraphicFrame.js +++ b/common/Drawings/Format/GraphicFrame.js @@ -776,6 +776,11 @@ CGraphicFrame.prototype.deselect = CShape.prototype.deselect; CGraphicFrame.prototype.Update_ContentIndexing = function() {}; + +CGraphicFrame.prototype.Get_TopDocumentContent = function() +{ + return null; +}; CGraphicFrame.prototype.draw = function(graphics) { diff --git a/common/Shapes/Serialize.js b/common/Shapes/Serialize.js index 91730239b271cc7bc8b92ca551122b07afaafbf0..1a55a41d50934995afa8a99de6af200fdbfb0bcb 100644 --- a/common/Shapes/Serialize.js +++ b/common/Shapes/Serialize.js @@ -2272,25 +2272,26 @@ function BinaryPPTYLoader() } } - if (null != uni_fill.fill.lin && null != uni_fill.fill.path) + + } + if (null != uni_fill.fill.lin && null != uni_fill.fill.path) + { + // ms office не открывает такие файлы. + uni_fill.fill.setPath(null); + } + + if(uni_fill.fill.colors.length < 2) + { + if(uni_fill.fill.colors.length === 1) { - // ms office не открывает такие файлы. - uni_fill.fill.setPath(null); + var oUniColor = uni_fill.fill.colors[0].color; + uni_fill.fill = new AscFormat.CSolidFill(); + uni_fill.fill.color = oUniColor; } - - if(uni_fill.fill.colors.length < 2) + else { - if(uni_fill.fill.colors.length === 1) - { - var oUniColor = uni_fill.fill.colors[0].color; - uni_fill.fill = new AscFormat.CSolidFill(); - uni_fill.fill.color = oUniColor; - } - else - { - uni_fill.fill = new AscFormat.CSolidFill(); - uni_fill.fill.color = AscFormat.CreateUniColorRGB(0, 0, 0); - } + uni_fill.fill = new AscFormat.CSolidFill(); + uni_fill.fill.color = AscFormat.CreateUniColorRGB(0, 0, 0); } }