diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-07-30 11:42:16 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-07-30 11:42:16 +0000 |
commit | beae59f724fce248ea86da9f31591b8cf80c8ecd (patch) | |
tree | 1e6ee0a8e67f51c705bf7b86d20302fc1fb56843 /xmlhelp | |
parent | 2a416b978441820e31419ddf1beef8e00d12c18c (diff) |
INTEGRATION: CWS sb92 (1.14.10); FILE MERGED
2008/07/23 11:09:34 sb 1.14.10.1: #i83545# SOLARIS problem seems to be caused by some std::ifstream::~ifstream bug in STLport-4.0, which appears to be worked around by calling std::ifstream::close
Diffstat (limited to 'xmlhelp')
-rw-r--r-- | xmlhelp/source/com/sun/star/help/HelpLinker.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/xmlhelp/source/com/sun/star/help/HelpLinker.cxx b/xmlhelp/source/com/sun/star/help/HelpLinker.cxx index bff1d6533c..84f9048fc4 100644 --- a/xmlhelp/source/com/sun/star/help/HelpLinker.cxx +++ b/xmlhelp/source/com/sun/star/help/HelpLinker.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: HelpLinker.cxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.16 $ * * This file is part of OpenOffice.org. * @@ -406,6 +406,7 @@ void HelpLinker::link() throw( HelpProcessingException ) if (!key.empty() && !data.empty()) hidlistTranslation[key] = data; } + fileReader.close(); // lastly, initialize the indexBuilder if ( (!bExtensionMode || bIndexForExtension) && !helpFiles.empty()) @@ -605,7 +606,6 @@ void HelpLinker::link() throw( HelpProcessingException ) } } // while loop over hzip files ending - if( !bExtensionMode ) std::cout << std::endl; @@ -645,10 +645,6 @@ void HelpLinker::link() throw( HelpProcessingException ) } } -#ifdef SOLARIS - if( !bExtensionMode ) - _exit( 0 ); -#endif /* ///////////////////////////////////////////////////////////////////////// /// remove temprary directory for index creation @@ -685,6 +681,7 @@ void HelpLinker::main(std::vector<std::string> &args, std::string* pExtensionPat if (!token.empty()) stringList.push_back(token); } + fileReader.close(); args = stringList; } |