Commit ed843602 authored by Oleg Korshul's avatar Oleg Korshul

dash in print

parent d158274a
...@@ -909,6 +909,8 @@ ...@@ -909,6 +909,8 @@
this.LastFontOriginInfo = {Name : "", Replace : null}; this.LastFontOriginInfo = {Name : "", Replace : null};
this.StartOffset = 0; this.StartOffset = 0;
this.m_bIsPenDash = false;
} }
CMetafile.prototype = CMetafile.prototype =
...@@ -945,7 +947,27 @@ ...@@ -945,7 +947,27 @@
}, },
p_dash : function(params) p_dash : function(params)
{ {
// TODO: var bIsDash = params ? true : false;
if (false == this.m_bIsPenDash && bIsDash == this.m_bIsPenDash)
return;
this.m_bIsPenDash = bIsDash;
if (!this.m_bIsPenDash)
{
this.Memory.WriteByte(CommandType.ctPenDashStyle);
this.Memory.WriteByte(0);
}
else
{
this.Memory.WriteByte(CommandType.ctPenDashStyle);
this.Memory.WriteByte(5);
this.Memory.WriteLong(params.length);
for (var i = 0; i < params.length; i++)
{
this.Memory.WriteDouble(params[i]);
}
}
}, },
// brush methods // brush methods
b_color1 : function(r, g, b, a) b_color1 : function(r, g, b, a)
......
...@@ -269,12 +269,12 @@ ...@@ -269,12 +269,12 @@
startLongAction : function() startLongAction : function()
{ {
console.log("startLongAction"); //console.log("startLongAction");
this.api.sync_StartAction(Asc.c_oAscAsyncActionType.BlockInteraction, Asc.c_oAscAsyncAction.SlowOperation); this.api.sync_StartAction(Asc.c_oAscAsyncActionType.BlockInteraction, Asc.c_oAscAsyncAction.SlowOperation);
}, },
endLongAction : function() endLongAction : function()
{ {
console.log("endLongAction"); //console.log("endLongAction");
this.api.sync_EndAction(Asc.c_oAscAsyncActionType.BlockInteraction, Asc.c_oAscAsyncAction.SlowOperation); this.api.sync_EndAction(Asc.c_oAscAsyncActionType.BlockInteraction, Asc.c_oAscAsyncAction.SlowOperation);
} }
}; };
...@@ -332,8 +332,17 @@ ...@@ -332,8 +332,17 @@
{ {
_images[_imagesArray[i]] = _imagesArray[i]; _images[_imagesArray[i]] = _imagesArray[i];
} }
window.g_asc_plugins.images_rename = _images;
AscCommon.Check_LoadingDataBeforePrepaste(window.g_asc_plugins.api, _fonts, _images, function() AscCommon.Check_LoadingDataBeforePrepaste(window.g_asc_plugins.api, _fonts, _images, function()
{ {
if (window.g_asc_plugins.api.WordControl &&
window.g_asc_plugins.api.WordControl.m_oLogicDocument &&
window.g_asc_plugins.api.WordControl.m_oLogicDocument.Reassign_ImageUrls)
{
window.g_asc_plugins.api.WordControl.m_oLogicDocument.Reassign_ImageUrls(window.g_asc_plugins.images_rename);
}
delete window.g_asc_plugins.images_rename;
window.g_asc_plugins.api.asc_Recalculate(); window.g_asc_plugins.api.asc_Recalculate();
}); });
} }
......
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