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

Word/Editor/GraphicObjects/GraphicObjects.js

@@ -1475,6 +1475,8 @@ CGraphicObjects.prototype =
         if(!docContent.Is_HdrFtr())
         {
 
+            if(!page)
+                return ret;
             a = [page.behindDocObjects, page.wrappingObjects, page.beforeTextObjects];
 
         }
@@ -3268,6 +3270,15 @@ CGraphicObjects.prototype =
     {
         if(!object.DocumentContent.Is_HdrFtr())
         {
+            if(!this.graphicPages[pageIndex])
+            {
+                this.graphicPages[pageIndex] = new CGraphicPage(pageIndex, this);
+                for(var z = 0; z < pageIndex; ++z)
+                {
+                    if(this.graphicPages[z])
+                        this.graphicPages[z] = new CGraphicPage(z, this);
+                }
+            }
             var page = this.graphicPages[pageIndex];
             var array_type = object.getDrawingArrayType();
             switch(array_type)

Word/Editor/GraphicObjects/ObjectTypes/Chart.js

@@ -119,6 +119,46 @@ CChartAsGroup.prototype =
         }
     },
 
+    documentGetAllFontNames: function(AllFonts)
+    {
+        if(isRealObject(this.chartTitle))
+        {
+            this.chartTitle.getAllFonts(AllFonts);
+        }
+
+        if(isRealObject(this.vAxisTitle))
+        {
+            this.vAxisTitle.getAllFonts(AllFonts);
+        }
+
+        if(isRealObject(this.hAxisTitle))
+        {
+            this.hAxisTitle.getAllFonts(AllFonts);
+        }
+        this.chart.legend && this.chart.legend.font && typeof  this.chart.legend.font.name === "string"
+            && this.chart.legend.font.name !== "" && (AllFonts[this.chart.legend.font.name] = true);
+    },
+
+    documentCreateFontMap: function(AllFonts)
+    {
+        if(isRealObject(this.chartTitle))
+        {
+            this.chartTitle.getAllFonts(AllFonts);
+        }
+
+        if(isRealObject(this.vAxisTitle))
+        {
+            this.vAxisTitle.getAllFonts(AllFonts);
+        }
+
+        if(isRealObject(this.hAxisTitle))
+        {
+            this.hAxisTitle.getAllFonts(AllFonts);
+        }
+        this.chart.legend && this.chart.legend.font && typeof  this.chart.legend.font.name === "string"
+            && this.chart.legend.font.name !== "" && (AllFonts[this.chart.legend.font.name] = true);
+    },
+
     setSizes: function(posX, posY, w, h, flipH, flipV)
     {
         var data = {};

Word/Editor/GraphicObjects/ObjectTypes/ChartTitle.js

@@ -52,6 +52,14 @@ CChartTitle.prototype =
         return CLASS_TYPE_CHART_TITLE;
     },
 
+    getAllFonts: function(AllFonts)
+    {
+        if(this.txBody && this.txBody.content)
+        {
+            this.txBody.content.Document_Get_AllFontNames(AllFonts);
+        }
+    },
+
     Get_Id: function()
     {
         return this.Id;