pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

DocFormatReader - add word doc without compound storage(earlier 1995)

Browse Source
This commit is contained in:
ElenaSubbotina
2018-03-27 16:43:48 +03:00
parent 7ea2b40585
commit 7df5ff1aeb
72 changed files with 2040 additions and 1336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
ASCOfficeDocFile/DocDocxConverter/StringTable.h
View File

@ -71,12 +71,12 @@ namespace DocFileFormat
parse( reader, (unsigned int)reader->GetPosition() );
}
StringTable( POLE::Stream* tableStream, unsigned int fc, unsigned int lcb, bool older ) :
StringTable( POLE::Stream* tableStream, unsigned int fc, unsigned int lcb, int nWordVersion ) :
code_page(1250), fExtend(false), cbData(0), cbExtra(0)
{
if ( lcb > 0 )
{
VirtualStreamReader reader( tableStream, fc, older);
VirtualStreamReader reader( tableStream, fc, nWordVersion);
parse( &reader, fc, lcb ) ;
}
@ -123,25 +123,44 @@ namespace DocFileFormat
//read cData
long cDataStart = reader->GetPosition();
unsigned short c = reader->ReadUInt16();
if ( c != 0xFFFF )
unsigned short cb = 0, elem_sz = 0;
if (reader->nWordVersion == 2)
{
if (reader->olderVersion)
this->cbData = (int)c; // all size
cb = reader->ReadByte();
elem_sz = reader->ReadByte();
if (elem_sz > 0)
{
count_elements = cb;
}
else
count_elements = c;
{
this->cbData = cb;
}
}
else
else if (reader->nWordVersion == 1)
{
//cData is a 4byte signed Integer, so we need to seek back
reader->Seek( (int)( fc + cDataStart ), 0/*STREAM_SEEK_SET*/ );
this->cbData = reader->ReadInt32();
cb = reader->ReadUInt16();
this->cbData = cb; // all size
}
else if (reader->nWordVersion == 0)
{
cb = reader->ReadUInt16();
if ( cb != 0xFFFF )
{
count_elements = cb;
}
else
{
//cData is a 4byte signed Integer, so we need to seek back
reader->Seek( (int)( fc + cDataStart ), 0/*STREAM_SEEK_SET*/ );
this->cbData = reader->ReadInt32();
}
}
//read cbExtra
if (reader->olderVersion == false)
if (reader->nWordVersion == 0)
{
this->cbExtra = reader->ReadUInt16();
}