Skip to content

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

правка бага 21155 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50529 954022d7-b5bf-4e40-9824-e11837661b57
parent 50085fc8
Hide whitespace changes
Inline Side-by-side
Showing with 130 additions and 21 deletions
PowerPoint/Editor/Format/Paragraph.js
View file @ 370a3415
......@@ -7060,6 +7060,18 @@ Paragraph.prototype =
if ( this.Content[Pos].Type == para_TextPr )
{
this.Content[Pos].Apply_TextPr( TextPr );
var Item = this.Content[Pos];
if(isRealObject(Item.Value) && isRealObject(Item.Value.unifill))
{
if(this.Parent && this.Parent.Parent instanceof CTextBody)
{
this.Parent.Parent.textPropsForRecalc.push(Item);
}
if(this.Parent && this.Parent.Parent instanceof CTableCell && this.Parent.Parent.Row.Table.Parent instanceof CGraphicFrame)
{
this.Parent.Parent.Row.Table.Parent.textPropsForRecalc.push(Item);
}
}
}
}
......@@ -10661,6 +10673,24 @@ Paragraph.prototype =
this.Content.splice( StartPos, EndPos - StartPos + 1 );
for ( var Pos = 0; Pos < this.Content.length; Pos++ )
{
if ( this.Content[Pos].Type == para_TextPr )
{
var Item = this.Content[Pos];
if(isRealObject(Item.Value) && isRealObject(Item.Value.unifill))
{
if(this.Parent && this.Parent.Parent instanceof CTextBody)
{
this.Parent.Parent.textPropsForRecalc.push(Item);
}
if(this.Parent && this.Parent.Parent instanceof CTableCell && this.Parent.Parent.Row.Table.Parent instanceof CGraphicFrame)
{
this.Parent.Parent.Row.Table.Parent.textPropsForRecalc.push(Item);
}
}
}
}
break;
}
......@@ -11023,6 +11053,24 @@ Paragraph.prototype =
this.Content = Array_start.concat( Data.Items, Array_end );
for ( var Pos = 0; Pos < this.Content.length; Pos++ )
{
if ( this.Content[Pos].Type == para_TextPr )
{
var Item = this.Content[Pos];
if(isRealObject(Item.Value) && isRealObject(Item.Value.unifill))
{
if(this.Parent && this.Parent.Parent instanceof CTextBody)
{
this.Parent.Parent.textPropsForRecalc.push(Item);
}
if(this.Parent && this.Parent.Parent instanceof CTableCell && this.Parent.Parent.Row.Table.Parent instanceof CGraphicFrame)
{
this.Parent.Parent.Row.Table.Parent.textPropsForRecalc.push(Item);
}
}
}
}
break;
}
......@@ -11454,6 +11502,24 @@ Paragraph.prototype =
break;
}
for ( var Pos = 0; Pos < this.Content.length; Pos++ )
{
if ( this.Content[Pos].Type == para_TextPr )
{
var Item = this.Content[Pos];
if(isRealObject(Item.Value) && isRealObject(Item.Value.unifill))
{
if(this.Parent && this.Parent.Parent instanceof CTextBody)
{
this.Parent.Parent.textPropsForRecalc.push(Item);
}
if(this.Parent && this.Parent.Parent instanceof CTableCell && this.Parent.Parent.Row.Table.Parent instanceof CGraphicFrame)
{
this.Parent.Parent.Row.Table.Parent.textPropsForRecalc.push(Item);
}
}
}
}
this.RecalcInfo.Set_Type_0(pararecalc_0_All);
bNeedRecalc = true;
break;
......
PowerPoint/Editor/Format/ParagraphContent.js
View file @ 370a3415
......@@ -915,6 +915,11 @@ ParaTextPr.prototype =
break;
}
case historyitem_TextPr_Unifill:
{
this.Value.unifill = Data.Old;
break;
}
}
},
......@@ -1110,6 +1115,11 @@ ParaTextPr.prototype =
break;
}
case historyitem_TextPr_Unifill:
{
this.Value.unifill = Data.New;
break;
}
}
},
......@@ -1383,6 +1393,15 @@ ParaTextPr.prototype =
break;
}
case historyitem_TextPr_Unifill:
{
Writer.WriteBool(isRealObject(Data.New))
if(isRealObject(Data.New))
{
Data.New.Write_ToBinary2(Writer);
}
break;
}
}
return Writer;
......@@ -1674,10 +1693,24 @@ ParaTextPr.prototype =
break;
}
case historyitem_TextPr_Unifill:
{
if(Reader.GetBool())
{
this.Value.unifill = new CUniFill();
this.Value.unifill.Read_FromBinary2(Reader);
}
else
{
this.Value.unifill = undefined;
}
break;
}
}
}
};
// Класс окончание параграфа ParaEnd
function ParaEnd()
{
......
PowerPoint/Editor/Format/Presentation.js
View file @ 370a3415
......@@ -17,6 +17,7 @@
//
// Графическая часть:
var tableSpacingMinValue = 0.02;//0.02мм
var Page_Width = 210;
var Page_Height = 297;
......
PowerPoint/Editor/GraphicObjects.js
View file @ 370a3415
......@@ -734,9 +734,9 @@ CGraphicObjects.prototype = {
var cur_group = groups[i];
var arr_by_types = cur_group.getArraysByTypes();
var images = arr_by_types.images;
for(var i = 0; i < images.length; ++i)
for(var j = 0; j < images.length; ++j)
{
var _cur_image_prop = images[i].getImageProps();
var _cur_image_prop = images[j].getImageProps();
if(_cur_image_prop !== null)
{
if(image_props === null)
......@@ -751,9 +751,9 @@ CGraphicObjects.prototype = {
}
var shapes = arr_by_types.shapes;
for(var i = 0; i < shapes.length; ++i)
for(var j = 0; j < shapes.length; ++j)
{
var _current_object = shapes[i];
var _current_object = shapes[j];
var _cur_shape_prop =
{
type: _current_object.getPresetGeom(),
......@@ -1038,9 +1038,9 @@ CGraphicObjects.prototype = {
var shapes = arr_by_types.shapes;
for(var i = 0; i < shapes.length; ++i)
for(var j = 0; j < shapes.length; ++j)
{
var _current_object = shapes[i];
var _current_object = shapes[j];
var _cur_paragraph_para_pr = _current_object.getParagraphParaPr();
......@@ -1172,9 +1172,9 @@ CGraphicObjects.prototype = {
var shapes = arr_by_types.shapes;
for(var i = 0; i < shapes.length; ++i)
for(var j = 0; j < shapes.length; ++j)
{
var _current_object = shapes[i];
var _current_object = shapes[j];
var _cur_paragraph_para_pr = _current_object.getParagraphParaPr();
......
PowerPoint/Editor/States.js
View file @ 370a3415
......@@ -2802,22 +2802,22 @@ function GroupState(drawingObjectsController, drawingObjects, group)
var arr_graphic_objects = this.group.getArrGraphicObjects();
for(i = arr_graphic_objects.length - 1; i > -1; --i)
{
var cur_drawing = arr_graphic_objects[i];
var hit_in_inner_area = cur_drawing.hitInInnerArea(x, y);
var hit_in_path = cur_drawing.hitInPath(x, y);
var hit_in_text_rect = cur_drawing.hitInTextRect(x, y);
var cur_grouped_object = arr_graphic_objects[i];
var hit_in_inner_area = cur_grouped_object.hitInInnerArea(x, y);
var hit_in_path = cur_grouped_object.hitInPath(x, y);
var hit_in_text_rect = cur_grouped_object.hitInTextRect(x, y);
if(hit_in_inner_area && !hit_in_text_rect || hit_in_path)
{
var is_selected = cur_drawing.selected;
var is_selected = cur_grouped_object.selected;
if(!(e.CtrlKey || e.ShiftKey) && !is_selected)
this.group.resetSelection();
cur_drawing.select(this.drawingObjectsController);
cur_grouped_object.select(this.drawingObjectsController);
this.drawingObjects.OnUpdateOverlay();
for(var j = 0; j < group_selected_objects.length; ++j)
{
this.drawingObjectsController.addPreTrackObject(group_selected_objects[j].createMoveInGroupTrack());
}
this.drawingObjectsController.changeCurrentState(new PreMoveInGroupState(this.drawingObjectsController, this.drawingObjects,this.group, x, y, e.ShiftKey, e.ctrl, cur_drawing, is_selected));
this.drawingObjectsController.changeCurrentState(new PreMoveInGroupState(this.drawingObjectsController, this.drawingObjects,this.group, x, y, e.ShiftKey, e.ctrl, cur_grouped_object, is_selected));
this.drawingObjects.OnUpdateOverlay();
return;
}
......@@ -2825,11 +2825,11 @@ function GroupState(drawingObjectsController, drawingObjects, group)
{
this.drawingObjectsController.resetSelection();
this.group.select(this.drawingObjectsController);
cur_drawing.select(this.group);
cur_drawing.selectionSetStart(e, x, y);
this.drawingObjectsController.changeCurrentState(new TextAddInGroup(this.drawingObjectsController, this.drawingObjects, this.group, cur_drawing));
cur_grouped_object.select(this.group);
cur_grouped_object.selectionSetStart(e, x, y);
this.drawingObjectsController.changeCurrentState(new TextAddInGroup(this.drawingObjectsController, this.drawingObjects, this.group, cur_grouped_object));
if(e.ClickCount < 2)
cur_drawing.updateSelectionState(editor.WordControl.m_oLogicDocument.DrawingDocument);
cur_grouped_object.updateSelectionState(editor.WordControl.m_oLogicDocument.DrawingDocument);
return;
}
}
......@@ -2864,9 +2864,9 @@ function GroupState(drawingObjectsController, drawingObjects, group)
cur_drawing.select(this.drawingObjectsController);
cur_grouped_object.select(this.group);
cur_grouped_object.selectionSetStart(e, x, y);
this.drawingObjectsController.changeCurrentState(new TextAddInGroup(this.drawingObjectsController, this.drawingObjects, this.group, cur_drawing));
this.drawingObjectsController.changeCurrentState(new TextAddInGroup(this.drawingObjectsController, this.drawingObjects, this.group, cur_grouped_object));
if(e.ClickCount < 2)
cur_drawing.updateSelectionState(editor.WordControl.m_oLogicDocument.DrawingDocument);
cur_grouped_object.updateSelectionState(editor.WordControl.m_oLogicDocument.DrawingDocument);
return;
}
}
......
PowerPoint/api.js
View file @ 370a3415
......@@ -16,6 +16,15 @@ var c_oSerFormat =
Signature: "PPTY"
};
function CErrorData()
{
this.Value = 0;
}
CErrorData.prototype.put_Value = function(v){ this.Value = v; };
CErrorData.prototype.get_Value = function() { return this.Value; };
function asc_docs_api(name)
{
/************ private!!! **************/
......
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