Commit ee924ac7 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Bug 29786 - Некорректное копирование текста в таблице.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63944 954022d7-b5bf-4e40-9824-e11837661b57
parent 967d25c9
...@@ -2909,7 +2909,7 @@ DrawingObjectsController.prototype = ...@@ -2909,7 +2909,7 @@ DrawingObjectsController.prototype =
{ {
chartSettings.bLine = true; chartSettings.bLine = true;
} }
if(chartSettings.showMarker) if(chartSettings.showMarker)
{ {
if(!chart_type.marker) if(!chart_type.marker)
...@@ -4104,21 +4104,21 @@ DrawingObjectsController.prototype = ...@@ -4104,21 +4104,21 @@ DrawingObjectsController.prototype =
} }
}, },
cursorMoveRight: function(AddToSelect, Word) cursorMoveRight: function(AddToSelect, Word, bFromPaste)
{ {
var target_text_object = getTargetTextObject(this); var target_text_object = getTargetTextObject(this);
if(target_text_object) if(target_text_object)
{ {
if(target_text_object.getObjectType() === historyitem_type_GraphicFrame) if(target_text_object.getObjectType() === historyitem_type_GraphicFrame)
{ {
target_text_object.graphicObject.Cursor_MoveRight(1, AddToSelect, Word); target_text_object.graphicObject.Cursor_MoveRight(1, AddToSelect, Word, bFromPaste);
} }
else else
{ {
var content = this.getTargetDocContent(undefined, true); var content = this.getTargetDocContent(undefined, true);
if(content) if(content)
{ {
content.Cursor_MoveRight(AddToSelect, Word); content.Cursor_MoveRight(AddToSelect, Word, bFromPaste);
} }
} }
this.updateSelectionState(); this.updateSelectionState();
......
...@@ -777,7 +777,7 @@ CGraphicFrame.prototype = ...@@ -777,7 +777,7 @@ CGraphicFrame.prototype =
{ {
if(this.parent && this.parent.graphicObjects) if(this.parent && this.parent.graphicObjects)
{ {
this.parent.graphicObjects.resetSelection(); this.parent.graphicObjects.resetSelection(true);
if(this.group) if(this.group)
{ {
var main_group = this.group.getMainGroup(); var main_group = this.group.getMainGroup();
......
...@@ -3372,7 +3372,7 @@ CPresentation.prototype = ...@@ -3372,7 +3372,7 @@ CPresentation.prototype =
{ {
if(this.Slides[this.CurPage].graphicObjects.getTargetDocContent(false, false)) if(this.Slides[this.CurPage].graphicObjects.getTargetDocContent(false, false))
{ {
this.Slides[this.CurPage].graphicObjects.cursorMoveRight(false, false); this.Slides[this.CurPage].graphicObjects.cursorMoveRight(false, false, true);
} }
} }
}, },
......
...@@ -762,6 +762,12 @@ ParaTextPr.prototype = ...@@ -762,6 +762,12 @@ ParaTextPr.prototype =
if ( undefined != this.Value.RFonts.Hint ) if ( undefined != this.Value.RFonts.Hint )
this.Set_RFonts_Hint( undefined ); this.Set_RFonts_Hint( undefined );
if(undefined != this.Value.TextFill)
this.Set_TextFill( undefined );
if(undefined != this.Value.TextOutline)
this.Set_TextOutline( undefined );
}, },
Set_Prop : function(Prop, Value) Set_Prop : function(Prop, Value)
......
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