diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-09-17 22:59:00 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-17 23:20:47 +0100 |
commit | ec303dfe52f7ba78ffba2a5327fda38abfef5d6f (patch) | |
tree | d6b6a72437f7d7755ca853768fd4d939c76be324 /l10ntools | |
parent | drop makefile.mk (diff) | |
download | core-ec303dfe52f7ba78ffba2a5327fda38abfef5d6f.tar.gz core-ec303dfe52f7ba78ffba2a5327fda38abfef5d6f.zip |
charset arg doesn't exist anymore, fixes helpex
Diffstat (limited to 'l10ntools')
-rw-r--r-- | l10ntools/source/export.cxx | 6 | ||||
-rw-r--r-- | l10ntools/source/helpex.cxx | 7 | ||||
-rw-r--r-- | l10ntools/source/lngmerge.cxx | 2 | ||||
-rw-r--r-- | l10ntools/source/xrmmerge.cxx | 2 |
4 files changed, 7 insertions, 10 deletions
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index 86b94d34ad55..49d9a0ff64a4 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -527,7 +527,7 @@ Export::~Export() if ( bMergeMode && !bUnmerge ) { if ( !pMergeDataFile ) - pMergeDataFile = new MergeDataFile( sMergeSrc, sFile, bErrorLog);//, bUTF8 ); + pMergeDataFile = new MergeDataFile(sMergeSrc, sFile, bErrorLog); delete pMergeDataFile; } @@ -1881,7 +1881,7 @@ sal_Bool Export::PrepareTextToMerge(ByteString &rText, sal_uInt16 nTyp, // search for merge data if ( !pMergeDataFile ){ - pMergeDataFile = new MergeDataFile( sMergeSrc, sFile, bErrorLog );//, bUTF8 ); + pMergeDataFile = new MergeDataFile( sMergeSrc, sFile, bErrorLog ); // Init Languages ByteString sTmp = Export::sLanguages; @@ -1931,7 +1931,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode ) /*****************************************************************************/ { if ( !pMergeDataFile ){ - pMergeDataFile = new MergeDataFile( sMergeSrc, sFile, bErrorLog );//, bUTF8 ); + pMergeDataFile = new MergeDataFile( sMergeSrc, sFile, bErrorLog ); // Init Languages ByteString sTmp = Export::sLanguages; diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx index e67f9793b899..b6a019934fa9 100644 --- a/l10ntools/source/helpex.cxx +++ b/l10ntools/source/helpex.cxx @@ -225,10 +225,8 @@ int _cdecl main( int argc, char *argv[] ) if ( bMergeMode ) { - //sal_uInt64 startreadloc = Export::startMessure(); - MergeDataFile aMergeDataFile( sSDFFile, sInputFile , sal_False, RTL_TEXTENCODING_MS_1252 ); - //MergeDataFile aMergeDataFile( sSDFFile, sInputFile , sal_False, RTL_TEXTENCODING_MS_1252, false ); + MergeDataFile aMergeDataFile(sSDFFile, sInputFile, sal_False); //Export::stopMessure( ByteString("read localize.sdf") , startreadloc ); hasNoError = aParser.Merge( sSDFFile, sOutputFile , Export::sLanguages , aMergeDataFile ); @@ -260,8 +258,7 @@ int _cdecl main( int argc, char *argv[] ) aFStream.close(); ByteString sHelpFile(""); // dummy - //MergeDataFile aMergeDataFile( sSDFFile, sHelpFile , sal_False, RTL_TEXTENCODING_MS_1252, false ); - MergeDataFile aMergeDataFile( sSDFFile, sHelpFile , sal_False, RTL_TEXTENCODING_MS_1252 ); + MergeDataFile aMergeDataFile( sSDFFile, sHelpFile, sal_False ); //aMergeDataFile.Dump(); std::vector<ByteString> aLanguages; diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index 066fb014ea8d..8281073a55b7 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -219,7 +219,7 @@ sal_Bool LngParser::Merge( } nError = LNG_OK; - MergeDataFile aMergeDataFile( rSDFFile, sSource , sal_False, RTL_TEXTENCODING_MS_1252);//, bDBIsUTF8 ); + MergeDataFile aMergeDataFile( rSDFFile, sSource, sal_False ); ByteString sTmp( Export::sLanguages ); if( sTmp.ToUpperAscii().Equals("ALL") ) Export::SetLanguages( aMergeDataFile.GetLanguages() ); diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx index 4043e6f0e857..a2a701e0e44f 100644 --- a/l10ntools/source/xrmmerge.cxx +++ b/l10ntools/source/xrmmerge.cxx @@ -605,7 +605,7 @@ XRMResMerge::XRMResMerge( { if ( rMergeSource.Len()) pMergeDataFile = new MergeDataFile( - rMergeSource, sInputFileName, bErrorLog);//, bUTF8 ); + rMergeSource, sInputFileName, bErrorLog); if( Export::sLanguages.EqualsIgnoreCaseAscii("ALL") ){ Export::SetLanguages( pMergeDataFile->GetLanguages() ); aLanguages = pMergeDataFile->GetLanguages(); |