Merge pull request #164 from iaom/0308-dev
[FIX]Some 'doc' type could not be read.
This commit is contained in:
commit
110ef5bddc
|
@ -42,7 +42,7 @@ void FileReader::getTextContent(QString path, QString &textContent)
|
|||
if(strsfx.endsWith( "txt"))
|
||||
FileUtils::getTxtContent(path,textContent);
|
||||
}
|
||||
else if(type.inherits("application/msword"))
|
||||
else if(type.inherits("application/msword") || type.name() == "application/x-ole-storage")
|
||||
{
|
||||
if (strsfx.endsWith("doc"))
|
||||
{
|
||||
|
|
|
@ -5067,6 +5067,8 @@ bool KBinaryParser::read8DocText(FILE *pFile, const ppsInfoType *pPPS,
|
|||
//need more format document
|
||||
ptaucBytes = (UCHAR*)xfree((void*)ptaucBytes);
|
||||
qWarning()<<"Parser error:"<<m_strFileName;
|
||||
// content.append(QString::fromStdString((char*)ptaucBytes).replace("\r",""));
|
||||
// ptaucBytes = (UCHAR*)xfree((void*)ptaucBytes);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue