delete _labels_above_angle, _labels_specific_align

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51860 954022d7-b5bf-4e40-9824-e11837661b57

Common/Charts/libraries/OfficeExcel.bar.js

@@ -548,10 +548,10 @@
                                         x + hmargin + (barWidth / 2),
                                         yPos,
                                         OfficeExcel.number_format(this, OfficeExcel.num_round(this.data[i]),this._otherProps._units_pre,this._otherProps._units_post),
-                                        this._otherProps._labels_above_angle ? 'bottom' : null,
-                                        this._otherProps._labels_above_angle ? (this._otherProps._labels_above_angle > 0 && (this._otherProps._xaxispos != 'top') ? 'right' : 'left') : 'center',
                                         null,
-                                        this._otherProps._labels_above_angle,
+                                        'center',
+                                        null,
+                                        null,
 										null,
 										bold,
 										null,
@@ -1338,9 +1338,9 @@
 							//OfficeExcel.number_format(this, OfficeExcel.num_round(this.data[i][j]),this._otherProps._units_pre,this._otherProps._units_post),
 							value,
 							null,
-							this._otherProps._labels_above_angle ? (this._otherProps._labels_above_angle > 0 ? 'right' : 'left') : 'center',
+							'center',
+							null,
 							null,
-							this._otherProps._labels_above_angle,
 							null,
 							bold,
 							null,

Common/Charts/libraries/OfficeExcel.chartProperties.js

@@ -85,8 +85,6 @@ OfficeExcel.OtherProps = function()
     this._labels = [];
     this._labels_above = false;
     this._labels_above_size = null;
-    this._labels_above_angle = null;
-    this._labels_specific_align = 'left';
 
     this._background_barcolor1 = 'rgba(0,0,0,0)';
     this._background_barcolor2 = 'rgba(0,0,0,0)';

Common/Charts/libraries/OfficeExcel.scatter.js

@@ -832,21 +832,7 @@
                 
                 if (typeof(labels[i]) == 'object') {
                 
-                    if (this._otherProps._labels_specific_align == 'center') {
-                        var rightEdge = 0;
-    
-                        if (labels[i+1] && labels[i+1][1]) {
-                            rightEdge = labels[i+1][1];
-                        } else {
-                            rightEdge = this._otherProps._xmax;
-                        }
-                        
-                        var offset = (rightEdge - labels[i][1]) / 2;
-    
-                    } else {
-                        var offset = 0;
-                    }
-                
+                    var offset = 0;
     
                     OfficeExcel.Text(context,
                                 font,
@@ -855,7 +841,7 @@
                                 yPos,
                                 String(labels[i][0]),
                                 valign,
-                                angle != 0 ? 'right' : (this._otherProps._labels_specific_align == 'center' ? 'center' : 'left'),
+                                angle != 0 ? 'right' : 'left',
                                 null,
                                 angle, null, bold, null, textOptions
                                );