Skip to content

C
core
Kaydet (Commit) 1b1f0bbb authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

ByteString->rtl::OString

üst 4521fc85
Hide whitespace changes
Inline Side-by-side
Showing with 137 additions and 163 deletions
l10ntools/inc/cfgmerge.hxx
Dosyayı görüntüle @ 1b1f0bbb
...@@ -46,21 +46,22 @@ friend class CfgParser; ...@@ -46,21 +46,22 @@ friend class CfgParser;
friend class CfgExport; friend class CfgExport;
friend class CfgMerge; friend class CfgMerge;
private: private:
ByteString sTagType; rtl::OString sTagType;
ByteString sIdentifier; rtl::OString sIdentifier;
ByteString sResTyp; rtl::OString sResTyp;
ByteString sTextTag; rtl::OString sTextTag;
ByteString sEndTextTag; rtl::OString sEndTextTag;
ByteStringHashMap sText; ByteStringHashMap sText;
public: public:
CfgStackData( const ByteString &rTag, const ByteString &rId ) CfgStackData(const rtl::OString &rTag, const rtl::OString &rId)
: sTagType( rTag ), sIdentifier( rId ) {}; : sTagType( rTag ), sIdentifier( rId )
{}
ByteString &GetTagType() { return sTagType; } const rtl::OString &GetTagType() { return sTagType; }
ByteString &GetIdentifier() { return sIdentifier; } const rtl::OString &GetIdentifier() { return sIdentifier; }
}; };
...@@ -79,18 +80,19 @@ public: ...@@ -79,18 +80,19 @@ public:
CfgStack() {} CfgStack() {}
~CfgStack(); ~CfgStack();
CfgStackData *Push( const ByteString &rTag, const ByteString &rId ); CfgStackData *Push(const rtl::OString &rTag, const rtl::OString &rId);
CfgStackData *Pop() CfgStackData *Pop()
{ {
if ( maList.empty() ) return NULL; if (maList.empty())
CfgStackData* temp = maList.back(); return NULL;
maList.pop_back(); CfgStackData* temp = maList.back();
return temp; maList.pop_back();
} return temp;
}
CfgStackData *GetStackData( size_t nPos = LIST_APPEND ); CfgStackData *GetStackData( size_t nPos = LIST_APPEND );
ByteString GetAccessPath( size_t nPos = LIST_APPEND ); rtl::OString GetAccessPath( size_t nPos = LIST_APPEND );
size_t size() const { return maList.size(); } size_t size() const { return maList.size(); }
}; };
...@@ -102,11 +104,11 @@ public: ...@@ -102,11 +104,11 @@ public:
class CfgParser class CfgParser
{ {
protected: protected:
ByteString sCurrentResTyp; rtl::OString sCurrentResTyp;
ByteString sCurrentIsoLang; rtl::OString sCurrentIsoLang;
ByteString sCurrentText; ByteString sCurrentText;
ByteString sLastWhitespace; rtl::OString sLastWhitespace;
CfgStack aStack; CfgStack aStack;
CfgStackData *pStackData; CfgStackData *pStackData;
...@@ -115,11 +117,11 @@ protected: ...@@ -115,11 +117,11 @@ protected:
virtual void WorkOnText( virtual void WorkOnText(
ByteString &rText, ByteString &rText,
const ByteString &nLangIndex )=0; const rtl::OString &rLangIndex )=0;
virtual void WorkOnRessourceEnd()=0; virtual void WorkOnRessourceEnd()=0;
virtual void Output( const ByteString& rOutput )=0; virtual void Output(const rtl::OString & rOutput)=0;
void Error( const ByteString &rError ); void Error( const ByteString &rError );
...@@ -131,7 +133,7 @@ private: ...@@ -131,7 +133,7 @@ private:
const ByteString &rIsoLang, const ByteString &rIsoLang,
const ByteString &rResTyp ); const ByteString &rResTyp );
sal_Bool IsTokenClosed( const ByteString &rToken ); sal_Bool IsTokenClosed(const rtl::OString &rToken);
public: public:
CfgParser(); CfgParser();
...@@ -164,13 +166,13 @@ private: ...@@ -164,13 +166,13 @@ private:
ByteString sPath; ByteString sPath;
std::vector<ByteString> aLanguages; std::vector<ByteString> aLanguages;
protected: protected:
void WorkOnText( virtual void WorkOnText(
ByteString &rText, ByteString &rText,
const ByteString &rIsoLang const rtl::OString &rIsoLang
); );
void WorkOnRessourceEnd(); void WorkOnRessourceEnd();
void Output( const ByteString& rOutput ); void Output(const rtl::OString& rOutput);
public: public:
CfgExport( CfgExport(
const ByteString &rOutputFile, const ByteString &rOutputFile,
...@@ -191,23 +193,18 @@ private: ...@@ -191,23 +193,18 @@ private:
std::vector<ByteString> aLanguages; std::vector<ByteString> aLanguages;
ResData *pResData; ResData *pResData;
ByteString sFilename; rtl::OString sFilename;
sal_Bool bEnglish; sal_Bool bEnglish;
protected: protected:
void WorkOnText( virtual void WorkOnText(ByteString &rText, const rtl::OString &rLangIndex);
ByteString &rText,
const ByteString &nLangIndex );
void WorkOnRessourceEnd(); void WorkOnRessourceEnd();
void Output( const ByteString& rOutput ); void Output(const rtl::OString& rOutput);
public: public:
CfgMerge( CfgMerge(const rtl::OString &rMergeSource,
const ByteString &rMergeSource, const rtl::OString &rOutputFile, const rtl::OString &rFilename);
const ByteString &rOutputFile,
ByteString &rFilename
);
~CfgMerge(); ~CfgMerge();
}; };
......
l10ntools/source/cfgmerge.cxx
Dosyayı görüntüle @ 1b1f0bbb
...@@ -64,8 +64,8 @@ ByteString sPrjRoot; ...@@ -64,8 +64,8 @@ ByteString sPrjRoot;
ByteString sInputFileName; ByteString sInputFileName;
ByteString sActFileName; ByteString sActFileName;
ByteString sFullEntry; ByteString sFullEntry;
ByteString sOutputFile; rtl::OString sOutputFile;
ByteString sMergeSrc; rtl::OString sMergeSrc;
String sUsedTempFile; String sUsedTempFile;
CfgParser *pParser; CfgParser *pParser;
...@@ -145,7 +145,7 @@ extern char *GetOutputFile( int argc, char* argv[]) ...@@ -145,7 +145,7 @@ extern char *GetOutputFile( int argc, char* argv[])
} }
break; break;
case STATE_MERGESRC: { case STATE_MERGESRC: {
sMergeSrc = ByteString( argv[ i ]); sMergeSrc = rtl::OString(argv[i]);
bMergeMode = sal_True; // activate merge mode, cause merge database found bMergeMode = sal_True; // activate merge mode, cause merge database found
} }
break; break;
...@@ -160,26 +160,25 @@ extern char *GetOutputFile( int argc, char* argv[]) ...@@ -160,26 +160,25 @@ extern char *GetOutputFile( int argc, char* argv[])
if ( bInput ) { if ( bInput ) {
// command line is valid // command line is valid
bEnableExport = sal_True; bEnableExport = sal_True;
char *pReturn = new char[ sOutputFile.Len() + 1 ]; char *pReturn = new char[ sOutputFile.getLength() + 1 ];
strcpy( pReturn, sOutputFile.GetBuffer()); // #100211# - checked strcpy( pReturn, sOutputFile.getStr()); // #100211# - checked
return pReturn; return pReturn;
} }
// command line is not valid // command line is not valid
return NULL; return NULL;
} }
/*****************************************************************************/
int InitCfgExport( char *pOutput , char* pFilename ) int InitCfgExport( char *pOutput , char* pFilename )
/*****************************************************************************/
{ {
// instanciate Export // instanciate Export
ByteString sOutput( pOutput ); rtl::OString sOutput( pOutput );
ByteString sFilename( pFilename ); ByteString sFilename( pFilename );
Export::InitLanguages(); Export::InitLanguages();
if ( bMergeMode ) if ( bMergeMode )
pParser = new CfgMerge( sMergeSrc, sOutputFile, sFilename ); pParser = new CfgMerge( sMergeSrc, sOutputFile, sFilename );
else if ( sOutputFile.Len()) else if ( sOutputFile.getLength())
pParser = new CfgExport( sOutputFile, sPrj, sActFileName ); pParser = new CfgExport( sOutputFile, sPrj, sActFileName );
return 1; return 1;
...@@ -283,7 +282,7 @@ int GetError() ...@@ -283,7 +282,7 @@ int GetError()
// class CfgStackData // class CfgStackData
// //
CfgStackData* CfgStack::Push( const ByteString &rTag, const ByteString &rId ) CfgStackData* CfgStack::Push(const rtl::OString &rTag, const rtl::OString &rId)
{ {
CfgStackData *pD = new CfgStackData( rTag, rId ); CfgStackData *pD = new CfgStackData( rTag, rId );
maList.push_back( pD ); maList.push_back( pD );
...@@ -303,21 +302,20 @@ CfgStack::~CfgStack() ...@@ -303,21 +302,20 @@ CfgStack::~CfgStack()
maList.clear(); maList.clear();
} }
/*****************************************************************************/ rtl::OString CfgStack::GetAccessPath( size_t nPos )
ByteString CfgStack::GetAccessPath( size_t nPos )
/*****************************************************************************/
{ {
if ( nPos == LIST_APPEND ) if ( nPos == LIST_APPEND )
nPos = maList.size() - 1; nPos = maList.size() - 1;
ByteString sReturn; rtl::OStringBuffer sReturn;
for ( size_t i = 0; i <= nPos; i++ ) { for (size_t i = 0; i <= nPos; ++i)
if ( i ) {
sReturn += "."; if (i)
sReturn += GetStackData( i )->GetIdentifier(); sReturn.append('.');
sReturn.append(GetStackData( i )->GetIdentifier());
} }
return sReturn; return sReturn.makeStringAndClear();
} }
/*****************************************************************************/ /*****************************************************************************/
...@@ -347,18 +345,13 @@ CfgParser::CfgParser() ...@@ -347,18 +345,13 @@ CfgParser::CfgParser()
{ {
} }
/*****************************************************************************/
CfgParser::~CfgParser() CfgParser::~CfgParser()
/*****************************************************************************/
{ {
} }
sal_Bool CfgParser::IsTokenClosed(const rtl::OString &rToken)
/*****************************************************************************/
sal_Bool CfgParser::IsTokenClosed( const ByteString &rToken )
/*****************************************************************************/
{ {
return rToken.GetChar( rToken.Len() - 2 ) == '/'; return rToken[rToken.getLength() - 2] == '/';
} }
/*****************************************************************************/ /*****************************************************************************/
...@@ -392,7 +385,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken ) ...@@ -392,7 +385,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
if ( sToken == " " || sToken == "\t" ) if ( sToken == " " || sToken == "\t" )
sLastWhitespace += sToken; sLastWhitespace += sToken;
ByteString sTokenName; rtl::OString sTokenName;
ByteString sTokenId; ByteString sTokenId;
sal_Bool bOutput = sal_True; sal_Bool bOutput = sal_True;
...@@ -484,13 +477,15 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken ) ...@@ -484,13 +477,15 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
break; break;
case CFG_CLOSETAG: case CFG_CLOSETAG:
sTokenName = getToken(getToken(getToken(sToken, 1, '/'), 0, '>'), 0, ' '); sTokenName = getToken(getToken(getToken(sToken, 1, '/'), 0, '>'), 0, ' ');
if ( aStack.GetStackData() && ( aStack.GetStackData()->GetTagType() == sTokenName )) { if ( aStack.GetStackData() && ( aStack.GetStackData()->GetTagType() == sTokenName ))
if ( ! sCurrentText.Len()) {
if (!sCurrentText.Len())
WorkOnRessourceEnd(); WorkOnRessourceEnd();
aStack.Pop(); aStack.Pop();
pStackData = aStack.GetStackData(); pStackData = aStack.GetStackData();
} }
else { else
{
ByteString sError( "Misplaced close tag: " ); ByteString sError( "Misplaced close tag: " );
ByteString sInFile(" in file "); ByteString sInFile(" in file ");
sError += sToken; sError += sToken;
...@@ -511,7 +506,8 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken ) ...@@ -511,7 +506,8 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
break; break;
} }
if ( sCurrentText.Len() && nToken != CFG_TEXTCHAR ) { if ( sCurrentText.Len() && nToken != CFG_TEXTCHAR )
{
AddText( sCurrentText, sCurrentIsoLang, sCurrentResTyp ); AddText( sCurrentText, sCurrentIsoLang, sCurrentResTyp );
Output( sCurrentText ); Output( sCurrentText );
sCurrentText = ""; sCurrentText = "";
...@@ -527,12 +523,8 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken ) ...@@ -527,12 +523,8 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
return 1; return 1;
} }
/*****************************************************************************/ void CfgExport::Output(const rtl::OString&)
void CfgExport::Output( const ByteString& rOutput )
/*****************************************************************************/
{ {
// Dummy operation to suppress warnings caused by poor class design
ByteString a( rOutput );
} }
/*****************************************************************************/ /*****************************************************************************/
...@@ -681,14 +673,12 @@ void CfgExport::WorkOnRessourceEnd() ...@@ -681,14 +673,12 @@ void CfgExport::WorkOnRessourceEnd()
} }
} }
/*****************************************************************************/
void CfgExport::WorkOnText( void CfgExport::WorkOnText(
ByteString &rText, ByteString &rText,
const ByteString &rIsoLang const rtl::OString &rIsoLang
) )
/*****************************************************************************/
{ {
if( rIsoLang.Len() ) Export::UnquotHTML( rText ); if( rIsoLang.getLength() ) Export::UnquotHTML( rText );
} }
...@@ -696,18 +686,16 @@ void CfgExport::WorkOnText( ...@@ -696,18 +686,16 @@ void CfgExport::WorkOnText(
// class CfgMerge // class CfgMerge
// //
/*****************************************************************************/
CfgMerge::CfgMerge( CfgMerge::CfgMerge(
const ByteString &rMergeSource, const ByteString &rOutputFile, const rtl::OString &rMergeSource, const rtl::OString &rOutputFile,
ByteString &rFilename ) const rtl::OString &rFilename)
/*****************************************************************************/
: CfgOutputParser( rOutputFile ), : CfgOutputParser( rOutputFile ),
pMergeDataFile( NULL ), pMergeDataFile( NULL ),
pResData( NULL ), pResData( NULL ),
sFilename( rFilename ), sFilename( rFilename ),
bEnglish( sal_False ) bEnglish( sal_False )
{ {
if (rMergeSource.Len()) if (rMergeSource.getLength())
{ {
pMergeDataFile = new MergeDataFile( pMergeDataFile = new MergeDataFile(
rMergeSource, sInputFileName, bErrorLog, true ); rMergeSource, sInputFileName, bErrorLog, true );
...@@ -730,12 +718,7 @@ CfgMerge::~CfgMerge() ...@@ -730,12 +718,7 @@ CfgMerge::~CfgMerge()
delete pResData; delete pResData;
} }
/*****************************************************************************/ void CfgMerge::WorkOnText(ByteString &rText, const rtl::OString& rLangIndex)
void CfgMerge::WorkOnText(
ByteString &rText,
const ByteString& nLangIndex
)
/*****************************************************************************/
{ {
if ( pMergeDataFile && bLocalize ) { if ( pMergeDataFile && bLocalize ) {
...@@ -757,15 +740,15 @@ void CfgMerge::WorkOnText( ...@@ -757,15 +740,15 @@ void CfgMerge::WorkOnText(
pResData->sResTyp = pStackData->sResTyp; pResData->sResTyp = pStackData->sResTyp;
} }
if (( nLangIndex.EqualsIgnoreCaseAscii("en-US") )) if (rLangIndex.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("en-US")))
bEnglish = sal_True; bEnglish = sal_True;
PFormEntrys *pEntrys = pMergeDataFile->GetPFormEntrysCaseSensitive( pResData ); PFormEntrys *pEntrys = pMergeDataFile->GetPFormEntrysCaseSensitive( pResData );
if ( pEntrys ) { if ( pEntrys ) {
ByteString sContent; ByteString sContent;
pEntrys->GetText( sContent, STRING_TYP_TEXT, nLangIndex ); pEntrys->GetText( sContent, STRING_TYP_TEXT, rLangIndex );
if ( Export::isAllowed( nLangIndex ) && if ( Export::isAllowed( rLangIndex ) &&
( sContent != "-" ) && ( sContent.Len())) ( sContent != "-" ) && ( sContent.Len()))
{ {
Export::QuotHTML( rText ); Export::QuotHTML( rText );
...@@ -774,12 +757,10 @@ void CfgMerge::WorkOnText( ...@@ -774,12 +757,10 @@ void CfgMerge::WorkOnText(
} }
} }
/*****************************************************************************/ void CfgMerge::Output(const rtl::OString& rOutput)
void CfgMerge::Output( const ByteString& rOutput )
/*****************************************************************************/
{ {
if ( pOutputStream ) if (pOutputStream)
pOutputStream->Write( rOutput.GetBuffer(), rOutput.Len()); pOutputStream->Write(rOutput.getStr(), rOutput.getLength());
} }
/*****************************************************************************/ /*****************************************************************************/
......
rsc/inc/rscrsc.hxx
Dosyayı görüntüle @ 1b1f0bbb
...@@ -97,14 +97,14 @@ private: ...@@ -97,14 +97,14 @@ private:
void Append( const rtl::OString& rOutputSrs, const rtl::OString& rTmpFile ); void Append( const rtl::OString& rOutputSrs, const rtl::OString& rTmpFile );
bool GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile, bool GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
const WriteRcContext& rContext, const WriteRcContext& rContext,
const ByteString& rBaseFileName, const rtl::OString& rBaseFileName,
ByteString& rImagePath, ByteString& rImagePath,
FILE* pSysListFile ); FILE* pSysListFile );
void PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, void PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
const WriteRcContext& rContext, const WriteRcContext& rContext,
const DirEntry& rSrsInPath, const DirEntry& rSrsInPath,
const DirEntry& rSrsOutPath ); const DirEntry& rSrsOutPath );
public: public:
RscTypCont* pTC; // String und Id-Verwalter RscTypCont* pTC; // String und Id-Verwalter
......
rsc/source/parser/rscibas.cxx
Dosyayı görüntüle @ 1b1f0bbb
...@@ -147,19 +147,19 @@ void RscLangEnum::Init( RscNameTable& rNames ) ...@@ -147,19 +147,19 @@ void RscLangEnum::Init( RscNameTable& rNames )
rtl::OString aEnvIsoTokens = getenv( "RSC_LANG_ISO" ); rtl::OString aEnvIsoTokens = getenv( "RSC_LANG_ISO" );
if ( aEnvIsoTokens.getLength() ) if ( aEnvIsoTokens.getLength() )
{ {
ByteString aIsoToken; rtl::OString aIsoToken;
sal_uInt16 nTokenCounter = 0; sal_uInt16 nTokenCounter = 0;
sal_Bool bOneMore = 1; sal_Bool bOneMore = 1;
while ( bOneMore ) while ( bOneMore )
{ {
aIsoToken = comphelper::string::getToken(aEnvIsoTokens, nTokenCounter, ' '); aIsoToken = comphelper::string::getToken(aEnvIsoTokens, nTokenCounter, ' ');
if ( aIsoToken.Len() ) if ( aIsoToken.getLength() )
{ {
SetConstant( rNames.Put( aIsoToken.GetBuffer(), CONSTNAME, mnLangId ), mnLangId ); SetConstant( rNames.Put( aIsoToken.getStr(), CONSTNAME, mnLangId ), mnLangId );
if ( ! GetLangId( aIsoToken )) if ( ! GetLangId( aIsoToken ))
ULong_Iso_map[ aIsoToken ] = mnLangId; ULong_Iso_map[ aIsoToken ] = mnLangId;
#if OSL_DEBUG_LEVEL > 2 #if OSL_DEBUG_LEVEL > 2
fprintf( stderr, "Env ISO Language out: %s 0x%lx\n", aIsoToken.GetBuffer(), mnLangId ); fprintf( stderr, "Env ISO Language out: %s 0x%lx\n", aIsoToken.getStr(), mnLangId );
#endif #endif
mnLangId++; mnLangId++;
} }
......
rsc/source/parser/rsclex.cxx
Dosyayı görüntüle @ 1b1f0bbb
...@@ -381,7 +381,7 @@ void IncludeParser( RscFileInst * pFileInst ) ...@@ -381,7 +381,7 @@ void IncludeParser( RscFileInst * pFileInst )
} }
else if( INCLUDE_STRING == nToken ){ else if( INCLUDE_STRING == nToken ){
lKey = pTypCon->aFileTab.NewIncFile( aYYSType.string, lKey = pTypCon->aFileTab.NewIncFile( aYYSType.string,
ByteString() ); rtl::OString() );
pFName->InsertDependFile( lKey, ULONG_MAX ); pFName->InsertDependFile( lKey, ULONG_MAX );
}; };
}; };
......
rsc/source/parser/rscyacc.y
Dosyayı görüntüle @ 1b1f0bbb
...@@ -504,13 +504,13 @@ type ...@@ -504,13 +504,13 @@ type
{ {
if( $1 ) if( $1 )
{ {
ByteString aTypeName = pHS->getString( $1->GetId() ); rtl::OString aTypeName = rtl::OStringBuffer(pHS->getString($1->GetId())).
aTypeName += "[]"; append("[]").makeStringAndClear();
$$ = pTC->SearchType( pHS->getID( aTypeName.GetBuffer(), true ) ); $$ = pTC->SearchType( pHS->getID( aTypeName.getStr(), true ) );
if( !$$ ) if( !$$ )
{ {
RscCont * pCont; RscCont * pCont;
pCont = new RscCont( pHS->getID( aTypeName.GetBuffer() ), RSC_NOTYPE ); pCont = new RscCont( pHS->getID( aTypeName.getStr() ), RSC_NOTYPE );
pCont->SetTypeClass( $1 ); pCont->SetTypeClass( $1 );
pTC->InsertType( pCont ); pTC->InsertType( pCont );
$$ = pCont; $$ = pCont;
......
rsc/source/prj/start.cxx
Dosyayı görüntüle @ 1b1f0bbb
...@@ -62,22 +62,21 @@ int rsc2_main(int, char**); ...@@ -62,22 +62,21 @@ int rsc2_main(int, char**);
|* |*
|* Beschreibung |* Beschreibung
*************************************************************************/ *************************************************************************/
static sal_Bool CallPrePro( const ByteString& rInput, static sal_Bool CallPrePro( const rtl::OString& rInput,
const ByteString& rOutput, const rtl::OString& rOutput, RscPtrPtr * pCmdLine,
RscPtrPtr * pCmdLine, sal_Bool bResponse )
sal_Bool bResponse )
{ {
RscPtrPtr aNewCmdL; // Kommandozeile RscPtrPtr aNewCmdL; // Kommandozeile
RscPtrPtr aRespCmdL; // Kommandozeile RscPtrPtr aRespCmdL; // Kommandozeile
RscPtrPtr * pCmdL = &aNewCmdL; RscPtrPtr * pCmdL = &aNewCmdL;
int i, nRet; int i, nRet;
FILE* fRspFile = NULL; FILE* fRspFile = NULL;
ByteString aRspFileName; rtl::OString aRspFileName;
if( bResponse ) if( bResponse )
{ {
aRspFileName = ::GetTmpFileName(); aRspFileName = ::GetTmpFileName();
fRspFile = fopen( aRspFileName.GetBuffer(), "w" ); fRspFile = fopen( aRspFileName.getStr(), "w" );
} }
if( !fRspFile ) if( !fRspFile )
...@@ -100,8 +99,8 @@ static sal_Bool CallPrePro( const ByteString& rInput, ...@@ -100,8 +99,8 @@ static sal_Bool CallPrePro( const ByteString& rInput,
} }
} }
aNewCmdL.Append( rsc_strdup( rInput.GetBuffer() ) ); aNewCmdL.Append( rsc_strdup( rInput.getStr() ) );
aNewCmdL.Append( rsc_strdup( rOutput.GetBuffer() ) ); aNewCmdL.Append( rsc_strdup( rOutput.getStr() ) );
aNewCmdL.Append( (void *)0 ); aNewCmdL.Append( (void *)0 );
if ( bVerbose ) if ( bVerbose )
...@@ -145,11 +144,13 @@ static sal_Bool CallPrePro( const ByteString& rInput, ...@@ -145,11 +144,13 @@ static sal_Bool CallPrePro( const ByteString& rInput,
nRet = rscpp_main( pCmdL->GetCount()-1, (char**)pCmdL->GetBlock() ); nRet = rscpp_main( pCmdL->GetCount()-1, (char**)pCmdL->GetBlock() );
if ( fRspFile ) if ( fRspFile )
{
#if OSL_DEBUG_LEVEL > 5 #if OSL_DEBUG_LEVEL > 5
fprintf( stderr, "leaving response file %s\n", aRspFileName.GetBuffer() ); fprintf( stderr, "leaving response file %s\n", aRspFileName.getStr() );
#else #else
unlink( aRspFileName.GetBuffer() ); unlink( aRspFileName.getStr() );
#endif #endif
}
if ( nRet ) if ( nRet )
return sal_False; return sal_False;
...@@ -163,8 +164,7 @@ static sal_Bool CallPrePro( const ByteString& rInput, ...@@ -163,8 +164,7 @@ static sal_Bool CallPrePro( const ByteString& rInput,
|* Beschreibung |* Beschreibung
*************************************************************************/ *************************************************************************/
static sal_Bool CallRsc2( RscStrList * pInputList, static sal_Bool CallRsc2( RscStrList * pInputList,
ByteString aSrsName, const rtl::OString &rSrsName, RscPtrPtr * pCmdLine )
RscPtrPtr * pCmdLine )
{ {
int nRet; int nRet;
rtl::OString* pString; rtl::OString* pString;
...@@ -200,7 +200,7 @@ static sal_Bool CallRsc2( RscStrList * pInputList, ...@@ -200,7 +200,7 @@ static sal_Bool CallRsc2( RscStrList * pInputList,
aNewCmdL.Append( rsc_strdup( (char *)pCmdLine->GetEntry( i ) ) ); aNewCmdL.Append( rsc_strdup( (char *)pCmdLine->GetEntry( i ) ) );
}; };
aNewCmdL.Append( rsc_strdup( aSrsName.GetBuffer() ) ); aNewCmdL.Append( rsc_strdup( rSrsName.getStr() ) );
for ( size_t i = 0, n = pInputList->size(); i < n; ++i ) for ( size_t i = 0, n = pInputList->size(); i < n; ++i )
{ {
...@@ -232,12 +232,12 @@ static sal_Bool CallRsc2( RscStrList * pInputList, ...@@ -232,12 +232,12 @@ static sal_Bool CallRsc2( RscStrList * pInputList,
*************************************************************************/ *************************************************************************/
SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
{ {
sal_Bool bPrePro = sal_True; sal_Bool bPrePro = sal_True;
sal_Bool bHelp = sal_False; sal_Bool bHelp = sal_False;
sal_Bool bError = sal_False; sal_Bool bError = sal_False;
sal_Bool bResponse = sal_False; sal_Bool bResponse = sal_False;
ByteString aSrsName; rtl::OString aSrsName;
ByteString aResName; rtl::OString aResName;
RscStrList aInputList; RscStrList aInputList;
RscStrList aTmpList; RscStrList aTmpList;
char * pStr; char * pStr;
...@@ -296,12 +296,12 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) ...@@ -296,12 +296,12 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
if( !aInputList.empty() ) if( !aInputList.empty() )
{ {
/* build the output file names */ /* build the output file names */
if( ! aResName.Len() ) if (!aResName.getLength())
aResName = OutputFile( *aInputList[ 0 ], "res" ); aResName = OutputFile( *aInputList[ 0 ], "res" );
if( ! bSetSrs ) if( ! bSetSrs )
{ {
aSrsName = "-fp="; aSrsName = rtl::OStringBuffer("-fp=").append(OutputFile(*aInputList[0], "srs")).
aSrsName += OutputFile( *aInputList[ 0 ], "srs" ); makeStringAndClear();
} }
}; };
...@@ -309,7 +309,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) ...@@ -309,7 +309,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
bPrePro = sal_False; bPrePro = sal_False;
if( bPrePro && !aInputList.empty() ) if( bPrePro && !aInputList.empty() )
{ {
ByteString aTmpName; rtl::OString aTmpName;
for ( size_t k = 0, n = aInputList.size(); k < n; ++k ) for ( size_t k = 0, n = aInputList.size(); k < n; ++k )
{ {
......
rsc/source/res/rscmgr.cxx
Dosyayı görüntüle @ 1b1f0bbb
...@@ -311,12 +311,12 @@ ERRTYPE RscMgr::WriteRc( const RSCINST &, RscWriteRc &, ...@@ -311,12 +311,12 @@ ERRTYPE RscMgr::WriteRc( const RSCINST &, RscWriteRc &,
} }
static rtl::OString MakeSmartName( const ByteString & rDefName ) static rtl::OString MakeSmartName( const rtl::OString& rDefName )
{ {
rtl::OStringBuffer aSmartName; rtl::OStringBuffer aSmartName;
if( rDefName.Len() ) if( rDefName.getStr() )
{ {
char * pStr = (char *)rDefName.GetBuffer(); char * pStr = (char *)rDefName.getStr();
aSmartName.append(static_cast<sal_Char>(toupper(*pStr))); aSmartName.append(static_cast<sal_Char>(toupper(*pStr)));
while( *++pStr ) while( *++pStr )
{ {
...@@ -335,10 +335,10 @@ static rtl::OString MakeSmartName( const ByteString & rDefName ) ...@@ -335,10 +335,10 @@ static rtl::OString MakeSmartName( const ByteString & rDefName )
} }
static rtl::OString MakeName( RscTypCont * pTypCon, RscTop * pClass, static rtl::OString MakeName( RscTypCont * pTypCon, RscTop * pClass,
const ByteString & rName ) const rtl::OString& rName )
{ {
rtl::OStringBuffer aRet; rtl::OStringBuffer aRet;
if( !pTypCon->IsSmart() || isdigit( rName.GetChar(0) ) ) if( !pTypCon->IsSmart() || isdigit( rName[0] ) )
{ {
aRet.append(pHS->getString( pClass->GetId() ).getStr()); aRet.append(pHS->getString( pClass->GetId() ).getStr());
aRet.append(rName); aRet.append(rName);
......
rsc/source/rsc/rsc.cxx
Dosyayı görüntüle @ 1b1f0bbb
...@@ -856,11 +856,11 @@ ERRTYPE RscCompiler::Link() ...@@ -856,11 +856,11 @@ ERRTYPE RscCompiler::Link()
pTC->SetSourceCharSet( RTL_TEXTENCODING_UTF8 ); pTC->SetSourceCharSet( RTL_TEXTENCODING_UTF8 );
pTC->ClearSysNames(); pTC->ClearSysNames();
rtl::OStringBuffer aSysSearchPath(it->aLangSearchPath); rtl::OStringBuffer aSysSearchPath(it->aLangSearchPath);
xub_StrLen nIndex = 0; sal_Int32 nIndex = 0;
ByteString aSearchPath = pTC->GetSearchPath(); rtl::OString aSearchPath = pTC->GetSearchPath();
while( nIndex != STRING_NOTFOUND ) do
{ {
ByteString aToken = aSearchPath.GetToken( 0, cSearchDelim, nIndex ); rtl::OString aToken = aSearchPath.getToken( 0, cSearchDelim, nIndex );
if (aSysSearchPath.getLength()) if (aSysSearchPath.getLength())
aSysSearchPath.append(cSearchDelim); aSysSearchPath.append(cSearchDelim);
aSysSearchPath.append(aToken); aSysSearchPath.append(aToken);
...@@ -869,6 +869,7 @@ ERRTYPE RscCompiler::Link() ...@@ -869,6 +869,7 @@ ERRTYPE RscCompiler::Link()
aSysSearchPath.append(cSearchDelim); aSysSearchPath.append(cSearchDelim);
aSysSearchPath.append(aToken); aSysSearchPath.append(aToken);
} }
while ( nIndex >= 0 );
OSL_TRACE( "setting search path for language %s: %s", it->aLangName.GetBuffer(), aSysSearchPath.getStr() ); OSL_TRACE( "setting search path for language %s: %s", it->aLangName.GetBuffer(), aSysSearchPath.getStr() );
pTC->SetSysSearchPath(aSysSearchPath.makeStringAndClear()); pTC->SetSysSearchPath(aSysSearchPath.makeStringAndClear());
...@@ -975,12 +976,12 @@ ERRTYPE RscCompiler::Link() ...@@ -975,12 +976,12 @@ ERRTYPE RscCompiler::Link()
pTC->pEH->StdOut( "Generating .cxx file\n" ); pTC->pEH->StdOut( "Generating .cxx file\n" );
ByteString aHxx = pCL->aOutputHxx; rtl::OString aHxx = pCL->aOutputHxx;
if( !aHxx.Len() ) if( !aHxx.getLength() )
{ {
UniString aUniOutputCxx( pCL->aOutputCxx, RTL_TEXTENCODING_ASCII_US ); UniString aUniOutputCxx( pCL->aOutputCxx, RTL_TEXTENCODING_ASCII_US );
aHxx = rtl::OUStringToOString(DirEntry( aUniOutputCxx ).GetBase(), RTL_TEXTENCODING_ASCII_US); aHxx = rtl::OStringBuffer(rtl::OUStringToOString(DirEntry(aUniOutputCxx).GetBase(),
aHxx += ".hxx"; RTL_TEXTENCODING_ASCII_US)).append(".hxx").makeStringAndClear();
} }
// Schreibe Datei // Schreibe Datei
...@@ -1050,20 +1051,17 @@ void RscCompiler::Append( const rtl::OString& rOutputSrs, ...@@ -1050,20 +1051,17 @@ void RscCompiler::Append( const rtl::OString& rOutputSrs,
bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile, bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
const WriteRcContext& rContext, const WriteRcContext& rContext,
const ByteString& rBaseFileName, const rtl::OString& rBaseFileName,
ByteString& rImagePath, ByteString& rImagePath,
FILE* pSysListFile ) FILE* pSysListFile )
{ {
::std::list< ByteString > aFileNames; ::std::list< rtl::OString > aFileNames;
bool bFound = false; bool bFound = false;
ByteString aFileName( rBaseFileName ); aFileNames.push_back( rBaseFileName + rtl::OString(".png") );
aFileNames.push_back( aFileName += ".png" ); aFileNames.push_back( rBaseFileName + rtl::OString(".bmp") );
aFileName = rBaseFileName; ::std::list< rtl::OString >::iterator aFileIter( aFileNames.begin() );
aFileNames.push_back( aFileName += ".bmp" );
::std::list< ByteString >::iterator aFileIter( aFileNames.begin() );
while( ( aFileIter != aFileNames.end() ) && !bFound ) while( ( aFileIter != aFileNames.end() ) && !bFound )
{ {
...@@ -1090,11 +1088,9 @@ bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile, ...@@ -1090,11 +1088,9 @@ bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
while( ( aReplIter != rContext.pCmdLine->m_aReplacements.end() ) && !bFound ) while( ( aReplIter != rContext.pCmdLine->m_aReplacements.end() ) && !bFound )
{ {
ByteString aSearch( aReplIter->second ); rtl::OString aSearch(aReplIter->second.toAsciiLowerCase());
aSearch.ToLowerAscii(); rtl::OString aSearchIn(aRelPathStr.toAsciiLowerCase());
ByteString aSearchIn( aRelPathStr ); if( aSearchIn.indexOf(aSearch) == 0 )
aSearchIn.ToLowerAscii();
if( aSearchIn.Search( aSearch ) == 0 )
{ {
sal_Int32 nCopyPos = aReplIter->second.getLength(), nLength = aRelPathStr.getLength(); sal_Int32 nCopyPos = aReplIter->second.getLength(), nLength = aRelPathStr.getLength();
const sal_Char* pChars = aRelPathStr.getStr(); const sal_Char* pChars = aRelPathStr.getStr();
...@@ -1145,7 +1141,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, ...@@ -1145,7 +1141,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
{ {
SvFileStream aIStm( rSrsInPath.GetFull(), STREAM_READ ); SvFileStream aIStm( rSrsInPath.GetFull(), STREAM_READ );
SvFileStream aOStm( rSrsOutPath.GetFull(), STREAM_WRITE | STREAM_TRUNC ); SvFileStream aOStm( rSrsOutPath.GetFull(), STREAM_WRITE | STREAM_TRUNC );
::std::vector< ByteString > aMissingImages; ::std::vector< rtl::OString > aMissingImages;
FILE* pSysListFile = rContext.aOutputSysList.getLength() ? fopen( rContext.aOutputSysList.getStr(), "ab" ) : NULL; FILE* pSysListFile = rContext.aOutputSysList.getLength() ? fopen( rContext.aOutputSysList.getStr(), "ab" ) : NULL;
if( !aIStm.GetError() && !aOStm.GetError() ) if( !aIStm.GetError() && !aOStm.GetError() )
...@@ -1183,7 +1179,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, ...@@ -1183,7 +1179,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
} }
while( aLine.Search( "Prefix" ) == STRING_NOTFOUND ); while( aLine.Search( "Prefix" ) == STRING_NOTFOUND );
const ByteString aPrefix( getToken(aLine, 1, '"') ); const rtl::OString aPrefix( getToken(aLine, 1, '"') );
aIStm.Seek( nImgListStartPos ); aIStm.Seek( nImgListStartPos );
do do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment