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

add 3d charts in word

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@67928 954022d7-b5bf-4e40-9824-e11837661b57
parent 921fb8a5
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
"../../Word/Drawing/translations.js", "../../Word/Drawing/translations.js",
"../../Common/Charts/charts.js", "../../Common/Charts/charts.js",
"../../Common/Charts/ChartsDrawer.js", "../../Common/Charts/ChartsDrawer.js",
"../../Common/Charts/3DTransformation.js",
"../../Common/Charts/DrawingArea.js", "../../Common/Charts/DrawingArea.js",
"../../Common/Charts/DrawingObjects.js", "../../Common/Charts/DrawingObjects.js",
"../../Common/NumFormat.js", "../../Common/NumFormat.js",
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
"../../Word/Drawing/translations.js", "../../Word/Drawing/translations.js",
"../../Common/Charts/charts.js", "../../Common/Charts/charts.js",
"../../Common/Charts/ChartsDrawer.js", "../../Common/Charts/ChartsDrawer.js",
"../../Common/Charts/3DTransformation.js",
"../../Common/Charts/DrawingArea.js", "../../Common/Charts/DrawingArea.js",
"../../Common/Charts/DrawingObjects.js", "../../Common/Charts/DrawingObjects.js",
"../../Common/NumFormat.js", "../../Common/NumFormat.js",
......
...@@ -2493,7 +2493,7 @@ CChartsDrawer.prototype = ...@@ -2493,7 +2493,7 @@ CChartsDrawer.prototype =
var chart = chartSpace && chartSpace.chart ? chartSpace.chart.plotArea.chart: null; var chart = chartSpace && chartSpace.chart ? chartSpace.chart.plotArea.chart: null;
var typeChart = chart ? chart.getObjectType() : null; var typeChart = chart ? chart.getObjectType() : null;
if(isTurnOn3DCharts && excelApi && chartSpace && chartSpace.chart.view3D && chartSpace.chart.view3D.rAngAx && ((typeChart === historyitem_type_BarChart && chart && chart.barDir !== BAR_DIR_BAR) /*|| (typeChart === historyitem_type_LineChart) || (typeChart === historyitem_type_BarChart && chart.barDir === BAR_DIR_BAR) || (typeChart === historyitem_type_AreaChart) || (typeChart === historyitem_type_PieChart)*/)) if(isTurnOn3DCharts && chartSpace && chartSpace.chart.view3D && chartSpace.chart.view3D.rAngAx && ((typeChart === historyitem_type_BarChart && chart && chart.barDir !== BAR_DIR_BAR) /*|| (typeChart === historyitem_type_LineChart) || (typeChart === historyitem_type_BarChart && chart.barDir === BAR_DIR_BAR) || (typeChart === historyitem_type_AreaChart) || (typeChart === historyitem_type_PieChart)*/))
{ {
res = true; res = true;
} }
......
...@@ -275,6 +275,7 @@ ...@@ -275,6 +275,7 @@
<!--Drawings --> <!--Drawings -->
<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/charts.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/charts.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/ChartsDrawer.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/ChartsDrawer.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/3DTransformation.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/DrawingArea.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/DrawingArea.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/DrawingObjects.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/DrawingObjects.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/NumFormat.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Common/NumFormat.js"></script>
......
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