Commit a7d62eb3 authored by Oleg Korshul's avatar Oleg Korshul

.

parent b804fa01
......@@ -1037,7 +1037,7 @@ function GenerateWordArtPrewiewCode()
{
oRetString += "\n\t\t{Type: \"" + aByTypes[j]['Type'] + "\", Image: \"" + oWordArtPreview.getWordArtPreview(aByTypes[j]['Image']) + "\"}" + ((j === aByTypes.length - 1) ? "" : ",");
}
oRetString += "\n\t]" + (i < (g_PresetTxWarpTypes.length - 1) ? "," : "");
oRetString += "\n\t]" + (i < (AscCommon.g_PresetTxWarpTypes.length - 1) ? "," : "");
}
oRetString += "\n];";
return oRetString;
......
......@@ -1994,7 +1994,7 @@ CChartSpace.prototype.rebuildSeriesFromAsc = function(asc_chart)
var oDPt = new AscFormat.CDPt();
oDPt.setBubble3D(false);
oDPt.setIdx(j);
ApplySpPr(oFirstSpPrPreset, oDPt, j, base_fills, bAccent1Background);
AscFormat.ApplySpPr(oFirstSpPrPreset, oDPt, j, base_fills, bAccent1Background);
series.series[i].addDPt(oDPt);
}
}
......
......@@ -9993,7 +9993,7 @@ function CorrectUniColor(asc_color, unicolor, flag)
function builder_CreateGradientStop(oUniColor, nPos){
var Gs = new AscFormat.CGs();
Gs.pos = pos;
Gs.pos = nPos;
Gs.color = oUniColor;
return Gs;
}
......
......@@ -598,11 +598,6 @@ function CGroupShape()
return this.scaleCoefficients;
};
CGroupShape.prototype.getType = function()
{
return DRAWING_OBJECT_TYPE_GROUP;
};
CGroupShape.prototype.getCompiledTransparent = function()
{
return null;
......
......@@ -123,7 +123,7 @@ BinaryCommonWriter.prototype.WriteItem = function(type, fWrite)
this.memory.WriteByte(type);
this.WriteItemWithLength(fWrite);
};
BinaryCommonWriter.prototype.WriteItemStart = function(type)
BinaryCommonWriter.prototype.WriteItemStart = function(type, fWrite)
{
this.memory.WriteByte(type);
return this.WriteItemWithLengthStart(fWrite);
......
......@@ -37,6 +37,10 @@
* @param {undefined} undefined
*/
function (window, undefined) {
var Asc = window['Asc'];
var AscCommon = window['AscCommon'];
// Import
var prot;
var c_oAscMouseMoveDataTypes = AscCommon.c_oAscMouseMoveDataTypes;
......@@ -1254,8 +1258,8 @@
this.Space = (undefined != obj.Space) ? obj.Space : null;
} else {
this.Color = CreateAscColorCustom(0, 0, 0);
this.Size = 0.5 * AscCommonWord.g_dKoef_pt_to_mm;
this.Value = AscCommonWord.border_Single;
this.Size = 0.5 * window["AscCommonWord"].g_dKoef_pt_to_mm;
this.Value = window["AscCommonWord"].border_Single;
this.Space = 0;
}
}
......@@ -1664,7 +1668,7 @@
this.Brd = (undefined != obj.Brd && null != obj.Brd) ? new asc_CParagraphBorders(obj.Brd) : null;
this.Shd = (undefined != obj.Shd && null != obj.Shd) ? new asc_CParagraphShd(obj.Shd) : null;
this.Tabs = (undefined != obj.Tabs) ? new asc_CParagraphTabs(obj.Tabs) : undefined;
this.DefaultTab = AscCommonWord.Default_Tab_Stop;
this.DefaultTab = window["AscCommonWord"].Default_Tab_Stop;
this.Locked = (undefined != obj.Locked && null != obj.Locked ) ? obj.Locked : false;
this.CanAddTable = (undefined != obj.CanAddTable ) ? obj.CanAddTable : true;
......@@ -2427,7 +2431,7 @@
},
asc_getOriginSize: function (api) {
if (AscFormat.isRealNumber(this.oleWidth) && AscFormat.isRealNumber(this.oleHeight)) {
if (window['AscFormat'].isRealNumber(this.oleWidth) && window['AscFormat'].isRealNumber(this.oleHeight)) {
return new asc_CImageSize(this.oleWidth, this.oleHeight, true);
}
var _section_select = api.WordControl.m_oLogicDocument.Get_PageSizesByDrawingObjects();
......@@ -2449,7 +2453,7 @@
}
var _image = api.ImageLoader.map_image_index[AscCommon.getFullImageSrc2(this.ImageUrl)];
if (_image != undefined && _image.Image != null && _image.Status == AscFonts.ImageLoadStatus.Complete) {
if (_image != undefined && _image.Image != null && _image.Status == window['AscFonts'].ImageLoadStatus.Complete) {
var _w = Math.max(1, _page_width - (_page_x_left_margin + _page_x_right_margin));
var _h = Math.max(1, _page_height - (_page_y_top_margin + _page_y_bottom_margin));
......
......@@ -35,6 +35,9 @@
(function(window, undefined) {
'use strict';
var Asc = window['Asc'];
var AscCommon = window['AscCommon'];
var ConnectionState = AscCommon.ConnectionState;
var c_oEditorId = AscCommon.c_oEditorId;
var c_oCloseCode = AscCommon.c_oCloseCode;
......
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