diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:22:44 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:00:26 +0000 |
| commit | 8b27d78b4afaa9c47ca0fda144c8060f2f14046b (patch) | |
| tree | 2dbddceebf0f96492adc5652697e8efce8a8ba06 /cppuhelper/test/loader/loader.test.cxx | |
| parent | fe8eba5faa59ddf9ee82f3eb009daac72a0ec846 (diff) | |
automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings
Done with a perl regex:
s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms
Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'cppuhelper/test/loader/loader.test.cxx')
| -rw-r--r-- | cppuhelper/test/loader/loader.test.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cppuhelper/test/loader/loader.test.cxx b/cppuhelper/test/loader/loader.test.cxx index 466f243f52dc..cbaf7348d5e9 100644 --- a/cppuhelper/test/loader/loader.test.cxx +++ b/cppuhelper/test/loader/loader.test.cxx @@ -82,7 +82,7 @@ static rtl::OUString s_test__cppu_loadSharedLibComponentFactory(char const * pSe rtl_str_getLength(pServicePurpose), RTL_TEXTENCODING_ASCII_US); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__cppu_loadSharedLibComponentFactory ")); + result += rtl::OUString("\ts_test__cppu_loadSharedLibComponentFactory "); result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(\"")); result += servicePurpose; result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\") - ")); @@ -92,14 +92,14 @@ static rtl::OUString s_test__cppu_loadSharedLibComponentFactory(char const * pSe cppu::loadSharedLibComponentFactory( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SAL_DLLPREFIX "TestComponent.uno" SAL_DLLEXTENSION)), rtl::OUString(), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("impl.test.TestComponent")) + servicePurpose, + rtl::OUString("impl.test.TestComponent") + servicePurpose, uno::Reference<lang::XMultiServiceFactory>(), uno::Reference<registry::XRegistryKey>()) ); rtl::OUString envDcp_purpose(cppu::EnvDcp::getPurpose(g_envDcp)); if (envDcp_purpose == servicePurpose) - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("passed\n")); + result += rtl::OUString("passed\n"); else { @@ -125,7 +125,7 @@ static rtl::OUString s_test__cppu_writeSharedLibComponentInfo(char const * pServ rtl_str_getLength(pServicePurpose), RTL_TEXTENCODING_ASCII_US); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\ts_test__cppu_writeSharedLibComponentInfo ")); + result += rtl::OUString("\ts_test__cppu_writeSharedLibComponentInfo "); result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(\"")); result += servicePurpose; result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\") - ")); @@ -146,7 +146,7 @@ static rtl::OUString s_test__cppu_writeSharedLibComponentInfo(char const * pServ rtl::OUString envDcp_purpose(cppu::EnvDcp::getPurpose(g_envDcp)); if (envDcp_purpose == servicePurpose) - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("passed\n")); + result += rtl::OUString("passed\n"); else { @@ -172,7 +172,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(/*argc*/, argv) rtl::OUString message; message += rtl::OUString(argv[0], rtl_str_getLength(argv[0]), RTL_TEXTENCODING_ASCII_US); - message += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + message += rtl::OUString("\n"); message += s_test__cppu_loadSharedLibComponentFactory(":unsafe"); message += s_test__cppu_loadSharedLibComponentFactory(":affine"); @@ -183,11 +183,11 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(/*argc*/, argv) message += s_test__cppu_writeSharedLibComponentInfo(""); if (message.indexOf("FAILED") == -1) - message += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TESTS PASSED\n")); + message += rtl::OUString("TESTS PASSED\n"); else { - message += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TESTS _NOT_ PASSED\n")); + message += rtl::OUString("TESTS _NOT_ PASSED\n"); result = -1; } |