Commit bd6b2b7e authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov

Дефолтные размеры шрифтов диаграммы(из Excel)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@47370 954022d7-b5bf-4e40-9824-e11837661b57
parent 0f455bc0
...@@ -139,10 +139,10 @@ function CChartData(bWordContext, chart) { ...@@ -139,10 +139,10 @@ function CChartData(bWordContext, chart) {
subTitle: "", subTitle: "",
bDefaultTitle: false, bDefaultTitle: false,
font: { font: {
name: "Arial", name: "Calibri",
size: 12, size: 18,
color: "#000000", color: "#000000",
bold: 0, bold: 1,
italic: 0, italic: 0,
underline: 0 underline: 0
} }
...@@ -158,16 +158,16 @@ function CChartData(bWordContext, chart) { ...@@ -158,16 +158,16 @@ function CChartData(bWordContext, chart) {
bShow: true, bShow: true,
bGrid: true, bGrid: true,
titleFont: { titleFont: {
name: "Arial", name: "Calibri",
size: 12, size: 10,
color: "#000000", color: "#000000",
bold: 0, bold: 1,
italic: 0, italic: 0,
underline: 0 underline: 0
}, },
labelFont: { labelFont: {
name: "Arial", name: "Calibri",
size: 12, size: 10,
color: "#000000", color: "#000000",
bold: 0, bold: 0,
italic: 0, italic: 0,
...@@ -180,16 +180,16 @@ function CChartData(bWordContext, chart) { ...@@ -180,16 +180,16 @@ function CChartData(bWordContext, chart) {
bShow: true, bShow: true,
bGrid: true, bGrid: true,
titleFont: { titleFont: {
name: "Arial", name: "Calibri",
size: 12, size: 10,
color: "#000000", color: "#000000",
bold: 0, bold: 1,
italic: 0, italic: 0,
underline: 0 underline: 0
}, },
labelFont: { labelFont: {
name: "Arial", name: "Calibri",
size: 12, size: 10,
color: "#000000", color: "#000000",
bold: 0, bold: 0,
italic: 0, italic: 0,
...@@ -201,8 +201,8 @@ function CChartData(bWordContext, chart) { ...@@ -201,8 +201,8 @@ function CChartData(bWordContext, chart) {
bShow: true, bShow: true,
bOverlay: false, bOverlay: false,
font: { font: {
name: "Arial", name: "Calibri",
size: 12, size: 10,
color: "#000000", color: "#000000",
bold: 0, bold: 0,
italic: 0, italic: 0,
...@@ -1305,8 +1305,9 @@ function asc_CChartHeader(object) { ...@@ -1305,8 +1305,9 @@ function asc_CChartHeader(object) {
this.font = bCopy ? new asc_CChartFont(object.font) : new asc_CChartFont(); this.font = bCopy ? new asc_CChartFont(object.font) : new asc_CChartFont();
if ( !bCopy ) { if ( !bCopy ) {
this.font.asc_setSize(14); this.font.asc_setSize(18);
} this.font.asc_setBold(1);
}
this.Properties = { this.Properties = {
title: 0, title: 0,
...@@ -1391,6 +1392,10 @@ function asc_CChartAxisX(object) { ...@@ -1391,6 +1392,10 @@ function asc_CChartAxisX(object) {
this.titleFont = bCopy ? new asc_CChartFont(object.titleFont) : new asc_CChartFont(); this.titleFont = bCopy ? new asc_CChartFont(object.titleFont) : new asc_CChartFont();
this.labelFont = bCopy ? new asc_CChartFont(object.labelFont) : new asc_CChartFont(); this.labelFont = bCopy ? new asc_CChartFont(object.labelFont) : new asc_CChartFont();
if ( !bCopy ) {
this.titleFont.asc_setBold(1);
}
this.Properties = { this.Properties = {
title: 0, title: 0,
bDefaultTitle: 1, bDefaultTitle: 1,
...@@ -1492,6 +1497,10 @@ function asc_CChartAxisY(object) { ...@@ -1492,6 +1497,10 @@ function asc_CChartAxisY(object) {
this.titleFont = bCopy ? new asc_CChartFont(object.titleFont) : new asc_CChartFont(); this.titleFont = bCopy ? new asc_CChartFont(object.titleFont) : new asc_CChartFont();
this.labelFont = bCopy ? new asc_CChartFont(object.labelFont) : new asc_CChartFont(); this.labelFont = bCopy ? new asc_CChartFont(object.labelFont) : new asc_CChartFont();
if ( !bCopy ) {
this.titleFont.asc_setBold(1);
}
this.Properties = { this.Properties = {
title: 0, title: 0,
bDefaultTitle: 1, bDefaultTitle: 1,
...@@ -1778,8 +1787,8 @@ function asc_CChartFont(object) { ...@@ -1778,8 +1787,8 @@ function asc_CChartFont(object) {
var bCopy = isObject(object); var bCopy = isObject(object);
this.name = bCopy ? object.name : "Arial"; this.name = bCopy ? object.name : "Calibri";
this.size = bCopy ? object.size : 12; this.size = bCopy ? object.size : 10;
this.color = bCopy ? object.color : "#000000"; this.color = bCopy ? object.color : "#000000";
this.bold = bCopy ? object.bold : 0; this.bold = bCopy ? object.bold : 0;
......
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