mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ByteString->rtl::OString

Browse Source
This commit is contained in:
Caolán McNamara
2012-01-25 20:34:11 +00:00
parent b7da830447
commit 901b6f587d
10 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
l10ntools/inc/helpmerge.hxx
View File

@@ -60,14 +60,14 @@ public:
static bool CreateSDF( const ByteString &rSDFFile_in, const ByteString &rPrj_in, const ByteString &rRoot_in,
const ByteString &sHelpFile, XMLFile *pXmlFile, const ByteString &rGsi1 );
static void parse_languages( std::vector<ByteString>& aLanguages , MergeDataFile& aMergeDataFile );
static void parse_languages( std::vector<rtl::OString>& aLanguages , MergeDataFile& aMergeDataFile );
/// Method merges the String from the SDFfile into XMLfile. Both Strings must
/// point to existing files.
bool Merge( const ByteString &rSDFFile_in, const ByteString &rDestinationFile_in ,
const rtl::OString& sLanguage , MergeDataFile& aMergeDataFile );
bool Merge( const ByteString &rSDFFile, const ByteString &rPathX , const ByteString &rPathY , bool bISO
, const std::vector<ByteString>& aLanguages , MergeDataFile& aMergeDataFile , bool bCreateDir );
, const std::vector<rtl::OString>& aLanguages , MergeDataFile& aMergeDataFile , bool bCreateDir );
private:
static ByteString makeAbsolutePath( const ByteString& sHelpFile , const ByteString& rRoot_in );