Commit 6e76045e authored by Oleg Korshul's avatar Oleg Korshul

fix bug 34595

parent 23e1dd29
......@@ -1050,6 +1050,10 @@
put_brushTexture : function(src, mode)
{
var isLocalUse = true;
if (window["AscDesktopEditor"] && window["AscDesktopEditor"]["IsLocalFile"] && window["AscDesktopEditor"]["IsFilePrinting"])
isLocalUse = ((!window["AscDesktopEditor"]["IsLocalFile"]()) && window["AscDesktopEditor"]["IsFilePrinting"]()) ? false : true;
if (this.BrushType != MetaBrushType.Texture)
{
this.Memory.WriteByte(CommandType.ctBrushType);
......@@ -1066,7 +1070,7 @@
var _src = src;
var srcLocal = AscCommon.g_oDocumentUrls.getLocal(_src);
if (srcLocal)
if (srcLocal && isLocalUse)
{
_src = srcLocal;
}
......@@ -1287,13 +1291,17 @@
// images
drawImage : function(img, x, y, w, h)
{
var isLocalUse = true;
if (window["AscDesktopEditor"] && window["AscDesktopEditor"]["IsLocalFile"] && window["AscDesktopEditor"]["IsFilePrinting"])
isLocalUse = ((!window["AscDesktopEditor"]["IsLocalFile"]()) && window["AscDesktopEditor"]["IsFilePrinting"]()) ? false : true;
if (!window.editor)
{
// excel
this.Memory.WriteByte(CommandType.ctDrawImageFromFile);
var imgLocal = AscCommon.g_oDocumentUrls.getLocal(img);
if (imgLocal)
if (imgLocal && isLocalUse)
{
this.Memory.WriteString2(imgLocal);
}
......@@ -1324,7 +1332,7 @@
}
var srcLocal = AscCommon.g_oDocumentUrls.getLocal(_src);
if (srcLocal)
if (srcLocal && isLocalUse)
{
_src = srcLocal;
}
......
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