diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-22 14:34:51 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-23 11:37:06 +0000 |
| commit | b1f74de0311af25596e861c24be8b829f4b27cb4 (patch) | |
| tree | a5c17d136efca429a72d2d17f0640fa9e5b9e12f /l10ntools | |
| parent | d3c0bf6c8087c4573b181fc5d01a70cffc17c78f (diff) | |
ByteString->rtl::OString
Diffstat (limited to 'l10ntools')
| -rw-r--r-- | l10ntools/source/gsicheck.cxx | 4 | ||||
| -rw-r--r-- | l10ntools/source/localize.cxx | 8 | ||||
| -rw-r--r-- | l10ntools/source/merge.cxx | 20 |
3 files changed, 16 insertions, 16 deletions
diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx index 354bb8d65c97..e915a4a184d2 100644 --- a/l10ntools/source/gsicheck.cxx +++ b/l10ntools/source/gsicheck.cxx @@ -1046,12 +1046,12 @@ int _cdecl main( int argc, char *argv[] ) } - ByteString sReferenceLine; + rtl::OString sReferenceLine; GSILine* pReferenceLine = NULL; ByteString aOldReferenceId("No Valid ID"); // just set to something which can never be an ID sal_uLong nReferenceLine = 0; - ByteString sGSILine; + rtl::OString sGSILine; GSILine* pGSILine = NULL; ByteString aOldId("No Valid ID"); // just set to something which can never be an ID GSIBlock *pBlock = NULL; diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index b29d08e00fec..c00beee90fec 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -371,12 +371,12 @@ void SourceTreeLocalizer::WorkOnFile( nFileCnt++; SvFileStream aSDFIn( aTemp.GetFull(), STREAM_READ ); - ByteString sLine; - while ( aSDFIn.IsOpen() && !aSDFIn.IsEof()) { + rtl::OString sLine; + while ( aSDFIn.IsOpen() && !aSDFIn.IsEof()) + { aSDFIn.ReadLine( sLine ); - if ( sLine.Len()) { + if (!sLine.isEmpty()) aSDF.WriteLine( sLine ); - } } aSDFIn.Close(); diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index a2c7f8e67dfd..f2193155a070 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -187,7 +187,7 @@ MergeDataFile::MergeDataFile( { SvFileStream aInputStream( String( rFileName, RTL_TEXTENCODING_ASCII_US ), STREAM_STD_READ ); aInputStream.SetStreamCharSet( RTL_TEXTENCODING_MS_1252 ); - ByteString sLine; + rtl::OString sLine; const ByteString sHACK("HACK"); const ::rtl::OString sFileNormalized(lcl_NormalizeFilename(sFile)); const bool isFileEmpty = !sFileNormalized.isEmpty(); @@ -208,17 +208,17 @@ MergeDataFile::MergeDataFile( const ::rtl::OString filename = lcl_NormalizeFilename(getToken(sLine, 1 , '\t')); if(isFileEmpty || sFileNormalized.equals("") || (!isFileEmpty && filename.equals(sFileNormalized)) ) { - xub_StrLen rIdx = 0; - const ByteString sTYP = sLine.GetToken( 3, '\t', rIdx ); - const ByteString sGID = sLine.GetToken( 0, '\t', rIdx ); // 4 - const ByteString sLID = sLine.GetToken( 0, '\t', rIdx ); // 5 - ByteString sPFO = sLine.GetToken( 1, '\t', rIdx ); // 7 + sal_Int32 rIdx = 0; + const ByteString sTYP = sLine.getToken( 3, '\t', rIdx ); + const ByteString sGID = sLine.getToken( 0, '\t', rIdx ); // 4 + const ByteString sLID = sLine.getToken( 0, '\t', rIdx ); // 5 + ByteString sPFO = sLine.getToken( 1, '\t', rIdx ); // 7 sPFO = sHACK; - ByteString nLANG = sLine.GetToken( 1, '\t', rIdx ); // 9 + ByteString nLANG = sLine.getToken( 1, '\t', rIdx ); // 9 nLANG = comphelper::string::strip(nLANG, ' '); - const ByteString sTEXT = sLine.GetToken( 0, '\t', rIdx ); // 10 - const ByteString sQHTEXT = sLine.GetToken( 1, '\t', rIdx ); // 12 - const ByteString sTITLE = sLine.GetToken( 0, '\t', rIdx ); // 13 + const ByteString sTEXT = sLine.getToken( 0, '\t', rIdx ); // 10 + const ByteString sQHTEXT = sLine.getToken( 1, '\t', rIdx ); // 12 + const ByteString sTITLE = sLine.getToken( 0, '\t', rIdx ); // 13 if( !nLANG.EqualsIgnoreCaseAscii("en-US") ) |