Commit 62807991 authored by Igor.Zotov's avatar Igor.Zotov

http://bugzserver/show_bug.cgi?id=27377 - [Copy&Paste] Не копируется...

http://bugzserver/show_bug.cgi?id=27377 -  [Copy&Paste] Не копируется межсимвольный и междустрочный интервал из MS Word в CDE 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@61686 954022d7-b5bf-4e40-9824-e11837661b57
parent d2c0491c
...@@ -5457,9 +5457,9 @@ PasteProcessor.prototype = ...@@ -5457,9 +5457,9 @@ PasteProcessor.prototype =
var margin_bottom = computedStyle.getPropertyValue( "margin-bottom" ); var margin_bottom = computedStyle.getPropertyValue( "margin-bottom" );
if(margin_bottom && null != (margin_bottom = this._ValueToMm(margin_bottom))) if(margin_bottom && null != (margin_bottom = this._ValueToMm(margin_bottom)))
Spacing.After = margin_bottom; Spacing.After = margin_bottom;
/*var line_height = computedStyle.getPropertyValue( "line-height" ); var line_height = computedStyle.getPropertyValue( "line-height" );
if(line_height && null != (line_height = this._ValueToMm(line_height))) if(line_height && null != (line_height = this._ValueToMm(line_height)))
Spacing.Line = line_height;*/ Spacing.After = line_height;
if(false == this._isEmptyProperty(Spacing)) if(false == this._isEmptyProperty(Spacing))
Para.Set_Spacing(Spacing); Para.Set_Spacing(Spacing);
//Shd //Shd
...@@ -5805,6 +5805,11 @@ PasteProcessor.prototype = ...@@ -5805,6 +5805,11 @@ PasteProcessor.prototype =
{ {
rPr.Color = color; rPr.Color = color;
} }
var spacing = computedStyle.getPropertyValue( "letter-spacing" );
if(spacing && null != (spacing = this._ValueToMm(spacing)))
rPr.Spacing = spacing;
//������� �� ��������, ������� �� �����������, ���� �������� ������������ �������� //������� �� ��������, ������� �� �����������, ���� �������� ������������ ��������
var background_color = null; var background_color = null;
var underline = null; var underline = null;
......
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