Skip to content

S
sdkjs
Commit 60135a99 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov
Browse files
Options

удаление заголовков и подписей осей через delete и backspace 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@52963 954022d7-b5bf-4e40-9824-e11837661b57
parent 3decefb5
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 145 deletions
PowerPoint/Editor/Format/Chart.js
View file @ 60135a99
...@@ -733,134 +733,11 @@ CChartAsGroup.prototype = ...@@ -733,134 +733,11 @@ CChartAsGroup.prototype =
}, },
setXfrmObject: function(xfrm)
{
var oldId = isRealObject(this.spPr.xfrm) ? this.spPr.xfrm.Get_Id() : null;
var newId = isRealObject(xfrm) ? xfrm.Get_Id() : null;
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_SetXfrm, null, null,
new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOSingleProp(oldId, newId)));
this.spPr.xfrm = xfrm;
},
isEmptyPlaceholder: function () isEmptyPlaceholder: function ()
{ {
return false; return false;
}, },
/* init: function()
{
var is_on = History.Is_On();
if(is_on)
History.TurnOff();
if(isRealObject(this.chartTitle))
{
this.chartTitle.setType(CHART_TITLE_TYPE_TITLE);
if(this.chartTitle.isEmpty())
{
var title_str = "Chart Title";
this.chartTitle.setTextBody(new CTextBody(this.chartTitle));
for(var i in title_str)
this.chartTitle.txBody.content.Paragraph_Add(new ParaText(title_str[i]), false);
}
else
{
var content = this.chartTitle.txBody.content;
content.Parent = this.chartTitle.txBody;
content.DrawingDocument = editor.WordControl.m_oDrawingDocument;
for(var i = 0; i < content.Content.length; ++i)
{
content.Content[i].DrawingDocument = editor.WordControl.m_oDrawingDocument;
content.Content[i].Parent = content;
}
}
var content2 = this.chartTitle.txBody.content.Content;
for(var i = 0; i < content2.length; ++i)
{
content2[i].Pr.PStyle = 3;
}
// this.chart.header.title = this.chartTitle.txBody.content.getTextString();
}
if(isRealObject(this.hAxisTitle))
{
this.hAxisTitle.setType(CHART_TITLE_TYPE_H_AXIS);
this.hAxisTitle.drawingObjects = this.drawingObjects;
if(this.hAxisTitle.isEmpty())
{
var title_str = "X Axis";
this.hAxisTitle.setTextBody(new CTextBody(this.hAxisTitle));
for(var i in title_str)
this.hAxisTitle.txBody.content.Paragraph_Add(new ParaText(title_str[i]), false);
}
else
{
var content = this.hAxisTitle.txBody.content;
content.Parent = this.hAxisTitle.txBody;
content.DrawingDocument = editor.WordControl.m_oDrawingDocument;
for(var i = 0; i < content.Content.length; ++i)
{
content.Content[i].DrawingDocument = editor.WordControl.m_oDrawingDocument;
content.Content[i].Parent = content;
}
}
var content2 = this.hAxisTitle.txBody.content.Content;
for(var i = 0; i < content2.length; ++i)
{
content2[i].Pr.PStyle = 3;
}
// this.chart.xAxis.title = this.hAxisTitle.txBody.content.getTextString();
}
if(isRealObject(this.vAxisTitle))
{
this.chart.xAxis.title = "";
this.vAxisTitle.setType(CHART_TITLE_TYPE_V_AXIS);
this.vAxisTitle.drawingObjects = this.drawingObjects;
if(this.vAxisTitle.isEmpty())
{
var title_str = "Y Axis";
this.vAxisTitle.setTextBody(new CTextBody(this.vAxisTitle));
this.vAxisTitle.txBody.bodyPr.vert = (nVertTTvert270);
for(var i in title_str)
this.vAxisTitle.txBody.content.Paragraph_Add(new ParaText(title_str[i]), false);
this.vAxisTitle.txBody.content.Set_ApplyToAll(true);
this.vAxisTitle.txBody.content.Set_ParagraphAlign(align_Center);
this.vAxisTitle.txBody.content.Set_ApplyToAll(false);
}
else
{
this.vAxisTitle.txBody.bodyPr.vert = (nVertTTvert270);
var content = this.vAxisTitle.txBody.content;
content.Parent = this.vAxisTitle.txBody;
content.DrawingDocument = editor.WordControl.m_oDrawingDocument;
for(var i = 0; i < content.Content.length; ++i)
{
content.Content[i].DrawingDocument = editor.WordControl.m_oDrawingDocument;
content.Content[i].Parent = content;
}
content.Set_ApplyToAll(true);
content.Set_ParagraphAlign(align_Center);
content.Set_ApplyToAll(false);
}
var content2 = this.vAxisTitle.txBody.content.Content;
for(var i = 0; i < content2.length; ++i)
{
content2[i].Pr.PStyle = 3;
}
// this.chart.yAxis.title = this.vAxisTitle.txBody.content.getTextString();
}
if(is_on)
History.TurnOn();
//this.recalculate();
}, */
calculateAfterOpen: function() calculateAfterOpen: function()
{ {
this.init(); this.init();
...@@ -913,18 +790,6 @@ CChartAsGroup.prototype = ...@@ -913,18 +790,6 @@ CChartAsGroup.prototype =
} }
}, },
deleteDrawingBase: function()
{
var position = this.drawingObjects.deleteDrawingBase(this.Get_Id());
if(isRealNumber(position))
{
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_DeleteDrawingBase, null, null, new UndoRedoDataGraphicObjects(this.Id, new UndoRedoDataGOSingleProp(position, null)), null);
}
},
setChartTitle: function(chartTitle) setChartTitle: function(chartTitle)
{ {
this.chartTitle = chartTitle; this.chartTitle = chartTitle;
...@@ -946,6 +811,7 @@ CChartAsGroup.prototype = ...@@ -946,6 +811,7 @@ CChartAsGroup.prototype =
var newValue = isRealObject(title) ? title.Get_Id() : null; var newValue = isRealObject(title) ? title.Get_Id() : null;
this.hAxisTitle = title; this.hAxisTitle = title;
History.Add(this, {Type: historyitem_AutoShapes_AddXAxis, oldPr: oldValue, newPr: newValue}); History.Add(this, {Type: historyitem_AutoShapes_AddXAxis, oldPr: oldValue, newPr: newValue});
editor.WordControl.m_oLogicDocument.recalcMap[this.Id] = this;
}, },
addYAxis: function(title) addYAxis: function(title)
...@@ -961,6 +827,7 @@ CChartAsGroup.prototype = ...@@ -961,6 +827,7 @@ CChartAsGroup.prototype =
this.vAxisTitle.setBodyPr(body_pr); this.vAxisTitle.setBodyPr(body_pr);
} }
History.Add(this, {Type: historyitem_AutoShapes_AddYAxis, oldPr: oldValue, newPr: newValue}); History.Add(this, {Type: historyitem_AutoShapes_AddYAxis, oldPr: oldValue, newPr: newValue});
editor.WordControl.m_oLogicDocument.recalcMap[this.Id] = this;
}, },
addTitle: function(title) addTitle: function(title)
...@@ -969,6 +836,7 @@ CChartAsGroup.prototype = ...@@ -969,6 +836,7 @@ CChartAsGroup.prototype =
var newValue = isRealObject(title) ? title.Get_Id() : null; var newValue = isRealObject(title) ? title.Get_Id() : null;
this.chartTitle = title; this.chartTitle = title;
History.Add(this, {Type: historyitem_AutoShapes_AddTitle, oldPr: oldValue, newPr: newValue}); History.Add(this, {Type: historyitem_AutoShapes_AddTitle, oldPr: oldValue, newPr: newValue});
editor.WordControl.m_oLogicDocument.recalcMap[this.Id] = this;
}, },
......
PowerPoint/Editor/GraphicObjects.js
View file @ 60135a99
...@@ -3265,6 +3265,7 @@ CGraphicObjects.prototype = { ...@@ -3265,6 +3265,7 @@ CGraphicObjects.prototype = {
case STATES_ID_TEXT_ADD: case STATES_ID_TEXT_ADD:
case STATES_ID_TEXT_ADD_IN_GROUP: case STATES_ID_TEXT_ADD_IN_GROUP:
case STATES_ID_CHART_GROUP_TEXT_ADD: case STATES_ID_CHART_GROUP_TEXT_ADD:
case STATES_ID_CHART_TEXT_ADD:
{ {
if(editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Drawing_Props) === false) if(editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Drawing_Props) === false)
{ {
...@@ -3276,6 +3277,43 @@ CGraphicObjects.prototype = { ...@@ -3276,6 +3277,43 @@ CGraphicObjects.prototype = {
} }
break; break;
} }
case STATES_ID_CHART:
case STATES_ID_CHART_GROUP:
{
if(editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Drawing_Props) === false)
{
History.Create_NewPoint();
var chart = this.State.chart;
if(chart.chartTitle && chart.chartTitle.selected)
{
chart.addTitle(null);
g_oTableId.m_bTurnOff = true;
var copy_asc_chart = new asc_CChart(chart.chart);
g_oTableId.m_bTurnOff = false;
copy_asc_chart.header.asc_setTitle("");
chart.setAscChart(copy_asc_chart);
}
else if(chart.hAxisTitle && chart.hAxisTitle.selected)
{
chart.addXAxis(null);
g_oTableId.m_bTurnOff = true;
var copy_asc_chart = new asc_CChart(chart.chart);
g_oTableId.m_bTurnOff = false;
copy_asc_chart.xAxis.asc_setTitle("");
chart.setAscChart(copy_asc_chart);
}
else if(chart.vAxisTitle && chart.vAxisTitle.selected)
{
chart.addYAxis(null);
g_oTableId.m_bTurnOff = true;
var copy_asc_chart = new asc_CChart(chart.chart);
g_oTableId.m_bTurnOff = false;
copy_asc_chart.yAxis.asc_setTitle("");
chart.setAscChart(copy_asc_chart);
}
}
break;
}
case STATES_ID_NULL: case STATES_ID_NULL:
{ {
if(this.selectedObjects.length > 0) if(this.selectedObjects.length > 0)
...@@ -3397,16 +3435,6 @@ CGraphicObjects.prototype = { ...@@ -3397,16 +3435,6 @@ CGraphicObjects.prototype = {
} }
break; break;
} }
case STATES_ID_CHART_TEXT_ADD:
{
if(editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Drawing_Props) === false)
{
History.Create_NewPoint();
this.State.textObject.remove(Count, bOnlyText, bRemoveOnlySelection);
this.updateSelectionState();
}
break;
}
} }
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7