Security update
This commit is contained in:
ONLYOFFICE
parent
e0923e7aa4
commit
654bd6fbf9
Binary file not shown.
|
|
@ -71,7 +71,7 @@
|
||||||
}
|
}
|
||||||
var dc = Ext.fly("header-documentcaption");
|
var dc = Ext.fly("header-documentcaption");
|
||||||
if (dc) {
|
if (dc) {
|
||||||
Ext.DomHelper.overwrite(dc, value);
|
Ext.DomHelper.overwrite(dc, Ext.htmlEncode(value));
|
||||||
}
|
}
|
||||||
return value;
|
return value;
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -67,60 +67,7 @@ function ChartStyleManager() {
|
||||||
var bReady = false;
|
var bReady = false;
|
||||||
_this.colorMap = [];
|
_this.colorMap = [];
|
||||||
_this.baseColors = [];
|
_this.baseColors = [];
|
||||||
_this.init = function (options) {
|
_this.init = function (options) {};
|
||||||
_this.colorMap = [];
|
|
||||||
var api_doc = window["editor"];
|
|
||||||
var api_sheet = window["Asc"]["editor"];
|
|
||||||
var themeColors = [];
|
|
||||||
if (api_sheet) {
|
|
||||||
themeColors = api_sheet.GuiControlColorsMap;
|
|
||||||
} else {
|
|
||||||
themeColors = getDocColors(api_doc, options);
|
|
||||||
}
|
|
||||||
function getDocColors(api, options) {
|
|
||||||
var _theme = api.WordControl.m_oLogicDocument.theme;
|
|
||||||
var _clrMap = api.WordControl.m_oLogicDocument.clrSchemeMap ? api.WordControl.m_oLogicDocument.clrSchemeMap.color_map : undefined;
|
|
||||||
var arr_colors = new Array(10);
|
|
||||||
var rgba = {
|
|
||||||
R: 0,
|
|
||||||
G: 0,
|
|
||||||
B: 0,
|
|
||||||
A: 255
|
|
||||||
};
|
|
||||||
var array_colors_types = [6, 15, 7, 16, 0, 1, 2, 3, 4, 5];
|
|
||||||
var _count = array_colors_types.length;
|
|
||||||
var color = new CUniColor();
|
|
||||||
color.color = new CSchemeColor();
|
|
||||||
for (var i = 0; i < _count; ++i) {
|
|
||||||
color.color.id = array_colors_types[i];
|
|
||||||
if (!options) {
|
|
||||||
color.Calculate(_theme, _clrMap, rgba);
|
|
||||||
} else {
|
|
||||||
color.Calculate(options.theme, options.slide, options.layout, options.master, {
|
|
||||||
R: 0,
|
|
||||||
G: 0,
|
|
||||||
B: 0,
|
|
||||||
A: 255
|
|
||||||
});
|
|
||||||
}
|
|
||||||
var _rgba = color.RGBA;
|
|
||||||
arr_colors[i] = new CColor(_rgba.R, _rgba.G, _rgba.B);
|
|
||||||
}
|
|
||||||
return arr_colors;
|
|
||||||
}
|
|
||||||
_this.colorMap[1] = ["#555555", "#9E9E9E", "#727272", "#464646", "#838383", "#C1C1C1"];
|
|
||||||
_this.colorMap[2] = [themeColors[4].get_hex(), themeColors[5].get_hex(), themeColors[6].get_hex(), themeColors[7].get_hex(), themeColors[8].get_hex(), themeColors[9].get_hex()];
|
|
||||||
_this.colorMap[3] = [themeColors[4].get_hex()];
|
|
||||||
_this.colorMap[4] = [themeColors[5].get_hex()];
|
|
||||||
_this.colorMap[5] = [themeColors[6].get_hex()];
|
|
||||||
_this.colorMap[6] = [themeColors[7].get_hex()];
|
|
||||||
_this.colorMap[7] = [themeColors[8].get_hex()];
|
|
||||||
_this.colorMap[8] = [themeColors[9].get_hex()];
|
|
||||||
for (var i = 0; i < themeColors.length; i++) {
|
|
||||||
_this.baseColors.push(themeColors[i].get_hex());
|
|
||||||
}
|
|
||||||
bReady = true;
|
|
||||||
};
|
|
||||||
_this.isReady = function () {
|
_this.isReady = function () {
|
||||||
return bReady;
|
return bReady;
|
||||||
};
|
};
|
||||||
|
|
@ -162,263 +109,7 @@ function ChartPreviewManager() {
|
||||||
previewGroups[c_oAscChartType.scatter][c_oAscChartSubType.normal] = [];
|
previewGroups[c_oAscChartType.scatter][c_oAscChartSubType.normal] = [];
|
||||||
previewGroups[c_oAscChartType.stock] = [];
|
previewGroups[c_oAscChartType.stock] = [];
|
||||||
previewGroups[c_oAscChartType.stock][c_oAscChartSubType.normal] = [];
|
previewGroups[c_oAscChartType.stock][c_oAscChartSubType.normal] = [];
|
||||||
_this.init = function (options) {
|
_this.init = function (options) {};
|
||||||
var startTime = new Date();
|
|
||||||
var api_doc = window["editor"];
|
|
||||||
var api_sheet = window["Asc"]["editor"];
|
|
||||||
var styleManager = api_doc ? api_doc.chartStyleManager : api_sheet.chartStyleManager;
|
|
||||||
var chartRender = new ChartRender(options);
|
|
||||||
var preview_w = 50,
|
|
||||||
preview_h = 50;
|
|
||||||
function createItem(value) {
|
|
||||||
return {
|
|
||||||
numFormatStr: "General",
|
|
||||||
isDateTimeFormat: false,
|
|
||||||
val: value,
|
|
||||||
isHidden: false
|
|
||||||
};
|
|
||||||
}
|
|
||||||
function fillChartData(chart) {
|
|
||||||
chart.data = [];
|
|
||||||
chart.series = [];
|
|
||||||
var uniColors = chart.generateUniColors(4);
|
|
||||||
switch (chart.type) {
|
|
||||||
case c_oAscChartType.line:
|
|
||||||
switch (chart.subType) {
|
|
||||||
case c_oAscChartSubType.normal:
|
|
||||||
var ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(2), createItem(3), createItem(2), createItem(3)];
|
|
||||||
ser.OutlineColor = uniColors[0];
|
|
||||||
chart.series.push(ser);
|
|
||||||
ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(1), createItem(2), createItem(3), createItem(2)];
|
|
||||||
ser.OutlineColor = uniColors[1];
|
|
||||||
chart.series.push(ser);
|
|
||||||
break;
|
|
||||||
case c_oAscChartSubType.stacked:
|
|
||||||
var ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(1), createItem(6), createItem(2), createItem(8)];
|
|
||||||
ser.OutlineColor = uniColors[0];
|
|
||||||
chart.series.push(ser);
|
|
||||||
ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(4), createItem(4), createItem(4), createItem(5)];
|
|
||||||
ser.OutlineColor = uniColors[1];
|
|
||||||
chart.series.push(ser);
|
|
||||||
break;
|
|
||||||
case c_oAscChartSubType.stackedPer:
|
|
||||||
var ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(2), createItem(4), createItem(2), createItem(4)];
|
|
||||||
ser.OutlineColor = uniColors[0];
|
|
||||||
chart.series.push(ser);
|
|
||||||
ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(2), createItem(2), createItem(2), createItem(2)];
|
|
||||||
ser.OutlineColor = uniColors[1];
|
|
||||||
chart.series.push(ser);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case c_oAscChartType.hbar:
|
|
||||||
var uniColorsReverse = OfficeExcel.array_reverse(uniColors);
|
|
||||||
switch (chart.subType) {
|
|
||||||
case c_oAscChartSubType.normal:
|
|
||||||
var ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(4)];
|
|
||||||
ser.OutlineColor = uniColors[0];
|
|
||||||
chart.series.push(ser);
|
|
||||||
var ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(3)];
|
|
||||||
ser.OutlineColor = uniColors[1];
|
|
||||||
chart.series.push(ser);
|
|
||||||
var ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(2)];
|
|
||||||
ser.OutlineColor = uniColors[2];
|
|
||||||
chart.series.push(ser);
|
|
||||||
var ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(1)];
|
|
||||||
ser.OutlineColor = uniColors[3];
|
|
||||||
chart.series.push(ser);
|
|
||||||
break;
|
|
||||||
case c_oAscChartSubType.stacked:
|
|
||||||
var ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(4), createItem(3), createItem(2), createItem(1)];
|
|
||||||
ser.OutlineColor = uniColors[0];
|
|
||||||
chart.series.push(ser);
|
|
||||||
ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(5), createItem(4), createItem(3), createItem(2)];
|
|
||||||
ser.OutlineColor = uniColors[1];
|
|
||||||
chart.series.push(ser);
|
|
||||||
break;
|
|
||||||
case c_oAscChartSubType.stackedPer:
|
|
||||||
var ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(7), createItem(5), createItem(3), createItem(1)];
|
|
||||||
ser.OutlineColor = uniColors[0];
|
|
||||||
chart.series.push(ser);
|
|
||||||
ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(7), createItem(6), createItem(5), createItem(4)];
|
|
||||||
ser.OutlineColor = uniColors[1];
|
|
||||||
chart.series.push(ser);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case c_oAscChartType.bar:
|
|
||||||
switch (chart.subType) {
|
|
||||||
case c_oAscChartSubType.normal:
|
|
||||||
var ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(1)];
|
|
||||||
ser.OutlineColor = uniColors[0];
|
|
||||||
chart.series.push(ser);
|
|
||||||
var ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(2)];
|
|
||||||
ser.OutlineColor = uniColors[1];
|
|
||||||
chart.series.push(ser);
|
|
||||||
var ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(3)];
|
|
||||||
ser.OutlineColor = uniColors[2];
|
|
||||||
chart.series.push(ser);
|
|
||||||
var ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(4)];
|
|
||||||
ser.OutlineColor = uniColors[3];
|
|
||||||
chart.series.push(ser);
|
|
||||||
break;
|
|
||||||
case c_oAscChartSubType.stacked:
|
|
||||||
var ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(1), createItem(2), createItem(3), createItem(4)];
|
|
||||||
ser.OutlineColor = uniColors[0];
|
|
||||||
chart.series.push(ser);
|
|
||||||
ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(2), createItem(3), createItem(4), createItem(5)];
|
|
||||||
ser.OutlineColor = uniColors[1];
|
|
||||||
chart.series.push(ser);
|
|
||||||
break;
|
|
||||||
case c_oAscChartSubType.stackedPer:
|
|
||||||
var ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(1), createItem(3), createItem(5), createItem(7)];
|
|
||||||
ser.OutlineColor = uniColors[0];
|
|
||||||
chart.series.push(ser);
|
|
||||||
ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(4), createItem(5), createItem(6), createItem(7)];
|
|
||||||
ser.OutlineColor = uniColors[1];
|
|
||||||
chart.series.push(ser);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case c_oAscChartType.pie:
|
|
||||||
var ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(3), createItem(1)];
|
|
||||||
ser.OutlineColor = uniColors[0];
|
|
||||||
chart.series.push(ser);
|
|
||||||
break;
|
|
||||||
case c_oAscChartType.area:
|
|
||||||
switch (chart.subType) {
|
|
||||||
case c_oAscChartSubType.normal:
|
|
||||||
var ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(0), createItem(8), createItem(5), createItem(6)];
|
|
||||||
ser.OutlineColor = uniColors[0];
|
|
||||||
chart.series.push(ser);
|
|
||||||
ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(0), createItem(4), createItem(2), createItem(9)];
|
|
||||||
ser.OutlineColor = uniColors[1];
|
|
||||||
chart.series.push(ser);
|
|
||||||
break;
|
|
||||||
case c_oAscChartSubType.stacked:
|
|
||||||
var ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(0), createItem(8), createItem(5), createItem(11)];
|
|
||||||
ser.OutlineColor = uniColors[0];
|
|
||||||
chart.series.push(ser);
|
|
||||||
ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(4), createItem(4), createItem(4), createItem(4)];
|
|
||||||
ser.OutlineColor = uniColors[1];
|
|
||||||
chart.series.push(ser);
|
|
||||||
break;
|
|
||||||
case c_oAscChartSubType.stackedPer:
|
|
||||||
var ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(0), createItem(4), createItem(1), createItem(16)];
|
|
||||||
ser.OutlineColor = uniColors[0];
|
|
||||||
chart.series.push(ser);
|
|
||||||
ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(4), createItem(4), createItem(4), createItem(4)];
|
|
||||||
ser.OutlineColor = uniColors[1];
|
|
||||||
chart.series.push(ser);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case c_oAscChartType.scatter:
|
|
||||||
var ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(1), createItem(5)];
|
|
||||||
ser.OutlineColor = uniColors[0];
|
|
||||||
chart.series.push(ser);
|
|
||||||
ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(2), createItem(6)];
|
|
||||||
ser.OutlineColor = uniColors[1];
|
|
||||||
chart.series.push(ser);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
var ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(3), createItem(5), createItem(7)];
|
|
||||||
ser.OutlineColor = uniColors[0];
|
|
||||||
chart.series.push(ser);
|
|
||||||
ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(10), createItem(12), createItem(14)];
|
|
||||||
ser.OutlineColor = uniColors[1];
|
|
||||||
chart.series.push(ser);
|
|
||||||
ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(1), createItem(3), createItem(5)];
|
|
||||||
ser.OutlineColor = uniColors[2];
|
|
||||||
chart.series.push(ser);
|
|
||||||
ser = new asc_CChartSeria();
|
|
||||||
ser.Val.NumCache = [createItem(8), createItem(10), createItem(12)];
|
|
||||||
ser.OutlineColor = uniColors[3];
|
|
||||||
chart.series.push(ser);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for (var chartType in previewGroups) {
|
|
||||||
var group = [];
|
|
||||||
var maxCol = 2,
|
|
||||||
maxRow = 2;
|
|
||||||
if (chartType == c_oAscChartType.stock) {
|
|
||||||
maxCol = 4;
|
|
||||||
maxRow = 3;
|
|
||||||
}
|
|
||||||
for (var style in styleManager.colorMap) {
|
|
||||||
var chart = new asc_CChart();
|
|
||||||
chart.range.interval = "Sheet1!A1:C3";
|
|
||||||
chart.xAxis.bShow = chart.xAxis.bGrid = false;
|
|
||||||
chart.yAxis.bShow = chart.yAxis.bGrid = false;
|
|
||||||
chart.legend.bShow = false;
|
|
||||||
chart.type = chartType;
|
|
||||||
chart.styleId = parseInt(style);
|
|
||||||
switch (chartType) {
|
|
||||||
case c_oAscChartType.line:
|
|
||||||
case c_oAscChartType.bar:
|
|
||||||
case c_oAscChartType.hbar:
|
|
||||||
case c_oAscChartType.area:
|
|
||||||
chart.subType = c_oAscChartSubType.normal;
|
|
||||||
fillChartData(chart);
|
|
||||||
var chartBase64 = chartRender.insertChart(chart, null, preview_w, preview_h, false, true).toDataURL();
|
|
||||||
previewGroups[chartType][c_oAscChartSubType.normal][style] = chartBase64;
|
|
||||||
chart.subType = c_oAscChartSubType.stacked;
|
|
||||||
fillChartData(chart);
|
|
||||||
var chartBase64 = chartRender.insertChart(chart, null, preview_w, preview_h, false, true).toDataURL();
|
|
||||||
previewGroups[chartType][c_oAscChartSubType.stacked][style] = chartBase64;
|
|
||||||
chart.subType = c_oAscChartSubType.stackedPer;
|
|
||||||
fillChartData(chart);
|
|
||||||
var chartBase64 = chartRender.insertChart(chart, null, preview_w, preview_h, false, true).toDataURL();
|
|
||||||
previewGroups[chartType][c_oAscChartSubType.stackedPer][style] = chartBase64;
|
|
||||||
break;
|
|
||||||
case c_oAscChartType.pie:
|
|
||||||
case c_oAscChartType.scatter:
|
|
||||||
case c_oAscChartType.stock:
|
|
||||||
chart.subType = c_oAscChartSubType.normal;
|
|
||||||
fillChartData(chart);
|
|
||||||
var chartBase64 = chartRender.insertChart(chart, null, preview_w, preview_h, false, true).toDataURL();
|
|
||||||
previewGroups[chartType][c_oAscChartSubType.normal][style] = chartBase64;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
bReady = true;
|
|
||||||
};
|
|
||||||
_this.isReady = function () {
|
_this.isReady = function () {
|
||||||
return bReady;
|
return bReady;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,214 +0,0 @@
|
||||||
Versions
|
|
||||||
========
|
|
||||||
The excanvas.original.js is the original unminified and uncompressed library. The excanvas.compressed.js has been minified by hand and
|
|
||||||
Gzip compressed.
|
|
||||||
|
|
||||||
License for excanvas.js
|
|
||||||
=======================
|
|
||||||
|
|
||||||
This license is applicable to excanvas.original.js and excanvas.compressed.js ONLY.
|
|
||||||
|
|
||||||
License
|
|
||||||
=======
|
|
||||||
|
|
||||||
Apache License
|
|
||||||
Version 2.0, January 2004
|
|
||||||
http://www.apache.org/licenses/
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
||||||
|
|
||||||
1. Definitions.
|
|
||||||
|
|
||||||
"License" shall mean the terms and conditions for use, reproduction,
|
|
||||||
and distribution as defined by Sections 1 through 9 of this document.
|
|
||||||
|
|
||||||
"Licensor" shall mean the copyright owner or entity authorized by
|
|
||||||
the copyright owner that is granting the License.
|
|
||||||
|
|
||||||
"Legal Entity" shall mean the union of the acting entity and all
|
|
||||||
other entities that control, are controlled by, or are under common
|
|
||||||
control with that entity. For the purposes of this definition,
|
|
||||||
"control" means (i) the power, direct or indirect, to cause the
|
|
||||||
direction or management of such entity, whether by contract or
|
|
||||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
||||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
||||||
|
|
||||||
"You" (or "Your") shall mean an individual or Legal Entity
|
|
||||||
exercising permissions granted by this License.
|
|
||||||
|
|
||||||
"Source" form shall mean the preferred form for making modifications,
|
|
||||||
including but not limited to software source code, documentation
|
|
||||||
source, and configuration files.
|
|
||||||
|
|
||||||
"Object" form shall mean any form resulting from mechanical
|
|
||||||
transformation or translation of a Source form, including but
|
|
||||||
not limited to compiled object code, generated documentation,
|
|
||||||
and conversions to other media types.
|
|
||||||
|
|
||||||
"Work" shall mean the work of authorship, whether in Source or
|
|
||||||
Object form, made available under the License, as indicated by a
|
|
||||||
copyright notice that is included in or attached to the work
|
|
||||||
(an example is provided in the Appendix below).
|
|
||||||
|
|
||||||
"Derivative Works" shall mean any work, whether in Source or Object
|
|
||||||
form, that is based on (or derived from) the Work and for which the
|
|
||||||
editorial revisions, annotations, elaborations, or other modifications
|
|
||||||
represent, as a whole, an original work of authorship. For the purposes
|
|
||||||
of this License, Derivative Works shall not include works that remain
|
|
||||||
separable from, or merely link (or bind by name) to the interfaces of,
|
|
||||||
the Work and Derivative Works thereof.
|
|
||||||
|
|
||||||
"Contribution" shall mean any work of authorship, including
|
|
||||||
the original version of the Work and any modifications or additions
|
|
||||||
to that Work or Derivative Works thereof, that is intentionally
|
|
||||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
||||||
or by an individual or Legal Entity authorized to submit on behalf of
|
|
||||||
the copyright owner. For the purposes of this definition, "submitted"
|
|
||||||
means any form of electronic, verbal, or written communication sent
|
|
||||||
to the Licensor or its representatives, including but not limited to
|
|
||||||
communication on electronic mailing lists, source code control systems,
|
|
||||||
and issue tracking systems that are managed by, or on behalf of, the
|
|
||||||
Licensor for the purpose of discussing and improving the Work, but
|
|
||||||
excluding communication that is conspicuously marked or otherwise
|
|
||||||
designated in writing by the copyright owner as "Not a Contribution."
|
|
||||||
|
|
||||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
||||||
on behalf of whom a Contribution has been received by Licensor and
|
|
||||||
subsequently incorporated within the Work.
|
|
||||||
|
|
||||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
||||||
this License, each Contributor hereby grants to You a perpetual,
|
|
||||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
||||||
copyright license to reproduce, prepare Derivative Works of,
|
|
||||||
publicly display, publicly perform, sublicense, and distribute the
|
|
||||||
Work and such Derivative Works in Source or Object form.
|
|
||||||
|
|
||||||
3. Grant of Patent License. Subject to the terms and conditions of
|
|
||||||
this License, each Contributor hereby grants to You a perpetual,
|
|
||||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
||||||
(except as stated in this section) patent license to make, have made,
|
|
||||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
||||||
where such license applies only to those patent claims licensable
|
|
||||||
by such Contributor that are necessarily infringed by their
|
|
||||||
Contribution(s) alone or by combination of their Contribution(s)
|
|
||||||
with the Work to which such Contribution(s) was submitted. If You
|
|
||||||
institute patent litigation against any entity (including a
|
|
||||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
||||||
or a Contribution incorporated within the Work constitutes direct
|
|
||||||
or contributory patent infringement, then any patent licenses
|
|
||||||
granted to You under this License for that Work shall terminate
|
|
||||||
as of the date such litigation is filed.
|
|
||||||
|
|
||||||
4. Redistribution. You may reproduce and distribute copies of the
|
|
||||||
Work or Derivative Works thereof in any medium, with or without
|
|
||||||
modifications, and in Source or Object form, provided that You
|
|
||||||
meet the following conditions:
|
|
||||||
|
|
||||||
(a) You must give any other recipients of the Work or
|
|
||||||
Derivative Works a copy of this License; and
|
|
||||||
|
|
||||||
(b) You must cause any modified files to carry prominent notices
|
|
||||||
stating that You changed the files; and
|
|
||||||
|
|
||||||
(c) You must retain, in the Source form of any Derivative Works
|
|
||||||
that You distribute, all copyright, patent, trademark, and
|
|
||||||
attribution notices from the Source form of the Work,
|
|
||||||
excluding those notices that do not pertain to any part of
|
|
||||||
the Derivative Works; and
|
|
||||||
|
|
||||||
(d) If the Work includes a "NOTICE" text file as part of its
|
|
||||||
distribution, then any Derivative Works that You distribute must
|
|
||||||
include a readable copy of the attribution notices contained
|
|
||||||
within such NOTICE file, excluding those notices that do not
|
|
||||||
pertain to any part of the Derivative Works, in at least one
|
|
||||||
of the following places: within a NOTICE text file distributed
|
|
||||||
as part of the Derivative Works; within the Source form or
|
|
||||||
documentation, if provided along with the Derivative Works; or,
|
|
||||||
within a display generated by the Derivative Works, if and
|
|
||||||
wherever such third-party notices normally appear. The contents
|
|
||||||
of the NOTICE file are for informational purposes only and
|
|
||||||
do not modify the License. You may add Your own attribution
|
|
||||||
notices within Derivative Works that You distribute, alongside
|
|
||||||
or as an addendum to the NOTICE text from the Work, provided
|
|
||||||
that such additional attribution notices cannot be construed
|
|
||||||
as modifying the License.
|
|
||||||
|
|
||||||
You may add Your own copyright statement to Your modifications and
|
|
||||||
may provide additional or different license terms and conditions
|
|
||||||
for use, reproduction, or distribution of Your modifications, or
|
|
||||||
for any such Derivative Works as a whole, provided Your use,
|
|
||||||
reproduction, and distribution of the Work otherwise complies with
|
|
||||||
the conditions stated in this License.
|
|
||||||
|
|
||||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
||||||
any Contribution intentionally submitted for inclusion in the Work
|
|
||||||
by You to the Licensor shall be under the terms and conditions of
|
|
||||||
this License, without any additional terms or conditions.
|
|
||||||
Notwithstanding the above, nothing herein shall supersede or modify
|
|
||||||
the terms of any separate license agreement you may have executed
|
|
||||||
with Licensor regarding such Contributions.
|
|
||||||
|
|
||||||
6. Trademarks. This License does not grant permission to use the trade
|
|
||||||
names, trademarks, service marks, or product names of the Licensor,
|
|
||||||
except as required for reasonable and customary use in describing the
|
|
||||||
origin of the Work and reproducing the content of the NOTICE file.
|
|
||||||
|
|
||||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
||||||
agreed to in writing, Licensor provides the Work (and each
|
|
||||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
||||||
implied, including, without limitation, any warranties or conditions
|
|
||||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
||||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
||||||
appropriateness of using or redistributing the Work and assume any
|
|
||||||
risks associated with Your exercise of permissions under this License.
|
|
||||||
|
|
||||||
8. Limitation of Liability. In no event and under no legal theory,
|
|
||||||
whether in tort (including negligence), contract, or otherwise,
|
|
||||||
unless required by applicable law (such as deliberate and grossly
|
|
||||||
negligent acts) or agreed to in writing, shall any Contributor be
|
|
||||||
liable to You for damages, including any direct, indirect, special,
|
|
||||||
incidental, or consequential damages of any character arising as a
|
|
||||||
result of this License or out of the use or inability to use the
|
|
||||||
Work (including but not limited to damages for loss of goodwill,
|
|
||||||
work stoppage, computer failure or malfunction, or any and all
|
|
||||||
other commercial damages or losses), even if such Contributor
|
|
||||||
has been advised of the possibility of such damages.
|
|
||||||
|
|
||||||
9. Accepting Warranty or Additional Liability. While redistributing
|
|
||||||
the Work or Derivative Works thereof, You may choose to offer,
|
|
||||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
||||||
or other liability obligations and/or rights consistent with this
|
|
||||||
License. However, in accepting such obligations, You may act only
|
|
||||||
on Your own behalf and on Your sole responsibility, not on behalf
|
|
||||||
of any other Contributor, and only if You agree to indemnify,
|
|
||||||
defend, and hold each Contributor harmless for any liability
|
|
||||||
incurred by, or claims asserted against, such Contributor by reason
|
|
||||||
of your accepting any such warranty or additional liability.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
APPENDIX: How to apply the Apache License to your work.
|
|
||||||
|
|
||||||
To apply the Apache License to your work, attach the following
|
|
||||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
|
||||||
replaced with your own identifying information. (Don't include
|
|
||||||
the brackets!) The text should be enclosed in the appropriate
|
|
||||||
comment syntax for the file format. We also recommend that a
|
|
||||||
file or class name and description of purpose be included on the
|
|
||||||
same "printed page" as the copyright notice for easier
|
|
||||||
identification within third-party archives.
|
|
||||||
|
|
||||||
Copyright [yyyy] [name of copyright owner]
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
##
|
|
||||||
## This is an example Apache .htaccess file that can be used to add the required
|
|
||||||
## Content-Encoding: header to the compressed version of the ExCanvas library.
|
|
||||||
## This .htaccess file is ONLY required for the compressed version. The
|
|
||||||
## necessary header is this:
|
|
||||||
## Content-Encoding: gzip
|
|
||||||
##
|
|
||||||
## If you are not using the compressed version, or are doing the compression
|
|
||||||
## yourself (it could for example, be built into your web server), then you
|
|
||||||
## do not need this file.
|
|
||||||
##
|
|
||||||
|
|
||||||
AddEncoding gzip .js
|
|
||||||
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
|
@ -3361,34 +3361,6 @@ function BinaryPPTYLoader() {
|
||||||
case 3:
|
case 3:
|
||||||
var _length = s.GetLong();
|
var _length = s.GetLong();
|
||||||
var _pos = s.cur;
|
var _pos = s.cur;
|
||||||
_chart = new CChartAsGroup(this.TempGroupObject);
|
|
||||||
if (g_oTableId) {
|
|
||||||
g_oTableId.m_bTurnOff = true;
|
|
||||||
}
|
|
||||||
var chart = new asc_CChart();
|
|
||||||
if (g_oTableId) {
|
|
||||||
g_oTableId.m_bTurnOff = false;
|
|
||||||
}
|
|
||||||
var _stream = new FT_Stream2();
|
|
||||||
_stream.data = s.data;
|
|
||||||
_stream.pos = s.pos;
|
|
||||||
_stream.cur = s.cur;
|
|
||||||
_stream.size = s.size;
|
|
||||||
var oBinary_ChartReader = new Binary_ChartReader(_stream, chart, _chart);
|
|
||||||
oBinary_ChartReader.ReadExternal(_length);
|
|
||||||
if (null != chart.range.interval && chart.range.interval.length > 0) {
|
|
||||||
if (_xfrm) {
|
|
||||||
if (_chart.setXfrm) {
|
|
||||||
_chart.setXfrm(_xfrm.offX, _xfrm.offY, _xfrm.extX, _xfrm.extY, _xfrm.rot, _xfrm.flipH, _xfrm.flipV);
|
|
||||||
} else {
|
|
||||||
_chart.setPosition(_xfrm.offX, _xfrm.offY);
|
|
||||||
_chart.setExtents(_xfrm.extX, _xfrm.extY);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_chart.setAscChart(chart);
|
|
||||||
} else {
|
|
||||||
_chart = null;
|
|
||||||
}
|
|
||||||
s.Seek2(_pos + _length);
|
s.Seek2(_pos + _length);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
@ -3441,19 +3413,6 @@ function BinaryPPTYLoader() {
|
||||||
case 3:
|
case 3:
|
||||||
var _length = s.GetLong();
|
var _length = s.GetLong();
|
||||||
var _pos = s.cur;
|
var _pos = s.cur;
|
||||||
if (typeof CChartAsGroup !== "undefined") {
|
|
||||||
_chart = new CChartAsGroup(this.TempMainObject);
|
|
||||||
var _stream = new FT_Stream2();
|
|
||||||
_stream.data = s.data;
|
|
||||||
_stream.pos = s.pos;
|
|
||||||
_stream.cur = s.cur;
|
|
||||||
_stream.size = s.size;
|
|
||||||
var oBinary_ChartReader = new Binary_ChartReader(_stream, _chart.chart, _chart);
|
|
||||||
oBinary_ChartReader.ReadExternal(_length);
|
|
||||||
if (null == _chart.chart.range.interval || _chart.chart.range.interval.length <= 0) {
|
|
||||||
_chart = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
s.Seek2(_pos + _length);
|
s.Seek2(_pos + _length);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
|
||||||
|
|
@ -9185,6 +9185,14 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow
|
||||||
}
|
}
|
||||||
if (null != oParaDrawing.Extent) {
|
if (null != oParaDrawing.Extent) {
|
||||||
oParaDrawing.setExtent(oParaDrawing.Extent.W, oParaDrawing.Extent.H);
|
oParaDrawing.setExtent(oParaDrawing.Extent.W, oParaDrawing.Extent.H);
|
||||||
|
var bChartDisabled = true;
|
||||||
|
if (bChartDisabled && oParaDrawing.isChart) {
|
||||||
|
delete oParaDrawing.isChart;
|
||||||
|
var Image = new WordImage(oParaDrawing, doc, doc.DrawingDocument, null);
|
||||||
|
var src = "";
|
||||||
|
Image.init(src, oParaDrawing.Extent.W, oParaDrawing.Extent.H, null);
|
||||||
|
oParaDrawing.Set_GraphicObject(Image);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (null != oParaDrawing.wrappingPolygon) {
|
if (null != oParaDrawing.wrappingPolygon) {
|
||||||
oParaDrawing.addWrapPolygon(oParaDrawing.wrappingPolygon);
|
oParaDrawing.addWrapPolygon(oParaDrawing.wrappingPolygon);
|
||||||
|
|
@ -9399,19 +9407,25 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow
|
||||||
oParaDrawing.Set_GraphicObject(grObject);
|
oParaDrawing.Set_GraphicObject(grObject);
|
||||||
} else {
|
} else {
|
||||||
if (c_oSerImageType2.Chart === type) {
|
if (c_oSerImageType2.Chart === type) {
|
||||||
var oNewGraphicObj = new CChartAsGroup();
|
var bChartDisabled = true;
|
||||||
if (g_oTableId) {
|
if (bChartDisabled) {
|
||||||
g_oTableId.m_bTurnOff = true;
|
oParaDrawing.isChart = true;
|
||||||
}
|
res = c_oSerConstants.ReadUnknown;
|
||||||
var chart = new asc_CChart();
|
} else {
|
||||||
if (g_oTableId) {
|
var oNewGraphicObj = new CChartAsGroup();
|
||||||
g_oTableId.m_bTurnOff = false;
|
if (g_oTableId) {
|
||||||
}
|
g_oTableId.m_bTurnOff = true;
|
||||||
var oBinary_ChartReader = new Binary_ChartReader(this.stream, chart, oNewGraphicObj);
|
}
|
||||||
oBinary_ChartReader.ReadExternal(length);
|
var chart = new asc_CChart();
|
||||||
if (null != chart.range.interval && chart.range.interval.length > 0) {
|
if (g_oTableId) {
|
||||||
oNewGraphicObj.setAscChart(chart);
|
g_oTableId.m_bTurnOff = false;
|
||||||
oParaDrawing.Set_GraphicObject(oNewGraphicObj);
|
}
|
||||||
|
var oBinary_ChartReader = new Binary_ChartReader(this.stream, chart, oNewGraphicObj);
|
||||||
|
oBinary_ChartReader.ReadExternal(length);
|
||||||
|
if (null != chart.range.interval && chart.range.interval.length > 0) {
|
||||||
|
oNewGraphicObj.setAscChart(chart);
|
||||||
|
oParaDrawing.Set_GraphicObject(oNewGraphicObj);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (c_oSerImageType2.AllowOverlap === type) {
|
if (c_oSerImageType2.AllowOverlap === type) {
|
||||||
|
|
|
||||||
|
|
@ -819,8 +819,6 @@ function asc_docs_api(name) {
|
||||||
g_bIsDocumentCopyPaste = true;
|
g_bIsDocumentCopyPaste = true;
|
||||||
this.DocumentReaderMode = null;
|
this.DocumentReaderMode = null;
|
||||||
this.isChartEditor = false;
|
this.isChartEditor = false;
|
||||||
this.chartStyleManager = new ChartStyleManager();
|
|
||||||
this.chartPreviewManager = new ChartPreviewManager();
|
|
||||||
this.IsLongActionCurrent = false;
|
this.IsLongActionCurrent = false;
|
||||||
this.ParcedDocument = false;
|
this.ParcedDocument = false;
|
||||||
this.isStartCoAuthoringOnEndLoad = false;
|
this.isStartCoAuthoringOnEndLoad = false;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue