Commit 933b174d authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

заглушки для copy/paste.(проверка наличия класса + проверки наличия объектов)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55940 954022d7-b5bf-4e40-9824-e11837661b57
parent b3e55de9
...@@ -3845,7 +3845,9 @@ function ParaDrawing(W, H, GraphicObj, DrawingDocument, DocumentContent, Parent) ...@@ -3845,7 +3845,9 @@ function ParaDrawing(W, H, GraphicObj, DrawingDocument, DocumentContent, Parent)
this.selectX = 0; this.selectX = 0;
this.selectY = 0; this.selectY = 0;
this.wrappingType = WRAPPING_TYPE_THROUGH; this.wrappingType = WRAPPING_TYPE_THROUGH;
this.wrappingPolygon = new CWrapPolygon(this);
if(typeof CWrapPolygon !== "undefined")
this.wrappingPolygon = new CWrapPolygon(this);
this.document = editor.WordControl.m_oLogicDocument; this.document = editor.WordControl.m_oLogicDocument;
this.drawingDocument = DrawingDocument; this.drawingDocument = DrawingDocument;
...@@ -3879,7 +3881,8 @@ function ParaDrawing(W, H, GraphicObj, DrawingDocument, DocumentContent, Parent) ...@@ -3879,7 +3881,8 @@ function ParaDrawing(W, H, GraphicObj, DrawingDocument, DocumentContent, Parent)
//------------------------------------------------------------ //------------------------------------------------------------
g_oTableId.Add( this, this.Id ); g_oTableId.Add( this, this.Id );
this.graphicObjects.addGraphicObject(this); if(this.graphicObjects)
this.graphicObjects.addGraphicObject(this);
} }
...@@ -6036,7 +6039,8 @@ ParaDrawing.prototype = ...@@ -6036,7 +6039,8 @@ ParaDrawing.prototype =
setZIndex: function() setZIndex: function()
{ {
var data = {Type:historyitem_Drawing_SetZIndex, oldIndex: this.RelativeHeight}; var data = {Type:historyitem_Drawing_SetZIndex, oldIndex: this.RelativeHeight};
this.RelativeHeight = ++this.mainGraphicObjects.maximalGraphicObjectZIndex; if(this.mainGraphicObjects)
this.RelativeHeight = ++this.mainGraphicObjects.maximalGraphicObjectZIndex;
data.newIndex = this.RelativeHeight; data.newIndex = this.RelativeHeight;
History.Add(this, data); History.Add(this, data);
}, },
...@@ -6650,7 +6654,7 @@ ParaDrawing.prototype = ...@@ -6650,7 +6654,7 @@ ParaDrawing.prototype =
init: function() init: function()
{ {
this.calculateAfterOpen(); this.calculateAfterOpen();
if(this.RelativeHeight > editor.WordControl.m_oLogicDocument.DrawingObjects.maximalGraphicObjectZIndex) if(editor.WordControl.m_oLogicDocument.DrawingObjects && this.RelativeHeight > editor.WordControl.m_oLogicDocument.DrawingObjects.maximalGraphicObjectZIndex)
editor.WordControl.m_oLogicDocument.DrawingObjects.maximalGraphicObjectZIndex = this.RelativeHeight; editor.WordControl.m_oLogicDocument.DrawingObjects.maximalGraphicObjectZIndex = this.RelativeHeight;
}, },
......
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