diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-02-18 00:29:47 +0100 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-02-18 17:30:23 +0100 |
| commit | 94af3bc2a4d729339486989fba67b17127e87329 (patch) | |
| tree | 00839755078f090e6e46cd920ab71367fdbc7a6a /l10ntools | |
| parent | 6ba4d125f61f1cfe737190628e84f7fc75263382 (diff) | |
ulfex: remove unneeded bULF, it is always true
Change-Id: I1401fddfdd42eba96253f4dd19cf60bba8de6802
Diffstat (limited to 'l10ntools')
| -rw-r--r-- | l10ntools/inc/lngmerge.hxx | 4 | ||||
| -rw-r--r-- | l10ntools/source/lngex.cxx | 2 | ||||
| -rw-r--r-- | l10ntools/source/lngmerge.cxx | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx index b566accb0ec3..278910c3a539 100644 --- a/l10ntools/inc/lngmerge.hxx +++ b/l10ntools/inc/lngmerge.hxx @@ -46,7 +46,6 @@ private: sal_uInt16 nError; LngLineList *pLines; OString sSource; - bool bULF; std::vector<OString> aLanguages; bool isNextGroup(OString &sGroup_out, const OString &sLine_in); @@ -55,8 +54,7 @@ private: void WritePO(PoOfstream &aPOStream, OStringHashMap &rText_inout, const OString &rActFileName, const OString &rID); public: - LngParser(const OString &rLngFile, - bool bULFFormat); + LngParser(const OString &rLngFile); ~LngParser(); bool CreatePO( const OString &rPOFile ); diff --git a/l10ntools/source/lngex.cxx b/l10ntools/source/lngex.cxx index 399c9cf16f9a..3754326e1ae8 100644 --- a/l10ntools/source/lngex.cxx +++ b/l10ntools/source/lngex.cxx @@ -34,7 +34,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { return 1; } - LngParser aParser( aArgs.m_sInputFile, true ); + LngParser aParser( aArgs.m_sInputFile ); if ( aArgs.m_bMergeMode ) aParser.Merge( aArgs.m_sMergeSrc, aArgs.m_sOutputFile, aArgs.m_sLanguage ); diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index 0b14a2c59379..7171f6584c5e 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -47,12 +47,10 @@ static void lcl_RemoveUTF8ByteOrderMarker( OString &rString ) // // class LngParser // -LngParser::LngParser(const OString &rLngFile, - bool bULFFormat) +LngParser::LngParser(const OString &rLngFile) : nError( LNG_OK ) , pLines( NULL ) , sSource( rLngFile ) - , bULF( bULFFormat ) { pLines = new LngLineList(); std::ifstream aStream(sSource.getStr()); @@ -237,7 +235,7 @@ bool LngParser::Merge( std::advance( it, nPos ); pLines->erase( it ); } - if( bULF && pEntrys ) + if( pEntrys ) { if( !sLang.isEmpty() ) { |