Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed false error report with helpfiles without index

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-01-24 15:38:42 +00:00
parent 446f8f2aad
commit b19d5e569e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/html/helpdata.cpp
View File

@@ -222,7 +222,7 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, c
HP_TagHandler *handler = new HP_TagHandler(book); HP_TagHandler *handler = new HP_TagHandler(book);
parser.AddTagHandler(handler); parser.AddTagHandler(handler);
f = ( contentsfile.IsEmpty() ? 0 : fsys.OpenFile(contentsfile) ); f = ( contentsfile.IsEmpty() ? NULL : fsys.OpenFile(contentsfile) );
if (f) { if (f) {
sz = f -> GetStream() -> GetSize(); sz = f -> GetStream() -> GetSize();
buf = new char[sz + 1]; buf = new char[sz + 1];
@@ -237,7 +237,7 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, c
else else
wxLogError(_("Cannot open contents file: %s"), contentsfile.mb_str()); wxLogError(_("Cannot open contents file: %s"), contentsfile.mb_str());
f = ( indexfile.IsEmpty() ? 0 : fsys.OpenFile(indexfile) ); f = ( indexfile.IsEmpty() ? NULL : fsys.OpenFile(indexfile) );
if (f) { if (f) {
sz = f -> GetStream() -> GetSize(); sz = f -> GetStream() -> GetSize();
buf = new char[sz + 1]; buf = new char[sz + 1];
@@ -249,7 +249,7 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, c
handler -> WriteOut(m_Index, m_IndexCnt); handler -> WriteOut(m_Index, m_IndexCnt);
delete[] buf; delete[] buf;
} }
else else if (!indexfile.IsEmpty())
wxLogError(_("Cannot open index file: %s"), indexfile.mb_str()); wxLogError(_("Cannot open index file: %s"), indexfile.mb_str());
return TRUE; return TRUE;
} }