баг компиляцией прозрачности

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

Common/Drawings/Format/Shape.js

@@ -883,7 +883,7 @@ CShape.prototype =
                     var hierarchy = this.getHierarchy();
                     for (var i = 0; i < hierarchy.length; ++i) {
                         if (isRealObject(hierarchy[i]) && isRealObject(hierarchy[i].spPr) && isRealObject(hierarchy[i].spPr.Fill) && isRealNumber(hierarchy[i].spPr.Fill.transparent)) {
-                            this.compiledTransparent = this.spPr.Fill.transparent;
+                            this.compiledTransparent = hierarchy[i].spPr.Fill.transparent;
                             break;
                         }
 
@@ -894,7 +894,7 @@ CShape.prototype =
                 var hierarchy = this.getHierarchy();
                 for (var i = 0; i < hierarchy.length; ++i) {
                     if (isRealObject(hierarchy[i]) && isRealObject(hierarchy[i].spPr) && isRealObject(hierarchy[i].spPr.Fill) && isRealNumber(hierarchy[i].spPr.Fill.transparent)) {
-                        this.compiledTransparent = this.spPr.Fill.transparent;
+                        this.compiledTransparent = hierarchy[i].spPr.Fill.transparent;
                         break;
                     }
 

PowerPoint/api.js

@@ -70,6 +70,7 @@ function asc_docs_api(name)
     this.isPageBreakBefore = false;
     this.isKeepLinesTogether = false;
     this.isPresentationEditor = true;
+    this.bAlignBySelected     = true;
 
     this.isMobileVersion = false;
     this.isPaintFormat = false;
@@ -1787,6 +1788,11 @@ asc_docs_api.prototype.FontSizeOut = function()
     this.WordControl.m_oLogicDocument.Paragraph_IncDecFontSize(false);
 }
 
+asc_docs_api.prototype.put_AlignBySelect = function(val)
+{
+    this.bAlignBySelected = val;
+}
+
 /*callbacks*/
 asc_docs_api.prototype.sync_BoldCallBack = function(isBold){
 	this.asc_fireCallback("asc_onBold",isBold);