Commit b9a82fc4 authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Исправлены баги связанные с изменением работы орфографии. Исправлен баг с...

Исправлены баги связанные с изменением работы орфографии. Исправлен  баг с перенесением картинки в гиперссылку. Исправлен баг с сохранением текста в бинарник.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58172 954022d7-b5bf-4e40-9824-e11837661b57
parent 7c9b62dc
...@@ -725,7 +725,7 @@ ParaHyperlink.prototype = ...@@ -725,7 +725,7 @@ ParaHyperlink.prototype =
var CurContentPos = ( true === UseContentPos ? ContentPos.Get(Depth) : -1 ); var CurContentPos = ( true === UseContentPos ? ContentPos.Get(Depth) : -1 );
for ( var CurPos = StartPos; CurPos < EndPos; CurPos++ ) for ( var CurPos = StartPos; CurPos <= EndPos; CurPos++ )
{ {
this.Content[CurPos].Get_Layout(DrawingLayout, ( CurPos === CurContentPos ? true : false ), ContentPos, Depth + 1 ); this.Content[CurPos].Get_Layout(DrawingLayout, ( CurPos === CurContentPos ? true : false ), ContentPos, Depth + 1 );
......
...@@ -114,7 +114,7 @@ function ParaText(value) ...@@ -114,7 +114,7 @@ function ParaText(value)
this.Value = (undefined !== value ? value.charCodeAt(0) : 0x00); this.Value = (undefined !== value ? value.charCodeAt(0) : 0x00);
this.Width = 0x00000000 | 0; this.Width = 0x00000000 | 0;
this.WidthVisible = 0x00000000 | 0; this.WidthVisible = 0x00000000 | 0;
this.Flags = 0x00000000; this.Flags = 0x00000000 | 0;
this.Set_SpaceAfter(45 === this.Value); // charCode символа "-" this.Set_SpaceAfter(45 === this.Value); // charCode символа "-"
} }
...@@ -297,9 +297,9 @@ ParaText.prototype = ...@@ -297,9 +297,9 @@ ParaText.prototype =
// Класс ParaSpace // Класс ParaSpace
function ParaSpace() function ParaSpace()
{ {
this.Flags = 0x00000000; this.Flags = 0x00000000 | 0;
this.Width = 0x00000000; this.Width = 0x00000000 | 0;
this.WidthVisible = 0x00000000; this.WidthVisible = 0x00000000 | 0;
} }
ParaSpace.prototype = ParaSpace.prototype =
{ {
...@@ -2938,7 +2938,7 @@ ParaNumbering.prototype = ...@@ -2938,7 +2938,7 @@ ParaNumbering.prototype =
} }
}; };
// TODO: Реализовать табы правые, центральные, по точке и с чертой. // TODO: Реализовать табы по точке и с чертой.
var tab_Clear = 0x00; var tab_Clear = 0x00;
var tab_Left = 0x01; var tab_Left = 0x01;
var tab_Right = 0x02; var tab_Right = 0x02;
......
...@@ -4880,12 +4880,12 @@ ParaRun.prototype.Split_Run = function(Pos) ...@@ -4880,12 +4880,12 @@ ParaRun.prototype.Split_Run = function(Pos)
var MarkElement = Mark.Element; var MarkElement = Mark.Element;
if ( true === Mark.Start ) if ( true === Mark.Start )
{ {
MarkElement.ClassesS[Mark.Depth] = NewRun; //MarkElement.ClassesS[Mark.Depth] = NewRun;
MarkElement.StartPos.Data[Mark.Depth] -= Pos; MarkElement.StartPos.Data[Mark.Depth] -= Pos;
} }
else else
{ {
MarkElement.ClassesE[Mark.Depth] = NewRun; //MarkElement.ClassesE[Mark.Depth] = NewRun;
MarkElement.EndPos.Data[Mark.Depth] -= Pos; MarkElement.EndPos.Data[Mark.Depth] -= Pos;
} }
......
...@@ -3269,12 +3269,12 @@ function BinaryNumberingTableWriter(memory, doc, oNumIdMap, oUsedNumIdMap) ...@@ -3269,12 +3269,12 @@ function BinaryNumberingTableWriter(memory, doc, oNumIdMap, oUsedNumIdMap)
var index = 0; var index = 0;
if(null != this.oUsedNumIdMap) if(null != this.oUsedNumIdMap)
{ {
for(i in this.oUsedNumIdMap) for(var i in this.oUsedNumIdMap)
this.bs.WriteItem(c_oSerNumTypes.Num, function(){oThis.WriteNum(i, oThis.oUsedNumIdMap[i] - 1);}); this.bs.WriteItem(c_oSerNumTypes.Num, function(){oThis.WriteNum(i, oThis.oUsedNumIdMap[i] - 1);});
} }
else else
{ {
for(i in nums) for(var i in nums)
{ {
this.bs.WriteItem(c_oSerNumTypes.Num, function(){oThis.WriteNum(i, index);}); this.bs.WriteItem(c_oSerNumTypes.Num, function(){oThis.WriteNum(i, index);});
index++; index++;
...@@ -3300,7 +3300,7 @@ function BinaryNumberingTableWriter(memory, doc, oNumIdMap, oUsedNumIdMap) ...@@ -3300,7 +3300,7 @@ function BinaryNumberingTableWriter(memory, doc, oNumIdMap, oUsedNumIdMap)
var aNumsToWrite = nums; var aNumsToWrite = nums;
if(null != this.oUsedNumIdMap) if(null != this.oUsedNumIdMap)
{ {
for(i in this.oUsedNumIdMap) for(var i in this.oUsedNumIdMap)
{ {
var num = nums[i]; var num = nums[i];
if(null != num) if(null != num)
...@@ -3309,7 +3309,7 @@ function BinaryNumberingTableWriter(memory, doc, oNumIdMap, oUsedNumIdMap) ...@@ -3309,7 +3309,7 @@ function BinaryNumberingTableWriter(memory, doc, oNumIdMap, oUsedNumIdMap)
} }
else else
{ {
for(i in nums) for(var i in nums)
{ {
var num = nums[i]; var num = nums[i];
this.bs.WriteItem(c_oSerNumTypes.AbstractNum, function(){oThis.WriteAbstractNum(num, index);}); this.bs.WriteItem(c_oSerNumTypes.AbstractNum, function(){oThis.WriteAbstractNum(num, index);});
...@@ -3748,7 +3748,7 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyPa ...@@ -3748,7 +3748,7 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyPa
switch ( item.Type ) switch ( item.Type )
{ {
case para_Text: case para_Text:
sCurText += item.Value; sCurText += String.fromCharCode(item.Value);
break; break;
case para_Space: case para_Space:
sCurText += " "; sCurText += " ";
......
...@@ -1009,12 +1009,12 @@ ParaHyperlink.prototype.Add_SpellCheckerElement = function(Element, Start, Depth ...@@ -1009,12 +1009,12 @@ ParaHyperlink.prototype.Add_SpellCheckerElement = function(Element, Start, Depth
{ {
if ( true === Start ) if ( true === Start )
{ {
Element.ClassesS.push(this); //Element.ClassesS.push(this);
this.Content[Element.StartPos.Get(Depth)].Add_SpellCheckerElement(Element, Start, Depth + 1); this.Content[Element.StartPos.Get(Depth)].Add_SpellCheckerElement(Element, Start, Depth + 1);
} }
else else
{ {
Element.ClassesE.push(this); //Element.ClassesE.push(this);
this.Content[Element.EndPos.Get(Depth)].Add_SpellCheckerElement(Element, Start, Depth + 1); this.Content[Element.EndPos.Get(Depth)].Add_SpellCheckerElement(Element, Start, Depth + 1);
} }
......
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