Skip to content

S
sdkjs
Commit 960bf331 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov
Browse files
Options

(2.0.0.131): AVSOfficeDocxFile2 

(1.0.0.54): XlsxSerializerCom
открытие для chart текстовых настроек.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@47592 954022d7-b5bf-4e40-9824-e11837661b57
parent de3def33
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1260 additions and 57 deletions
Build/sdk_configs/webexcel.json
View file @ 960bf331
......@@ -27,6 +27,7 @@
"../Common/FontsFreeType/font_engine.js",
"../Common/FontsFreeType/FontFile.js",
"../Common/FontsFreeType/FontManager.js",
"../Common/PresentationSerializeAdapter.js",
"../Word/Drawing/Externals.js",
"../Word/Drawing/Graphics.js",
"../Word/Drawing/Metafile.js",
......
Build/sdk_configs/webword.json
View file @ 960bf331
......@@ -63,6 +63,7 @@
"../Common/FontsFreeType/font_engine.js",
"../Common/FontsFreeType/FontFile.js",
"../Common/FontsFreeType/FontManager.js",
"../Common/PresentationSerializeAdapter.js",
"../Word/Drawing/Externals.js",
"../Word/Drawing/AllFonts.js",
"../Word/Drawing/GlobalLoaders.js",
......
Common/Charts/DrawingObjects.js
View file @ 960bf331
......@@ -217,6 +217,7 @@ function CChartData(bWordContext, chart) {
_this.data = [];
_this.themeColors = [];
_this.series = [];
if ( chart ) {
for (var row = 0; row < chart.data.length; row++) {
......@@ -993,6 +994,42 @@ asc_CChart.prototype = {
asc_getChartEditorFlag: function() { return this.bChartEditor; },
asc_setChartEditorFlag: function(value) { this.bChartEditor = value; },
generateFontMap: function(oFontMap)
{
var font;
font = this.header.asc_getFont();
if(null != font)
oFontMap[font.asc_getName()] = 1;
font = this.xAxis.asc_getTitleFont();
if(null != font)
oFontMap[font.asc_getName()] = 1;
font = this.xAxis.asc_getLabelFont();
if(null != font)
oFontMap[font.asc_getName()] = 1;
font = this.yAxis.asc_getTitleFont();
if(null != font)
oFontMap[font.asc_getName()] = 1;
font = this.yAxis.asc_getLabelFont();
if(null != font)
oFontMap[font.asc_getName()] = 1;
font = this.legend.asc_getFont();
if(null != font)
oFontMap[font.asc_getName()] = 1;
for(var i = 0, length = this.series.length; i < length; ++i)
{
var seria = this.series[i];
if(null != seria)
{
font = seria.asc_getTitleFont();
if(null != font)
oFontMap[font.asc_getName()] = 1;
font = seria.asc_getLabelFont();
if(null != font)
oFontMap[font.asc_getName()] = 1;
}
}
},
rebuildSeries: function() {
var _t = this;
var bbox = _t.range.intervalObject.getBBox0();
......@@ -1674,6 +1711,7 @@ function asc_CChartSeria() {
this.Val = { Formula: null, NumCache: [] };
this.xVal = { Formula: null, NumCache: [] };
this.Tx = null;
this.TxFont = new asc_CChartFont();
this.Marker = { Size: null, Symbol: null };
this.OutlineColor = null;
this.FormatCode = "";
......@@ -1689,7 +1727,8 @@ function asc_CChartSeria() {
MarkerSymbol: 6,
OutlineColor: 7,
FormatCode: 8,
LabelFont: 9
LabelFont: 9,
TxFont: 10
};
}
......@@ -1703,6 +1742,9 @@ asc_CChartSeria.prototype = {
asc_getTitle: function() { return this.Tx; },
asc_setTitle: function(title) { this.Tx = title; },
asc_getTitleFont: function() { return this.TxFont; },
asc_setTitleFont: function(title) { this.TxFont = title; },
asc_getMarkerSize: function() { return this.Marker.Size; },
asc_setMarkerSize: function(size) { this.Marker.Size = size; },
......@@ -1716,6 +1758,9 @@ asc_CChartSeria.prototype = {
asc_getFormatCode: function() { return this.FormatCode; },
asc_setFormatCode: function(format) { this.FormatCode = format; },
asc_getLabelFont: function() { return this.LabelFont; },
asc_setLabelFont: function(format) { this.LabelFont = format; },
// For collaborative editing
getType: function() {
return UndoRedoDataTypes.ChartSeriesData;
......@@ -1732,6 +1777,7 @@ asc_CChartSeria.prototype = {
case this.Properties.XValFormula: return this.xVal.Formula; break;
case this.Properties.XValNumCache: return this.xVal.NumCache; break;
case this.Properties.Tx: return this.Tx; break;
case this.Properties.TxFont: return this.TxFont; break;
case this.Properties.MarkerSize: return this.Marker.Size; break;
case this.Properties.MarkerSymbol: return this.Marker.Symbol; break;
case this.Properties.OutlineColor: return this.OutlineColor; break;
......@@ -1747,6 +1793,7 @@ asc_CChartSeria.prototype = {
case this.Properties.XValFormula: this.xVal.Formula = value; break;
case this.Properties.XValNumCache: this.xVal.NumCache = value; break;
case this.Properties.Tx: this.Tx = value; break;
case this.Properties.TxFont: this.TxFont = value; break;
case this.Properties.MarkerSize: this.Marker.Size = value; break;
case this.Properties.MarkerSymbol: this.Marker.Symbol = value; break;
case this.Properties.OutlineColor: this.OutlineColor = value; break;
......
Common/PresentationSerializeAdapter.js 0 → 100644
View file @ 960bf331
This diff is collapsed.
Common/SerializeCommonWordExcel.js
View file @ 960bf331
This diff is collapsed.
Excel/SpreadsheetTestMenu.html
View file @ 960bf331
......@@ -99,7 +99,10 @@
<script type="text/javascript" src="apiDefines.js"></script>
<script type="text/javascript" src="api.js"></script>
<script type="text/javascript" src="menu/menu.js"></script>
<!--for presentation-->
<script type="text/javascript" src="../Common/PresentationSerializeAdapter.js"></script>
<!--for theme-->
<script type="text/javascript" src="../Common/Shapes/EditorSettings.js"></script>
<script type="text/javascript" src="../Common/Shapes/Serialize.js"></script>
......
Excel/model/Serialize.js
View file @ 960bf331
......@@ -4827,8 +4827,6 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs,
}
else if ( c_oSerWorksheetsTypes.Drawings == type )
{
if(null == oWorksheet.Drawings)
oWorksheet.Drawings = new Array();
res = this.bcr.Read1(length, function(t,l){
return oThis.ReadDrawings(t,l, oWorksheet.Drawings, oWorksheet.Id);
});
......
Excel/model/Workbook.js
View file @ 960bf331
......@@ -1361,6 +1361,7 @@ function Workbook(sUrlPath, eventsHandlers, oApi){
this.nActive = 0;
this.theme = GenerateDefaultTheme(this);
this.clrSchemeMap = GenerateDefaultColorMap();
this.DefinedNames = new Object();
this.oRealDefinedNames = new Object();
......@@ -2095,6 +2096,7 @@ function Woorksheet(wb, _index, bAddUserId, sId){
this.nColsCount = 0;
this.aGCells = new Object();// 0 based
this.aCols = new Array();// 0 based
this.Drawings = new Array();
this.oAllCol = null;
this.objForRebuldFormula = {};
this.aComments = new Array();
......@@ -2150,6 +2152,16 @@ Woorksheet.prototype.generateFontMap=function(oFontMap){
}
}
}
//пробегаемся по chart
for(var i = 0, length = this.Drawings.length; i < length; ++i)
{
var drawing = this.Drawings[i];
if(drawing.isChart())
{
var chart = drawing.chart;
chart.generateFontMap(oFontMap);
}
}
}
Woorksheet.prototype.clone=function(sNewId){
var oNewWs;
......@@ -2309,9 +2321,9 @@ Woorksheet.prototype.initPostOpen = function(){
//анализируем series
var oBounds = null;
var ws = null;
for(var j = 0; j < chart.seriesOpen.length; ++j)
for(var j = 0; j < chart.series.length; ++j)
{
var seria = chart.seriesOpen[j];
var seria = chart.series[j];
if(0 == j && null != seria && null != seria.xVal && null != seria.xVal.Formula)
{
var sRef = seria.xVal.Formula.replace(/\$/g,"");
......
Word/Editor/Serialize2.js
View file @ 960bf331
......@@ -5183,9 +5183,9 @@ function Binary_DocumentTableReader(doc, openParams, ImageMap, stream, bAllowFlo
});
oBinary_ChartReader.PostRead();
//анализируем серии заполняем data
for(var i = 0, length = chart.seriesOpen.length; i < length; ++i)
for(var i = 0, length = chart.series.length; i < length; ++i)
{
var seria = chart.seriesOpen[i];
var seria = chart.series[i];
if(null != seria)
{
if(0 == i)
......
Word/TextEditor.html
View file @ 960bf331
......@@ -154,6 +154,9 @@
<script type="text/javascript" src="../Common/SerializeCommonWordExcel.js"></script>
<script type="text/javascript" src="Editor/SerializeCommon.js"></script>
<!--for presentation-->
<script type="text/javascript" src="../Common/PresentationSerializeAdapter.js"></script>
</head>
<body id="id_body" class="block_elem" style="-moz-user-select:none;-khtml-user-select:none;user-select:none;width:100%;height:100%;background-color:#B0B0B0;overflow:hidden;position:fixed;" UNSELECTABLE="on">
<div id="id_menu" class="block_elem" style="width:100%;height:21mm;background-color:#F4F5F6;">
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7