Commit 95697084 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

refactoring

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49861 954022d7-b5bf-4e40-9824-e11837661b57
parent ab64cc33
...@@ -212,7 +212,6 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -212,7 +212,6 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
asc_CheckGuiControlColors : function() { asc_CheckGuiControlColors : function() {
// потом реализовать проверку на то, что нужно ли посылать // потом реализовать проверку на то, что нужно ли посылать
var _theme = this.wbModel.theme;
var arr_colors = new Array(10); var arr_colors = new Array(10);
var _count = arr_colors.length; var _count = arr_colors.length;
......
...@@ -6634,7 +6634,7 @@ Range.prototype.getVerticalText=function(){ ...@@ -6634,7 +6634,7 @@ Range.prototype.getVerticalText=function(){
return g_nVerticalTextAngle == col.xfs.align.angle; return g_nVerticalTextAngle == col.xfs.align.angle;
} }
return g_nVerticalTextAngle == g_oDefaultAlign.angle; return g_nVerticalTextAngle == g_oDefaultAlign.angle;
}; }
Range.prototype.hasMerged=function(){ Range.prototype.hasMerged=function(){
var oThis = this; var oThis = this;
var oRes = null; var oRes = null;
......
...@@ -5054,11 +5054,6 @@ ...@@ -5054,11 +5054,6 @@
var aFormulaIntersection = arFormulaTmp.intersection(this.visibleRange); var aFormulaIntersection = arFormulaTmp.intersection(this.visibleRange);
if (aFormulaIntersection) { if (aFormulaIntersection) {
var drawLeftSideFormula = aFormulaIntersection.c1 === arFormulaTmp.c1;
var drawRightSideFormula = aFormulaIntersection.c2 === arFormulaTmp.c2;
var drawTopSideFormula = aFormulaIntersection.r1 === arFormulaTmp.r1;
var drawBottomSideFormula = aFormulaIntersection.r2 === arFormulaTmp.r2;
var xFormula1 = this.cols[aFormulaIntersection.c1].left - offsetX; var xFormula1 = this.cols[aFormulaIntersection.c1].left - offsetX;
var xFormula2 = this.cols[aFormulaIntersection.c2].left + this.cols[aFormulaIntersection.c2].width - offsetX; var xFormula2 = this.cols[aFormulaIntersection.c2].left + this.cols[aFormulaIntersection.c2].width - offsetX;
var yFormula1 = this.rows[aFormulaIntersection.r1].top - offsetY; var yFormula1 = this.rows[aFormulaIntersection.r1].top - offsetY;
......
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