Commit 651a978d authored by Oleg Korshul's avatar Oleg Korshul

.

parent 916cbdcb
...@@ -2662,7 +2662,7 @@ function cff_size_done(cffsize) ...@@ -2662,7 +2662,7 @@ function cff_size_done(cffsize)
var internal = cffsize.internal; var internal = cffsize.internal;
if (internal != null) if (internal != null)
{ {
var funcs = cff_size_get_globals_funcs(size); var funcs = cff_size_get_globals_funcs(cffsize);
if (funcs != null) if (funcs != null)
{ {
funcs.destroy(internal.topfont); funcs.destroy(internal.topfont);
...@@ -3152,7 +3152,7 @@ function cff_face_init(stream, face, face_index, num_params, params) ...@@ -3152,7 +3152,7 @@ function cff_face_init(stream, face, face_index, num_params, params)
var cid_font_name = cff_index_get_sid_string(cff, dict.cid_font_name); var cid_font_name = cff_index_get_sid_string(cff, dict.cid_font_name);
/* do we have a `/FontName' for a CID-keyed font? */ /* do we have a `/FontName' for a CID-keyed font? */
if (cid_font_name != null) if (cid_font_name != null)
face.family_name = cff_strcpy(memory, cid_font_name); face.family_name = cff_strcpy(face.memory, cid_font_name);
} }
if (style_name != null) if (style_name != null)
...@@ -5820,7 +5820,7 @@ function cff_get_ros(face, registry, ordering, supplement) ...@@ -5820,7 +5820,7 @@ function cff_get_ros(face, registry, ordering, supplement)
ret.supplement = dict.cid_supplement; ret.supplement = dict.cid_supplement;
} }
return error; return ret;
} }
function cff_get_is_cid(face) function cff_get_is_cid(face)
......
...@@ -1554,7 +1554,7 @@ function T1_Get_MM_Var(face) ...@@ -1554,7 +1554,7 @@ function T1_Get_MM_Var(face)
if (error != 0) if (error != 0)
return { err: error, mm : null }; return { err: error, mm : null };
var _num_axis = master.num_axis; var _num_axis = mmaster.num_axis;
mmvar.axis = new Array(_num_axis); mmvar.axis = new Array(_num_axis);
for (var i = 0; i < _num_axis; i++) for (var i = 0; i < _num_axis; i++)
mmvar.axis[i] = new FT_Var_Axis(); mmvar.axis[i] = new FT_Var_Axis();
......
...@@ -33582,12 +33582,12 @@ function cff_size_done(cffsize) ...@@ -33582,12 +33582,12 @@ function cff_size_done(cffsize)
var internal = cffsize.internal; var internal = cffsize.internal;
if (internal != null) if (internal != null)
{ {
var funcs = cff_size_get_globals_funcs(size); var funcs = cff_size_get_globals_funcs(cffsize);
if (funcs != null) if (funcs != null)
{ {
funcs.destroy(internal.topfont); funcs.destroy(internal.topfont);
for (var i = font.num_subfonts; i > 0; i--) for (var i = internal.topfont.num_subfonts; i > 0; i--)
funcs.destroy(internal.subfonts[i - 1]); funcs.destroy(internal.subfonts[i - 1]);
} }
/* `internal' is freed by destroy_size (in ftobjs.c) */ /* `internal' is freed by destroy_size (in ftobjs.c) */
...@@ -34072,7 +34072,7 @@ function cff_face_init(stream, face, face_index, num_params, params) ...@@ -34072,7 +34072,7 @@ function cff_face_init(stream, face, face_index, num_params, params)
var cid_font_name = cff_index_get_sid_string(cff, dict.cid_font_name); var cid_font_name = cff_index_get_sid_string(cff, dict.cid_font_name);
/* do we have a `/FontName' for a CID-keyed font? */ /* do we have a `/FontName' for a CID-keyed font? */
if (cid_font_name != null) if (cid_font_name != null)
face.family_name = cff_strcpy(memory, cid_font_name); face.family_name = cff_strcpy(face.memory, cid_font_name);
} }
if (style_name != null) if (style_name != null)
...@@ -36740,7 +36740,7 @@ function cff_get_ros(face, registry, ordering, supplement) ...@@ -36740,7 +36740,7 @@ function cff_get_ros(face, registry, ordering, supplement)
ret.supplement = dict.cid_supplement; ret.supplement = dict.cid_supplement;
} }
return error; return ret;
} }
function cff_get_is_cid(face) function cff_get_is_cid(face)
...@@ -38441,7 +38441,7 @@ function T1_Get_MM_Var(face) ...@@ -38441,7 +38441,7 @@ function T1_Get_MM_Var(face)
if (error != 0) if (error != 0)
return { err: error, mm : null }; return { err: error, mm : null };
var _num_axis = master.num_axis; var _num_axis = mmaster.num_axis;
mmvar.axis = new Array(_num_axis); mmvar.axis = new Array(_num_axis);
for (var i = 0; i < _num_axis; i++) for (var i = 0; i < _num_axis; i++)
mmvar.axis[i] = new FT_Var_Axis(); mmvar.axis[i] = new FT_Var_Axis();
...@@ -162,10 +162,10 @@ BinaryCommonWriter.prototype.WriteBorder = function(border) ...@@ -162,10 +162,10 @@ BinaryCommonWriter.prototype.WriteBorder = function(border)
if (null != border.Color) if (null != border.Color)
color = border.Color; color = border.Color;
else if (null != border.Unifill) { else if (null != border.Unifill) {
var doc = editor.WordControl.m_oLogicDocument; var doc = window.editor.WordControl.m_oLogicDocument;
border.Unifill.check(doc.Get_Theme(), doc.Get_ColorMap()); border.Unifill.check(doc.Get_Theme(), doc.Get_ColorMap());
var RGBA = border.Unifill.getRGBAColor(); var RGBA = border.Unifill.getRGBAColor();
color = new AscCommonWord.CDocumentColor(RGBA.R, RGBA.G, RGBA.B); color = new window['AscCommonWord'].CDocumentColor(RGBA.R, RGBA.G, RGBA.B);
} }
if (null != color && !color.Auto) if (null != color && !color.Auto)
this.WriteColor(c_oSerBorderType.Color, color); this.WriteColor(c_oSerBorderType.Color, color);
......
This diff is collapsed.
...@@ -501,7 +501,6 @@ ...@@ -501,7 +501,6 @@
if (window.editor == undefined) if (window.editor == undefined)
{ {
window.editor = this; window.editor = this;
window.editor;
window['editor'] = window.editor; window['editor'] = window.editor;
if (window["NATIVE_EDITOR_ENJINE"]) if (window["NATIVE_EDITOR_ENJINE"])
......
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