git-svn-id:...

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

Common/Charts/DrawingObjects.js

@@ -2176,6 +2176,11 @@ function DrawingObjects() {
 			lockState: c_oAscObjectLockState.No
 		};
 
+
+        _t.getAllFonts = function(AllFonts) {
+            _t.graphicObject && _t.graphicObject.getAllFonts && _t.graphicObject.getAllFonts(AllFonts);
+        };
+
 		// Свойства
 		_t.isImage = function() {
 			return _t.graphicObject ? _t.graphicObject.isImage() : false;
@@ -2609,6 +2614,11 @@ function DrawingObjects() {
 		}
 	}
 
+    _this.getAllFonts = function(AllFonts)
+    {
+
+    },
+
     _this.getChartRender = function() {
         return chartRender;
     };

Excel/model/DrawingObjects/DrawingObjectsController.js

@@ -20,6 +20,10 @@ function DrawingObjectsController(drawingObjects)
 
 DrawingObjectsController.prototype =
 {
+    getAllFontNames: function()
+    {
+
+    },
 
     setCellFontName: function (fontName) {
         if(typeof this.curState.setCellFontName === "function")

Excel/model/DrawingObjects/Format/Chart.js

@@ -1495,16 +1495,57 @@ CChartAsGroup.prototype =
             }
         }
     },
-	
-	getChartBinary: function()
-	{
-		//       
-		return "_chart_";
-	},
-	
-	setChartBinary: function(binary)
-	{
-		//     
-	}
+
+
+    getAllFonts: 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);
+        }
+
+    },
+
+    getChartBinary: function()
+    {
+        // Записываем объект в бинарник для редактора документов
+        var w = new CMemory();
+        w.WriteBool(isRealObject(this.chartTitle));
+        if(isRealObject(this.chartTitle))
+        {
+            this.chartTitle.writeToBinary();
+        }
+
+        w.WriteBool(isRealObject(this.vAxisTitle));
+        if(isRealObject(this.vAxisTitle))
+        {
+            this.vAxisTitle.writeToBinary();
+        }
+
+        w.WriteBool(isRealObject(this.hAxisTitle));
+        if(isRealObject(this.hAxisTitle))
+        {
+            this.hAxisTitle.writeToBinary();
+        }
+
+        this.chart.Write_ToBinary2(w);
+        this.spPr.Write_ToBinary2(w);
+        return w.pos + ";" + w.GetBase64Memory();
+    },
+
+    setChartBinary: function(binary)
+    {
+        // Приводим бинарник к внутренней структуре
+    }
 };
 

Excel/model/DrawingObjects/Format/ChartTitle.js

@@ -941,5 +941,53 @@ CChartTitle.prototype =
     getInvertTransform: function()
     {
         return this.invertTransform;
+    },
+
+    getAllFonts: function(AllFonts)
+    {
+        if(this.txBody && this.txBody.content)
+        {
+            this.txBody.content.Document_Get_AllFontNames(AllFonts);
+        }
+    },
+
+    writeToBinary: function(w)
+    {
+        w.WriteBool(isRealObject(this.layout));
+        if(isRealOBject(this.layout))
+            this.layout.writeToBinary(w);
+        w.WriteBool(this.overlay);
+        this.spPr.Write_ToBinary2(w);
+        w.WriteBool(isRealObject(this.txPr));
+        if(isRealObject(this.txPr))
+            this.txPr.writeToBinary(w);
+
+        w.WriteBool(isRealObject(this.txBody));
+        if(isRealObject(this.txBody))
+            this.txBody.writeToBinary(w);
+
+    },
+
+    readFromBinary: function(r)
+    {
+        if(r.GetBool())
+        {
+            this.layout = new CChartLayout();
+            this.layout.readFromBinary(r);
+        }
+        this.overlay = r.GetBool();
+        this.spPr.Read_FromBinary2(r);
+        if(r.GetBool())
+        {
+            this.txPr = new CTextBody(this);
+            this.txPr.readFromBinary(r);
+        }
+
+        if(r.GetBool())
+        {
+            this.txBody = new CTextBody(this);
+            this.txBody.readFromBinary(r);
+        }
+
     }
 };
\ No newline at end of file

Excel/model/DrawingObjects/Format/GroupShape.js

