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 /sal/rtl | |
| 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 'sal/rtl')
| -rw-r--r-- | sal/rtl/bootstrap.cxx | 8 | ||||
| -rw-r--r-- | sal/rtl/uri.cxx | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index 84d1b58b450b..d3dadcb50d1c 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -105,8 +105,7 @@ rtl::OUString recursivelyExpandMacros( if (requestStack->file == requestFile && requestStack->key == requestKey) { - return rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("***RECURSION DETECTED***")); + return rtl::OUString("***RECURSION DETECTED***"); } } ExpandRequestLink link = { requestStack, requestFile, requestKey }; @@ -267,7 +266,7 @@ static OUString & getIniFileName_Impl() resolvePathnameUrl(&fileName); #else if(getFromCommandLineArgs( - OUString(RTL_CONSTASCII_USTRINGPARAM("INIFILENAME")), &fileName)) + OUString("INIFILENAME"), &fileName)) { resolvePathnameUrl(&fileName); } @@ -459,8 +458,7 @@ struct FundamentalIniData { ini = ((static_cast< Bootstrap_Impl * >(get_static_bootstrap_handle())-> getValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("URE_BOOTSTRAP")), + rtl::OUString("URE_BOOTSTRAP"), &uri.pData, 0, LOOKUP_MODE_NORMAL, false, 0)) && resolvePathnameUrl(&uri)) ? rtl_bootstrap_args_open(uri.pData) : NULL; diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx index 02e71829ce0c..9edd087ca335 100644 --- a/sal/rtl/uri.cxx +++ b/sal/rtl/uri.cxx @@ -723,8 +723,7 @@ sal_Bool SAL_CALL rtl_uriConvertRelToAbs(rtl_uString * pBaseUriRef, { rtl::OUString aMessage(pBaseUriRef); aMessage += rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - " does not start with a scheme component")); + " does not start with a scheme component"); rtl_uString_assign(pException, const_cast< rtl::OUString & >(aMessage).pData); return false; @@ -734,8 +733,7 @@ sal_Bool SAL_CALL rtl_uriConvertRelToAbs(rtl_uString * pBaseUriRef, { rtl::OUString aMessage(pBaseUriRef); aMessage += rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "path component does not start with slash")); + "path component does not start with slash"); rtl_uString_assign(pException, aMessage.pData); return false; } |