diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-10-10 09:28:34 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-10-10 09:29:00 +0100 |
commit | 19d37e5c4bd43d2477d21fbaeccef923a60eb9ec (patch) | |
tree | 25f28316783b40d04f5dc5a2663c9c7d9525f9f5 | |
parent | c14bd74f268d4883a73f46a7ceac2d2e98ac96a3 (diff) |
loplugin: unused O[U]Strings
Change-Id: I020149a3073d8479887d108465cf5d3b727588d7
-rw-r--r-- | framework/source/services/substitutepathvars.cxx | 12 | ||||
-rw-r--r-- | sal/qa/osl/file/osl_old_test_file.cxx | 3 | ||||
-rw-r--r-- | sal/qa/osl/module/osl_Module_Const.h | 9 | ||||
-rw-r--r-- | sal/qa/rtl/cipher/rtl_cipher.cxx | 2 |
4 files changed, 5 insertions, 21 deletions
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 9ac3c21cf87f..fbab8a466532 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -375,11 +375,9 @@ const rtl::OUString& SubstitutePathVariables_Impl::GetNTDomainName() const rtl::OUString& SubstitutePathVariables_Impl::GetHostName() { - if ( !m_bHostRetrieved ) + if (!m_bHostRetrieved) { - rtl::OUString aHostName; oslSocketResult aSocketResult; - m_aHost = osl::SocketAddr::getLocalHostname( &aSocketResult ).toAsciiLowerCase(); } @@ -1133,8 +1131,8 @@ throw ( NoSuchElementException, RuntimeException ) aVariable = rVariable.copy( 2, rVariable.getLength() - 3 ); else { - rtl::OUString aExceptionText( RTL_CONSTASCII_USTRINGPARAM( "Unknown variable!" )); - throw NoSuchElementException(); + OUString aExceptionText("Unknown variable!"); + throw NoSuchElementException(aExceptionText, (cppu::OWeakObject *)this); } } else @@ -1148,8 +1146,8 @@ throw ( NoSuchElementException, RuntimeException ) return pIter->second.aSubstValue; } - rtl::OUString aExceptionText( RTL_CONSTASCII_USTRINGPARAM( "Unknown variable!" )); - throw NoSuchElementException( aExceptionText, (cppu::OWeakObject *)this ); + OUString aExceptionText("Unknown variable!"); + throw NoSuchElementException(aExceptionText, (cppu::OWeakObject *)this); } } diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx index 1cdb283d7a80..0d2379e0fa75 100644 --- a/sal/qa/osl/file/osl_old_test_file.cxx +++ b/sal/qa/osl/file/osl_old_test_file.cxx @@ -173,9 +173,6 @@ void oldtestfile::test_file_004() { CPPUNIT_ASSERT_MESSAGE("failure #10.1", target.equalsAscii( aSource1[i+1] ) ); } - OString o = OUStringToOString( target , RTL_TEXTENCODING_ASCII_US ); - OString obase = OUStringToOString( base4 , RTL_TEXTENCODING_ASCII_US ); - //fprintf( stderr, "%d %s + %s = %s\n" ,e, obase.getStr(), aSource1[i], o.pData->buffer ); } #endif } diff --git a/sal/qa/osl/module/osl_Module_Const.h b/sal/qa/osl/module/osl_Module_Const.h index 00de78d9d838..544c525c0252 100644 --- a/sal/qa/osl/module/osl_Module_Const.h +++ b/sal/qa/osl/module/osl_Module_Const.h @@ -47,15 +47,6 @@ # define FILE_PREFIX "file:///" -//Korea charactors -::rtl::OUString aKname( - RTL_CONSTASCII_STRINGPARAM( - "/\xEC\x95\x88\xEB\x85\x95\xED\x95\x98\xEC\x84\xB8\xEC\x9A\x94"), - RTL_TEXTENCODING_ISO_8859_1); - // zero-extend the individual byte-sized characters one-to-one to individual - // sal_Unicode-sized characters; not sure whether this is what was - // intended... - //------------------------------------------------------------------------ // function pointer type. //------------------------------------------------------------------------ diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx index 2b982e51e7f1..9514bd5ff27c 100644 --- a/sal/qa/rtl/cipher/rtl_cipher.cxx +++ b/sal/qa/rtl/cipher/rtl_cipher.cxx @@ -258,8 +258,6 @@ public: /* rtlCipherError */ aError = rtl_cipher_decode(aCipher, pCipherBuffer, nCipherLen, pPlainText2Buffer, nPlainText2Len); CPPUNIT_ASSERT_MESSAGE("wrong decode", aError == rtl_Cipher_E_None); - rtl::OString sPlainText2Str((char*)pPlainText2Buffer, nPlainText2Len); - sal_Int32 nCompare = memcmp(pPlainTextBuffer, pPlainText2Buffer, 16); CPPUNIT_ASSERT_MESSAGE("compare between plain and decoded plain failed", nCompare == 0); |