Skip to content

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

git-svn-id:... 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49279 954022d7-b5bf-4e40-9824-e11837661b57
parent c0fb0361
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 155 deletions
Common/Charts/DrawingObjects.js
View file @ 0dce9324
......@@ -4628,4 +4628,149 @@ function ObjectLocker(ws) {
worksheet.collaborativeEditing.onEndCheckLock(callbackEx);
}
}
\ No newline at end of file
}
function writeToBinaryDocContent(docContent, w)
{
w.WriteBool(docContent.TurnOffInnerWrap);
w.WriteBool(docContent.Split);
var Count = docContent.Content.length;
w.WriteLong(Count);
for ( var Index = 0; Index < Count; Index++ )
writeToBinaryParagraph(docContent.Content[Index], w);
}
function readFromBinaryDocContent(docContent, r)
{
docContent.TurnOffInnerWrap = r.GetBool();
docContent.Split = r.GetBool();
var Count = r.GetLong();
docContent.Content = new Array();
for ( var Index = 0; Index < Count; Index++ )
{
var p = new Paragraph(docContent.DrawingDocument, docContent, 0, 0, 0, 0, 0);
readFromBinaryParagraph(p, r);
docContent.Content.push(p);
}
}
function writeToBinaryParagraph(p, w)
{
p.Pr.Write_ToBinary( w );
//p.TextPr.writeToBinary(w);
var StartPos = w.GetCurPosition();
w.Skip( 4 );
var Len = p.Content.length;
var Count = 0;
for ( var Index = 0; Index < Len; Index++ )
{
var Item = p.Content[Index];
if ( true === Item.Is_RealContent() )
{
writeToBinaryParagraphContent(Item, w);
Count++;
}
}
var EndPos = w.GetCurPosition();
w.Seek( StartPos );
w.WriteLong( Count );
w.Seek( EndPos );
}
function readFromBinaryParagraph(p, r)
{
p.Pr = new CParaPr();
p.Pr.Read_FromBinary( r );
p.TextPr = new ParaTextPr();
//p.TextPr.readFromBinary(r);
p.Content = new Array();
var Count = r.GetLong();
for ( var Index = 0; Index < Count; Index++ )
{
var Element = readFromBinaryParagraphContent(r);
if ( null != Element )
p.Content.push( Element );
}
}
function writeToBinaryParagraphContent(Element, w)
{
var ElementType = Element.Type;
// w.WriteLong(ElementType);
switch ( ElementType )
{
case para_TextPr :
// case para_HyperlinkStart :
{
w.WriteLong(ElementType);
Element.Value.Write_ToBinary(w);
break;
}
case para_Text :
case para_Space :
case para_End :
case para_NewLine :
case para_NewLineRendered :
case para_InlineBreak :
case para_PageBreakRendered :
case para_Empty :
case para_Numbering :
case para_Tab :
case para_PageNum :
case para_FlowObjectAnchor :
case para_HyperlinkEnd :
case para_CommentStart :
case para_CommentEnd :
case para_PresentationNumbering :
Element.Write_ToBinary(w);
break;
}
return Element;
}
function readFromBinaryParagraphContent(r)
{
var ElementType = r.GetLong();
var Element = null;
switch ( ElementType )
{
case para_TextPr :
// case para_Drawing :
// case para_HyperlinkStart :
{
Element = new ParaTextPr();
Element.Value = new CTextPr();
Element.Value.Read_FromBinary(r);
return Element;
}
case para_Text : Element = new ParaText(); break;
case para_Space : Element = new ParaSpace(); break;
case para_End : Element = new ParaEnd(); break;
case para_NewLine : Element = new ParaNewLine(); break;
case para_NewLineRendered : Element = new ParaNewLineRendered(); break;
case para_InlineBreak : Element = new ParaInlineBreak(); break;
case para_PageBreakRendered : Element = new ParaPageBreakRenderer(); break;
case para_Empty : Element = new ParaEmpty(); break;
case para_Numbering : Element = new ParaNumbering(); break;
case para_Tab : Element = new ParaTab(); break;
case para_PageNum : Element = new ParaPageNum(); break;
case para_FlowObjectAnchor : Element = new ParaFlowObjectAnchor(); break;
case para_HyperlinkEnd : Element = new ParaHyperlinkEnd(); break;
case para_CommentStart : Element = new ParaCommentStart(); break;
case para_CommentEnd : Element = new ParaCommentEnd(); break;
case para_PresentationNumbering : Element = new ParaPresentationNumbering(); break;
}
if ( null != Element )
Element.Read_FromBinary(r);
return Element;
}
Excel/model/DrawingObjects/Format/TextBody.js
View file @ 0dce9324
......@@ -933,71 +933,3 @@ CTextBody.prototype =
function writeToBinaryDocContent(docContent, w)
{
w.WriteBool(docContent.TurnOffInnerWrap);
w.WriteBool(docContent.Split);
var Count = docContent.Content.length;
w.WriteLong(Count);
for ( var Index = 0; Index < Count; Index++ )
writeToBinaryParagraph(docContent.Content[Index], w);
}
function readFromBinaryDocContent(docContent, r)
{
docContent.TurnOffInnerWrap = r.GetBool();
docContent.Split = r.GetBool();
var Count = r.GetLong();
docContent.Content = new Array();
for ( var Index = 0; Index < Count; Index++ )
{
var p = new Paragraph(docContent.DrawingDocument, docContent, 0, 0, 0, 0, 0);
readFromBinaryParagraph(p, r);
docContent.Content.push(p);
}
}
function writeToBinaryParagraph(p, w)
{
p.Pr.Write_ToBinary( w );
//p.TextPr.writeToBinary(w);
var StartPos = w.GetCurPosition();
w.Skip( 4 );
var Len = p.Content.length;
var Count = 0;
for ( var Index = 0; Index < Len; Index++ )
{
var Item = p.Content[Index];
if ( true === Item.Is_RealContent() )
{
Item.Write_ToBinary( w );
Count++;
}
}
var EndPos = w.GetCurPosition();
w.Seek( StartPos );
w.WriteLong( Count );
w.Seek( EndPos );
}
function readFromBinaryParagraph(p, r)
{
p.Pr = new CParaPr();
p.Pr.Read_FromBinary( r );
p.TextPr = new ParaTextPr();
//p.TextPr.readFromBinary(r);
p.Content = new Array();
var Count = r.GetLong();
for ( var Index = 0; Index < Count; Index++ )
{
var Element = ParagraphContent_Read_FromBinary(r);
if ( null != Element )
p.Content.push( Element );
}
}
Excel/model/DrawingObjects/States.js
View file @ 0dce9324
......@@ -4812,7 +4812,7 @@ function DefaultKeyDownHandle(drawingObjectsController, e)
case STATES_ID_TEXT_ADD_IN_GROUP:
{
drawingObjectsController.drawingObjects.objectLocker.reset();
drawingObjectsController.drawingObjects.objectLocker.addObjectId(drawingObjectsController.textObject.Get_Id());
drawingObjectsController.drawingObjects.objectLocker.addObjectId(drawingObjectsController.curState.textObject.Get_Id());
var selection_state = drawingObjectsController.getSelectionState();
var callback = function(bLock)
......@@ -4865,7 +4865,6 @@ function DefaultKeyDownHandle(drawingObjectsController, e)
}
else if ( e.keyCode == 32 && false === isViewMode ) // Space
{
switch(state.id)
{
case STATES_ID_TEXT_ADD:
......
Word/Editor/GraphicObjects/ObjectTypes/ChartTitle.js
View file @ 0dce9324
......@@ -22,15 +22,6 @@ function CChartTitle(chartGroup, type)
this.extX = null;
this.extY = null;
/* this.pen = new CLn();
this.pen.w = 90000;
this.pen.Fill = new CUniFill();
this.pen.Fill.fill = new CSolidFill();
this.pen.Fill.fill.color.color = new CRGBColor();
this.brush = new CUniFill();
this.brush.fill = new CSolidFill();
this.brush.fill.color.color = new CRGBColor(); */
this.brush = null;
this.pen = null;
......
Word/Editor/GraphicObjects/ObjectTypes/TextBody.js
View file @ 0dce9324
......@@ -565,72 +565,3 @@ CTextBody.prototype =
};
function writeToBinaryDocContent(docContent, w)
{
w.WriteBool(docContent.TurnOffInnerWrap);
w.WriteBool(docContent.Split);
var Count = docContent.Content.length;
w.WriteLong(Count);
for ( var Index = 0; Index < Count; Index++ )
writeToBinaryParagraph(docContent.Content[Index], w);
}
function readFromBinaryDocContent(docContent, r)
{
docContent.TurnOffInnerWrap = r.GetBool();
docContent.Split = r.GetBool();
var Count = r.GetLong();
docContent.Content = new Array();
for ( var Index = 0; Index < Count; Index++ )
{
var p = new Paragraph(docContent.DrawingDocument, docContent, 0, 0, 0, 0, 0);
readFromBinaryParagraph(p, r);
docContent.Content.push(p);
}
}
function writeToBinaryParagraph(p, w)
{
p.Pr.Write_ToBinary( w );
//p.TextPr.writeToBinary(w);
var StartPos = w.GetCurPosition();
w.Skip( 4 );
var Len = p.Content.length;
var Count = 0;
for ( var Index = 0; Index < Len; Index++ )
{
var Item = p.Content[Index];
if ( true === Item.Is_RealContent() )
{
Item.Write_ToBinary( w );
Count++;
}
}
var EndPos = w.GetCurPosition();
w.Seek( StartPos );
w.WriteLong( Count );
w.Seek( EndPos );
}
function readFromBinaryParagraph(p, r)
{
p.Pr = new CParaPr();
p.Pr.Read_FromBinary( r );
p.TextPr = new ParaTextPr();
//p.TextPr.readFromBinary(r);
p.Content = new Array();
var Count = r.GetLong();
for ( var Index = 0; Index < Count; Index++ )
{
var Element = ParagraphContent_Read_FromBinary(r);
if ( null != Element )
p.Content.push( Element );
}
}
\ No newline at end of file
Word/Editor/GraphicObjects/States.js
View file @ 0dce9324
......@@ -4466,11 +4466,11 @@ function PreMoveInlineObject(graphicObjects, objectId, ctrlShiftFlag, bSelectedM
if(e.ClickCount > 1)
{
var gr_obj = this.graphicObjects.majorGraphicObject;
if(gr_obj.GraphicObj.isImage() && isRealObject(gr_obj.GraphicObj.chart))
if( isRealObject(gr_obj.GraphicObj.chart))
{
if(false === this.graphicObjects.document.Document_Is_SelectionLocked(changestype_Drawing_Props, {Type : changestype_2_Element_and_Type , Element : gr_obj.Parent, CheckType : changestype_Paragraph_Content} )) {
var chart = this.graphicObjects.majorGraphicObject.GraphicObj.chart.serializeChart();
var chart = this.graphicObjects.majorGraphicObject.GraphicObj;
chart["themeColors"] = [];
for (var i = 0; i < this.graphicObjects.drawingDocument.GuiControlColorsMap.length; i++) {
chart["themeColors"].push( this.graphicObjects.drawingDocument.GuiControlColorsMap[i].get_hex() );
......@@ -5086,10 +5086,10 @@ function PreMoveState(graphicObjects, ctrlShiftFlag/*был ли нажат Ctrl
if(e.ClickCount > 1)
{
var gr_obj = this.graphicObjects.majorGraphicObject;
if(gr_obj.GraphicObj.isImage() && isRealObject(gr_obj.GraphicObj.chart))
if(gr_obj.GraphicObj.chart)
{
if(false === this.graphicObjects.document.Document_Is_SelectionLocked(changestype_Drawing_Props, {Type : changestype_2_Element_and_Type , Element : gr_obj.Parent, CheckType : changestype_Paragraph_Content} )) {
var chart = gr_obj.GraphicObj.chart.serializeChart();
var chart = gr_obj.GraphicObj;
chart["themeColors"] = [];
for (var i = 0; i < this.graphicObjects.drawingDocument.GuiControlColorsMap.length; i++) {
chart["themeColors"].push( this.graphicObjects.drawingDocument.GuiControlColorsMap[i].get_hex() );
......@@ -9497,10 +9497,10 @@ function PreMoveInGroup(graphicObjects, group, ctrlShift, bSelectedMajorObject,
if(this.group.selectionInfo.selectionArray.length === 1)
{
var obj = this.group.selectionInfo.selectionArray[0];
if(obj.isImage() && isRealObject(obj.chart))
if( isRealObject(obj.chart))
{
if(false === this.graphicObjects.document.Document_Is_SelectionLocked(changestype_Drawing_Props, {Type : changestype_2_Element_and_Type , Element : this.group.parent.Parent, CheckType : changestype_Paragraph_Content} )) {
var chart = obj.chart.serializeChart();
var chart = obj;
chart["themeColors"] = [];
for (var i = 0; i < this.graphicObjects.drawingDocument.GuiControlColorsMap.length; i++) {
chart["themeColors"].push( this.graphicObjects.drawingDocument.GuiControlColorsMap[i].get_hex() );
......
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