diff options
author | Rüdiger Timm <rt@openoffice.org> | 2004-11-18 07:17:02 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-18 07:17:02 +0000 |
commit | 45ca22da3ba2af1ad65fe17e542e88ce54c015e7 (patch) | |
tree | 6bfa3370db0752daf0d94be9b0749f7d6851290a /transex3 | |
parent | e48156a9d4efe24b264edf6e06ad89555c10469d (diff) |
INTEGRATION: CWS babelfish04 (1.3.12); FILE MERGED
2004/11/17 18:07:10 ihi 1.3.12.1: #i35471# #i36441# Sort order / speed fix
Diffstat (limited to 'transex3')
-rw-r--r-- | transex3/source/helpmerge.cxx | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/transex3/source/helpmerge.cxx b/transex3/source/helpmerge.cxx index a381bf7ee228..6c9243989c34 100644 --- a/transex3/source/helpmerge.cxx +++ b/transex3/source/helpmerge.cxx @@ -2,9 +2,9 @@ * * $RCSfile: helpmerge.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: pjunck $ $Date: 2004-11-02 16:04:47 $ + * last change: $Author: rt $ $Date: 2004-11-18 08:17:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -234,8 +234,17 @@ bool HelpParser::CreateSDF( Export::InitLanguages( false ); std::vector<ByteString> aLanguages = Export::GetLanguages(); - for(XMLHashMap::iterator pos=aXMLStrHM->begin();pos!=aXMLStrHM->end();++pos){ - pElem=pos->second; + //for(XMLHashMap::iterator pos=aXMLStrHM->begin();pos!=aXMLStrHM->end();++pos){ + std::vector<ByteString> order = file->getOrder(); + std::vector<ByteString>::iterator pos; + XMLHashMap::iterator posm; + + for( pos = order.begin(); pos != order.end() ; ++pos ){ + //ByteString sKey = *pos; + posm = aXMLStrHM->find( *pos ); + pElem = posm->second; + //pElem = aXMLStrHM[ sKey ]; + //pElem=pos->second; ByteString sCur; for( long int n = 0; n < aLanguages.size(); n++ ){ sCur = aLanguages[ n ]; @@ -258,7 +267,7 @@ bool HelpParser::CreateSDF( if ( rRoot_in.Len()) sBuffer.append( sOUActFileName ); sBuffer.append( GSI_SEQUENCE1 ); //"\t0\thelp\t"; - ByteString sID = pos->first; // ID + ByteString sID = posm->first; // ID sBuffer.append( OUString( sID.GetBuffer() , sID.Len() , RTL_TEXTENCODING_UTF8 ) ); sBuffer.append( GSI_TAB ); //"\t"; ByteString sOldRef = pXMLElement->GetOldref(); // oldref |