diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-06-04 08:47:58 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-06-04 08:47:58 +0000 |
| commit | 149465394495a9d152ad20f1074d1330ecc6c08d (patch) | |
| tree | 5a6dd33d3ad4fc1f48e00d64ffd83499362cb51a | |
| parent | 291b5fe139de78f48183c844453ba64a047b88b4 (diff) | |
INTEGRATION: CWS l10nfix26 (1.10.8); FILE MERGED
2008/06/02 15:03:11 ihi 1.10.8.1: Better error message output
| -rw-r--r-- | transex3/inc/helpmerge.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/transex3/inc/helpmerge.hxx b/transex3/inc/helpmerge.hxx index 6c925a4aa0e7..5402d77d7333 100644 --- a/transex3/inc/helpmerge.hxx +++ b/transex3/inc/helpmerge.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: helpmerge.hxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.11 $ * * This file is part of OpenOffice.org. * @@ -76,6 +76,8 @@ public: , const std::vector<ByteString>& aLanguages , MergeDataFile& aMergeDataFile , bool bCreateDir ); private: + static ByteString makeAbsolutePath( const ByteString& sHelpFile , const ByteString& rRoot_in ); + ByteString GetOutpath( const ByteString& rPathX , const ByteString& sCur , const ByteString& rPathY ); bool MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile , const ByteString& sLanguage , ByteString sPath ); |