diff options
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/config/itemholder2.cxx | 7 | ||||
| -rw-r--r-- | svl/source/passwordcontainer/passwordcontainer.cxx | 12 |
2 files changed, 8 insertions, 11 deletions
diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx index fc12e7681ce4..c7ab2bfb4b26 100644 --- a/svl/source/config/itemholder2.cxx +++ b/svl/source/config/itemholder2.cxx @@ -50,11 +50,8 @@ ItemHolder2::ItemHolder2() if(bMessage) { bMessage = false; - OString sMsg = "CreateInstance with arguments exception: " - + OString(rEx.Message.getStr(), - rEx.Message.getLength(), - RTL_TEXTENCODING_ASCII_US); - OSL_FAIL(sMsg.getStr()); + SAL_WARN( "svl", "CreateInstance with arguments exception: " + << rEx.Message); } } #else diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index 7f17e57c640f..eaed9780e490 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -50,12 +50,12 @@ using namespace com::sun::star::ucb; static OUString createIndex(const vector< OUString >& lines) { - OString aResult; + OUString aResult; for( size_t i = 0; i < lines.size(); i++ ) { if( i ) - aResult += OString( "__" ); + aResult += "__"; OString line = OUStringToOString( lines[i], RTL_TEXTENCODING_UTF8 ); const sal_Char* pLine = line.getStr(); @@ -63,19 +63,19 @@ static OUString createIndex(const vector< OUString >& lines) { if (rtl::isAsciiAlphanumeric(static_cast<unsigned char>(*pLine))) { - aResult += OString( *pLine ); + aResult += OUStringLiteral1(*pLine); } else { - aResult += OString("_"); - aResult += OString::number( *pLine, 16 ); + aResult += "_"; + aResult += OUString::number( *pLine, 16 ); } pLine++; } } - return OUString::createFromAscii( aResult.getStr() ); + return aResult; } |