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

6
l10ntools/inc/cfgmerge.hxx
View File

@@ -127,7 +127,7 @@ protected:
private:
int ExecuteAnalyzedToken( int nToken, char *pToken );
std::vector<ByteString> aLanguages;
std::vector<rtl::OString> aLanguages;
void AddText(
ByteString &rText,
const ByteString &rIsoLang,
@@ -164,7 +164,7 @@ class CfgExport : public CfgOutputParser
private:
ByteString sPrj;
ByteString sPath;
std::vector<ByteString> aLanguages;
std::vector<rtl::OString> aLanguages;
protected:
virtual void WorkOnText(
ByteString &rText,
@@ -190,7 +190,7 @@ class CfgMerge : public CfgOutputParser
{
private:
MergeDataFile *pMergeDataFile;
std::vector<ByteString> aLanguages;
std::vector<rtl::OString> aLanguages;
ResData *pResData;
rtl::OString sFilename;

16
l10ntools/inc/export.hxx
View File

@@ -325,10 +325,10 @@ public:
static bool skipProject( ByteString sPrj ) ;
static void InitLanguages( bool bMergeMode = false );
static void InitForcedLanguages( bool bMergeMode = false );
static std::vector<ByteString> GetLanguages();
static std::vector<ByteString> GetForcedLanguages();
static std::vector<rtl::OString> GetLanguages();
static std::vector<rtl::OString> GetForcedLanguages();
static void SetLanguages( std::vector<ByteString> val );
static void SetLanguages( std::vector<rtl::OString> val );
static void RemoveUTF8ByteOrderMarker( rtl::OString &rString );
static bool hasUTF8ByteOrderMarker( const rtl::OString &rString );
static void RemoveUTF8ByteOrderMarkerFromFile( const ByteString &rFilename );
@@ -343,7 +343,7 @@ public:
static bool isSourceLanguage( const ByteString &sLanguage );
static bool isAllowed( const ByteString &sLanguage );
static void Languages( std::vector<ByteString>::const_iterator& begin , std::vector<ByteString>::const_iterator& end );
static void Languages( std::vector<rtl::OString>::const_iterator& begin , std::vector<rtl::OString>::const_iterator& end );
static void getRandomName( const ByteString& sPrefix , ByteString& sRandStr , const ByteString& sPostfix );
static void getCurrentDir( std::string& dir );
@@ -358,8 +358,8 @@ public:
ByteStringHashMap& aMap);
private:
static std::vector<ByteString> aLanguages;
static std::vector<ByteString> aForcedLanguages;
static std::vector<rtl::OString> aLanguages;
static std::vector<rtl::OString> aForcedLanguages;
sal_Bool WriteData( ResData *pResData, sal_Bool bCreateNew = sal_False );// called befor dest. cur ResData
sal_Bool WriteExportList( ResData *pResData, ExportList *pExportList,
@@ -493,7 +493,7 @@ class MergeDataFile
ByteString sErrorLog;
SvFileStream aErrLog;
MergeDataHashMap aMap;
std::set<ByteString> aLanguageSet;
std::set<rtl::OString> aLanguageSet;
MergeData *GetMergeData( ResData *pResData , bool bCaseSensitve = false );
void InsertEntry( const ByteString &rTYP, const ByteString &rGID, const ByteString &rLID,
@@ -508,7 +508,7 @@ class MergeDataFile
~MergeDataFile();
std::vector<ByteString> GetLanguages();
std::vector<rtl::OString> GetLanguages();
PFormEntrys *GetPFormEntrys( ResData *pResData );
PFormEntrys *GetPFormEntrysCaseSensitive( ResData *pResData );

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 );

2
l10ntools/inc/lngmerge.hxx
View File

@@ -51,7 +51,7 @@ private:
sal_Bool bDBIsUTF8;
sal_Bool bULF;
bool bQuiet;
std::vector<ByteString> aLanguages;
std::vector<rtl::OString> aLanguages;
bool isNextGroup(rtl::OString &sGroup_out, rtl::OString &sLine_in);
void ReadLine(const rtl::OString &rLine_in,

6
l10ntools/inc/xmlparse.hxx
View File

@@ -211,7 +211,7 @@ public:
XMLFile( const XMLFile& obj ) ;
~XMLFile();
ByteString* GetGroupID(std::deque<ByteString> &groupid);
ByteString* GetGroupID(std::deque<rtl::OString> &groupid);
void Print( XMLNode *pCur = NULL, sal_uInt16 nLevel = 0 );
virtual void SearchL10NElements( XMLParentNode *pCur, int pos = 0 );
void Extract( XMLFile *pCur = NULL );
@@ -230,7 +230,7 @@ public:
const String &GetName() { return sFileName; }
void SetName( const String &rFilename ) { sFileName = rFilename; }
void SetFullName( const String &rFullFilename ) { sFullName = rFullFilename; }
const std::vector<ByteString> getOrder(){ return order; }
const std::vector<rtl::OString> getOrder(){ return order; }
protected:
// writes a string as UTF8 with dos line ends to a given stream
@@ -250,7 +250,7 @@ protected:
TagMap nodes_localize;
XMLHashMap* XMLStrings;
std::vector <ByteString> order;
std::vector <rtl::OString> order;
};
/// An Utility class for XML

8
l10ntools/inc/xrmmerge.hxx
View File

@@ -47,7 +47,7 @@ private:
ByteString sCurrentOpenTag;
ByteString sCurrentCloseTag;
ByteString sCurrentText;
std::vector<ByteString> aLanguages;
std::vector<rtl::OString> aLanguages;
protected:
ByteString GetAttribute( const ByteString &rToken, const ByteString &rAttribute );
@@ -90,7 +90,7 @@ public:
class XRMResOutputParser : public XRMResParser
{
private:
std::vector<ByteString> aLanguages;
std::vector<rtl::OString> aLanguages;
protected:
SvFileStream *pOutputStream;
public:
@@ -108,7 +108,7 @@ private:
ResData *pResData;
ByteString sPrj;
ByteString sPath;
std::vector<ByteString> aLanguages;
std::vector<rtl::OString> aLanguages;
protected:
void WorkOnDesc(
@@ -144,7 +144,7 @@ private:
MergeDataFile *pMergeDataFile;
ByteString sFilename;
ResData *pResData;
std::vector<ByteString> aLanguages;
std::vector<rtl::OString> aLanguages;
protected:
void WorkOnDesc(

10
l10ntools/source/export2.cxx
View File

@@ -124,23 +124,23 @@ ByteString Export::DumpMap(const rtl::OString& rMapName,
}
/*****************************************************************************/
void Export::SetLanguages( std::vector<ByteString> val ){
void Export::SetLanguages( std::vector<rtl::OString> val ){
/*****************************************************************************/
aLanguages = val;
isInitialized = true;
}
/*****************************************************************************/
std::vector<ByteString> Export::GetLanguages(){
std::vector<rtl::OString> Export::GetLanguages(){
/*****************************************************************************/
return aLanguages;
}
/*****************************************************************************/
std::vector<ByteString> Export::GetForcedLanguages(){
std::vector<rtl::OString> Export::GetForcedLanguages(){
/*****************************************************************************/
return aForcedLanguages;
}
std::vector<ByteString> Export::aLanguages = std::vector<ByteString>();
std::vector<ByteString> Export::aForcedLanguages = std::vector<ByteString>();
std::vector<rtl::OString> Export::aLanguages = std::vector<rtl::OString>();
std::vector<rtl::OString> Export::aForcedLanguages = std::vector<rtl::OString>();
/*****************************************************************************/
void Export::QuotHTML( ByteString &rString )

2
l10ntools/source/helpex.cxx
View File

@@ -237,7 +237,7 @@ int _cdecl main( int argc, char *argv[] )
rtl::OString sHelpFile; // dummy
MergeDataFile aMergeDataFile( sSDFFile, sHelpFile, sal_False );
std::vector<ByteString> aLanguages;
std::vector<rtl::OString> aLanguages;
HelpParser::parse_languages( aLanguages , aMergeDataFile );
bool bCreateDir = true;

16
l10ntools/source/helpmerge.cxx
View File

@@ -156,10 +156,10 @@ bool HelpParser::CreateSDF(
const OUString sOUGsi1( rGsi1.GetBuffer() , rGsi1.Len() , RTL_TEXTENCODING_ASCII_US );
Export::InitLanguages( false );
std::vector<ByteString> aLanguages = Export::GetLanguages();
std::vector<rtl::OString> aLanguages = Export::GetLanguages();
std::vector<ByteString> order = file->getOrder();
std::vector<ByteString>::iterator pos;
std::vector<rtl::OString> order = file->getOrder();
std::vector<rtl::OString>::iterator pos;
XMLHashMap::iterator posm;
for( pos = order.begin(); pos != order.end() ; ++pos )
@@ -276,8 +276,8 @@ bool ByteStringLess( const ByteString& rKey1, const ByteString& rKey2 ) {
return rKey1.CompareTo( rKey2 )==COMPARE_LESS;
}
void HelpParser::parse_languages( std::vector<ByteString>& aLanguages , MergeDataFile& aMergeDataFile ){
std::vector<ByteString> aTmp;
void HelpParser::parse_languages( std::vector<rtl::OString>& aLanguages , MergeDataFile& aMergeDataFile ){
std::vector<rtl::OString> aTmp;
const ByteString ENUS ("en-US");
@@ -290,13 +290,13 @@ void HelpParser::parse_languages( std::vector<ByteString>& aLanguages , MergeDat
if( !Export::sForcedLanguages.isEmpty() )
{
std::vector<ByteString> aFL = Export::GetForcedLanguages();
std::vector<rtl::OString> aFL = Export::GetForcedLanguages();
std::copy( aFL.begin() ,
aFL.end() ,
back_inserter( aLanguages )
);
std::sort( aLanguages.begin() , aLanguages.end() , ByteStringLess );
std::vector<ByteString>::iterator unique_iter = std::unique( aLanguages.begin() , aLanguages.end() , ByteStringEqual );
std::vector<rtl::OString>::iterator unique_iter = std::unique( aLanguages.begin() , aLanguages.end() , ByteStringEqual );
std::copy( aLanguages.begin() , unique_iter , back_inserter( aTmp ) );
aLanguages = aTmp;
}
@@ -309,7 +309,7 @@ void HelpParser::parse_languages( std::vector<ByteString>& aLanguages , MergeDat
bool HelpParser::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 )
{

4
l10ntools/source/merge.cxx
View File

@@ -257,8 +257,8 @@ ByteString MergeDataFile::Dump(){
return sRet;
}
std::vector<ByteString> MergeDataFile::GetLanguages(){
return std::vector<ByteString>(aLanguageSet.begin(),aLanguageSet.end());
std::vector<rtl::OString> MergeDataFile::GetLanguages(){
return std::vector<rtl::OString>(aLanguageSet.begin(),aLanguageSet.end());
}
MergeData *MergeDataFile::GetMergeData( ResData *pResData , bool bCaseSensitive )