diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 16:19:10 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 16:19:10 +0000 |
| commit | a41abe94f6aa33b83f0a1b6a40618c3d7ec3b7b9 (patch) | |
| tree | 5e0c7f31628c790217db99cdcbb0714e51cb6c65 /transex3/inc | |
| parent | 9d87dfa547a3c2e8592e0a20d7f5e84eac85c7f9 (diff) | |
INTEGRATION: CWS warnings01 (1.5.4); FILE MERGED
2006/04/18 17:03:24 ihi 1.5.4.1: resync fix
Diffstat (limited to 'transex3/inc')
| -rw-r--r-- | transex3/inc/helpmerge.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/transex3/inc/helpmerge.hxx b/transex3/inc/helpmerge.hxx index bc9b32a9123b..feba66a10eb3 100644 --- a/transex3/inc/helpmerge.hxx +++ b/transex3/inc/helpmerge.hxx @@ -4,9 +4,9 @@ * * $RCSfile: helpmerge.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-03-29 13:25:19 $ + * last change: $Author: hr $ $Date: 2006-06-19 17:19:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -49,9 +49,9 @@ class HelpParser { private: + ByteString sHelpFile; bool bUTF8; bool bHasInputList; - ByteString sHelpFile; /// Copy fallback language String (ENUS,DE) into position of the numeric language iso code /// @PRECOND 0 < langIdx_in < MAX_IDX @@ -85,7 +85,7 @@ public: private: ByteString GetOutpath( const ByteString& rPathX , const ByteString& sCur , const ByteString& rPathY ); bool MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile , const ByteString& sLanguage , ByteString sPath ); -; + void Process( LangHashMap* aLangHM , const ByteString& sCur , ResData *pResData , MergeDataFile& aMergeDataFile ); void ProcessHelp( LangHashMap* aLangHM , const ByteString& sCur , ResData *pResData , MergeDataFile& aMergeDataFile ); void MakeDir( const ByteString& sPath ); |