diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-12-02 22:35:57 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-12-03 18:04:24 +0100 |
| commit | ce90f99a2d66c2b998ad3f9f028e2ea623a757f5 (patch) | |
| tree | ec8f3adaeca225e22ae41eee80be114aadc25d17 /l10ntools | |
| parent | 249f09885bc06f580ec3aea5ccd7a09d8e91541d (diff) | |
fixes for where fast string operator+ is not perfectly source compatible
Change-Id: I80af0399037e4f68113338139e7f2ad2400e65ab
Diffstat (limited to 'l10ntools')
| -rw-r--r-- | l10ntools/source/po.cxx | 6 | ||||
| -rw-r--r-- | l10ntools/source/propmerge.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index d767db3cb9b5..c59a4f8a4e31 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -420,7 +420,7 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) OString sMsgCtxt = vParts[GROUPID] + "\n" + - (vParts[LOCALID].isEmpty() ? "" : vParts[LOCALID] + "\n") + + (vParts[LOCALID].isEmpty() ? OString( "" ) : vParts[LOCALID] + "\n") + vParts[RESOURCETYPE]; switch(eType){ case TTEXT: @@ -433,7 +433,7 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType) only three element*/ } m_pGenPo->setExtractCom( - ( !vParts[HELPTEXT].isEmpty() ? vParts[HELPTEXT] + "\n" : "" ) + + ( !vParts[HELPTEXT].isEmpty() ? vParts[HELPTEXT] + "\n" : OString( "" )) + lcl_GenKeyId( vParts[SOURCEFILE] + sMsgCtxt + vParts[eType] ) ); m_pGenPo->setMsgCtxt(sMsgCtxt); @@ -827,7 +827,7 @@ void PoIfstream::readEntry( PoEntry& rPoEntry ) sExtractCom.indexOf("\n") == -1 ) ) { aGenPo.setExtractCom( - ( !sExtractCom.isEmpty() ? sExtractCom + "\n" : "" ) + + ( !sExtractCom.isEmpty() ? sExtractCom + "\n" : OString( "" )) + lcl_GenKeyId( aGenPo.getReference() + sMsgCtxt + aGenPo.getMsgId() ) ); diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx index 79c737ed0917..3bd44fb5f974 100644 --- a/l10ntools/source/propmerge.cxx +++ b/l10ntools/source/propmerge.cxx @@ -210,7 +210,7 @@ void PropParser::Merge( const OString &rMergeSrc, const OString &rDestinationFil { OString sNewText; pEntrys->GetText( sNewText, STRING_TYP_TEXT, m_sLang ); - aDestination << (sID + OString("=")).getStr(); + aDestination << OString(sID + "=").getStr(); lcl_PrintJavaStyle( sNewText, aDestination ); aDestination << std::endl; } |