yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 02:09:35 +02:00
Code Issues Releases Wiki Activity

ms-word doc plugin: added forgotten [] for delete syntax

Browse source
This commit is contained in:
Alexander Turkin 2012-06-21 17:32:29 +04:00
parent 2f660b47ff
commit 0abb1f46a6
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
jni/NativeFormats/fbreader/src/formats/doc/OleMainStream.cpp
View file

@ -197,7 +197,7 @@ std::string OleMainStream::getPiecesTableBuffer(const char *headerBuffer, OleStr
tableStream.seek(clxOffset, true); tableStream.seek(clxOffset, true);
tableStream.read(clxBuffer, clxLength); tableStream.read(clxBuffer, clxLength);
std::string clx(clxBuffer, clxLength); std::string clx(clxBuffer, clxLength);
delete clxBuffer; delete[] clxBuffer;
//2 step: searching for pieces table buffer at CLX //2 step: searching for pieces table buffer at CLX
//(determines it by 0x02 as start symbol) //(determines it by 0x02 as start symbol)
@ -474,7 +474,7 @@ bool OleMainStream::readStylesheet(const char *headerBuffer, const OleEntry &tab
} }
} }
} while (styleSheetWasChanged); } while (styleSheetWasChanged);
delete buffer; delete[] buffer;
return true; return true;
} }
@ -522,7 +522,7 @@ bool OleMainStream::readCharInfoTable(const char *headerBuffer, const OleEntry &
myCharInfoList.push_back(CharPosToCharInfo(charPos, charInfo)); myCharInfoList.push_back(CharPosToCharInfo(charPos, charInfo));
} }
} }
delete formatPageBuffer; delete[] formatPageBuffer;
return true; return true;
} }
@ -580,7 +580,7 @@ bool OleMainStream::readParagraphStyleTable(const char *headerBuffer, const OleE
myStyleInfoList.push_back(CharPosToStyle(charPos, styleInfo)); myStyleInfoList.push_back(CharPosToStyle(charPos, styleInfo));
} }
} }
delete formatPageBuffer; delete[] formatPageBuffer;
return true; return true;
} }
@ -638,14 +638,14 @@ bool OleMainStream::readSectionsInfoTable(const char *headerBuffer, const OleEnt
} }
char *formatPageBuffer = new char[bytes]; char *formatPageBuffer = new char[bytes];
if (read(formatPageBuffer, bytes) != bytes) { if (read(formatPageBuffer, bytes) != bytes) {
delete formatPageBuffer; delete[] formatPageBuffer;
continue; continue;
} }
SectionInfo sectionInfo; SectionInfo sectionInfo;
sectionInfo.charPos = charPos.at(index); sectionInfo.charPos = charPos.at(index);
getSectionInfo(formatPageBuffer + 2, bytes - 2, sectionInfo); getSectionInfo(formatPageBuffer + 2, bytes - 2, sectionInfo);
mySectionInfoList.push_back(sectionInfo); mySectionInfoList.push_back(sectionInfo);
delete formatPageBuffer; delete[] formatPageBuffer;
} }
return true; return true;
} }
@ -867,7 +867,7 @@ bool OleMainStream::readToBuffer(std::string &result, unsigned int offset, size_
return false; return false;
} }
result = std::string(buffer, length); result = std::string(buffer, length);
delete buffer; delete[] buffer;
return true; return true;
} }

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

@ -229,7 +229,7 @@ bool OleStreamReader::fillBuffer(OleMainStream &stream) {
} }
myCurBufferPosition = 0; myCurBufferPosition = 0;
++myNextPieceNumber; ++myNextPieceNumber;
delete textBuffer; delete[] textBuffer;
return true; return true;
} }