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 /smoketest | |
| 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 'smoketest')
| -rw-r--r-- | smoketest/smoketest.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/smoketest/smoketest.cxx b/smoketest/smoketest.cxx index 36b3585f40a5..8714c0ac68f3 100644 --- a/smoketest/smoketest.cxx +++ b/smoketest/smoketest.cxx @@ -138,16 +138,14 @@ void Test::test() { rtl::OUString doc; CPPUNIT_ASSERT( test::getTestArgument( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("smoketest.doc")), &doc)); + rtl::OUString("smoketest.doc"), &doc)); css::uno::Sequence< css::beans::PropertyValue > args(2); - args[0].Name = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode")); + args[0].Name = rtl::OUString("MacroExecutionMode"); args[0].Handle = -1; args[0].Value <<= com::sun::star::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN; args[0].State = css::beans::PropertyState_DIRECT_VALUE; - args[1].Name = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("ReadOnly")); + args[1].Name = rtl::OUString("ReadOnly"); args[1].Handle = -1; args[1].Value <<= sal_True; args[1].State = css::beans::PropertyState_DIRECT_VALUE; @@ -165,12 +163,12 @@ void Test::test() { css::uno::Reference< css::frame::XModel >( xDesktop->loadComponentFromURL( test::toAbsoluteFileUrl(doc), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")), + rtl::OUString("_default"), 0, args), css::uno::UNO_QUERY_THROW)->getCurrentController(), css::uno::UNO_SET_THROW)->getFrame(), css::uno::UNO_QUERY_THROW)->queryDispatch( - url, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), 0), + url, rtl::OUString("_self"), 0), css::uno::UNO_QUERY_THROW); Result result; // Shifted to main thread to work around potential deadlocks (i112867): |