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

convert vectors to OString

Browse Source
This commit is contained in:
Caolán McNamara
2012-01-25 21:07:19 +00:00
parent 1f26095e9c
commit 0143300979
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
l10ntools/inc/lngmerge.hxx
View File

@@ -29,7 +29,7 @@
#include "export.hxx"
#include <vector>
typedef ::std::vector< ByteString* > LngLineList;
typedef ::std::vector< rtl::OString* > LngLineList;
#define LNG_OK 0x0000
#define LNG_FILE_NOTFOUND 0x0001

18
l10ntools/source/lngmerge.cxx
View File

@@ -67,7 +67,7 @@ LngParser::LngParser(const rtl::OString &rLngFile, sal_Bool bUTF8,
bFirstLine = false;
}
pLines->push_back( new ByteString( sLine ) );
pLines->push_back( new rtl::OString(sLine) );
}
}
else
@@ -79,7 +79,7 @@ LngParser::LngParser(const rtl::OString &rLngFile, sal_Bool bUTF8,
LngParser::~LngParser()
{
for ( size_t i = 0, n = pLines->size(); i < n; i++ )
for ( size_t i = 0, n = pLines->size(); i < n; ++i )
delete (*pLines)[ i ];
pLines->clear();
delete pLines;
@@ -244,11 +244,11 @@ sal_Bool LngParser::Merge(
while ( nPos < pLines->size() && !bGroup )
{
ByteString sLine( *(*pLines)[ nPos ] );
rtl::OString sLine( *(*pLines)[ nPos ] );
sLine = comphelper::string::stripStart(sLine, ' ');
sLine = comphelper::string::stripEnd(sLine, ' ');
if (( sLine.GetChar( 0 ) == '[' ) &&
( sLine.GetChar( sLine.Len() - 1 ) == ']' ))
if (( sLine[0] == '[' ) &&
( sLine[sLine.getLength() - 1] == ']' ))
{
sGroup = getToken(getToken(sLine, 1, '['), 0, ']');
sGroup = comphelper::string::stripStart(sGroup, ' ');
@@ -280,7 +280,7 @@ sal_Bool LngParser::Merge(
pEntrys->GetText( sNewText, STRING_TYP_TEXT, sLang, sal_True );
if ( sNewText.Len()) {
ByteString *pLine = (*pLines)[ nPos ];
rtl::OString *pLine = (*pLines)[ nPos ];
ByteString sText1( sLang );
sText1 += " = \"";
@@ -329,9 +329,9 @@ sal_Bool LngParser::Merge(
if ( nLastLangPos < pLines->size() ) {
LngLineList::iterator it = pLines->begin();
::std::advance( it, nLastLangPos );
pLines->insert( it, new ByteString( sLine ) );
pLines->insert( it, new rtl::OString(sLine) );
} else {
pLines->push_back( new ByteString( sLine ) );
pLines->push_back( new rtl::OString(sLine) );
}
}
}
@@ -341,7 +341,7 @@ sal_Bool LngParser::Merge(
delete pResData;
}
for ( size_t i = 0; i < pLines->size(); i++ )
for ( size_t i = 0; i < pLines->size(); ++i )
aDestination.WriteLine( *(*pLines)[ i ] );
aDestination.Close();