git-svn-id:...

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

Common/Charts/charts.js

@@ -1909,10 +1909,10 @@ function drawChart(chart, arrValues, width, height) {
 		colorMap = GenerateDefaultColorMap().color_map;
 		RGBA = {R: 0, G: 0, B: 0, A: 255};
 	}
-	else if(api_doc)
+	else if (api_doc)
 	{
-		theme  = api.WordControl.m_oLogicDocument.theme;
-		colorMap = api.WordControl.m_oLogicDocument.clrSchemeMap.color_map;
+		theme  = api_doc.WordControl.m_oLogicDocument.theme;
+		colorMap = api_doc.WordControl.m_oLogicDocument.clrSchemeMap.color_map;
 		RGBA = {R: 0, G: 0, B: 0, A: 255};
 		if(colorMap==null)
 			colorMap = GenerateDefaultColorMap().color_map;

Excel/model/DrawingObjects/Format/Chart.js

@@ -1494,7 +1494,17 @@ CChartAsGroup.prototype =
                 this.recalculate();
             }
         }
-    }
-
+    },
+	
+	getChartBinary: function()
+	{
+		//       
+		return "_chart_";
+	},
+	
+	setChartBinary: function(binary)
+	{
+		//     
+	}
 };
 

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 CLASS_TYPE_CHART_DATA = 26;


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 g_oTableId = null;
\ No newline at end of file

Word/api.js

@@ -6859,8 +6859,9 @@ CErrorData.prototype.get_Value = function() { return this.Value; };
 // Вставка диаграмм
 asc_docs_api.prototype.asc_getChartObject = function()
 {	
-	this.isChartEditor = true;
-	var chart = this.WordControl.m_oLogicDocument.Get_ChartObject();
+	this.isChartEditor = true;		// Для совместного редактирования
+	
+	/*var chart = this.WordControl.m_oLogicDocument.Get_ChartObject();
 	if ( chart.type != "" )
 		this.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Drawing_Props);
 	else
@@ -6869,14 +6870,15 @@ asc_docs_api.prototype.asc_getChartObject = function()
 	chart["themeColors"] = [];
 	for (var i = 0; i < this.WordControl.m_oDrawingDocument.GuiControlColorsMap.length; i++) {
 		chart["themeColors"].push( this.WordControl.m_oDrawingDocument.GuiControlColorsMap[i].get_hex() );
-	}
+	}*/
 		
+	var chart;		// Объект типа CChartAsGroup. Внутри asc_CChart
     return  chart;
 }
 
-asc_docs_api.prototype.asc_addChartDrawingObject = function(chart)
+asc_docs_api.prototype.asc_addChartDrawingObject = function(chartBinary)
 {
-    if ( false === this.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Paragraph_Content) ) 
+    /*if ( false === this.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Paragraph_Content) ) 
     {
         History.Create_NewPoint();
         var diagramm = new CChartData(true);
@@ -6899,12 +6901,14 @@ asc_docs_api.prototype.asc_addChartDrawingObject = function(chart)
                 this.sync_EndAction(c_oAscAsyncActionType.Information, c_oAscAsyncAction.LoadImage);
             }
         }
-    }
+    }*/
+	
+	// Приводим бинарик к объекту типа CChartAsGroup и добавляем объект
 }
 
-asc_docs_api.prototype.asc_editChartDrawingObject = function(chart)
+asc_docs_api.prototype.asc_editChartDrawingObject = function(chartBinary)
 {
-    if ( false === this.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Paragraph_Content) )
+    /*if ( false === this.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Paragraph_Content) )
     {
         History.Create_NewPoint();
         var diagramm = new CChartData(true);
@@ -6925,7 +6929,9 @@ asc_docs_api.prototype.asc_editChartDrawingObject = function(chart)
                 this.sync_EndAction(c_oAscAsyncActionType.Information, c_oAscAsyncAction.LoadImage);
             }
         }
-    }
+    }*/
+	
+	// Находим выделенную диаграмму и накатываем бинарник
 }
 
 asc_docs_api.prototype.asc_getChartPreviews = function(chartType, chartSubType)