@@ -54,6 +54,17 @@ function CGroupShape(drawingBase, drawingObjects)
 CGroupShape.prototype =
 {
 
+    getAllFonts: function(AllFonts)
+    {
+       for(var i = 0;  i< this.spTree.length; ++i)
+       {
+           if(typeof  this.spTree[i].getAllFonts === "function")
+           {
+               this.spTree[i].getAllFonts(AllFonts);
+           }
+       }
+    },
+
     Get_Id: function()
     {
         return this.Id;

Excel/model/DrawingObjects/Format/Image.js

@@ -78,6 +78,10 @@ function CImageShape(drawingBase, drawingObjects)
 
 CImageShape.prototype =
 {
+    getAllFonts: function(AllFonts)
+    {
+    },
+
     getObjectType: function()
     {
         return CLASS_TYPE_IMAGE;

Excel/model/DrawingObjects/Format/Shape.js

@@ -180,6 +180,14 @@ CShape.prototype =
         return CLASS_TYPE_SHAPE;
     },
 
+    getAllFonts: function(AllFonts)
+    {
+        if(this.txBody && this.txBody.content)
+        {
+            this.txBody.content.Document_Get_AllFontNames(AllFonts);
+        }
+    },
+
     isShape: function()
     {
         return true;

Excel/model/DrawingObjects/GlobalCounters.js

-//-----------------------------------------------------------------------------------
// Global counters
//-----------------------------------------------------------------------------------

function CIdCounter()
{
    this.m_sUserId        = null;
    this.m_bLoad          = true;
    this.m_nIdCounterLoad = 0; // Счетчик Id для загрузки
    this.m_nIdCounterEdit = 0; // Счетчик Id для работы

    this.Get_NewId = function()
    {
        if ( true === this.m_bLoad || null === this.m_sUserId )
        {
            this.m_nIdCounterLoad++;
            return ("" + this.m_nIdCounterLoad);
        }
        else
        {
            this.m_nIdCounterEdit++;
            return ("" + this.m_sUserId + "_" + this.m_nIdCounterEdit);
        }
    };

    this.Set_UserId = function(sUserId)
    {
        this.m_sUserId = sUserId;
    };

    this.Set_Load = function(bValue)
    {
        this.m_bLoad = bValue;
    };
}

var g_oIdCounter = null;

var CLASS_TYPE_TABLE_ID = 0;
var CLASS_TYPE_DOCUMENT_CONTENT = 1;
var CLASS_TYPE_SHAPE = 2;
var CLASS_TYPE_IMAGE = 3;
var CLASS_TYPE_GROUP = 4;
var CLASS_TYPE_XFRM = 5;
var CLASS_TYPE_GEOMETRY = 6;
var CLASS_TYPE_PATH = 7;
var CLASS_TYPE_PARAGRAPH = 8;
var CLASS_TYPE_TEXT_BODY = 9;
var CLASS_TYPE_TEXT_PR = 10;
var CLASS_TYPE_UNI_FILL = 11;
var CLASS_TYPE_PATTERN_FILL = 12;
var CLASS_TYPE_GRAD_FILL = 13;
var CLASS_TYPE_SOLID_FILL = 14;
var CLASS_TYPE_UNI_COLOR = 15;
var CLASS_TYPE_SCHEME_COLOR = 16;
var CLASS_TYPE_RGB_COLOR = 17;
var CLASS_TYPE_PRST_COLOR = 18;
var CLASS_TYPE_SYS_COLOR = 19;
var CLASS_TYPE_LINE = 20;
var CLASS_TYPE_CHART_AS_GROUP = 21;
var CLASS_TYPE_CHART_LEGEND = 22;
var CLASS_TYPE_CHART_TITLE = 23;
var CLASS_TYPE_COLOR_MOD = 24;
var CLASS_TYPE_LEGEND_ENTRY = 22;

var g_oTableId = null;
\ No newline at end of file
+//-----------------------------------------------------------------------------------
// Global counters
//-----------------------------------------------------------------------------------

function CIdCounter()
{
    this.m_sUserId        = null;
    this.m_bLoad          = true;
    this.m_nIdCounterLoad = 0; // Счетчик Id для загрузки
    this.m_nIdCounterEdit = 0; // Счетчик Id для работы

    this.Get_NewId = function()
    {
        if ( true === this.m_bLoad || null === this.m_sUserId )
        {
            this.m_nIdCounterLoad++;
            return ("" + this.m_nIdCounterLoad);
        }
        else
        {
            this.m_nIdCounterEdit++;
            return ("" + this.m_sUserId + "_" + this.m_nIdCounterEdit);
        }
    };

    this.Set_UserId = function(sUserId)
    {
        this.m_sUserId = sUserId;
    };

    this.Set_Load = function(bValue)
    {
        this.m_bLoad = bValue;
    };
}

var g_oIdCounter = null;

var CLASS_TYPE_TABLE_ID = 0;
var CLASS_TYPE_DOCUMENT_CONTENT = 1;
var CLASS_TYPE_SHAPE = 2;
var CLASS_TYPE_IMAGE = 3;
var CLASS_TYPE_GROUP = 4;
var CLASS_TYPE_XFRM = 5;
var CLASS_TYPE_GEOMETRY = 6;
var CLASS_TYPE_PATH = 7;
var CLASS_TYPE_PARAGRAPH = 8;
var CLASS_TYPE_TEXT_BODY = 9;
var CLASS_TYPE_TEXT_PR = 10;
var CLASS_TYPE_UNI_FILL = 11;
var CLASS_TYPE_PATTERN_FILL = 12;
var CLASS_TYPE_GRAD_FILL = 13;
var CLASS_TYPE_SOLID_FILL = 14;
var CLASS_TYPE_UNI_COLOR = 15;
var CLASS_TYPE_SCHEME_COLOR = 16;
var CLASS_TYPE_RGB_COLOR = 17;
var CLASS_TYPE_PRST_COLOR = 18;
var CLASS_TYPE_SYS_COLOR = 19;
var CLASS_TYPE_LINE = 20;
var CLASS_TYPE_CHART_AS_GROUP = 21;
var CLASS_TYPE_CHART_LEGEND = 22;
var CLASS_TYPE_CHART_TITLE = 23;
var CLASS_TYPE_COLOR_MOD = 24;
var CLASS_TYPE_LEGEND_ENTRY = 22;
var CLASS_TYPE_CHART_DATA = 23;

var g_oTableId = null;
\ No newline at end of file