(1.0.0.113): XlsxSerializerCom

чтение/запись THEMEOVERRIDE для chart

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

Common/SerializeChart.js

@@ -170,6 +170,7 @@ var c_oserct_chartspaceEXTERNALDATA = 11;
 var c_oserct_chartspacePRINTSETTINGS = 12;
 var c_oserct_chartspaceUSERSHAPES = 13;
 var c_oserct_chartspaceEXTLST = 14;
+var c_oserct_chartspaceTHEMEOVERRIDE = 15;
 
 var c_oserct_booleanVAL = 0;
 
@@ -1047,6 +1048,8 @@ BinaryChartWriter.prototype.WriteCT_ChartSpace = function (oVal) {
     // oThis.WriteCT_extLst(oCurVal);
     // });
     // }
+    if (null != oVal.themeOverride)
+	    this.bs.WriteItem(c_oserct_chartspaceTHEMEOVERRIDE, function () { window.global_pptx_content_writer.WriteTheme(oThis.memory, oVal.themeOverride); });
 }
 BinaryChartWriter.prototype.WriteSpPr = function (oVal) {
     window.global_pptx_content_writer.WriteSpPr(this.memory, oVal);
@@ -5365,6 +5368,12 @@ BinaryChartReader.prototype.ReadCT_ChartSpace = function (type, length, val, cur
         });
         // val.m_extLst = oNewVal;
     }
+    else if (c_oserct_chartspaceTHEMEOVERRIDE === type) {
+        var theme = window.global_pptx_content_loader.ReadTheme(this, this.stream);
+        if (null != theme)
+            val.setThemeOverride(theme);
+        res = c_oSerConstants.ReadUnknown;
+    }
     else
         res = c_oSerConstants.ReadUnknown;
     return res;

Excel/model/Serialize.js

@@ -6383,6 +6383,7 @@
             else if ( c_oSer_OtherType.Theme === type )
             {
                 this.wb.theme = window.global_pptx_content_loader.ReadTheme(this, this.stream);
+                res = c_oSerConstants.ReadUnknown;
             }
             else
                 res = c_oSerConstants.ReadUnknown;

Word/Editor/Serialize2.js

@@ -602,12 +602,12 @@ var c_oSer_HyperlinkType = {
     History: 4,
     DocLocation: 5,
     TgtFrame: 6
-};
-var c_oSer_ColorThemeType = {
-	Auto: 0,
-	Color: 1,
-	Tint: 2,
-	Shade: 3
+};
+var c_oSer_ColorThemeType = {
+	Auto: 0,
+	Color: 1,
+	Tint: 2,
+	Shade: 3
 };
 var ETblStyleOverrideType = {
 	tblstyleoverridetypeBand1Horz:  0,
@@ -5881,8 +5881,8 @@ function Binary_pPrReader(doc, oReadResult, stream)
 		else if( c_oSerBorderType.Value === type )
         {
             Border.Value = this.stream.GetUChar();
-        }
-		else if( c_oSerBorderType.ColorTheme === type )
+        }
+		else if( c_oSerBorderType.ColorTheme === type )
         {
 			var themeColor = {Auto: null, Color: null, Tint: null, Shade: null};
 			res = this.bcr.Read2(length, function(t, l){
@@ -5892,7 +5892,7 @@ function Binary_pPrReader(doc, oReadResult, stream)
 				Border.Color = new CDocumentColor(0, 0, 0, true);
 			var unifill = CreateThemeUnifill(themeColor.Color, themeColor.Tint, themeColor.Shade);
 			if(null != unifill)
-				Border.Unifill = unifill;
+				Border.Unifill = unifill;
         }
         else
             res = c_oSerConstants.ReadUnknown;
@@ -11963,6 +11963,7 @@ function Binary_OtherTableReader(doc, oReadResult, stream)
 		else if ( c_oSerOtherTableTypes.DocxTheme === type )
         {
 		    this.Document.theme = window.global_pptx_content_loader.ReadTheme(this, this.stream);
+		    res = c_oSerConstants.ReadUnknown;
 		}
         else
             res = c_oSerConstants.ReadUnknown;