Commit 9f4a88af authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

печать в нативной версии, где не используется скриптовый движок шрифтов

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@61405 954022d7-b5bf-4e40-9824-e11837661b57
parent 51eef82f
...@@ -1290,9 +1290,15 @@ CMetafile.prototype = ...@@ -1290,9 +1290,15 @@ CMetafile.prototype =
var _font_info = window.g_font_infos[window.g_map_font_index[this.m_oFont.Name]]; var _font_info = window.g_font_infos[window.g_map_font_index[this.m_oFont.Name]];
var _is_face_index_no_0 = (_font_info.faceIndexR <= 0 && _font_info.faceIndexI <= 0 && _font_info.faceIndexB <= 0 && _font_info.faceIndexBI <= 0); var _is_face_index_no_0 = (_font_info.faceIndexR <= 0 && _font_info.faceIndexI <= 0 && _font_info.faceIndexB <= 0 && _font_info.faceIndexBI <= 0);
if (code < 0xFFFF && _is_face_index_no_0) if (code < 0xFFFF && (_is_face_index_no_0 || window["native"] !== undefined))
return this.FillText(x, y, String.fromCharCode(code)); return this.FillText(x, y, String.fromCharCode(code));
if (window["native"] !== undefined)
{
// TODO:
return;
}
var _old_pos = this.Memory.pos; var _old_pos = this.Memory.pos;
g_fontApplication.LoadFont(_font_info.Name, window.g_font_loader, g_oTextMeasurer.m_oManager, this.m_oFont.FontSize, Math.max(this.m_oFont.Style, 0), 72, 72); g_fontApplication.LoadFont(_font_info.Name, window.g_font_loader, g_oTextMeasurer.m_oManager, this.m_oFont.FontSize, Math.max(this.m_oFont.Style, 0), 72, 72);
...@@ -1317,6 +1323,12 @@ CMetafile.prototype = ...@@ -1317,6 +1323,12 @@ CMetafile.prototype =
}, },
tg : function(gid,x,y) tg : function(gid,x,y)
{ {
if (window["native"] !== undefined)
{
// TODO:
return;
}
var _old_pos = this.Memory.pos; var _old_pos = this.Memory.pos;
g_fontApplication.LoadFont(this.m_oFont.Name, window.g_font_loader, g_oTextMeasurer.m_oManager, this.m_oFont.FontSize, Math.max(this.m_oFont.Style, 0), 72, 72); g_fontApplication.LoadFont(this.m_oFont.Name, window.g_font_loader, g_oTextMeasurer.m_oManager, this.m_oFont.FontSize, Math.max(this.m_oFont.Style, 0), 72, 72);
......
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