On 03/11/2013 02:10 PM, Chr. Rossmanith wrote:
commit 407b51db1831bb2cf21def88241323e35c612005 Author: Chr. Rossmanith <[email protected]> Date: Sun Mar 10 20:44:01 2013 +0100Remove RTL_CONSTASCII_STRINGPARAM (unotools) Change-Id: I2911e50ddcd007d80498b9d65efd14368ac3baca diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 4c7b0e1..a37f6ae 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -72,13 +72,11 @@ namespace utl namespace { - rtl::OUString makeImplName() + OUString makeImplName() { - rtl::OUString uri; - rtl::Bootstrap::get( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BRAND_BASE_DIR")), - uri); - return uri + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/program/" BOOTSTRAP_DATA_NAME)); + OUString uri; + rtl::Bootstrap::get( OUString("BRAND_BASE_DIR"), uri); + return uri + "/program/" + BOOTSTRAP_DATA_NAME;
For string literals that are concatenated via juxtaposition (as is the case for "/program/" and BOOTSTRAP_DATA_NAME, where the latter is a macro that expands to a string literal), it is arguably better to keep them as such, instead of concatenating them via operator +. It would e.g. fail if they were the first two terms in the whole expression,
return "/program/" + BOOTSTRAP_DATA_NAME + uri; Stephan _______________________________________________ LibreOffice mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice
