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

Bug #31672 - Ошибка "Cannot read property 'Lf' of null" при открытии...

Bug #31672 - Ошибка "Cannot read property 'Lf' of null" при открытии Sample.docx из тестового примера

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68384 954022d7-b5bf-4e40-9824-e11837661b57
parent 58c0dd17
...@@ -1380,7 +1380,7 @@ Paragraph.prototype = ...@@ -1380,7 +1380,7 @@ Paragraph.prototype =
Internal_Draw_2 : function(CurPage, pGraphics, Pr) Internal_Draw_2 : function(CurPage, pGraphics, Pr)
{ {
var isFirstPage = this.Check_FirstPage(CurPage); var isFirstPage = this.Check_FirstPage(CurPage);
if ( this.bFromDocument && true === editor.ShowParaMarks && true === isFirstPage && ( true === Pr.ParaPr.KeepNext || true === Pr.ParaPr.KeepLines || true === Pr.ParaPr.PageBreakBefore ) ) if ( this.bFromDocument && !pGraphics.Start_Command && true === editor.ShowParaMarks && true === isFirstPage && ( true === Pr.ParaPr.KeepNext || true === Pr.ParaPr.KeepLines || true === Pr.ParaPr.PageBreakBefore ) )
{ {
var SpecFont = { FontFamily: { Name : "Arial", Index : -1 }, FontSize : 12, Italic : false, Bold : false }; var SpecFont = { FontFamily: { Name : "Arial", Index : -1 }, FontSize : 12, Italic : false, Bold : false };
var SpecSym = String.fromCharCode( 0x25AA ); var SpecSym = String.fromCharCode( 0x25AA );
......
...@@ -4123,7 +4123,9 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyPa ...@@ -4123,7 +4123,9 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyPa
//} //}
if(this.copyParams) if(this.copyParams)
{ {
CheckSpPrXfrm2(item.GraphicObj) ExecuteNoHistory(function(){
CheckSpPrXfrm2(item.GraphicObj);
}, this, []);
} }
if(this.copyParams && item.ParaMath) if(this.copyParams && item.ParaMath)
...@@ -5028,19 +5030,19 @@ function BinaryFileReader(doc, openParams) ...@@ -5028,19 +5030,19 @@ function BinaryFileReader(doc, openParams)
}; };
this.Read = function(data) this.Read = function(data)
{ {
try{ //try{
this.stream = this.getbase64DecodedData(data); this.stream = this.getbase64DecodedData(data);
this.PreLoadPrepare(); this.PreLoadPrepare();
this.ReadMainTable(); this.ReadMainTable();
this.PostLoadPrepare(); this.PostLoadPrepare();
} /*}
catch(e) catch(e)
{ {
if(e.message == g_sErrorCharCountMessage) if(e.message == g_sErrorCharCountMessage)
return false; return false;
else else
throw e; throw e;
} }*/
return true; return true;
}; };
this.ReadData = function(data) this.ReadData = function(data)
......
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