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

правка для бага №20455

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49810 954022d7-b5bf-4e40-9824-e11837661b57
parent 7cfdc01f
......@@ -2467,6 +2467,8 @@ function getMaxPropertiesText(context, font, text)
var objOptions;
for(var i = 0; i < text.length; i++)
{
if((text[i]).toString() == '')
continue;
var lengthText = context.measureText((text[i]).toString(),0);
if(lengthText.width > maxWord)
{
......@@ -2547,9 +2549,14 @@ function calculateAngleText(labels)
for(var i = 0; i < labels.length; i++)
{
//если больше максимума - обрезаем и ставим ...
labels[i] = cutLabels(maxWidthAxisLabels, labels[i]);
optionText = context.measureText(labels[i],0);
result[i] = optionText.width;
if(labels[i] == "")
result[i] = 0;
else
{
labels[i] = cutLabels(maxWidthAxisLabels, labels[i]);
optionText = context.measureText(labels[i],0);
result[i] = optionText.width;
}
}
//угол в дефолте
result.angle = 45;
......@@ -2567,7 +2574,7 @@ function cutLabels(maxWidthAxisLabels, label)
var context = OfficeExcel.drawingCtxCharts;
var widthPoins = context.measureText("...",0).width;
label = label.toString();
if(maxWidthAxisLabels && context.measureText(label,0).width > maxWidthAxisLabels)
if(maxWidthAxisLabels && label != "" && context.measureText(label,0).width > maxWidthAxisLabels)
{
var newLabel = label;
while((context.measureText(newLabel,0).width + widthPoins) >= maxWidthAxisLabels && newLabel.length > 1)
......
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