yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 17:59:33 +02:00
Code Issues Releases Wiki Activity

ms-word doc plugin: now can read doc files with erorrs in formatting structures

Browse source
This commit is contained in:
Alexander Turkin 2012-06-15 17:32:29 +04:00
parent 52607ae0f1
commit aed70a41ea
3 changed files with 60 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

15
jni/NativeFormats/fbreader/src/formats/doc/OleStreamReader.cpp
View file

@ -198,14 +198,19 @@ bool OleStreamReader::fillBuffer(OleMainStream &stream) {
return false;
}
if (!stream.seek(piece.offset, true)) {
//TODO maybe in that case we should take next piece?
return false;
}
char *textBuffer = new char[piece.length];
stream.seek(piece.offset, true);
stream.read(textBuffer, piece.length);
size_t readedBytes = stream.read(textBuffer, piece.length);
if (readedBytes != (unsigned int)piece.length) {
ZLLogger::Instance().println("OleStreamReader", "not all bytes has been readed from piece");
}
myBuffer.clear();
if (!piece.isANSI) {
for (int i = 0; i < piece.length; i += 2) {
for (unsigned int i = 0; i < readedBytes; i += 2) {
ZLUnicodeUtil::Ucs2Char ch = OleUtil::getU2Bytes(textBuffer, i);
myBuffer.push_back(ch);
}
@ -219,7 +224,7 @@ bool OleStreamReader::fillBuffer(OleMainStream &stream) {
}
}
std::string utf8String;
myConverter->convert(utf8String, std::string(textBuffer, piece.length));
myConverter->convert(utf8String, std::string(textBuffer, readedBytes));
ZLUnicodeUtil::utf8ToUcs2(myBuffer, utf8String);
}
myCurBufferPosition = 0;