Commit f21e542d authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

для opensource версии

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@52860 954022d7-b5bf-4e40-9824-e11837661b57
parent 41d18776
...@@ -2477,7 +2477,9 @@ function DrawingObjects() { ...@@ -2477,7 +2477,9 @@ function DrawingObjects() {
var api = asc["editor"]; var api = asc["editor"];
var asc_Range = asc.Range; var asc_Range = asc.Range;
var chartRender = new ChartRender(); var chartRender = null;
if( typeof ChartRender !== "undefined" )
chartRender = new ChartRender();
var worksheet = null; var worksheet = null;
var drawingCtx = null; var drawingCtx = null;
...@@ -2771,7 +2773,7 @@ function DrawingObjects() { ...@@ -2771,7 +2773,7 @@ function DrawingObjects() {
copyObject.graphicObject = obj.graphicObject; copyObject.graphicObject = obj.graphicObject;
// Series colors // Series colors
if ( copyObject.graphicObject instanceof CChartAsGroup ) { if ( typeof CChartAsGroup !== "undefined" && copyObject.graphicObject instanceof CChartAsGroup ) {
var chart = copyObject.graphicObject.chart; var chart = copyObject.graphicObject.chart;
var uniColors = chart.generateUniColors(chart.series.length); var uniColors = chart.generateUniColors(chart.series.length);
...@@ -2847,7 +2849,7 @@ function DrawingObjects() { ...@@ -2847,7 +2849,7 @@ function DrawingObjects() {
} }
// Object types // Object types
if (drawingObject.graphicObject instanceof CChartAsGroup) { if (typeof CChartAsGroup !== "undefined" && drawingObject.graphicObject instanceof CChartAsGroup) {
_this.calcChartInterval(drawingObject.graphicObject.chart); _this.calcChartInterval(drawingObject.graphicObject.chart);
drawingObject.graphicObject.drawingBase = drawingObject; drawingObject.graphicObject.drawingBase = drawingObject;
......
...@@ -114,8 +114,10 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -114,8 +114,10 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
// Режим вставки диаграмм в редакторе документов // Режим вставки диаграмм в редакторе документов
this.isChartEditor = false; this.isChartEditor = false;
this.chartStyleManager = new ChartStyleManager(); if(typeof ChartStyleManager !== "undefined")
this.chartPreviewManager = new ChartPreviewManager(); this.chartStyleManager = new ChartStyleManager();
if(typeof ChartPreviewManager !== "undefined")
this.chartPreviewManager = new ChartPreviewManager();
// Chart // Chart
this.chartTranslate = new asc_CChartTranslate(); this.chartTranslate = new asc_CChartTranslate();
......
...@@ -5664,6 +5664,7 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs, ...@@ -5664,6 +5664,7 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs,
return oThis.ReadPic(t,l, oDrawing); return oThis.ReadPic(t,l, oDrawing);
}); });
} }
/** proprietary begin **/
else if ( c_oSer_DrawingType.GraphicFrame == type ) else if ( c_oSer_DrawingType.GraphicFrame == type )
{ {
var oNewGraphicObject = new CChartAsGroup(); var oNewGraphicObject = new CChartAsGroup();
...@@ -5673,6 +5674,7 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs, ...@@ -5673,6 +5674,7 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs,
if(null != oNewGraphicObject.chart.range.interval && oNewGraphicObject.chart.range.interval.length > 0) if(null != oNewGraphicObject.chart.range.interval && oNewGraphicObject.chart.range.interval.length > 0)
oDrawing.graphicObject = oNewGraphicObject; oDrawing.graphicObject = oNewGraphicObject;
} }
/** proprietary end **/
else if ( c_oSer_DrawingType.pptxDrawing == type ) else if ( c_oSer_DrawingType.pptxDrawing == type )
{ {
var oGraphicObject = this.oPPTXContentLoader.ReadGraphicObject(this.stream); var oGraphicObject = this.oPPTXContentLoader.ReadGraphicObject(this.stream);
......
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