diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-26 10:58:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-28 19:44:08 +0200 |
| commit | ef513fd4b049b214a03fbe6e62a5ea43680a7a9b (patch) | |
| tree | 82f2ce93bc8e5fde6dce8685b633c3d643c9f069 /svtools | |
| parent | 826f1bca40a01f0a249d5b6cbb7c39c11638a060 (diff) | |
remove unnecessary use of OString::getStr
Change-Id: I0490efedf459190521f4339854b3394d57765fdb
Reviewed-on: https://gerrit.libreoffice.org/38058
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/langsupport/langsupport.cxx | 3 | ||||
| -rw-r--r-- | svtools/source/config/extcolorcfg.cxx | 9 | ||||
| -rw-r--r-- | svtools/source/config/itemholder2.cxx | 6 | ||||
| -rw-r--r-- | svtools/source/dialogs/addresstemplate.cxx | 7 |
4 files changed, 7 insertions, 18 deletions
diff --git a/svtools/langsupport/langsupport.cxx b/svtools/langsupport/langsupport.cxx index 3a43af30eedf..7ef274571f7e 100644 --- a/svtools/langsupport/langsupport.cxx +++ b/svtools/langsupport/langsupport.cxx @@ -55,8 +55,7 @@ SAL_IMPLEMENT_MAIN() OUString sTag( LanguageTag::convertToBcp47( eLang)); - std::cout << OUStringToOString(sTag, osl_getThreadTextEncoding()).getStr() - << std::endl; + std::cout << sTag << std::endl; } } diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index f42a7c038d60..f60858d856cc 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -105,12 +105,9 @@ public: return aFind2->second; } #if OSL_DEBUG_LEVEL > 0 - OStringBuffer aMessage( "Could find the required config:\n" ); - aMessage.append( "component: " ); - aMessage.append( OUStringToOString( _sComponentName, RTL_TEXTENCODING_UTF8 ) ); - aMessage.append( "\nname: " ); - aMessage.append( OUStringToOString( _sName, RTL_TEXTENCODING_UTF8 ) ); - OSL_FAIL( aMessage.makeStringAndClear().getStr() ); + SAL_WARN( "svtools", "Could find the required config:\n" + "component: " << _sComponentName + << "\nname: " << _sName ); #endif return ExtendedColorConfigValue(); } diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index 638120cf1515..bdfb27387a8d 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -59,11 +59,7 @@ 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( "svtools", "CreateInstance with arguments exception: " << rEx.Message ); } } #else diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index c79e3ab01978..9b6812802520 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -179,11 +179,8 @@ namespace svt } else { - OSL_FAIL( - OString( - "AssigmentTransientData::AssigmentTransientData: unknown programmatic name (" - + OString(pFields->ProgrammaticName.getStr(), pFields->ProgrammaticName.getLength(), RTL_TEXTENCODING_ASCII_US) - + ")!").getStr()); + SAL_WARN( "svtools", "AssigmentTransientData::AssigmentTransientData: unknown programmatic name: " + << pFields->ProgrammaticName ); } } } |