diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-05-06 16:32:22 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-05-06 16:51:45 +0200 |
| commit | e2e2cc61144cb22227eebfadff0ea24b51ccfbd0 (patch) | |
| tree | 8063275cabcdf32e30c37451a32d96db5929561a /sal/qa | |
| parent | d01768c31a0658c8a74e0dd3a95b2d781639d18e (diff) | |
remove usage of RTL_CONSTASCII_USTRINGPARAM
Mechanical removal of usage together with OUString ctor, done
by compiler plugin.
Change-Id: I554227f76df0dac620b1b46fca32516f78b462c5
Diffstat (limited to 'sal/qa')
| -rw-r--r-- | sal/qa/osl/file/osl_old_test_file.cxx | 6 | ||||
| -rw-r--r-- | sal/qa/rtl/doublelock/rtl_doublelocking.cxx | 4 | ||||
| -rw-r--r-- | sal/qa/rtl/uri/rtl_testuri.cxx | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx index 57448e18ba78..fb51d63c9250 100644 --- a/sal/qa/osl/file/osl_old_test_file.cxx +++ b/sal/qa/osl/file/osl_old_test_file.cxx @@ -97,7 +97,7 @@ using ::rtl::OString; void oldtestfile::test_file_001() { #ifndef WIN32 - OUString base1( RTL_CONSTASCII_USTRINGPARAM( "file:///" TEST_VOLUME "bla" ) ); + OUString base1( "file:///" TEST_VOLUME "bla" ); int i; for( i = 0 ; aSource1[i] ; i +=2 ) { @@ -116,7 +116,7 @@ void oldtestfile::test_file_001() void oldtestfile::test_file_002() { #ifndef WIN32 - OUString base2( RTL_CONSTASCII_USTRINGPARAM( "file:///" TEST_VOLUME "bla/blubs/schnubbel" ) ); + OUString base2( "file:///" TEST_VOLUME "bla/blubs/schnubbel" ); int i; for( i = 0 ; aSource2[i] ; i +=2 ) { @@ -135,7 +135,7 @@ void oldtestfile::test_file_002() void oldtestfile::test_file_004() { #ifndef WIN32 - OUString base4( RTL_CONSTASCII_USTRINGPARAM( "file:///" TEST_VOLUME "bla/" ) ); + OUString base4( "file:///" TEST_VOLUME "bla/" ); int i; for( i = 0 ; aSource1[i] ; i +=2 ) { diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx index f380a7943aba..462a549e7440 100644 --- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx +++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx @@ -45,7 +45,7 @@ namespace { struct Gregorian : public rtl::StaticWithInit<rtl::OUString, Gregorian> { const rtl::OUString operator () () { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CONST_TEST_STRING )); + return rtl::OUString( CONST_TEST_STRING ); } }; } @@ -97,7 +97,7 @@ public: :m_nOK(0), m_nFails(0) { - m_sConstStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CONST_TEST_STRING )); + m_sConstStr = rtl::OUString( CONST_TEST_STRING ); } sal_Int32 getOK() { return m_nOK; } diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx index 005a7a75388a..e873cb7edc3c 100644 --- a/sal/qa/rtl/uri/rtl_testuri.cxx +++ b/sal/qa/rtl/uri/rtl_testuri.cxx @@ -204,8 +204,7 @@ void Test::test_Uri() { aBuffer.append(static_cast< sal_Unicode >('A')); // A aText1 = aBuffer.makeStringAndClear(); aText2 = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "%ED%A0%80" "%F0%90%8F%BF" "%ED%BF%BF" "A")); + "%ED%A0%80" "%F0%90%8F%BF" "%ED%BF%BF" "A"); CPPUNIT_ASSERT_MESSAGE( "failure 11", (rtl::Uri::encode( @@ -226,8 +225,7 @@ void Test::test_Uri() { == aText2)); aText1 = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "%ed%a0%80" "%f0%90%8f%bf" "%ed%bf%bf" "A")); + "%ed%a0%80" "%f0%90%8f%bf" "%ed%bf%bf" "A"); aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("%ED%A0%80")); aBuffer.append(static_cast< sal_Unicode >(0xD800)); aBuffer.append(static_cast< sal_Unicode >(0xDFFF)); |